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

Commit 737e0920 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'uniphier-dt64-v4.18' of... 

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

UniPhier ARM64 SoC DT updates for v4.18

- add more properties to ethernet nodes

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

:
  arm64: dts: uniphier: add syscon-phy-mode property to each ethernet node
  arm64: dts: uniphier: add clock-names and reset-names to ethernet node

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents e9528e79 b076ff8b

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

+4 −1
Original line number Diff line number Diff line
@@ -549,10 +549,13 @@ 
			status = "disabled";

			reg = <0x65000000 0x8500>;

			interrupts = <0 66 4>;

			clock-names = "ether";

			clocks = <&sys_clk 6>;

			reset-names = "ether";

			resets = <&sys_rst 6>;

			phy-mode = "rmii";

			phy-mode = "internal";

			local-mac-address = [00 00 00 00 00 00];

			socionext,syscon-phy-mode = <&soc_glue 0>;



			mdio: mdio {

				#address-cells = <1>;

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

+3 −0
Original line number Diff line number Diff line
@@ -604,10 +604,13 @@ 
			interrupts = <0 66 4>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_ether_rgmii>;

			clock-names = "ether";

			clocks = <&sys_clk 6>;

			reset-names = "ether";

			resets = <&sys_rst 6>;

			phy-mode = "rgmii";

			local-mac-address = [00 00 00 00 00 00];

			socionext,syscon-phy-mode = <&soc_glue 0>;



			mdio: mdio {

				#address-cells = <1>;

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

+7 −1
Original line number Diff line number Diff line
@@ -341,7 +341,7 @@ 
			cdns,phy-dll-delay-sdclk-hsmmc = <21>;

		};



		soc-glue@5f800000 {

		soc_glue: soc-glue@5f800000 {

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

				     "simple-mfd", "syscon";

			reg = <0x5f800000 0x2000>;
@@ -412,10 +412,13 @@ 
			interrupts = <0 66 4>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_ether_rgmii>;

			clock-names = "ether";

			clocks = <&sys_clk 6>;

			reset-names = "ether";

			resets = <&sys_rst 6>;

			phy-mode = "rgmii";

			local-mac-address = [00 00 00 00 00 00];

			socionext,syscon-phy-mode = <&soc_glue 0>;



			mdio0: mdio {

				#address-cells = <1>;
@@ -430,10 +433,13 @@ 
			interrupts = <0 67 4>;

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_ether1_rgmii>;

			clock-names = "ether";

			clocks = <&sys_clk 7>;

			reset-names = "ether";

			resets = <&sys_rst 7>;

			phy-mode = "rgmii";

			local-mac-address = [00 00 00 00 00 00];

			socionext,syscon-phy-mode = <&soc_glue 1>;



			mdio1: mdio {

				#address-cells = <1>;