Commit 889231c6 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'v5.12-rockchip-dts64-1' of... 

Merge tag 'v5.12-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into arm/dt

New boards: Radxa Rock Pi E, NanoPi M4B
More fixed indices for mmc nodes; removal of obsolete amba bus nodes;
nand-flash-controller nodes for px30 and rk3308; rk3399 pcie ranges fix;
board-level fixes for Helios64, NanoPi and Rock960; more sound support
for rock64 and rockpro64 and cleanups to make dt-bindings happier.

* tag 'v5.12-rockchip-dts64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: (24 commits)
  arm64: dts: rockchip: more user friendly name of sound nodes
  arm64: dts: rockchip: rename pinctrl nodename to gmac2io for nanopi-r2s board
  arm64: dts: rockchip: assign a fixed index to mmc devices on rk3368 boards
  arm64: dts: rockchip: assign a fixed index to mmc devices on rk3308 boards
  arm64: dts: rockchip: assign a fixed index to mmc devices on px30 boards
  arm64: dts: rockchip: cleanup cpu_thermal node of rk3399-rock960.dts
  arm64: dts: rockchip: Remove bogus "amba" bus nodes
  arm64: dts: rockchip: Light "sys" LED on NanoPi R2S
  arm64: dts: rockchip: fix ranges property format for rk3399 pcie node
  arm64: dts: rockchip: Rely on SoC external pull up on pmic-int-l on Helios64
  arm64: dts: rockchip: Add NanoPi M4B board
  arm64: dts: rockchip: Move ep-gpios property to nanopc-t4 from nanopi4
  arm64: dts: rockchip: Add NFC node for PX30 SoC
  arm64: dts: rockchip: Add NFC node for RK3308 SoC
  arm64: dts: rockchip: rk3328: Add Radxa ROCK Pi E
  dt-bindings: arm: rockchip: Add Radxa ROCK Pi E
  arm64: dts: rockchip: rk3328: Add clock_in_out property to gmac2phy node
  arm64: dts: rockchip: rename thermal subnodes for rk3399
  arm64: dts: rockchip: rename thermal subnodes for rk3368
  arm64: dts: rockchip: add SPDIF node for rk3399-rockpro64
  ...

Link: https://lore.kernel.org/r/12699743.uLZWGnKmhe@phil


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 243d3de3 7582ad63

Documentation/devicetree/bindings/arm/rockchip.yaml

+5 −0
Original line number Diff line number Diff line
@@ -467,6 +467,11 @@ properties: 
          - const: radxa,rockpi4

          - const: rockchip,rk3399



      - description: Radxa ROCK Pi E

        items:

          - const: radxa,rockpi-e

          - const: rockchip,rk3328



      - description: Radxa ROCK Pi N8

        items:

          - const: radxa,rockpi-n8

arch/arm64/boot/dts/rockchip/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-a1.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-evb.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock-pi-e.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox.dtb
@@ -33,6 +34,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-kobol-helios64.dtb 
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-leez-p710.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopc-t4.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-m4b.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-nanopi-neo4.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-orangepi.dtb

dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-pinebook-pro.dtb

arch/arm64/boot/dts/rockchip/px30.dtsi

