* [PATCH 1/6] ARM: dts: dra7: switch to use phy-gmii-sel
2019-02-20 15:25 [PATCH 0/6] ARM: dts: ti: cpsw: switch to phy-gmii-sel phy driver Grygorii Strashko
@ 2019-02-20 15:25 ` Grygorii Strashko
2019-02-20 15:25 ` [PATCH 2/6] ARM: dts: dm814x: " Grygorii Strashko
` (5 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Grygorii Strashko @ 2019-02-20 15:25 UTC (permalink / raw)
To: David S. Miller, Kishon Vijay Abraham I, Rob Herring, Tony Lindgren
Cc: devicetree, Grygorii Strashko, netdev, Sekhar Nori, linux-kernel,
linux-omap, linux-arm-kernel
Switch to use phy-gmii-sel PHY instead of cpsw-phy-sel.
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
---
arch/arm/boot/dts/dra7-l4.dtsi | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/arch/arm/boot/dts/dra7-l4.dtsi b/arch/arm/boot/dts/dra7-l4.dtsi
index bb45cb7fc3b6..414f1cd68733 100644
--- a/arch/arm/boot/dts/dra7-l4.dtsi
+++ b/arch/arm/boot/dts/dra7-l4.dtsi
@@ -77,18 +77,18 @@
};
};
+ phy_gmii_sel: phy-gmii-sel {
+ compatible = "ti,dra7xx-phy-gmii-sel";
+ reg = <0x554 0x4>;
+ #phy-cells = <1>;
+ };
+
scm_conf_clocks: clocks {
#address-cells = <1>;
#size-cells = <0>;
};
};
- phy_sel: cpsw-phy-sel@554 {
- compatible = "ti,dra7xx-cpsw-phy-sel";
- reg= <0x554 0x4>;
- reg-names = "gmii-sel";
- };
-
dra7_pmx_core: pinmux@1400 {
compatible = "ti,dra7-padconf",
"pinctrl-single";
@@ -3099,7 +3099,6 @@
<GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>;
ranges = <0 0 0x4000>;
syscon = <&scm_conf>;
- cpsw-phy-sel = <&phy_sel>;
status = "disabled";
davinci_mdio: mdio@1000 {
@@ -3114,11 +3113,13 @@
cpsw_emac0: slave@200 {
/* Filled in by U-Boot */
mac-address = [ 00 00 00 00 00 00 ];
+ phys = <&phy_gmii_sel 1>;
};
cpsw_emac1: slave@300 {
/* Filled in by U-Boot */
mac-address = [ 00 00 00 00 00 00 ];
+ phys = <&phy_gmii_sel 2>;
};
};
};
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 2/6] ARM: dts: dm814x: switch to use phy-gmii-sel
2019-02-20 15:25 [PATCH 0/6] ARM: dts: ti: cpsw: switch to phy-gmii-sel phy driver Grygorii Strashko
2019-02-20 15:25 ` [PATCH 1/6] ARM: dts: dra7: switch to use phy-gmii-sel Grygorii Strashko
@ 2019-02-20 15:25 ` Grygorii Strashko
2019-02-20 15:25 ` [PATCH 3/6] ARM: dts: am4372: " Grygorii Strashko
` (4 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Grygorii Strashko @ 2019-02-20 15:25 UTC (permalink / raw)
To: David S. Miller, Kishon Vijay Abraham I, Rob Herring, Tony Lindgren
Cc: devicetree, Grygorii Strashko, netdev, Sekhar Nori, linux-kernel,
linux-omap, linux-arm-kernel
Switch to use phy-gmii-sel PHY instead of cpsw-phy-sel.
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
---
arch/arm/boot/dts/dm814x.dtsi | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/arch/arm/boot/dts/dm814x.dtsi b/arch/arm/boot/dts/dm814x.dtsi
index 601c57afd4fe..413ae19dd5f0 100644
--- a/arch/arm/boot/dts/dm814x.dtsi
+++ b/arch/arm/boot/dts/dm814x.dtsi
@@ -343,6 +343,12 @@
#size-cells = <1>;
ranges = <0 0 0x800>;
+ phy_gmii_sel: phy-gmii-sel {
+ compatible = "ti,dm814-phy-gmii-sel";
+ reg = <0x650 0x4>;
+ #phy-cells = <1>;
+ };
+
scm_clocks: clocks {
#address-cells = <1>;
#size-cells = <0>;
@@ -549,17 +555,14 @@
cpsw_emac0: slave@4a100200 {
/* Filled in by U-Boot */
mac-address = [ 00 00 00 00 00 00 ];
+ phys = <&phy_gmii_sel 1>;
+
};
cpsw_emac1: slave@4a100300 {
/* Filled in by U-Boot */
mac-address = [ 00 00 00 00 00 00 ];
- };
-
- phy_sel: cpsw-phy-sel@48140650 {
- compatible = "ti,am3352-cpsw-phy-sel";
- reg= <0x48140650 0x4>;
- reg-names = "gmii-sel";
+ phys = <&phy_gmii_sel 2>;
};
};
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 3/6] ARM: dts: am4372: switch to use phy-gmii-sel
2019-02-20 15:25 [PATCH 0/6] ARM: dts: ti: cpsw: switch to phy-gmii-sel phy driver Grygorii Strashko
2019-02-20 15:25 ` [PATCH 1/6] ARM: dts: dra7: switch to use phy-gmii-sel Grygorii Strashko
2019-02-20 15:25 ` [PATCH 2/6] ARM: dts: dm814x: " Grygorii Strashko
@ 2019-02-20 15:25 ` Grygorii Strashko
2019-02-20 15:25 ` [PATCH 4/6] ARM: dts: am335x: " Grygorii Strashko
` (3 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Grygorii Strashko @ 2019-02-20 15:25 UTC (permalink / raw)
To: David S. Miller, Kishon Vijay Abraham I, Rob Herring, Tony Lindgren
Cc: devicetree, Grygorii Strashko, netdev, Sekhar Nori, linux-kernel,
linux-omap, linux-arm-kernel
Switch to use phy-gmii-sel PHY instead of cpsw-phy-sel.
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
---
arch/arm/boot/dts/am437x-l4.dtsi | 17 +++++++++--------
arch/arm/boot/dts/am43x-epos-evm.dts | 5 +----
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/arch/arm/boot/dts/am437x-l4.dtsi b/arch/arm/boot/dts/am437x-l4.dtsi
index ca0896f80248..85c6f4ff1824 100644
--- a/arch/arm/boot/dts/am437x-l4.dtsi
+++ b/arch/arm/boot/dts/am437x-l4.dtsi
@@ -280,12 +280,6 @@
#size-cells = <1>;
ranges = <0 0 0x4000>;
- phy_sel: cpsw-phy-sel@650 {
- compatible = "ti,am43xx-cpsw-phy-sel";
- reg= <0x650 0x4>;
- reg-names = "gmii-sel";
- };
-
am43xx_pinmux: pinmux@800 {
compatible = "ti,am437-padconf",
"pinctrl-single";
@@ -300,11 +294,17 @@
};
scm_conf: scm_conf@0 {
- compatible = "syscon";
+ compatible = "syscon", "simple-bus";
reg = <0x0 0x800>;
#address-cells = <1>;
#size-cells = <1>;
+ phy_gmii_sel: phy-gmii-sel {
+ compatible = "ti,am43xx-phy-gmii-sel";
+ reg = <0x650 0x4>;
+ #phy-cells = <2>;
+ };
+
scm_clocks: clocks {
#address-cells = <1>;
#size-cells = <0>;
@@ -555,7 +555,6 @@
cpts_clock_shift = <29>;
ranges = <0 0 0x8000>;
syscon = <&scm_conf>;
- cpsw-phy-sel = <&phy_sel>;
davinci_mdio: mdio@1000 {
compatible = "ti,am4372-mdio","ti,cpsw-mdio","ti,davinci_mdio";
@@ -572,11 +571,13 @@
cpsw_emac0: slave@200 {
/* Filled in by U-Boot */
mac-address = [ 00 00 00 00 00 00 ];
+ phys = <&phy_gmii_sel 1 0>;
};
cpsw_emac1: slave@300 {
/* Filled in by U-Boot */
mac-address = [ 00 00 00 00 00 00 ];
+ phys = <&phy_gmii_sel 2 0>;
};
};
};
diff --git a/arch/arm/boot/dts/am43x-epos-evm.dts b/arch/arm/boot/dts/am43x-epos-evm.dts
index 4ea753b3ee43..9dfd80e3b76e 100644
--- a/arch/arm/boot/dts/am43x-epos-evm.dts
+++ b/arch/arm/boot/dts/am43x-epos-evm.dts
@@ -584,10 +584,7 @@
&cpsw_emac0 {
phy-handle = <ðphy0>;
phy-mode = "rmii";
-};
-
-&phy_sel {
- rmii-clock-ext;
+ phys = <&phy_gmii_sel 1 1>;
};
&i2c0 {
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 4/6] ARM: dts: am335x: switch to use phy-gmii-sel
2019-02-20 15:25 [PATCH 0/6] ARM: dts: ti: cpsw: switch to phy-gmii-sel phy driver Grygorii Strashko
` (2 preceding siblings ...)
2019-02-20 15:25 ` [PATCH 3/6] ARM: dts: am4372: " Grygorii Strashko
@ 2019-02-20 15:25 ` Grygorii Strashko
2019-02-20 15:25 ` [PATCH 5/6] dt-bindings: net: ti: deprecate cpsw-phy-sel bindings Grygorii Strashko
` (2 subsequent siblings)
6 siblings, 0 replies; 15+ messages in thread
From: Grygorii Strashko @ 2019-02-20 15:25 UTC (permalink / raw)
To: David S. Miller, Kishon Vijay Abraham I, Rob Herring, Tony Lindgren
Cc: devicetree, Grygorii Strashko, netdev, Sekhar Nori, linux-kernel,
linux-omap, linux-arm-kernel
Switch to use phy-gmii-sel PHY instead of cpsw-phy-sel.
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
---
arch/arm/boot/dts/am335x-baltos-ir2110.dts | 4 ----
arch/arm/boot/dts/am335x-baltos-ir3220.dts | 4 ----
arch/arm/boot/dts/am335x-baltos-ir5221.dts | 4 ----
arch/arm/boot/dts/am335x-chiliboard.dts | 4 ----
arch/arm/boot/dts/am335x-icev2.dts | 4 ----
arch/arm/boot/dts/am335x-igep0033.dtsi | 4 ----
arch/arm/boot/dts/am335x-lxm.dts | 4 ----
arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi | 5 -----
arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts | 5 -----
arch/arm/boot/dts/am335x-phycore-som.dtsi | 4 ----
arch/arm/boot/dts/am33xx-l4.dtsi | 15 ++++++++-------
11 files changed, 8 insertions(+), 49 deletions(-)
diff --git a/arch/arm/boot/dts/am335x-baltos-ir2110.dts b/arch/arm/boot/dts/am335x-baltos-ir2110.dts
index 75de1e723303..50dcf1290ac6 100644
--- a/arch/arm/boot/dts/am335x-baltos-ir2110.dts
+++ b/arch/arm/boot/dts/am335x-baltos-ir2110.dts
@@ -72,7 +72,3 @@
dual_emac_res_vlan = <2>;
phy-handle = <&phy1>;
};
-
-&phy_sel {
- rmii-clock-ext = <1>;
-};
diff --git a/arch/arm/boot/dts/am335x-baltos-ir3220.dts b/arch/arm/boot/dts/am335x-baltos-ir3220.dts
index 1b215c425c57..f3f1abd26470 100644
--- a/arch/arm/boot/dts/am335x-baltos-ir3220.dts
+++ b/arch/arm/boot/dts/am335x-baltos-ir3220.dts
@@ -114,7 +114,3 @@
dual_emac_res_vlan = <2>;
phy-handle = <&phy1>;
};
-
-&phy_sel {
- rmii-clock-ext = <1>;
-};
diff --git a/arch/arm/boot/dts/am335x-baltos-ir5221.dts b/arch/arm/boot/dts/am335x-baltos-ir5221.dts
index 832ead864dc5..42f473f0ed77 100644
--- a/arch/arm/boot/dts/am335x-baltos-ir5221.dts
+++ b/arch/arm/boot/dts/am335x-baltos-ir5221.dts
@@ -133,10 +133,6 @@
phy-handle = <&phy1>;
};
-&phy_sel {
- rmii-clock-ext = <1>;
-};
-
&dcan1 {
pinctrl-names = "default";
pinctrl-0 = <&dcan1_pins>;
diff --git a/arch/arm/boot/dts/am335x-chiliboard.dts b/arch/arm/boot/dts/am335x-chiliboard.dts
index 9c2a947aacf5..4a869534db50 100644
--- a/arch/arm/boot/dts/am335x-chiliboard.dts
+++ b/arch/arm/boot/dts/am335x-chiliboard.dts
@@ -151,10 +151,6 @@
phy-mode = "rmii";
};
-&phy_sel {
- rmii-clock-ext;
-};
-
/* USB */
&usb {
status = "okay";
diff --git a/arch/arm/boot/dts/am335x-icev2.dts b/arch/arm/boot/dts/am335x-icev2.dts
index f2005ecca74f..9ac775c71072 100644
--- a/arch/arm/boot/dts/am335x-icev2.dts
+++ b/arch/arm/boot/dts/am335x-icev2.dts
@@ -484,10 +484,6 @@
dual_emac;
};
-&phy_sel {
- rmii-clock-ext;
-};
-
&davinci_mdio {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&davinci_mdio_default>;
diff --git a/arch/arm/boot/dts/am335x-igep0033.dtsi b/arch/arm/boot/dts/am335x-igep0033.dtsi
index 55b4c94cfafb..cbd22f25de95 100644
--- a/arch/arm/boot/dts/am335x-igep0033.dtsi
+++ b/arch/arm/boot/dts/am335x-igep0033.dtsi
@@ -123,10 +123,6 @@
phy-mode = "rmii";
};
-&phy_sel {
- rmii-clock-ext;
-};
-
&elm {
status = "okay";
};
diff --git a/arch/arm/boot/dts/am335x-lxm.dts b/arch/arm/boot/dts/am335x-lxm.dts
index 481edcfaf121..d0e8e720a4d6 100644
--- a/arch/arm/boot/dts/am335x-lxm.dts
+++ b/arch/arm/boot/dts/am335x-lxm.dts
@@ -328,10 +328,6 @@
dual_emac_res_vlan = <3>;
};
-&phy_sel {
- rmii-clock-ext;
-};
-
&mac {
pinctrl-names = "default", "sleep";
pinctrl-0 = <&cpsw_default>;
diff --git a/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi b/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi
index 14f781953475..cb5913a69837 100644
--- a/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi
+++ b/arch/arm/boot/dts/am335x-moxa-uc-2100-common.dtsi
@@ -159,11 +159,6 @@
status = "okay";
};
-&phy_sel {
- reg= <0x44e10650 0xf5>;
- rmii-clock-ext;
-};
-
&sham {
status = "okay";
};
diff --git a/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts b/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts
index 5a58efc0c874..e562ce40f290 100644
--- a/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts
+++ b/arch/arm/boot/dts/am335x-moxa-uc-8100-me-t.dts
@@ -446,11 +446,6 @@
dual_emac_res_vlan = <2>;
};
-&phy_sel {
- reg= <0x44e10650 0xf5>;
- rmii-clock-ext;
-};
-
&sham {
status = "okay";
};
diff --git a/arch/arm/boot/dts/am335x-phycore-som.dtsi b/arch/arm/boot/dts/am335x-phycore-som.dtsi
index 428a25e952b0..015adb626b03 100644
--- a/arch/arm/boot/dts/am335x-phycore-som.dtsi
+++ b/arch/arm/boot/dts/am335x-phycore-som.dtsi
@@ -100,10 +100,6 @@
status = "okay";
};
-&phy_sel {
- rmii-clock-ext;
-};
-
/* I2C Busses */
&am33xx_pinmux {
i2c0_pins: pinmux_i2c0 {
diff --git a/arch/arm/boot/dts/am33xx-l4.dtsi b/arch/arm/boot/dts/am33xx-l4.dtsi
index 7b818d9d2eab..f813131f8461 100644
--- a/arch/arm/boot/dts/am33xx-l4.dtsi
+++ b/arch/arm/boot/dts/am33xx-l4.dtsi
@@ -279,12 +279,6 @@
#pinctrl-cells = <1>;
ranges = <0 0 0x2000>;
- phy_sel: cpsw-phy-sel@650 {
- compatible = "ti,am3352-cpsw-phy-sel";
- reg= <0x650 0x4>;
- reg-names = "gmii-sel";
- };
-
am33xx_pinmux: pinmux@800 {
compatible = "pinctrl-single";
reg = <0x800 0x238>;
@@ -302,6 +296,12 @@
#size-cells = <1>;
ranges = <0 0 0x800>;
+ phy_gmii_sel: phy-gmii-sel {
+ compatible = "ti,am3352-phy-gmii-sel";
+ reg = <0x650 0x4>;
+ #phy-cells = <2>;
+ };
+
scm_clocks: clocks {
#address-cells = <1>;
#size-cells = <0>;
@@ -717,7 +717,6 @@
interrupts = <40 41 42 43>;
ranges = <0 0 0x8000>;
syscon = <&scm_conf>;
- cpsw-phy-sel = <&phy_sel>;
status = "disabled";
davinci_mdio: mdio@1000 {
@@ -733,11 +732,13 @@
cpsw_emac0: slave@200 {
/* Filled in by U-Boot */
mac-address = [ 00 00 00 00 00 00 ];
+ phys = <&phy_gmii_sel 1 1>;
};
cpsw_emac1: slave@300 {
/* Filled in by U-Boot */
mac-address = [ 00 00 00 00 00 00 ];
+ phys = <&phy_gmii_sel 2 1>;
};
};
};
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 5/6] dt-bindings: net: ti: deprecate cpsw-phy-sel bindings
2019-02-20 15:25 [PATCH 0/6] ARM: dts: ti: cpsw: switch to phy-gmii-sel phy driver Grygorii Strashko
` (3 preceding siblings ...)
2019-02-20 15:25 ` [PATCH 4/6] ARM: dts: am335x: " Grygorii Strashko
@ 2019-02-20 15:25 ` Grygorii Strashko
2019-02-20 15:25 ` [PATCH 6/6] net: ethernet: ti: cpsw: deprecate cpsw-phy-sel driver Grygorii Strashko
2019-02-20 15:48 ` [PATCH 0/6] ARM: dts: ti: cpsw: switch to phy-gmii-sel phy driver Tony Lindgren
6 siblings, 0 replies; 15+ messages in thread
From: Grygorii Strashko @ 2019-02-20 15:25 UTC (permalink / raw)
To: David S. Miller, Kishon Vijay Abraham I, Rob Herring, Tony Lindgren
Cc: devicetree, Grygorii Strashko, netdev, Sekhar Nori, linux-kernel,
linux-omap, linux-arm-kernel
The cpsw-phy-sel driver was replaced with new PHY driver phy-gmii-sel, so
deprecate cpsw-phy-sel bindings.
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
---
Documentation/devicetree/bindings/net/cpsw-phy-sel.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/net/cpsw-phy-sel.txt b/Documentation/devicetree/bindings/net/cpsw-phy-sel.txt
index 764c0c79b43d..5d76f991c027 100644
--- a/Documentation/devicetree/bindings/net/cpsw-phy-sel.txt
+++ b/Documentation/devicetree/bindings/net/cpsw-phy-sel.txt
@@ -1,4 +1,4 @@
-TI CPSW Phy mode Selection Device Tree Bindings
+TI CPSW Phy mode Selection Device Tree Bindings (DEPRECATED)
-----------------------------------------------
Required properties:
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 6/6] net: ethernet: ti: cpsw: deprecate cpsw-phy-sel driver
2019-02-20 15:25 [PATCH 0/6] ARM: dts: ti: cpsw: switch to phy-gmii-sel phy driver Grygorii Strashko
` (4 preceding siblings ...)
2019-02-20 15:25 ` [PATCH 5/6] dt-bindings: net: ti: deprecate cpsw-phy-sel bindings Grygorii Strashko
@ 2019-02-20 15:25 ` Grygorii Strashko
2019-02-20 16:18 ` Tony Lindgren
2019-02-20 19:22 ` David Miller
2019-02-20 15:48 ` [PATCH 0/6] ARM: dts: ti: cpsw: switch to phy-gmii-sel phy driver Tony Lindgren
6 siblings, 2 replies; 15+ messages in thread
From: Grygorii Strashko @ 2019-02-20 15:25 UTC (permalink / raw)
To: David S. Miller, Kishon Vijay Abraham I, Rob Herring, Tony Lindgren
Cc: devicetree, Grygorii Strashko, netdev, Sekhar Nori, linux-kernel,
linux-omap, linux-arm-kernel
Deprecate cpsw-phy-sel driver as it's been replaced with new
TI phy-gmii-sel PHY driver.
Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
---
drivers/net/ethernet/ti/Kconfig | 6 +++---
drivers/net/ethernet/ti/cpsw.h | 6 ++++++
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig
index bb126be1eb72..8b21b40a9fe5 100644
--- a/drivers/net/ethernet/ti/Kconfig
+++ b/drivers/net/ethernet/ti/Kconfig
@@ -49,10 +49,11 @@ config TI_DAVINCI_CPDMA
will be called davinci_cpdma. This is recommended.
config TI_CPSW_PHY_SEL
- bool
+ bool "TI CPSW Phy mode Selection (DEPRECATED)"
+ default n
---help---
This driver supports configuring of the phy mode connected to
- the CPSW.
+ the CPSW. DEPRECATED: use PHY_TI_GMII_SEL.
config TI_CPSW_ALE
tristate "TI CPSW ALE Support"
@@ -64,7 +65,6 @@ config TI_CPSW
depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || COMPILE_TEST
select TI_DAVINCI_CPDMA
select TI_DAVINCI_MDIO
- select TI_CPSW_PHY_SEL
select TI_CPSW_ALE
select MFD_SYSCON
select REGMAP
diff --git a/drivers/net/ethernet/ti/cpsw.h b/drivers/net/ethernet/ti/cpsw.h
index cf111db3dc27..907e05fc22e4 100644
--- a/drivers/net/ethernet/ti/cpsw.h
+++ b/drivers/net/ethernet/ti/cpsw.h
@@ -21,7 +21,13 @@
((mac)[2] << 16) | ((mac)[3] << 24))
#define mac_lo(mac) (((mac)[4] << 0) | ((mac)[5] << 8))
+#if IS_ENABLED(CONFIG_TI_CPSW_PHY_SEL)
void cpsw_phy_sel(struct device *dev, phy_interface_t phy_mode, int slave);
+#else
+static inline
+void cpsw_phy_sel(struct device *dev, phy_interface_t phy_mode, int slave)
+{}
+#endif
int ti_cm_get_macid(struct device *dev, int slave, u8 *mac_addr);
#endif /* __CPSW_H__ */
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH 6/6] net: ethernet: ti: cpsw: deprecate cpsw-phy-sel driver
2019-02-20 15:25 ` [PATCH 6/6] net: ethernet: ti: cpsw: deprecate cpsw-phy-sel driver Grygorii Strashko
@ 2019-02-20 16:18 ` Tony Lindgren
2019-02-20 19:22 ` David Miller
1 sibling, 0 replies; 15+ messages in thread
From: Tony Lindgren @ 2019-02-20 16:18 UTC (permalink / raw)
To: Grygorii Strashko
Cc: devicetree, netdev, Sekhar Nori, linux-kernel,
Kishon Vijay Abraham I, Rob Herring, linux-omap, David S. Miller,
linux-arm-kernel
Hi,
* Grygorii Strashko <grygorii.strashko@ti.com> [190220 15:26]:
> Deprecate cpsw-phy-sel driver as it's been replaced with new
> TI phy-gmii-sel PHY driver.
I'm not going to pick up this one, seems that Dave can merge
this later on? That is unless Dave wants to ack this one.
Regards,
Tony
> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
> ---
> drivers/net/ethernet/ti/Kconfig | 6 +++---
> drivers/net/ethernet/ti/cpsw.h | 6 ++++++
> 2 files changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/net/ethernet/ti/Kconfig b/drivers/net/ethernet/ti/Kconfig
> index bb126be1eb72..8b21b40a9fe5 100644
> --- a/drivers/net/ethernet/ti/Kconfig
> +++ b/drivers/net/ethernet/ti/Kconfig
> @@ -49,10 +49,11 @@ config TI_DAVINCI_CPDMA
> will be called davinci_cpdma. This is recommended.
>
> config TI_CPSW_PHY_SEL
> - bool
> + bool "TI CPSW Phy mode Selection (DEPRECATED)"
> + default n
> ---help---
> This driver supports configuring of the phy mode connected to
> - the CPSW.
> + the CPSW. DEPRECATED: use PHY_TI_GMII_SEL.
>
> config TI_CPSW_ALE
> tristate "TI CPSW ALE Support"
> @@ -64,7 +65,6 @@ config TI_CPSW
> depends on ARCH_DAVINCI || ARCH_OMAP2PLUS || COMPILE_TEST
> select TI_DAVINCI_CPDMA
> select TI_DAVINCI_MDIO
> - select TI_CPSW_PHY_SEL
> select TI_CPSW_ALE
> select MFD_SYSCON
> select REGMAP
> diff --git a/drivers/net/ethernet/ti/cpsw.h b/drivers/net/ethernet/ti/cpsw.h
> index cf111db3dc27..907e05fc22e4 100644
> --- a/drivers/net/ethernet/ti/cpsw.h
> +++ b/drivers/net/ethernet/ti/cpsw.h
> @@ -21,7 +21,13 @@
> ((mac)[2] << 16) | ((mac)[3] << 24))
> #define mac_lo(mac) (((mac)[4] << 0) | ((mac)[5] << 8))
>
> +#if IS_ENABLED(CONFIG_TI_CPSW_PHY_SEL)
> void cpsw_phy_sel(struct device *dev, phy_interface_t phy_mode, int slave);
> +#else
> +static inline
> +void cpsw_phy_sel(struct device *dev, phy_interface_t phy_mode, int slave)
> +{}
> +#endif
> int ti_cm_get_macid(struct device *dev, int slave, u8 *mac_addr);
>
> #endif /* __CPSW_H__ */
> --
> 2.17.1
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH 6/6] net: ethernet: ti: cpsw: deprecate cpsw-phy-sel driver
2019-02-20 15:25 ` [PATCH 6/6] net: ethernet: ti: cpsw: deprecate cpsw-phy-sel driver Grygorii Strashko
2019-02-20 16:18 ` Tony Lindgren
@ 2019-02-20 19:22 ` David Miller
2019-02-20 20:33 ` Tony Lindgren
1 sibling, 1 reply; 15+ messages in thread
From: David Miller @ 2019-02-20 19:22 UTC (permalink / raw)
To: grygorii.strashko
Cc: devicetree, tony, netdev, nsekhar, linux-kernel, kishon, robh+dt,
linux-omap, linux-arm-kernel
From: Grygorii Strashko <grygorii.strashko@ti.com>
Date: Wed, 20 Feb 2019 17:25:19 +0200
> Deprecate cpsw-phy-sel driver as it's been replaced with new
> TI phy-gmii-sel PHY driver.
>
> Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
Acked-by: David S. Miller <davem@davemloft.net>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 6/6] net: ethernet: ti: cpsw: deprecate cpsw-phy-sel driver
2019-02-20 19:22 ` David Miller
@ 2019-02-20 20:33 ` Tony Lindgren
2019-02-20 20:41 ` David Miller
0 siblings, 1 reply; 15+ messages in thread
From: Tony Lindgren @ 2019-02-20 20:33 UTC (permalink / raw)
To: David Miller
Cc: devicetree, grygorii.strashko, netdev, nsekhar, linux-kernel,
kishon, robh+dt, linux-omap, linux-arm-kernel
* David Miller <davem@davemloft.net> [190220 19:23]:
> From: Grygorii Strashko <grygorii.strashko@ti.com>
> Date: Wed, 20 Feb 2019 17:25:19 +0200
>
> > Deprecate cpsw-phy-sel driver as it's been replaced with new
> > TI phy-gmii-sel PHY driver.
> >
> > Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
>
> Acked-by: David S. Miller <davem@davemloft.net>
Thanks for the ack, but actually I'd prefer you to pick
this patch at some future date. I suggest Grygorii just
repost this one after v5.1-rc1.
This way I can keep my last pending v5.1 branch limited
to dts changes to make the arm-soc life easier.
Regards,
Tony
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 6/6] net: ethernet: ti: cpsw: deprecate cpsw-phy-sel driver
2019-02-20 20:33 ` Tony Lindgren
@ 2019-02-20 20:41 ` David Miller
2019-02-20 21:01 ` Tony Lindgren
0 siblings, 1 reply; 15+ messages in thread
From: David Miller @ 2019-02-20 20:41 UTC (permalink / raw)
To: tony
Cc: devicetree, grygorii.strashko, netdev, nsekhar, linux-kernel,
kishon, robh+dt, linux-omap, linux-arm-kernel
From: Tony Lindgren <tony@atomide.com>
Date: Wed, 20 Feb 2019 12:33:26 -0800
> * David Miller <davem@davemloft.net> [190220 19:23]:
>> From: Grygorii Strashko <grygorii.strashko@ti.com>
>> Date: Wed, 20 Feb 2019 17:25:19 +0200
>>
>> > Deprecate cpsw-phy-sel driver as it's been replaced with new
>> > TI phy-gmii-sel PHY driver.
>> >
>> > Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
>>
>> Acked-by: David S. Miller <davem@davemloft.net>
>
> Thanks for the ack, but actually I'd prefer you to pick
> this patch at some future date. I suggest Grygorii just
> repost this one after v5.1-rc1.
It's so much easier if you group this with those DT changes, they
logically belong together as well and it helps someone reading
the changes in the tree also if they are side by side.
Why don't you want to integrate this with them?
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 6/6] net: ethernet: ti: cpsw: deprecate cpsw-phy-sel driver
2019-02-20 20:41 ` David Miller
@ 2019-02-20 21:01 ` Tony Lindgren
2019-02-21 0:18 ` David Miller
0 siblings, 1 reply; 15+ messages in thread
From: Tony Lindgren @ 2019-02-20 21:01 UTC (permalink / raw)
To: David Miller
Cc: devicetree, grygorii.strashko, netdev, nsekhar, linux-kernel,
kishon, robh+dt, linux-omap, linux-arm-kernel
* David Miller <davem@davemloft.net> [190220 20:42]:
> From: Tony Lindgren <tony@atomide.com>
> Date: Wed, 20 Feb 2019 12:33:26 -0800
>
> > * David Miller <davem@davemloft.net> [190220 19:23]:
> >> From: Grygorii Strashko <grygorii.strashko@ti.com>
> >> Date: Wed, 20 Feb 2019 17:25:19 +0200
> >>
> >> > Deprecate cpsw-phy-sel driver as it's been replaced with new
> >> > TI phy-gmii-sel PHY driver.
> >> >
> >> > Signed-off-by: Grygorii Strashko <grygorii.strashko@ti.com>
> >>
> >> Acked-by: David S. Miller <davem@davemloft.net>
> >
> > Thanks for the ack, but actually I'd prefer you to pick
> > this patch at some future date. I suggest Grygorii just
> > repost this one after v5.1-rc1.
>
> It's so much easier if you group this with those DT changes, they
> logically belong together as well and it helps someone reading
> the changes in the tree also if they are side by side.
I agree that a group of patches should go together in
most cases.
> Why don't you want to integrate this with them?
Because the arm-soc tree wants dts changes separately in
general. The dts changes are considered firmware describing
hardware. And it makes it possible to split the arm-soc pile
of patches into multiple pull requests. In theory there
should be no dependency between dts changes and driver
changes, but in reality that's not always the case :)
What I can do is set up a separate branch with just this
patch on top of the dts changes that the arm-soc guys can
then merge towards the end of the merge cycle. If that
works for you, let me know and I'll do it.
Regards,
Tony
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 6/6] net: ethernet: ti: cpsw: deprecate cpsw-phy-sel driver
2019-02-20 21:01 ` Tony Lindgren
@ 2019-02-21 0:18 ` David Miller
2019-02-21 16:36 ` Tony Lindgren
0 siblings, 1 reply; 15+ messages in thread
From: David Miller @ 2019-02-21 0:18 UTC (permalink / raw)
To: tony
Cc: devicetree, grygorii.strashko, netdev, nsekhar, linux-kernel,
kishon, robh+dt, linux-omap, linux-arm-kernel
From: Tony Lindgren <tony@atomide.com>
Date: Wed, 20 Feb 2019 13:01:27 -0800
> What I can do is set up a separate branch with just this
> patch on top of the dts changes that the arm-soc guys can
> then merge towards the end of the merge cycle. If that
> works for you, let me know and I'll do it.
Yes, it does work for me.
Thanks.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 6/6] net: ethernet: ti: cpsw: deprecate cpsw-phy-sel driver
2019-02-21 0:18 ` David Miller
@ 2019-02-21 16:36 ` Tony Lindgren
0 siblings, 0 replies; 15+ messages in thread
From: Tony Lindgren @ 2019-02-21 16:36 UTC (permalink / raw)
To: David Miller
Cc: devicetree, grygorii.strashko, netdev, nsekhar, linux-kernel,
kishon, robh+dt, linux-omap, linux-arm-kernel
* David Miller <davem@davemloft.net> [190221 00:18]:
> From: Tony Lindgren <tony@atomide.com>
> Date: Wed, 20 Feb 2019 13:01:27 -0800
>
> > What I can do is set up a separate branch with just this
> > patch on top of the dts changes that the arm-soc guys can
> > then merge towards the end of the merge cycle. If that
> > works for you, let me know and I'll do it.
>
> Yes, it does work for me.
OK I've applied this patch into omap-for-v5.1/cpsw.
Thanks,
Tony
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 0/6] ARM: dts: ti: cpsw: switch to phy-gmii-sel phy driver
2019-02-20 15:25 [PATCH 0/6] ARM: dts: ti: cpsw: switch to phy-gmii-sel phy driver Grygorii Strashko
` (5 preceding siblings ...)
2019-02-20 15:25 ` [PATCH 6/6] net: ethernet: ti: cpsw: deprecate cpsw-phy-sel driver Grygorii Strashko
@ 2019-02-20 15:48 ` Tony Lindgren
6 siblings, 0 replies; 15+ messages in thread
From: Tony Lindgren @ 2019-02-20 15:48 UTC (permalink / raw)
To: Grygorii Strashko
Cc: devicetree, netdev, Sekhar Nori, linux-kernel,
Kishon Vijay Abraham I, Rob Herring, linux-omap, David S. Miller,
linux-arm-kernel
* Grygorii Strashko <grygorii.strashko@ti.com> [190220 07:26]:
> Hi Tony,
>
> Hence prerequisite patches [1] have been merged already I'm sending final set
> of DT patches to complete conversation of TI CPSW driver to use phy-gmii-sel
> phy driver instead of cpsw-phy-sel.
>
> [1] https://lkml.org/lkml/2018/11/26/154
Great, I was wondering about update of that series, will
apply.
Thanks and welcome back!
Tony
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 15+ messages in thread