Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a23e10da authored by Stefan Wahren's avatar Stefan Wahren Committed by Greg Kroah-Hartman
Browse files

ARM: dts: imx: Adjust dma-apbh node name 



[ Upstream commit e9f5cd85f1f931bb7b64031492f7051187ccaac7 ]

Currently the dtbs_check generates warnings like this:

$nodename:0: 'dma-apbh@110000' does not match '^dma-controller(@.*)?$'

So fix all affected dma-apbh node names.

Signed-off-by: default avatarStefan Wahren <stefan.wahren@i2se.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
Stable-dep-of: be18293e47cb ("ARM: dts: imx: Set default tuning step for imx7d usdhc")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 536c1bbe

arch/arm/boot/dts/imx23.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
				reg = <0x80000000 0x2000>;

			};



			dma_apbh: dma-apbh@80004000 {

			dma_apbh: dma-controller@80004000 {

				compatible = "fsl,imx23-dma-apbh";

				reg = <0x80004000 0x2000>;

				interrupts = <0 14 20 0

arch/arm/boot/dts/imx28.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ 
				status = "disabled";

			};



			dma_apbh: dma-apbh@80004000 {

			dma_apbh: dma-controller@80004000 {

				compatible = "fsl,imx28-dma-apbh";

				reg = <0x80004000 0x2000>;

				interrupts = <82 83 84 85

arch/arm/boot/dts/imx6qdl.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ 
		interrupt-parent = <&gpc>;

		ranges;



		dma_apbh: dma-apbh@110000 {

		dma_apbh: dma-controller@110000 {

			compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";

			reg = <0x00110000 0x2000>;

			interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>,

arch/arm/boot/dts/imx6sx.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -211,7 +211,7 @@ 
			power-domains = <&pd_pu>;

		};



		dma_apbh: dma-apbh@1804000 {

		dma_apbh: dma-controller@1804000 {

			compatible = "fsl,imx6sx-dma-apbh", "fsl,imx28-dma-apbh";

			reg = <0x01804000 0x2000>;

			interrupts = <GIC_SPI 13 IRQ_TYPE_LEVEL_HIGH>,

arch/arm/boot/dts/imx6ul.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ 
			      <0x00a06000 0x2000>;

		};



		dma_apbh: dma-apbh@1804000 {

		dma_apbh: dma-controller@1804000 {

			compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";

			reg = <0x01804000 0x2000>;

			interrupts = <0 13 IRQ_TYPE_LEVEL_HIGH>,