Commit f91423e9 authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

ARM: dts: exynos: Remove DMA controller bus node name to fix dtschema warnings 



There is no need to keep DMA controller nodes under AMBA bus node.
Remove the "amba" node to fix dtschema warnings like:

    amba: $nodename:0: 'amba' does not match '^(bus|soc|axi|ahb|apb)(@[0-9a-f]+)?$'

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
Tested-by: default avatarMarek Szyprowski <m.szyprowski@samsung.com>
Reviewed-by: default avatarAlim Akhtar <alim.akhtar@samsung.com>
parent 01ff9ff3

arch/arm/boot/dts/exynos3250.dtsi

+20 −27
Original line number Diff line number Diff line
@@ -418,12 +418,6 @@ exynos_usbphy: exynos-usbphy@125b0000 { 
			status = "disabled";

		};



		amba {

			compatible = "simple-bus";

			#address-cells = <1>;

			#size-cells = <1>;

			ranges;



		pdma0: pdma@12680000 {

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

			reg = <0x12680000 0x1000>;
@@ -445,7 +439,6 @@ pdma1: pdma@12690000 { 
			#dma-channels = <8>;

			#dma-requests = <32>;

		};

		};



		adc: adc@126c0000 {

			compatible = "samsung,exynos3250-adc";

arch/arm/boot/dts/exynos4.dtsi

+31 −39
Original line number Diff line number Diff line
@@ -669,13 +669,6 @@ pwm: pwm@139d0000 { 
			status = "disabled";

		};



		amba: amba {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "simple-bus";

			interrupt-parent = <&gic>;

			ranges;



		pdma0: pdma@12680000 {

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

			reg = <0x12680000 0x1000>;
@@ -708,7 +701,6 @@ mdma1: mdma@12850000 { 
			#dma-channels = <8>;

			#dma-requests = <1>;

		};

		};



		fimd: fimd@11c00000 {

			compatible = "samsung,exynos4210-fimd";

arch/arm/boot/dts/exynos4210-universal_c210.dts

+14 −14
Original line number Diff line number Diff line
@@ -181,20 +181,6 @@ hdmi_ddc: i2c-ddc { 
	};

};



&amba {

	mdma0: mdma@12840000 {

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

		reg = <0x12840000 0x1000>;

		interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_MDMA>;

		clock-names = "apb_pclk";

		#dma-cells = <1>;

		#dma-channels = <8>;

		#dma-requests = <1>;

		power-domains = <&pd_lcd0>;

	};

};



&camera {

	status = "okay";
@@ -616,6 +602,20 @@ &serial_3 { 
	/delete-property/dma-names;

};



&soc {

	mdma0: mdma@12840000 {

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

		reg = <0x12840000 0x1000>;

		interrupts = <GIC_SPI 34 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&clock CLK_MDMA>;

		clock-names = "apb_pclk";

		#dma-cells = <1>;

		#dma-channels = <8>;

		#dma-requests = <1>;

		power-domains = <&pd_lcd0>;

	};

};



&sysram {

	smp-sram@0 {

		status = "disabled";

arch/arm/boot/dts/exynos5250.dtsi

+42 −50
Original line number Diff line number Diff line
@@ -679,13 +679,6 @@ usb2_phy_gen: phy@12130000 { 
			samsung,pmureg-phandle = <&pmu_system_controller>;

		};



		amba {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "simple-bus";

			interrupt-parent = <&gic>;

			ranges;



		pdma0: pdma@121a0000 {

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

			reg = <0x121A0000 0x1000>;
@@ -729,7 +722,6 @@ mdma1: mdma@11c10000 { 
			#dma-channels = <8>;

			#dma-requests = <1>;

		};

		};



		gsc_0:  gsc@13e00000 {

			compatible = "samsung,exynos5250-gsc", "samsung,exynos5-gsc";

arch/arm/boot/dts/exynos5410.dtsi

+19 −27
Original line number Diff line number Diff line
@@ -189,13 +189,6 @@ pinctrl_3: pinctrl@3860000 { 
			interrupts = <GIC_SPI 47 IRQ_TYPE_LEVEL_HIGH>;

		};



		amba {

			#address-cells = <1>;

			#size-cells = <1>;

			compatible = "simple-bus";

			interrupt-parent = <&gic>;

			ranges;



		pdma0: pdma@121a0000 {

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

			reg = <0x121a0000 0x1000>;
@@ -217,7 +210,6 @@ pdma1: pdma@121b0000 { 
			#dma-channels = <8>;

			#dma-requests = <32>;

		};

		};



		audi2s0: i2s@3830000 {

			compatible = "samsung,exynos5420-i2s";