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

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

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

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

UniPhier ARM SoC DT updates for v4.18

- add more properties to ethernet nodes

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

:
  ARM: dts: uniphier: add syscon-phy-mode property to each ethernet node
  ARM: dts: uniphier: add required clocks and resets to Pro4 ethernet node

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 5d91dcfa 526f872b

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

+7 −3
Original line number Diff line number Diff line
@@ -286,7 +286,7 @@ 
			has-transaction-translator;

		};



		soc-glue@5f800000 {

		soc_glue: soc-glue@5f800000 {

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

				     "simple-mfd", "syscon";

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

			pinctrl-names = "default";

			pinctrl-0 = <&pinctrl_ether_rgmii>;

			clocks = <&sys_clk 6>;

			resets = <&sys_rst 6>;

			clock-names = "gio", "ether", "ether-gb", "ether-phy";

			clocks = <&sys_clk 12>, <&sys_clk 6>, <&sys_clk 7>,

				 <&sys_clk 10>;

			reset-names = "gio", "ether";

			resets = <&sys_rst 12>, <&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/arm/boot/dts/uniphier-pxs2.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -506,10 +506,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>;