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

Commit 3ac3a2f9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'uniphier-dt-v4.17-2' of... 

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

Pull "UniPhier ARM SoC DT updates for v4.17 (2nd)" from Masahiro Yamada:

- add syscon property to sound nodes
- add more ethernet pin groups
- add ethernet support for PXs3 SoC

* tag 'uniphier-dt-v4.17-2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-uniphier:
  arm64: dts: uniphier: add ethernet node for PXs3
  ARM: dts: uniphier: add pinctrl groups of ethernet for second instance
  ARM: dts: uniphier: add syscon property for UniPhier sound system
  arm64: dts: uniphier: add syscon property for UniPhier sound system
parents fd553821 aba054a1

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

+10 −0
Original line number Diff line number Diff line
@@ -71,6 +71,16 @@ 
		function = "ether_rmii";

	};



	pinctrl_ether1_rgmii: ether1-rgmii {

		groups = "ether1_rgmii";

		function = "ether1_rgmii";

	};



	pinctrl_ether1_rmii: ether1-rmii {

		groups = "ether1_rmii";

		function = "ether1_rmii";

	};



	pinctrl_i2c0: i2c0 {

		groups = "i2c0";

		function = "i2c0";

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

+2 −1
Original line number Diff line number Diff line
@@ -242,6 +242,7 @@ 
			reset-names = "aio";

			resets = <&sys_rst 40>;

			#sound-dai-cells = <1>;

			socionext,syscon = <&soc_glue>;



			i2s_port0: port@0 {

				i2s_hdmi: endpoint {
@@ -418,7 +419,7 @@ 
			};

		};



		soc-glue@5f800000 {

		soc_glue: soc-glue@5f800000 {

			compatible = "socionext,uniphier-pxs2-soc-glue",

				     "simple-mfd", "syscon";

			reg = <0x5f800000 0x2000>;

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

+2 −1
Original line number Diff line number Diff line
@@ -197,6 +197,7 @@ 
			reset-names = "aio";

			resets = <&sys_rst 40>;

			#sound-dai-cells = <1>;

			socionext,syscon = <&soc_glue>;



			i2s_port0: port@0 {

				i2s_hdmi: endpoint {
@@ -479,7 +480,7 @@ 
			};

		};



		soc-glue@5f800000 {

		soc_glue: soc-glue@5f800000 {

			compatible = "socionext,uniphier-ld11-soc-glue",

				     "simple-mfd", "syscon";

			reg = <0x5f800000 0x2000>;

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

+2 −1
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ 
			reset-names = "aio";

			resets = <&sys_rst 40>;

			#sound-dai-cells = <1>;

			socionext,syscon = <&soc_glue>;



			i2s_port0: port@0 {

				i2s_hdmi: endpoint {
@@ -525,7 +526,7 @@ 
			cdns,phy-dll-delay-sdclk-hsmmc = <21>;

		};



		soc-glue@5f800000 {

		soc_glue: soc-glue@5f800000 {

			compatible = "socionext,uniphier-ld20-soc-glue",

				     "simple-mfd", "syscon";

			reg = <0x5f800000 0x2000>;

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

+22 −0
Original line number Diff line number Diff line
@@ -75,6 +75,28 @@ 
	status = "okay";

};



&eth0 {

	status = "okay";

	phy-handle = <&ethphy0>;

};



&mdio0 {

	ethphy0: ethphy@0 {

		reg = <0>;

	};

};



&eth1 {

	status = "okay";

	phy-handle = <&ethphy1>;

};



&mdio1 {

	ethphy1: ethphy@0 {

		reg = <0>;

	};

};



&nand {

	status = "okay";

};