Commit c8128b5c authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'uniphier-dt64-v5.8' of... 

Merge tag 'uniphier-dt64-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into arm/dt

UniPhier ARM64 SoC DT updates for v5.8

- add DMA controller nodes

- add Akebi96 board support

* tag 'uniphier-dt64-v5.8' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  arm64: dts: uniphier: Add support for Akebi96
  dt-bindings: arm: Add Akebi96 board support
  arm64: dts: uniphier: add #address-cells and #size-cells to SPI nodes
  arm64: dts: uniphier: Stabilize Ethernet RGMII mode of PXs3 ref board
  arm64: dts: uniphier: Add ethernet aliases
  arm64: dts: uniphier: Add XDMAC node

Link: https://lore.kernel.org/r/CAK7LNARUL52pBhg8AD9XeScVqhD8qr2eVEfu4+1v8D+KPyOwNw@mail.gmail.com


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 184a2833 7d5620d3

Documentation/devicetree/bindings/arm/socionext/uniphier.yaml

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ properties: 
      - description: LD20 SoC boards

        items:

          - enum:

            - socionext,uniphier-ld20-akebi96

            - socionext,uniphier-ld20-global

            - socionext,uniphier-ld20-ref

          - const: socionext,uniphier-ld20

arch/arm64/boot/dts/socionext/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
dtb-$(CONFIG_ARCH_UNIPHIER) += \

	uniphier-ld11-global.dtb \

	uniphier-ld11-ref.dtb \

	uniphier-ld20-akebi96.dtb \

	uniphier-ld20-global.dtb \

	uniphier-ld20-ref.dtb \

	uniphier-pxs3-ref.dtb

arch/arm64/boot/dts/socionext/uniphier-ld11-global.dts

+1 −0
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ 
		i2c3 = &i2c3;

		i2c4 = &i2c4;

		i2c5 = &i2c5;

		ethernet0 = &eth;

	};



	memory@80000000 {

arch/arm64/boot/dts/socionext/uniphier-ld11-ref.dts

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ 
		i2c3 = &i2c3;

		i2c4 = &i2c4;

		i2c5 = &i2c5;

		ethernet0 = &eth;

	};



	memory@80000000 {

arch/arm64/boot/dts/socionext/uniphier-ld11.dtsi

+12 −0
Original line number Diff line number Diff line
@@ -129,6 +129,8 @@ 
			compatible = "socionext,uniphier-scssi";

			status = "disabled";

			reg = <0x54006000 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <0 39 4>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_spi0>;
@@ -140,6 +142,8 @@ 
			compatible = "socionext,uniphier-scssi";

			status = "disabled";

			reg = <0x54006100 0x100>;

			#address-cells = <1>;

			#size-cells = <0>;

			interrupts = <0 216 4>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_spi1>;
@@ -566,6 +570,14 @@ 
			};

		};



		xdmac: dma-controller@5fc10000 {

			compatible = "socionext,uniphier-xdmac";

			reg = <0x5fc10000 0x5300>;

			interrupts = <0 188 4>;

			dma-channels = <16>;

			#dma-cells = <2>;

		};



		aidet: interrupt-controller@5fc20000 {

			compatible = "socionext,uniphier-ld11-aidet";

			reg = <0x5fc20000 0x200>;