Eric Lee / smarc-uboot

12
Download as
Browse Code ยป

Commit 3b3e8a37d36e7a413bacf560ed138c6680bcb89b

Authored by Grygorii Strashko
Committed by Tom Rini
1 parent b1fe4fe330
Exists in smarc_8mq_lf_v2020.04 and in 9 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

arm: dts: am335x: sync cpsw/mdio/phy with latest linux - drop phy_id 

Synchronize CPSW/MDIO/PHY DT nodes with latest linux - replace deprecated
phy_id property with phy-handle.

Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Cc: Lokesh Vutla <lokeshvutla@ti.com>
Cc: Hannes Schmelzer <hannes.schmelzer@br-automation.com>
Cc: Heiko Schocher <hs@denx.de>
Cc: Felix Brack <fb@ltec.ch>
Cc: Jean-Jacques Hiblot <jjhiblot@ti.com>

Showing 14 changed files with 106 additions and 48 deletions Side-by-side Diff

arch/arm/dts/am335x-baltos.dts
Diff comments   View file @ 3b3e8a3
... ... @@ -409,16 +409,26 @@
409 409 pinctrl-1 = <&davinci_mdio_sleep>;
410 410  
411 411 status = "okay";
  412 +
  413 + phy0: ethernet-phy@0 {
  414 + reg = <0>;
  415 + };
  416 +
  417 + phy1: ethernet-phy@7 {
  418 + reg = <7>;
  419 + eee-broken-100tx;
  420 + eee-broken-1000t;
  421 + };
412 422 };
413 423  
414 424 &cpsw_emac0 {
415   - phy_id = <&davinci_mdio>, <0>;
  425 + phy-handle = <&phy0>;
416 426 phy-mode = "rmii";
417 427 dual_emac_res_vlan = <1>;
418 428 };
419 429  
420 430 &cpsw_emac1 {
421   - phy_id = <&davinci_mdio>, <7>;
  431 + phy-handle = <&phy1>;
422 432 phy-mode = "rgmii-txid";
423 433 dual_emac_res_vlan = <2>;
424 434 };
arch/arm/dts/am335x-bone-common.dtsi
Diff comments   View file @ 3b3e8a3
... ... @@ -360,16 +360,12 @@
360 360 };
361 361  
362 362 &cpsw_emac0 {
363   - phy_id = <&davinci_mdio>, <0>;
  363 + phy-handle = <&ethphy0>;
364 364 phy-mode = "mii";
365 365 };
366 366  
367   -&cpsw_emac1 {
368   - phy_id = <&davinci_mdio>, <1>;
369   - phy-mode = "mii";
370   -};
371   -
372 367 &mac {
  368 + slaves = <1>;
373 369 pinctrl-names = "default", "sleep";
374 370 pinctrl-0 = <&cpsw_default>;
375 371 pinctrl-1 = <&cpsw_sleep>;
... ... @@ -381,6 +377,10 @@
381 377 pinctrl-0 = <&davinci_mdio_default>;
382 378 pinctrl-1 = <&davinci_mdio_sleep>;
383 379 status = "okay";
  380 +
  381 + ethphy0: ethernet-phy@0 {
  382 + reg = <0>;
  383 + };
384 384 };
385 385  
386 386 &mmc1 {
arch/arm/dts/am335x-brsmarc1.dts
Diff comments   View file @ 3b3e8a3
... ... @@ -247,6 +247,14 @@
247 247  
248 248 &davinci_mdio {
249 249 status = "okay";
  250 +
  251 + ethphy0: ethernet-phy@1 {
  252 + reg = <1>;
  253 + };
  254 +
  255 + ethphy1: ethernet-phy@3 {
  256 + reg = <3>;
  257 + };
250 258 };
251 259  
252 260 &mac {
253 261  
... ... @@ -258,13 +266,13 @@
258 266 };
259 267  
260 268 &cpsw_emac0 {
261   - phy_id = <&davinci_mdio>, <1>;
  269 + phy-handle = <&ethphy0>;
262 270 phy-mode = "rmii";
263 271 ti,ledcr = <0x0480>;
264 272 };
265 273  
266 274 &cpsw_emac1 {
267   - phy_id = <&davinci_mdio>, <3>;
  275 + phy-handle = <&ethphy1>;
268 276 phy-mode = "rmii";
269 277 ti,ledcr = <0x0480>;
270 278 };
arch/arm/dts/am335x-brxre1.dts
Diff comments   View file @ 3b3e8a3
... ... @@ -206,6 +206,14 @@
206 206  
207 207 &davinci_mdio {
208 208 status = "okay";
  209 +
  210 + ethphy0: ethernet-phy@1 {
  211 + reg = <1>;
  212 + };
  213 +
  214 + ethphy1: ethernet-phy@2 {
  215 + reg = <2>;
  216 + };
209 217 };
210 218  
211 219 &mac {
212 220  
... ... @@ -213,12 +221,12 @@
213 221 };
214 222  
215 223 &cpsw_emac0 {
216   - phy_id = <&davinci_mdio>, <1>;
  224 + phy-handle = <&ethphy0>;
217 225 phy-mode = "mii";
218 226 };
219 227  
220 228 &cpsw_emac1 {
221   - phy_id = <&davinci_mdio>, <2>;
  229 + phy-handle = <&ethphy1>;
222 230 phy-mode = "mii";
223 231 };
224 232  
arch/arm/dts/am335x-chiliboard.dts
Diff comments   View file @ 3b3e8a3
... ... @@ -140,10 +140,14 @@
140 140 pinctrl-0 = <&davinci_mdio_default>;
141 141 pinctrl-1 = <&davinci_mdio_sleep>;
142 142 status = "okay";
  143 +
  144 + ethphy0: ethernet-phy@0 {
  145 + reg = <0>;
  146 + };
143 147 };
144 148  
145 149 &cpsw_emac0 {
146   - phy_id = <&davinci_mdio>, <0>;
  150 + phy-handle = <&ethphy0>;
147 151 phy-mode = "rmii";
148 152 };
149 153  
arch/arm/dts/am335x-draco.dts
Diff comments   View file @ 3b3e8a3
... ... @@ -143,7 +143,7 @@
143 143 };
144 144  
145 145 &cpsw_emac0 {
146   - phy_id = <&mdio0>, <0>;
  146 + phy-handle = <&phy0>;
147 147 phy-mode = "rmii";
148 148 };
149 149  
arch/arm/dts/am335x-evm.dts
Diff comments   View file @ 3b3e8a3
... ... @@ -675,6 +675,7 @@
675 675 pinctrl-0 = <&cpsw_default>;
676 676 pinctrl-1 = <&cpsw_sleep>;
677 677 status = "okay";
  678 + slaves = <1>;
