diff options
author | Corentin Labbe <clabbe.montjoie@gmail.com> | 2017-10-31 04:19:14 -0400 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2017-11-02 04:02:14 -0400 |
commit | 44a94c7ef989317de81e3e7f84385be2bf1b5fe2 (patch) | |
tree | a7632af585d3dec4b2a4c8aaf33555d84ea9cdf1 | |
parent | 4904337fe34fa7fc529d6f4d9ee8b96fe7db310a (diff) |
arm64: dts: allwinner: H5: Restore EMAC changes
The original dwmac-sun8i DT bindings have some issue on how to handle
integrated PHY and was reverted in last RC of 4.13.
But now we have a solution so we need to get back that was reverted.
This patch restore arm64 DT about dwmac-sun8i for H5
This reverts a part of commit 87e1f5e8bb4b ("arm64: dts: allwinner: Revert EMAC changes")
Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
3 files changed, 51 insertions, 0 deletions
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts index 1c2387bd5df6..6eb8092d8e57 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | |||
@@ -50,6 +50,7 @@ | |||
50 | compatible = "friendlyarm,nanopi-neo2", "allwinner,sun50i-h5"; | 50 | compatible = "friendlyarm,nanopi-neo2", "allwinner,sun50i-h5"; |
51 | 51 | ||
52 | aliases { | 52 | aliases { |
53 | ethernet0 = &emac; | ||
53 | serial0 = &uart0; | 54 | serial0 = &uart0; |
54 | }; | 55 | }; |
55 | 56 | ||
@@ -108,6 +109,22 @@ | |||
108 | status = "okay"; | 109 | status = "okay"; |
109 | }; | 110 | }; |
110 | 111 | ||
112 | &emac { | ||
113 | pinctrl-names = "default"; | ||
114 | pinctrl-0 = <&emac_rgmii_pins>; | ||
115 | phy-supply = <®_gmac_3v3>; | ||
116 | phy-handle = <&ext_rgmii_phy>; | ||
117 | phy-mode = "rgmii"; | ||
118 | status = "okay"; | ||
119 | }; | ||
120 | |||
121 | &external_mdio { | ||
122 | ext_rgmii_phy: ethernet-phy@7 { | ||
123 | compatible = "ethernet-phy-ieee802.3-c22"; | ||
124 | reg = <7>; | ||
125 | }; | ||
126 | }; | ||
127 | |||
111 | &mmc0 { | 128 | &mmc0 { |
112 | pinctrl-names = "default"; | 129 | pinctrl-names = "default"; |
113 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; | 130 | pinctrl-0 = <&mmc0_pins_a>, <&mmc0_cd_pin>; |
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts index 4f77c8470f6c..a0ca925175aa 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | |||
@@ -59,6 +59,7 @@ | |||
59 | }; | 59 | }; |
60 | 60 | ||
61 | aliases { | 61 | aliases { |
62 | ethernet0 = &emac; | ||
62 | serial0 = &uart0; | 63 | serial0 = &uart0; |
63 | }; | 64 | }; |
64 | 65 | ||
@@ -136,6 +137,22 @@ | |||
136 | status = "okay"; | 137 | status = "okay"; |
137 | }; | 138 | }; |
138 | 139 | ||
140 | &emac { | ||
141 | pinctrl-names = "default"; | ||
142 | pinctrl-0 = <&emac_rgmii_pins>; | ||
143 | phy-supply = <®_gmac_3v3>; | ||
144 | phy-handle = <&ext_rgmii_phy>; | ||
145 | phy-mode = "rgmii"; | ||
146 | status = "okay"; | ||
147 | }; | ||
148 | |||
149 | &external_mdio { | ||
150 | ext_rgmii_phy: ethernet-phy@1 { | ||
151 | compatible = "ethernet-phy-ieee802.3-c22"; | ||
152 | reg = <1>; | ||
153 | }; | ||
154 | }; | ||
155 | |||
139 | &ir { | 156 | &ir { |
140 | pinctrl-names = "default"; | 157 | pinctrl-names = "default"; |
141 | pinctrl-0 = <&ir_pins_a>; | 158 | pinctrl-0 = <&ir_pins_a>; |
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts index 6be06873e5af..b47790650144 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts +++ b/arch/arm64/boot/dts/allwinner/sun50i-h5-orangepi-prime.dts | |||
@@ -54,6 +54,7 @@ | |||
54 | compatible = "xunlong,orangepi-prime", "allwinner,sun50i-h5"; | 54 | compatible = "xunlong,orangepi-prime", "allwinner,sun50i-h5"; |
55 | 55 | ||
56 | aliases { | 56 | aliases { |
57 | ethernet0 = &emac; | ||
57 | serial0 = &uart0; | 58 | serial0 = &uart0; |
58 | }; | 59 | }; |
59 | 60 | ||
@@ -143,6 +144,22 @@ | |||
143 | status = "okay"; | 144 | status = "okay"; |
144 | }; | 145 | }; |
145 | 146 | ||
147 | &emac { | ||
148 | pinctrl-names = "default"; | ||
149 | pinctrl-0 = <&emac_rgmii_pins>; | ||
150 | phy-supply = <®_gmac_3v3>; | ||
151 | phy-handle = <&ext_rgmii_phy>; | ||
152 | phy-mode = "rgmii"; | ||
153 | status = "okay"; | ||
154 | }; | ||
155 | |||
156 | &external_mdio { | ||
157 | ext_rgmii_phy: ethernet-phy@1 { | ||
158 | compatible = "ethernet-phy-ieee802.3-c22"; | ||
159 | reg = <1>; | ||
160 | }; | ||
161 | }; | ||
162 | |||
146 | &ir { | 163 | &ir { |
147 | pinctrl-names = "default"; | 164 | pinctrl-names = "default"; |
148 | pinctrl-0 = <&ir_pins_a>; | 165 | pinctrl-0 = <&ir_pins_a>; |