Commit 9e824449 authored by Robin Murphy's avatar Robin Murphy Committed by Heiko Stuebner
Browse files

arm64: dts: rockchip: Remove bogus "amba" bus nodes 



The "amba" bus nodes wrapping all the DMA-330 nodes serve no useful
purpose, and certainly bear no relation at all to the actual underlying
interconnect topology. They appear to be cargo-cult copying from a
design misstep in the very early days of FDT adoption on ARM, which was
righted with the "arm,primecell" compatible, and the last trace of the
idea finally purged by commit 2ef7d5f3 ("ARM, ARM64: dts: drop
"arm,amba-bus" in favor of "simple-bus"").

As such, they can simply be removed and the DMA-330 nodes fitted into
the normal sort order.

Signed-off-by: default avatarRobin Murphy <robin.murphy@arm.com>
Link: https://lore.kernel.org/r/131e0ea065109760ea3b59c4bb90cf4fac7826f7.1611186142.git.robin.murphy@arm.com


Signed-off-by: default avatarHeiko Stuebner <heiko@sntech.de>
parent 833821ee

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

+9 −16
Original line number Diff line number Diff line
@@ -703,12 +703,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 +713,6 @@ dmac: dmac@ff240000 { 
		clock-names = "apb_pclk";

		#dma-cells = <1>;

	};

	};



	tsadc: tsadc@ff280000 {

		compatible = "rockchip,px30-tsadc";

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

+19 −26
Original line number Diff line number Diff line
@@ -513,12 +513,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 +534,6 @@ dmac1: dma-controller@ff2d0000 { 
		clock-names = "apb_pclk";

		#dma-cells = <1>;

	};

	};



	i2s_2ch_0: i2s@ff350000 {

		compatible = "rockchip,rk3308-i2s", "rockchip,rk3066-i2s";

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

+11 −18
Original line number Diff line number Diff line
@@ -145,24 +145,6 @@ opp-1296000000 { 
		};

	};



	amba: bus {

		compatible = "simple-bus";

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		dmac: dmac@ff1f0000 {

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

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

			interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;

			arm,pl330-periph-burst;

			clocks = <&cru ACLK_DMAC>;

			clock-names = "apb_pclk";

			#dma-cells = <1>;

		};

	};



	analog_sound: analog-sound {

		compatible = "simple-audio-card";

		simple-audio-card,format = "i2s";
@@ -507,6 +489,17 @@ pwm3: pwm@ff1b0030 { 
		status = "disabled";

	};



	dmac: dmac@ff1f0000 {

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

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

		interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;

		arm,pl330-periph-burst;

		clocks = <&cru ACLK_DMAC>;

		clock-names = "apb_pclk";

		#dma-cells = <1>;

	};



	thermal-zones {

		soc_thermal: soc-thermal {

			polling-delay-passive = <20>;

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

+24 −31
Original line number Diff line number Diff line
@@ -136,37 +136,6 @@ cpu_b3: cpu@103 { 
		};

	};



	amba: bus {

		compatible = "simple-bus";

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		dmac_peri: dma-controller@ff250000 {

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

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

			interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;

			#dma-cells = <1>;

			arm,pl330-broken-no-flushp;

			arm,pl330-periph-burst;

			clocks = <&cru ACLK_DMAC_PERI>;

			clock-names = "apb_pclk";

		};



		dmac_bus: dma-controller@ff600000 {

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

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

			interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;

			#dma-cells = <1>;

			arm,pl330-broken-no-flushp;

			arm,pl330-periph-burst;

			clocks = <&cru ACLK_DMAC_BUS>;

			clock-names = "apb_pclk";

		};

	};



	arm-pmu {

		compatible = "arm,armv8-pmuv3";

		interrupts = <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>,
@@ -399,6 +368,18 @@ uart4: serial@ff1c0000 { 
		status = "disabled";

	};



	dmac_peri: dma-controller@ff250000 {

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

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

		interrupts = <GIC_SPI 2 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 3 IRQ_TYPE_LEVEL_HIGH>;

		#dma-cells = <1>;

		arm,pl330-broken-no-flushp;

		arm,pl330-periph-burst;

		clocks = <&cru ACLK_DMAC_PERI>;

		clock-names = "apb_pclk";

	};



	thermal-zones {

		cpu_thermal: cpu-thermal {

			polling-delay-passive = <100>; /* milliseconds */
@@ -532,6 +513,18 @@ usb_otg: usb@ff580000 { 
		status = "disabled";

	};



	dmac_bus: dma-controller@ff600000 {

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

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

		interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;

		#dma-cells = <1>;

		arm,pl330-broken-no-flushp;

		arm,pl330-periph-burst;

		clocks = <&cru ACLK_DMAC_BUS>;

		clock-names = "apb_pclk";

	};



	i2c0: i2c@ff650000 {

		compatible = "rockchip,rk3368-i2c", "rockchip,rk3288-i2c";

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

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

+22 −29
Original line number Diff line number Diff line
@@ -200,35 +200,6 @@ xin24m: xin24m { 
		#clock-cells = <0>;

	};



	amba: bus {

		compatible = "simple-bus";

		#address-cells = <2>;

		#size-cells = <2>;

		ranges;



		dmac_bus: dma-controller@ff6d0000 {

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

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

			interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH 0>,

				     <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH 0>;

			#dma-cells = <1>;

			arm,pl330-periph-burst;

			clocks = <&cru ACLK_DMAC0_PERILP>;

			clock-names = "apb_pclk";

		};



		dmac_peri: dma-controller@ff6e0000 {

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

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

			interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH 0>,

				     <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH 0>;

			#dma-cells = <1>;

			arm,pl330-periph-burst;

			clocks = <&cru ACLK_DMAC1_PERILP>;

			clock-names = "apb_pclk";

		};

	};



	pcie0: pcie@f8000000 {

		compatible = "rockchip,rk3399-pcie";

		reg = <0x0 0xf8000000 0x0 0x2000000>,
@@ -1351,6 +1322,28 @@ wafer_info: wafer-info@1c { 
		};

	};



	dmac_bus: dma-controller@ff6d0000 {

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

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

		interrupts = <GIC_SPI 5 IRQ_TYPE_LEVEL_HIGH 0>,

			     <GIC_SPI 6 IRQ_TYPE_LEVEL_HIGH 0>;

		#dma-cells = <1>;

		arm,pl330-periph-burst;

		clocks = <&cru ACLK_DMAC0_PERILP>;

		clock-names = "apb_pclk";

	};



	dmac_peri: dma-controller@ff6e0000 {

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

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

		interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH 0>,

			     <GIC_SPI 8 IRQ_TYPE_LEVEL_HIGH 0>;

		#dma-cells = <1>;

		arm,pl330-periph-burst;

		clocks = <&cru ACLK_DMAC1_PERILP>;

		clock-names = "apb_pclk";

	};



	pmucru: pmu-clock-controller@ff750000 {

		compatible = "rockchip,rk3399-pmucru";

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