678 679 };
679 680  
680 681 &davinci_mdio {
681 682  
682 683  
... ... @@ -682,16 +683,15 @@
682 683 pinctrl-0 = <&davinci_mdio_default>;
683 684 pinctrl-1 = <&davinci_mdio_sleep>;
684 685 status = "okay";
685   -};
686 686  
687   -&cpsw_emac0 {
688   - phy_id = <&davinci_mdio>, <0>;
689   - phy-mode = "rgmii-txid";
  687 + ethphy0: ethernet-phy@0 {
  688 + reg = <0>;
  689 + };
690 690 };
691 691  
692   -&cpsw_emac1 {
693   - phy_id = <&davinci_mdio>, <1>;
694   - phy-mode = "rgmii-txid";
  692 +&cpsw_emac0 {
  693 + phy-handle = <&ethphy0>;
  694 + phy-mode = "rgmii-id";
695 695 };
696 696  
697 697 &tscadc {
arch/arm/dts/am335x-evmsk.dts
Diff comments   View file @ 3b3e8a3
... ... @@ -630,17 +630,25 @@
630 630 pinctrl-0 = <&davinci_mdio_default>;
631 631 pinctrl-1 = <&davinci_mdio_sleep>;
632 632 status = "okay";
  633 +
  634 + ethphy0: ethernet-phy@0 {
  635 + reg = <0>;
  636 + };
  637 +
  638 + ethphy1: ethernet-phy@1 {
  639 + reg = <1>;
  640 + };
633 641 };
634 642  
635 643 &cpsw_emac0 {
636   - phy_id = <&davinci_mdio>, <0>;
637   - phy-mode = "rgmii-txid";
  644 + phy-handle = <&ethphy0>;
  645 + phy-mode = "rgmii-id";
638 646 dual_emac_res_vlan = <1>;
639 647 };
640 648  
641 649 &cpsw_emac1 {
642   - phy_id = <&davinci_mdio>, <1>;
643   - phy-mode = "rgmii-txid";
  650 + phy-handle = <&ethphy1>;
  651 + phy-mode = "rgmii-id";
644 652 dual_emac_res_vlan = <2>;
645 653 };
646 654  
arch/arm/dts/am335x-icev2.dts
Diff comments   View file @ 3b3e8a3
... ... @@ -397,13 +397,13 @@
397 397 };
398 398  
399 399 &cpsw_emac0 {
400   - phy_id = <&davinci_mdio>, <1>;
  400 + phy-handle = <&ethphy0>;
401 401 phy-mode = "rmii";
402 402 dual_emac_res_vlan = <1>;
403 403 };
404 404  
405 405 &cpsw_emac1 {
406   - phy_id = <&davinci_mdio>, <3>;
  406 + phy-handle = <&ethphy1>;
407 407 phy-mode = "rmii";
408 408 dual_emac_res_vlan = <2>;
409 409 };
... ... @@ -427,5 +427,13 @@
427 427 status = "okay";
428 428 reset-gpios = <&gpio2 5 GPIO_ACTIVE_LOW>;
429 429 reset-delay-us = <2>; /* PHY datasheet states 1uS min */
  430 +
  431 + ethphy0: ethernet-phy@1 {
  432 + reg = <1>;
  433 + };
  434 +
  435 + ethphy1: ethernet-phy@3 {
  436 + reg = <3>;
  437 + };