+47 −36
Original line number Diff line number Diff line
@@ -25,6 +25,9 @@ aliases { 
		i2c1 = &i2c1;

		i2c2 = &i2c2;

		i2c3 = &i2c3;

		mmc0 = &sdmmc;

		mmc1 = &sdio;

		mmc2 = &emmc;

		serial0 = &uart0;

		serial1 = &uart1;

		serial2 = &uart2;
@@ -703,12 +706,6 @@ rktimer: timer@ff210000 { 
		clock-names = "pclk", "timer";

	};



	amba: bus {

		compatible = "simple-bus";

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



	dmac: dmac@ff240000 {

		compatible = "arm,pl330", "arm,primecell";

		reg = <0x0 0xff240000 0x0 0x4000>;
@@ -719,7 +716,6 @@ dmac: dmac@ff240000 { 
		clock-names = "apb_pclk";

		#dma-cells = <1>;

	};

	};



	tsadc: tsadc@ff280000 {

		compatible = "rockchip,px30-tsadc";
@@ -973,6 +969,21 @@ emmc: mmc@ff390000 { 
		status = "disabled";

	};



	nfc: nand-controller@ff3b0000 {

		compatible = "rockchip,px30-nfc";

		reg = <0x0 0xff3b0000 0x0 0x4000>;

		interrupts = <GIC_SPI 57 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru HCLK_NANDC>, <&cru SCLK_NANDC>;

		clock-names = "ahb", "nfc";

		assigned-clocks = <&cru SCLK_NANDC>;

		assigned-clock-rates = <150000000>;

		pinctrl-names = "default";

		pinctrl-0 = <&flash_ale &flash_bus8 &flash_cle &flash_cs0

			     &flash_rdn &flash_rdy &flash_wrn &flash_dqs>;

		power-domains = <&power PX30_PD_MMC_NAND>;

		status = "disabled";

	};



	gpu: gpu@ff400000 {

		compatible = "rockchip,px30-mali", "arm,mali-bifrost";

		reg = <0x0 0xff400000 0x0 0x4000>;
@@ -1107,102 +1118,102 @@ vopl_mmu: iommu@ff470f00 { 
	};



	qos_gmac: qos@ff518000 {

		compatible = "syscon";

		compatible = "rockchip,px30-qos", "syscon";

		reg = <0x0 0xff518000 0x0 0x20>;

	};



	qos_gpu: qos@ff520000 {

		compatible = "syscon";

		compatible = "rockchip,px30-qos", "syscon";

		reg = <0x0 0xff520000 0x0 0x20>;

	};



	qos_sdmmc: qos@ff52c000 {

		compatible = "syscon";

		compatible = "rockchip,px30-qos", "syscon";

		reg = <0x0 0xff52c000 0x0 0x20>;

	};



	qos_emmc: qos@ff538000 {

		compatible = "syscon";

		compatible = "rockchip,px30-qos", "syscon";

		reg = <0x0 0xff538000 0x0 0x20>;

	};



	qos_nand: qos@ff538080 {

		compatible = "syscon";

		compatible = "rockchip,px30-qos", "syscon";

		reg = <0x0 0xff538080 0x0 0x20>;

	};



	qos_sdio: qos@ff538100 {

		compatible = "syscon";

		compatible = "rockchip,px30-qos", "syscon";

		reg = <0x0 0xff538100 0x0 0x20>;

	};



	qos_sfc: qos@ff538180 {

		compatible = "syscon";

		compatible = "rockchip,px30-qos", "syscon";

		reg = <0x0 0xff538180 0x0 0x20>;

	};



	qos_usb_host: qos@ff540000 {

		compatible = "syscon";

		compatible = "rockchip,px30-qos", "syscon";

		reg = <0x0 0xff540000 0x0 0x20>;

	};



	qos_usb_otg: qos@ff540080 {

		compatible = "syscon";

		compatible = "rockchip,px30-qos", "syscon";

		reg = <0x0 0xff540080 0x0 0x20>;

	};



	qos_isp_128: qos@ff548000 {

		compatible = "syscon";

		compatible = "rockchip,px30-qos", "syscon";

		reg = <0x0 0xff548000 0x0 0x20>;

	};



	qos_isp_rd: qos@ff548080 {

		compatible = "syscon";

		compatible = "rockchip,px30-qos", "syscon";

		reg = <0x0 0xff548080 0x0 0x20>;

	};



	qos_isp_wr: qos@ff548100 {

		compatible = "syscon";

		compatible = "rockchip,px30-qos", "syscon";

		reg = <0x0 0xff548100 0x0 0x20>;

	};



	qos_isp_m1: qos@ff548180 {

		compatible = "syscon";

		compatible = "rockchip,px30-qos", "syscon";

		reg = <0x0 0xff548180 0x0 0x20>;

	};



	qos_vip: qos@ff548200 {

		compatible = "syscon";

		compatible = "rockchip,px30-qos", "syscon";

		reg = <0x0 0xff548200 0x0 0x20>;

	};



	qos_rga_rd: qos@ff550000 {

		compatible = "syscon";

		compatible = "rockchip,px30-qos", "syscon";

		reg = <0x0 0xff550000 0x0 0x20>;

	};



	qos_rga_wr: qos@ff550080 {

		compatible = "syscon";

		compatible = "rockchip,px30-qos", "syscon";

		reg = <0x0 0xff550080 0x0 0x20>;

	};



	qos_vop_m0: qos@ff550100 {

		compatible = "syscon";

		compatible = "rockchip,px30-qos", "syscon";

		reg = <0x0 0xff550100 0x0 0x20>;

	};



	qos_vop_m1: qos@ff550180 {

		compatible = "syscon";

		compatible = "rockchip,px30-qos", "syscon";

		reg = <0x0 0xff550180 0x0 0x20>;

	};



	qos_vpu: qos@ff558000 {

		compatible = "syscon";

		compatible = "rockchip,px30-qos", "syscon";

		reg = <0x0 0xff558000 0x0 0x20>;

	};



	qos_vpu_r128: qos@ff558080 {

		compatible = "syscon";

		compatible = "rockchip,px30-qos", "syscon";

		reg = <0x0 0xff558080 0x0 0x20>;

	};

arch/arm64/boot/dts/rockchip/rk3308.dtsi

+37 −26
Original line number Diff line number Diff line
@@ -24,6 +24,9 @@ aliases { 
		i2c1 = &i2c1;

		i2c2 = &i2c2;

		i2c3 = &i2c3;

		mmc0 = &sdmmc;

		mmc1 = &emmc;

		mmc2 = &sdio;

		serial0 = &uart0;

		serial1 = &uart1;

		serial2 = &uart2;
@@ -513,12 +516,6 @@ saradc: saradc@ff1e0000 { 
		status = "disabled";

	};



	amba: bus {

		compatible = "simple-bus";

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



	dmac0: dma-controller@ff2c0000 {

		compatible = "arm,pl330", "arm,primecell";

		reg = <0x0 0xff2c0000 0x0 0x4000>;
@@ -540,7 +537,6 @@ dmac1: dma-controller@ff2d0000 { 
		clock-names = "apb_pclk";

		#dma-cells = <1>;

	};

	};



	i2s_2ch_0: i2s@ff350000 {

		compatible = "rockchip,rk3308-i2s", "rockchip,rk3066-i2s";
@@ -629,6 +625,21 @@ sdio: mmc@ff4a0000 { 
		status = "disabled";

	};



	nfc: nand-controller@ff4b0000 {

		compatible = "rockchip,rk3308-nfc",

			     "rockchip,rv1108-nfc";

		reg = <0x0 0xff4b0000 0x0 0x4000>;

		interrupts = <GIC_SPI 81 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&cru HCLK_NANDC>, <&cru SCLK_NANDC>;

		clock-names = "ahb", "nfc";

		assigned-clocks = <&cru SCLK_NANDC>;

		assigned-clock-rates = <150000000>;

		pinctrl-0 = <&flash_ale &flash_bus8 &flash_cle &flash_csn0

			     &flash_rdn &flash_rdy &flash_wrn>;

		pinctrl-names = "default";

		status = "disabled";

	};



	cru: clock-controller@ff500000 {

		compatible = "rockchip,rk3308-cru";

		reg = <0x0 0xff500000 0x0 0x1000>;

arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s.dts

+2 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ lan_led: led-0 { 
		sys_led: led-1 {

			gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;

			label = "nanopi-r2s:red:sys";

			default-state = "on";

		};



		wan_led: led-2 {
@@ -280,7 +281,7 @@ reset_button_pin: reset-button-pin { 
		};

	};



	ethernet-phy {

	gmac2io {

		eth_phy_reset_pin: eth-phy-reset-pin {

			rockchip,pins = <1 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;

		};