Skip to content

Commit 847aed3

Browse files
arndbarndb
committed
Merge tag 'omap-for-v5.1/dt-cpsw-phy' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into arm/dt
Device tree changes to make CPSW Ethernet use proper phy driver We now have a proper PHY driver with drivers/phy/ti/phy-gmii-sel.c to configure the CPSW PHY. These changes update all CPSW users to use the new driver that already got merged during v5.0 merge window. * tag 'omap-for-v5.1/dt-cpsw-phy' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: dt-bindings: net: ti: deprecate cpsw-phy-sel bindings ARM: dts: am335x: switch to use phy-gmii-sel ARM: dts: am4372: switch to use phy-gmii-sel ARM: dts: dm814x: switch to use phy-gmii-sel ARM: dts: dra7: switch to use phy-gmii-sel Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 94224c2 + bae2bf9 commit 847aed3

16 files changed

+36
-75
lines changed

‎Documentation/devicetree/bindings/net/cpsw-phy-sel.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
TI CPSW Phy mode Selection Device Tree Bindings
1+
TI CPSW Phy mode Selection Device Tree Bindings (DEPRECATED)
22
-----------------------------------------------
33

44
Required properties:

‎arch/arm/boot/dts/am335x-baltos-ir2110.dts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,3 @@
7272
dual_emac_res_vlan = <2>;
7373
phy-handle = <&phy1>;
7474
};
75-
76-
&phy_sel {
77-
rmii-clock-ext = <1>;
78-
};

‎arch/arm/boot/dts/am335x-baltos-ir3220.dts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,3 @@
114114
dual_emac_res_vlan = <2>;
115115
phy-handle = <&phy1>;
116116
};
117-
118-
&phy_sel {
119-
rmii-clock-ext = <1>;
120-
};

‎arch/arm/boot/dts/am335x-baltos-ir5221.dts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -133,10 +133,6 @@
133133
phy-handle = <&phy1>;
134134
};
135135

136-
&phy_sel {
137-
rmii-clock-ext = <1>;
138-
};
139-
140136
&dcan1 {
141137
pinctrl-names = "default";
142138
pinctrl-0 = <&dcan1_pins>;

‎arch/arm/boot/dts/am335x-chiliboard.dts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,10 +155,6 @@
155155
phy-mode = "rmii";
156156
};
157157

158-
&phy_sel {
159-
rmii-clock-ext;
160-
};
161-
162158
/* USB */
163159
&usb {
164160
status = "okay";

‎arch/arm/boot/dts/am335x-icev2.dts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -484,10 +484,6 @@
484484
dual_emac;
485485
};
486486

487-
&phy_sel {
488-
rmii-clock-ext;
489-
};
490-
491487
&davinci_mdio {
492488
pinctrl-names = "default", "sleep";
493489
pinctrl-0 = <&davinci_mdio_default>;

‎arch/arm/boot/dts/am335x-igep0033.dtsi

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,6 @@
123123
phy-mode = "rmii";
124124
};
125125

126-
&phy_sel {
127-
rmii-clock-ext;
128-
};
129-
130126
&elm {
131127
status = "okay";
132128
};

‎arch/arm/boot/dts/am335x-lxm.dts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -328,10 +328,6 @@
328328
dual_emac_res_vlan = <3>;
329329
};
330330

331-
&phy_sel {
332-
rmii-clock-ext;
333-
};
334-
335331
&mac {
336332
pinctrl-names = "default", "sleep";
337333
pinctrl-0 = <&cpsw_default>;

‎arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,6 @@
159159
status = "okay";
160160
};
161161

162-
&phy_sel {
163-
reg= <0x44e10650 0xf5>;
164-
rmii-clock-ext;
165-
};
166-
167162
&sham {
168163
status = "okay";
169164
};

‎arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -446,11 +446,6 @@
446446
dual_emac_res_vlan = <2>;
447447
};
448448

449-
&phy_sel {
450-
reg= <0x44e10650 0xf5>;
451-
rmii-clock-ext;
452-
};
453-
454449
&sham {
455450
status = "okay";
456451
};

