Commit 5eae5696 authored by Robin Murphy's avatar Robin Murphy Committed by Heiko Stuebner
Browse files

ARM: 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/e682edd25133bde2ed8198138febc90071530a51.1611186142.git.robin.murphy@arm.com


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

arch/arm/boot/dts/rk3036.dtsi

+12 −19
Original line number Diff line number Diff line
@@ -54,25 +54,6 @@ cpu1: cpu@f01 { 
		};

	};



	amba: bus {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		pdma: pdma@20078000 {

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

			reg = <0x20078000 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_DMAC2>;

			clock-names = "apb_pclk";

		};

	};



	arm-pmu {

		compatible = "arm,cortex-a7-pmu";

		interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,
@@ -509,6 +490,18 @@ spi: spi@20074000 { 
		status = "disabled";

	};



	pdma: pdma@20078000 {

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

		reg = <0x20078000 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_DMAC2>;

		clock-names = "apb_pclk";

	};



	pinctrl: pinctrl {

		compatible = "rockchip,rk3036-pinctrl";

		rockchip,grf = <&grf>;

arch/arm/boot/dts/rk322x.dtsi

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

	};



	amba: bus {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		pdma: pdma@110f0000 {

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

			reg = <0x110f0000 0x4000>;

			interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,

				     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;

			#dma-cells = <1>;

			arm,pl330-periph-burst;

			clocks = <&cru ACLK_DMAC>;

			clock-names = "apb_pclk";

		};

	};



	arm-pmu {

		compatible = "arm,cortex-a7-pmu";

		interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,
@@ -464,6 +446,17 @@ cru: clock-controller@110e0000 { 
			<75000000>;

	};



	pdma: pdma@110f0000 {

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

		reg = <0x110f0000 0x4000>;

		interrupts = <GIC_SPI 0 IRQ_TYPE_LEVEL_HIGH>,

			     <GIC_SPI 1 IRQ_TYPE_LEVEL_HIGH>;

		#dma-cells = <1>;

		arm,pl330-periph-burst;

		clocks = <&cru ACLK_DMAC>;

		clock-names = "apb_pclk";

	};



	thermal-zones {

		cpu_thermal: cpu-thermal {

			polling-delay-passive = <100>; /* milliseconds */

arch/arm/boot/dts/rk3288.dtsi

+37 −44
Original line number Diff line number Diff line
@@ -154,50 +154,6 @@ opp-1608000000 { 
		};

	};



	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_DMAC2>;

			clock-names = "apb_pclk";

		};



		dmac_bus_ns: 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_DMAC1>;

			clock-names = "apb_pclk";

			status = "disabled";

		};



		dmac_bus_s: dma-controller@ffb20000 {

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

			reg = <0x0 0xffb20000 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_DMAC1>;

			clock-names = "apb_pclk";

		};

	};



	reserved-memory {

		#address-cells = <2>;

		#size-cells = <2>;
@@ -487,6 +443,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_DMAC2>;

		clock-names = "apb_pclk";

	};



	thermal-zones {

		reserve_thermal: reserve-thermal {

			polling-delay-passive = <1000>; /* milliseconds */
@@ -665,6 +633,19 @@ usb_hsic: usb@ff5c0000 { 
		status = "disabled";

	};



	dmac_bus_ns: 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_DMAC1>;

		clock-names = "apb_pclk";

		status = "disabled";

	};



	i2c0: i2c@ff650000 {

		compatible = "rockchip,rk3288-i2c";

		reg = <0x0 0xff650000 0x0 0x1000>;
@@ -1398,6 +1379,18 @@ qos_hevc_w: qos@ffaf0080 { 
		reg = <0x0 0xffaf0080 0x0 0x20>;

	};



	dmac_bus_s: dma-controller@ffb20000 {

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

		reg = <0x0 0xffb20000 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_DMAC1>;

		clock-names = "apb_pclk";

	};



	efuse: efuse@ffb40000 {

		compatible = "rockchip,rk3288-efuse";

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

arch/arm/boot/dts/rk3xxx.dtsi

+37 −44
Original line number Diff line number Diff line
@@ -32,50 +32,6 @@ aliases { 
		spi1 = &spi1;

	};



	amba: bus {

		compatible = "simple-bus";

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;



		dmac1_s: dma-controller@20018000 {

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

			reg = <0x20018000 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_DMA1>;

			clock-names = "apb_pclk";

		};



		dmac1_ns: dma-controller@2001c000 {

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

			reg = <0x2001c000 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_DMA1>;

			clock-names = "apb_pclk";

			status = "disabled";

		};



		dmac2: dma-controller@20078000 {

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

			reg = <0x20078000 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_DMA2>;

			clock-names = "apb_pclk";

		};

	};



	xin24m: oscillator {

		compatible = "fixed-clock";

		clock-frequency = <24000000>;
@@ -304,6 +260,31 @@ grf: grf@20008000 { 
		reg = <0x20008000 0x200>;

	};



	dmac1_s: dma-controller@20018000 {

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

		reg = <0x20018000 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_DMA1>;

		clock-names = "apb_pclk";

	};



	dmac1_ns: dma-controller@2001c000 {

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

		reg = <0x2001c000 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_DMA1>;

		clock-names = "apb_pclk";

		status = "disabled";

	};



	i2c0: i2c@2002d000 {

		compatible = "rockchip,rk3066-i2c";

		reg = <0x2002d000 0x1000>;
@@ -478,4 +459,16 @@ spi1: spi@20074000 { 
		dma-names = "tx", "rx";

		status = "disabled";

	};



	dmac2: dma-controller@20078000 {

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

		reg = <0x20078000 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_DMA2>;

		clock-names = "apb_pclk";

	};

};