Commit ba97d019 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'uniphier-dt-v4.21' of... 

Merge tag 'uniphier-dt-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier into next/dt

UniPhier ARM SoC DT updates for v4.21

- Add bindings for all SoCs/boards of UniPhier platform

- Move binding docs to socionext directory

- Add all CPUs in cooling maps

- Add MIO DMAC nodes

* tag 'uniphier-dt-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier

:
  ARM: dts: uniphier: add MIO DMAC nodes
  arm64: dts: uniphier: Add all CPUs in cooling maps
  ARM: dts: uniphier: Add all CPUs in cooling maps
  dt-bindings: uniphier: move cache-uniphier.txt to vendor directory
  dt-bindings: uniphier: add bindings for UniPhier SoC family

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents dd980900 5fd98eb7

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

0 → 100644
+47 −0
Original line number Diff line number Diff line 
Socionext UniPhier SoC family

-----------------------------



Required properties in the root node:

  - compatible: should contain board and SoC compatible strings



SoC and board compatible strings:

  (sorted chronologically)



  - LD4 SoC:  "socionext,uniphier-ld4"

      - Reference Board: "socionext,uniphier-ld4-ref"



  - Pro4 SoC: "socionext,uniphier-pro4"

      - Reference Board: "socionext,uniphier-pro4-ref"

      - Ace Board:       "socionext,uniphier-pro4-ace"

      - Sanji Board:     "socionext,uniphier-pro4-sanji"



  - sLD8 SoC: "socionext,uniphier-sld8"

      - Reference Board: "socionext,uniphier-sld8-ref"



  - PXs2 SoC: "socionext,uniphier-pxs2"

      - Gentil Board:    "socionext,uniphier-pxs2-gentil"

      - Vodka Board:     "socionext,uniphier-pxs2-vodka"



  - LD6b SoC: "socionext,uniphier-ld6b"

      - Reference Board: "socionext,uniphier-ld6b-ref"



  - LD11 SoC: "socionext,uniphier-ld11"

      - Reference Board: "socionext,uniphier-ld11-ref"

      - Global Board:    "socionext,uniphier-ld11-global"



  - LD20 SoC: "socionext,uniphier-ld20"

      - Reference Board: "socionext,uniphier-ld20-ref"

      - Global Board:    "socionext,uniphier-ld20-global"



  - PXs3 SoC: "socionext,uniphier-pxs3"

      - Reference Board: "socionext,uniphier-pxs3-ref"



Example:



/dts-v1/;



/ {

	compatible = "socionext,uniphier-ld20-ref", "socionext,uniphier-ld20";



	...

};

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -2247,6 +2247,7 @@ M: Masahiro Yamada <yamada.masahiro@socionext.com> 
L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier.git

S:	Maintained

F:	Documentation/devicetree/bindings/arm/socionext/uniphier.txt

F:	Documentation/devicetree/bindings/gpio/gpio-uniphier.txt

F:	Documentation/devicetree/bindings/pinctrl/socionext,uniphier-pinctrl.txt

F:	arch/arm/boot/dts/uniphier*

arch/arm/boot/dts/uniphier-ld4.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -235,6 +235,16 @@ 
			};

		};



		dmac: dma-controller@5a000000 {

			compatible = "socionext,uniphier-mio-dmac";

			reg = <0x5a000000 0x1000>;

			interrupts = <0 68 4>, <0 68 4>, <0 69 4>, <0 70 4>,

				     <0 71 4>, <0 72 4>, <0 73 4>;

			clocks = <&mio_clk 7>;

			resets = <&mio_rst 7>;

			#dma-cells = <1>;

		};



		sd: sdhc@5a400000 {

			compatible = "socionext,uniphier-sd-v2.91";

			status = "disabled";
@@ -246,6 +256,8 @@ 
			clocks = <&mio_clk 0>;

			reset-names = "host", "bridge";

			resets = <&mio_rst 0>, <&mio_rst 3>;

			dma-names = "rx-tx";

			dmas = <&dmac 4>;

			bus-width = <4>;

			cap-sd-highspeed;

			sd-uhs-sdr12;
@@ -263,6 +275,8 @@ 
			clocks = <&mio_clk 1>;

			reset-names = "host", "bridge", "hw";

			resets = <&mio_rst 1>, <&mio_rst 4>, <&mio_rst 6>;

			dma-names = "rx-tx";

			dmas = <&dmac 6>;

			bus-width = <8>;

			cap-mmc-highspeed;

			cap-mmc-hw-reset;

arch/arm/boot/dts/uniphier-pro4.dtsi

+16 −0
Original line number Diff line number Diff line
@@ -269,6 +269,16 @@ 
			};

		};



		dmac: dma-controller@5a000000 {

			compatible = "socionext,uniphier-mio-dmac";

			reg = <0x5a000000 0x1000>;

			interrupts = <0 68 4>, <0 68 4>, <0 69 4>, <0 70 4>,

				     <0 71 4>, <0 72 4>, <0 73 4>, <0 74 4>;

			clocks = <&mio_clk 7>;

			resets = <&mio_rst 7>;

			#dma-cells = <1>;

		};



		sd: sdhc@5a400000 {

			compatible = "socionext,uniphier-sd-v2.91";

			status = "disabled";
@@ -280,6 +290,8 @@ 
			clocks = <&mio_clk 0>;

			reset-names = "host", "bridge";

			resets = <&mio_rst 0>, <&mio_rst 3>;

			dma-names = "rx-tx";

			dmas = <&dmac 4>;

			bus-width = <4>;

			cap-sd-highspeed;

			sd-uhs-sdr12;
@@ -297,6 +309,8 @@ 
			clocks = <&mio_clk 1>;

			reset-names = "host", "bridge", "hw";

			resets = <&mio_rst 1>, <&mio_rst 4>, <&mio_rst 6>;

			dma-names = "rx-tx";

			dmas = <&dmac 5>;

			bus-width = <8>;

			cap-mmc-highspeed;

			cap-mmc-hw-reset;
@@ -313,6 +327,8 @@ 
			clocks = <&mio_clk 2>;

			reset-names = "host", "bridge";

			resets = <&mio_rst 2>, <&mio_rst 5>;

			dma-names = "rx-tx";

			dmas = <&dmac 6>;

			bus-width = <4>;

			cap-sd-highspeed;

		};

CRA Git | Maintained and supported by SUSTech CRA and CCSE