‎arch/arm/boot/dts/am335x-phycore-som.dtsi

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,6 @@
100100
status = "okay";
101101
};
102102

103-
&phy_sel {
104-
rmii-clock-ext;
105-
};
106-
107103
/* I2C Busses */
108104
&am33xx_pinmux {
109105
i2c0_pins: pinmux_i2c0 {

‎arch/arm/boot/dts/am33xx-l4.dtsi

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -279,12 +279,6 @@
279279
#pinctrl-cells = <1>;
280280
ranges = <0 0 0x2000>;
281281

282-
phy_sel: cpsw-phy-sel@650 {
283-
compatible = "ti,am3352-cpsw-phy-sel";
284-
reg= <0x650 0x4>;
285-
reg-names = "gmii-sel";
286-
};
287-
288282
am33xx_pinmux: pinmux@800 {
289283
compatible = "pinctrl-single";
290284
reg = <0x800 0x238>;
@@ -300,6 +294,12 @@
300294
#size-cells = <1>;
301295
ranges = <0 0 0x800>;
302296

297+
phy_gmii_sel: phy-gmii-sel {
298+
compatible = "ti,am3352-phy-gmii-sel";
299+
reg = <0x650 0x4>;
300+
#phy-cells = <2>;
301+
};
302+
303303
scm_clocks: clocks {
304304
#address-cells = <1>;
305305
#size-cells = <0>;
@@ -715,7 +715,6 @@
715715
interrupts = <40 41 42 43>;
716716
ranges = <0 0 0x8000>;
717717
syscon = <&scm_conf>;
718-
cpsw-phy-sel = <&phy_sel>;
719718
status = "disabled";
720719

721720
davinci_mdio: mdio@1000 {
@@ -731,11 +730,13 @@
731730
cpsw_emac0: slave@200 {
732731
/* Filled in by U-Boot */
733732
mac-address = [ 00 00 00 00 00 00 ];
733+
phys = <&phy_gmii_sel 1 1>;
734734
};
735735

736736
cpsw_emac1: slave@300 {
737737
/* Filled in by U-Boot */
738738
mac-address = [ 00 00 00 00 00 00 ];
739+
phys = <&phy_gmii_sel 2 1>;
739740
};
740741
};
741742
};

‎arch/arm/boot/dts/am437x-l4.dtsi

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -280,12 +280,6 @@
280280
#size-cells = <1>;
281281
ranges = <0 0 0x4000>;
282282

283-
phy_sel: cpsw-phy-sel@650 {
284-
compatible = "ti,am43xx-cpsw-phy-sel";
285-
reg= <0x650 0x4>;
286-
reg-names = "gmii-sel";
287-
};
288-
289283
am43xx_pinmux: pinmux@800 {
290284
compatible = "ti,am437-padconf",
291285
"pinctrl-single";
@@ -300,11 +294,17 @@
300294
};
301295

302296
scm_conf: scm_conf@0 {
303-
compatible = "syscon";
297+
compatible = "syscon", "simple-bus";
304298
reg = <0x0 0x800>;
305299
#address-cells = <1>;
306300
#size-cells = <1>;
307301

302+
phy_gmii_sel: phy-gmii-sel {
303+
compatible = "ti,am43xx-phy-gmii-sel";
304+
reg = <0x650 0x4>;
305+
#phy-cells = <2>;
306+
};
307+
308308
scm_clocks: clocks {
309309
#address-cells = <1>;
310310
#size-cells = <0>;
@@ -555,7 +555,6 @@
555555
cpts_clock_shift = <29>;
556556
ranges = <0 0 0x8000>;
557557
syscon = <&scm_conf>;
558-
cpsw-phy-sel = <&phy_sel>;
559558

560559
davinci_mdio: mdio@1000 {
561560
compatible = "ti,am4372-mdio","ti,cpsw-mdio","ti,davinci_mdio";
@@ -572,11 +571,13 @@
572571
cpsw_emac0: slave@200 {
573572
/* Filled in by U-Boot */
574573
mac-address = [ 00 00 00 00 00 00 ];
574+
phys = <&phy_gmii_sel 1 0>;
575575
};
576576

577577
cpsw_emac1: slave@300 {
578578
/* Filled in by U-Boot */
579579
mac-address = [ 00 00 00 00 00 00 ];
580+
phys = <&phy_gmii_sel 2 0>;
580581
};
581582
};
582583
};

‎arch/arm/boot/dts/am43x-epos-evm.dts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -584,10 +584,7 @@
584584
&cpsw_emac0 {
585585
phy-handle = <&ethphy0>;
586586
phy-mode = "rmii";
587-
};
588-
589-
&phy_sel {
590-
rmii-clock-ext;
587+
phys = <&phy_gmii_sel 1 1>;
591588
};
592589

593590
&i2c0 {

‎arch/arm/boot/dts/dm814x.dtsi

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -405,6 +405,12 @@
405405
#size-cells = <1>;
406406
ranges = <0 0 0x800>;
407407

408+
phy_gmii_sel: phy-gmii-sel {
409+
compatible = "ti,dm814-phy-gmii-sel";
410+
reg = <0x650 0x4>;
411+
#phy-cells = <1>;
412+
};
413+
408414
scm_clocks: clocks {
409415
#address-cells = <1>;
410416
#size-cells = <0>;
@@ -611,17 +617,14 @@
611617
cpsw_emac0: slave@4a100200 {
612618
/* Filled in by U-Boot */
613619
mac-address = [ 00 00 00 00 00 00 ];
620+
phys = <&phy_gmii_sel 1>;
621+
614622
};
615623

616624
cpsw_emac1: slave@4a100300 {
617625
/* Filled in by U-Boot */
618626
mac-address = [ 00 00 00 00 00 00 ];
619-
};
620-
621-
phy_sel: cpsw-phy-sel@48140650 {
622-
compatible = "ti,am3352-cpsw-phy-sel";
623-
reg= <0x48140650 0x4>;
624-
reg-names = "gmii-sel";
627+
phys = <&phy_gmii_sel 2>;
625628
};
626629
};
627630

‎arch/arm/boot/dts/dra7-l4.dtsi

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,18 +77,18 @@
7777
};
7878
};
7979

80+
phy_gmii_sel: phy-gmii-sel {
81+
compatible = "ti,dra7xx-phy-gmii-sel";
82+
reg = <0x554 0x4>;
83+
#phy-cells = <1>;
84+
};
85+
8086
scm_conf_clocks: clocks {
8187
#address-cells = <1>;
8288
#size-cells = <0>;
8389
};
8490
};
8591

86-
phy_sel: cpsw-phy-sel@554 {
87-
compatible = "ti,dra7xx-cpsw-phy-sel";
88-
reg= <0x554 0x4>;
89-
reg-names = "gmii-sel";
90-
};
91-
9292
dra7_pmx_core: pinmux@1400 {
9393
compatible = "ti,dra7-padconf",
9494
"pinctrl-single";
@@ -3099,7 +3099,6 @@
30993099
<GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>;
31003100
ranges = <0 0 0x4000>;
31013101
syscon = <&scm_conf>;
3102-
cpsw-phy-sel = <&phy_sel>;
31033102
status = "disabled";
31043103

31053104
davinci_mdio: mdio@1000 {
@@ -3114,11 +3113,13 @@
31143113
cpsw_emac0: slave@200 {
31153114
/* Filled in by U-Boot */
31163115
mac-address = [ 00 00 00 00 00 00 ];
3116+
phys = <&phy_gmii_sel 1>;
31173117
};
31183118

31193119
cpsw_emac1: slave@300 {
31203120
/* Filled in by U-Boot */
31213121
mac-address = [ 00 00 00 00 00 00 ];
3122+
phys = <&phy_gmii_sel 2>;
31223123
};
31233124
};
31243125
};

0 commit comments

Comments
 (0)