430 438 };
arch/arm/dts/am335x-igep0033.dtsi
Diff comments   View file @ 3b3e8a3
... ... @@ -102,15 +102,23 @@
102 102  
103 103 &davinci_mdio {
104 104 status = "okay";
  105 +
  106 + ethphy0: ethernet-phy@0 {
  107 + reg = <0>;
  108 + };
  109 +
  110 + ethphy1: ethernet-phy@1 {
  111 + reg = <1>;
  112 + };
105 113 };
106 114  
107 115 &cpsw_emac0 {
108   - phy_id = <&davinci_mdio>, <0>;
  116 + phy-handle = <&ethphy0>;
109 117 phy-mode = "rmii";
110 118 };
111 119  
112 120 &cpsw_emac1 {
113   - phy_id = <&davinci_mdio>, <1>;
  121 + phy-handle = <&ethphy1>;
114 122 phy-mode = "rmii";
115 123 };
116 124  
arch/arm/dts/am335x-pxm2.dtsi
Diff comments   View file @ 3b3e8a3
... ... @@ -117,12 +117,12 @@
117 117 };
118 118  
119 119 &cpsw_emac0 {
120   - phy_id = <&davinci_mdio>, <0>;
  120 + phy-handle = <&ethphy0>;
121 121 phy-mode = "rgmii-txid";
122 122 };
123 123  
124 124 &cpsw_emac1 {
125   - phy_id = <&davinci_mdio>, <1>;
  125 + phy-handle = <&ethphy1>;
126 126 phy-mode = "rgmii-txid";
127 127 };
128 128  
... ... @@ -131,6 +131,14 @@
131 131 pinctrl-0 = <&davinci_mdio_default>;
132 132 pinctrl-1 = <&davinci_mdio_sleep>;
133 133 status = "okay";
  134 +
  135 + ethphy0: ethernet-phy@0 {
  136 + reg = <0>;
  137 + };
  138 +
  139 + ethphy1: ethernet-phy@1 {
  140 + reg = <1>;
  141 + };
134 142 };
135 143  
136 144 &elm {
arch/arm/dts/am335x-rut.dts
Diff comments   View file @ 3b3e8a3
... ... @@ -149,13 +149,8 @@
149 149 };
150 150  
151 151 &cpsw_emac0 {
152   - phy_id = <&davinci_mdio>, <1>;
153 152 phy-mode = "rmii";
154   -};
155   -
156   -&cpsw_emac1 {
157   - phy_id = <&davinci_mdio>, <0>;
158   - phy-mode = "rmii";
  153 + phy-handle = <&ethernet_phy>;
159 154 };
160 155  
161 156 &davinci_mdio {
arch/arm/dts/am335x-shc.dts
Diff comments   View file @ 3b3e8a3
... ... @@ -197,17 +197,17 @@
197 197 };
198 198 };
199 199  
  200 +&cpsw_emac0 {
  201 + phy-mode = "mii";
  202 + phy-handle = <&ethernetphy0>;
  203 +};
  204 +
200 205 &mac {
201 206 pinctrl-names = "default", "sleep";
202 207 pinctrl-0 = <&cpsw_default>;
203 208 pinctrl-1 = <&cpsw_sleep>;
204 209 status = "okay";
205 210 slaves = <1>;
206   - cpsw_emac0: slave@4a100200 {
207   - phy_id = <&davinci_mdio>, <0>;
208   - phy-mode = "mii";
209   - phy-handle = <&ethernetphy0>;
210   - };
211 211 };
212 212  
213 213 &mmc1 {
arch/arm/dts/am335x-sl50.dts
Diff comments   View file @ 3b3e8a3
... ... @@ -507,15 +507,10 @@
507 507 };
508 508  
509 509 &cpsw_emac0 {
510   - phy_id = <&davinci_mdio>, <0>;
511 510 phy-mode = "mii";
  511 + phy-handle = <&ethphy0>;
512 512 };
513 513  
514   -&cpsw_emac1 {
515   - phy_id = <&davinci_mdio>, <1>;
516   - phy-mode = "mii";
517   -};
518   -
519 514 &mac {
520 515 status = "okay";
521 516 pinctrl-names = "default", "sleep";
... ... @@ -528,6 +523,12 @@
528 523 pinctrl-names = "default", "sleep";
529 524 pinctrl-0 = <&davinci_mdio_default>;
530 525 pinctrl-1 = <&davinci_mdio_sleep>;
  526 + reset-gpios = <&gpio1 14 GPIO_ACTIVE_LOW>;
  527 + reset-delay-us = <100>; /* PHY datasheet states 100us min */
  528 +
  529 + ethphy0: ethernet-phy@0 {
  530 + reg = <0>;
  531 + };
531 532 };
532 533  
533 534 &sham {