Unverified Commit e8f022f9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'dt64-cleanup-5.18' of... 

Merge tag 'dt64-cleanup-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into arm/dt

Minor cleanup of ARM64 DTS for v5.18

The DT schema expects DMA controller nodes to follow certain node naming
and having dma-cells property.  Adjust the DTS files to pass DT schema
checks.

* tag 'dt64-cleanup-5.18' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  arm64: dts: lg: align pl330 node name with dtschema
  arm64: dts: lg: add dma-cells to pl330 node
  arm64: dts: juno: align pl330 node name with dtschema

Link: https://lore.kernel.org/r/20220307173614.157884-1-krzysztof.kozlowski@canonical.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 1a38f961 ad3c72b0

arch/arm64/boot/dts/arm/juno-base.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -671,7 +671,7 @@ 
		dma-coherent;

	};



	dma@7ff00000 {

	dma-controller@7ff00000 {

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

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

		#dma-cells = <1>;

arch/arm64/boot/dts/lg/lg1312.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -182,12 +182,13 @@ 
			clocks = <&clk_bus>;

			clock-names = "apb_pclk";

		};

		dmac0: dma@c1128000 {

		dmac0: dma-controller@c1128000 {

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

			reg = <0x0 0xc1128000 0x1000>;

			interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clk_bus>;

			clock-names = "apb_pclk";

			#dma-cells = <1>;

		};

		gpio0: gpio@fd400000 {

			#gpio-cells = <2>;

arch/arm64/boot/dts/lg/lg1313.dtsi

+2 −1
Original line number Diff line number Diff line
@@ -182,12 +182,13 @@ 
			clocks = <&clk_bus>;

			clock-names = "apb_pclk";

		};

		dmac0: dma@c1128000 {

		dmac0: dma-controller@c1128000 {

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

			reg = <0x0 0xc1128000 0x1000>;

			interrupts = <GIC_SPI 29 IRQ_TYPE_LEVEL_HIGH>;

			clocks = <&clk_bus>;

			clock-names = "apb_pclk";

			#dma-cells = <1>;

		};

		gpio0: gpio@fd400000 {

			#gpio-cells = <2>;