| Message ID | 20171018114458.17891-1-clabbe.montjoie@gmail.com |
|---|---|
| Headers | show |
| Series | net: stmmac: dwmac-sun8i: Handle integrated PHY | expand |
> index e1dba9ffa94b..f2292deaa590 100644 > --- a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts > +++ b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts > @@ -52,6 +52,7 @@ > compatible = "sinovoip,bpi-m2-plus", "allwinner,sun8i-h3"; > > aliases { > + ethernet0 = &emac; > serial0 = &uart0; > serial1 = &uart1; > }; > @@ -111,6 +112,24 @@ > status = "okay"; > }; > > +&emac { > + pinctrl-names = "default"; > + pinctrl-0 = <&emac_rgmii_pins>; > + phy-supply = <®_gmac_3v3>; > + phy-handle = <&ext_rgmii_phy>; > + phy-mode = "rgmii"; > + > + allwinner,leds-active-low; > + status = "okay"; > +}; > + > +&external_mdio { > + ext_rgmii_phy: ethernet-phy@1 { > + compatible = "ethernet-phy-ieee802.3-c22"; > + reg = <0>; > + }; The reg value should match the @ value. Andrew -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Oct 18, 2017 at 01:44:50PM +0200, Corentin Labbe wrote: > 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 arm DT about dwmac-sun8i > This reverts commit fe45174b72ae ("arm: dts: sunxi: Revert EMAC changes") > > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> > --- > arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 9 ++++++++ > arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 19 +++++++++++++++++ > arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 19 +++++++++++++++++ > arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 7 ++++++ > arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 8 +++++++ > arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 8 +++++++ > arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 5 +++++ > arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 8 +++++++ > arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 22 +++++++++++++++++++ > arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts | 16 ++++++++++++++ > arch/arm/boot/dts/sunxi-h3-h5.dtsi | 26 +++++++++++++++++++++++ > 11 files changed, 147 insertions(+) > > diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts > index b1502df7b509..6713d0f2b3f4 100644 > --- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts > +++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts > @@ -56,6 +56,8 @@ > > aliases { > serial0 = &uart0; > + /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */ > + ethernet0 = &emac; > ethernet1 = &xr819; > }; > > @@ -102,6 +104,13 @@ > status = "okay"; > }; > > +&emac { > + phy-handle = <&int_mii_phy>; > + phy-mode = "mii"; > + allwinner,leds-active-low; > + status = "okay"; > +}; > + > &mmc0 { > pinctrl-names = "default"; > pinctrl-0 = <&mmc0_pins_a>; > diff --git a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts > index e1dba9ffa94b..f2292deaa590 100644 > --- a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts > +++ b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts > @@ -52,6 +52,7 @@ > compatible = "sinovoip,bpi-m2-plus", "allwinner,sun8i-h3"; > > aliases { > + ethernet0 = &emac; > serial0 = &uart0; > serial1 = &uart1; > }; > @@ -111,6 +112,24 @@ > status = "okay"; > }; > > +&emac { > + pinctrl-names = "default"; > + pinctrl-0 = <&emac_rgmii_pins>; > + phy-supply = <®_gmac_3v3>; > + phy-handle = <&ext_rgmii_phy>; > + phy-mode = "rgmii"; > + > + allwinner,leds-active-low; > + status = "okay"; > +}; > + > +&external_mdio { > + ext_rgmii_phy: ethernet-phy@1 { > + compatible = "ethernet-phy-ieee802.3-c22"; > + reg = <0>; > + }; > +}; > + Hi Corentin I'm wondering about the order of the patches. Does the external_mdio node actually exist at this point? Or only later when other patches are applied? Andrew -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Oct 18, 2017 at 06:44:50PM +0200, Andrew Lunn wrote: > On Wed, Oct 18, 2017 at 01:44:50PM +0200, Corentin Labbe wrote: > > 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 arm DT about dwmac-sun8i > > This reverts commit fe45174b72ae ("arm: dts: sunxi: Revert EMAC changes") > > > > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> > > --- > > arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 9 ++++++++ > > arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 19 +++++++++++++++++ > > arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 19 +++++++++++++++++ > > arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 7 ++++++ > > arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 8 +++++++ > > arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 8 +++++++ > > arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 5 +++++ > > arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 8 +++++++ > > arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 22 +++++++++++++++++++ > > arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts | 16 ++++++++++++++ > > arch/arm/boot/dts/sunxi-h3-h5.dtsi | 26 +++++++++++++++++++++++ > > 11 files changed, 147 insertions(+) > > > > diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts > > index b1502df7b509..6713d0f2b3f4 100644 > > --- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts > > +++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts > > @@ -56,6 +56,8 @@ > > > > aliases { > > serial0 = &uart0; > > + /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */ > > + ethernet0 = &emac; > > ethernet1 = &xr819; > > }; > > > > @@ -102,6 +104,13 @@ > > status = "okay"; > > }; > > > > +&emac { > > + phy-handle = <&int_mii_phy>; > > + phy-mode = "mii"; > > + allwinner,leds-active-low; > > + status = "okay"; > > +}; > > + > > &mmc0 { > > pinctrl-names = "default"; > > pinctrl-0 = <&mmc0_pins_a>; > > diff --git a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts > > index e1dba9ffa94b..f2292deaa590 100644 > > --- a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts > > +++ b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts > > @@ -52,6 +52,7 @@ > > compatible = "sinovoip,bpi-m2-plus", "allwinner,sun8i-h3"; > > > > aliases { > > + ethernet0 = &emac; > > serial0 = &uart0; > > serial1 = &uart1; > > }; > > @@ -111,6 +112,24 @@ > > status = "okay"; > > }; > > > > +&emac { > > + pinctrl-names = "default"; > > + pinctrl-0 = <&emac_rgmii_pins>; > > + phy-supply = <®_gmac_3v3>; > > + phy-handle = <&ext_rgmii_phy>; > > + phy-mode = "rgmii"; > > + > > + allwinner,leds-active-low; > > + status = "okay"; > > +}; > > + > > > > +&external_mdio { > > + ext_rgmii_phy: ethernet-phy@1 { > > + compatible = "ethernet-phy-ieee802.3-c22"; > > + reg = <0>; > > + }; > > +}; > > + > > Hi Corentin > > I'm wondering about the order of the patches. Does the external_mdio > node actually exist at this point? Or only later when other patches > are applied? > You are right order of patch are wrong, I need to cut this one in two. "Revert²" sunxi-h3-h5.dtsi apply mdiomux "Revert²" all board nodes Regards Corentin Labbe -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Wed, Oct 18, 2017 at 08:50:49PM +0200, Corentin Labbe wrote: > On Wed, Oct 18, 2017 at 06:44:50PM +0200, Andrew Lunn wrote: > > On Wed, Oct 18, 2017 at 01:44:50PM +0200, Corentin Labbe wrote: > > > 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 arm DT about dwmac-sun8i > > > This reverts commit fe45174b72ae ("arm: dts: sunxi: Revert EMAC changes") > > > > > > Signed-off-by: Corentin Labbe <clabbe.montjoie@gmail.com> > > > --- > > > arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 9 ++++++++ > > > arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 19 +++++++++++++++++ > > > arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 19 +++++++++++++++++ > > > arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 7 ++++++ > > > arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 8 +++++++ > > > arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 8 +++++++ > > > arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 5 +++++ > > > arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 8 +++++++ > > > arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 22 +++++++++++++++++++ > > > arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts | 16 ++++++++++++++ > > > arch/arm/boot/dts/sunxi-h3-h5.dtsi | 26 +++++++++++++++++++++++ > > > 11 files changed, 147 insertions(+) > > > > > > diff --git a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts > > > index b1502df7b509..6713d0f2b3f4 100644 > > > --- a/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts > > > +++ b/arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts > > > @@ -56,6 +56,8 @@ > > > > > > aliases { > > > serial0 = &uart0; > > > + /* ethernet0 is the H3 emac, defined in sun8i-h3.dtsi */ > > > + ethernet0 = &emac; > > > ethernet1 = &xr819; > > > }; > > > > > > @@ -102,6 +104,13 @@ > > > status = "okay"; > > > }; > > > > > > +&emac { > > > + phy-handle = <&int_mii_phy>; > > > + phy-mode = "mii"; > > > + allwinner,leds-active-low; > > > + status = "okay"; > > > +}; > > > + > > > &mmc0 { > > > pinctrl-names = "default"; > > > pinctrl-0 = <&mmc0_pins_a>; > > > diff --git a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts > > > index e1dba9ffa94b..f2292deaa590 100644 > > > --- a/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts > > > +++ b/arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts > > > @@ -52,6 +52,7 @@ > > > compatible = "sinovoip,bpi-m2-plus", "allwinner,sun8i-h3"; > > > > > > aliases { > > > + ethernet0 = &emac; > > > serial0 = &uart0; > > > serial1 = &uart1; > > > }; > > > @@ -111,6 +112,24 @@ > > > status = "okay"; > > > }; > > > > > > +&emac { > > > + pinctrl-names = "default"; > > > + pinctrl-0 = <&emac_rgmii_pins>; > > > + phy-supply = <®_gmac_3v3>; > > > + phy-handle = <&ext_rgmii_phy>; > > > + phy-mode = "rgmii"; > > > + > > > + allwinner,leds-active-low; > > > + status = "okay"; > > > +}; > > > + > > > > > > > +&external_mdio { > > > + ext_rgmii_phy: ethernet-phy@1 { > > > + compatible = "ethernet-phy-ieee802.3-c22"; > > > + reg = <0>; > > > + }; > > > +}; > > > + > > > > Hi Corentin > > > > I'm wondering about the order of the patches. Does the external_mdio > > node actually exist at this point? Or only later when other patches > > are applied? > > > > You are right order of patch are wrong, I need to cut this one in two. > "Revert²" sunxi-h3-h5.dtsi > apply mdiomux > "Revert²" all board nodes I'm not even sure why you're actually adding them that way. Can't you just create the new binding file, support it in the driver, and add the matching DT nodes ? Maxime
Hello The current way to find if the PHY is internal is to compare DT phy-mode and emac_variant/internal_phy. But it will negate a possible future SoC where an external PHY use the same phy mode than the integrated one. This patchs series adds a new way to handle this problem via a mdio-mux. The first try was to create a new MDIO mux "mdio-mux-syscon". mdio-mux-syscon working the same way than mdio-mux-mmioreg with the exception that the register is used via syscon/regmap. But this solution does not work for two reason: - changing the MDIO selection need the reset of MAC which cannot be done by the mdio-mux-syscon driver - There were driver loading order problem: - mdio-mux-syscon needing that stmmac register the parent MDIO - stmmac needing that child MDIO was registered just after registering parent MDIO So we cannot use any external MDIO-mux. The final solution was to represent the mdio-mux in MAC node and let the MAC handle all things. Since DT bits was reverted in 4.13, this patch series include the revert of the revert. So - the first four patchs bring back DT/stmmac stuff that was in 4.13 (and reverted) - fifth patch document how DT MDIO mux is implemented - patch 6 and 7 modify DT - patch 8, 9 Modify stmmac according to the new bindings I have let patch splited for easy review. (for seeing what's new) But the final serie could have some patch squashed if someone want. Like squashing patch and 2 and 5 (documentation) Regards Changes since v6: - renamed external mdio to "external_mdio" - added compatible to mdio-mux and internal-mdio - removed usage of phy-is-integrated - renamed do_not_scan to compatible_muxes (patch 10) - patch 8 9 of v6 are squashed Changes since v5: - reordered patch 1 and 2 - mdio-mux node is now a mdio's child - added patch 11 for removing unnecessary scan of mdio-mux Changes since v4: - Update documentation for new bindings - Added 4 patchs for bring back reverted stuff of 4.13 - dwmac-sun8i now handle mdio-mux - MDIO use now compatible = "snps,dwmac-mdio"; Changes since v3: - Added a patch for handling fixed-link - Updated documentation Changes since v2: - Add a MDIO mux for creating distinction between integrated and external MDIO. - phy-is-integrated is not set in dtsi. Changes since v1: - Dropped phy-is-integrated documentation patch since another same patch was already merged - Moved phy-is-integrated from SoC dtsi to final board DT. Corentin Labbe (10): dt-bindings: net: Restore sun8i dwmac binding arm: dts: sunxi: Restore EMAC changes arm64: dts: allwinner: Restore EMAC changes net: stmmac: sun8i: Restore the compatibles dt-bindings: net: dwmac-sun8i: update documentation about integrated PHY ARM: dts: sunxi: h3/h5: represent the mdio switch used by sun8i-h3-emac arm64: dts: allwinner: add snps,dwmac-mdio compatible to emac/mdio net: stmmac: snps,dwmac-mdio MDIOs are automatically registered net: stmmac: dwmac-sun8i: Handle integrated/external MDIOs of: mdio: Prevent of_mdiobus_register from scanning mdio-mux nodes .../devicetree/bindings/net/dwmac-sun8i.txt | 199 ++++++++++++ arch/arm/boot/dts/sun8i-h2-plus-orangepi-zero.dts | 9 + arch/arm/boot/dts/sun8i-h3-bananapi-m2-plus.dts | 19 ++ arch/arm/boot/dts/sun8i-h3-nanopi-m1-plus.dts | 19 ++ arch/arm/boot/dts/sun8i-h3-nanopi-neo.dts | 7 + arch/arm/boot/dts/sun8i-h3-orangepi-2.dts | 8 + arch/arm/boot/dts/sun8i-h3-orangepi-one.dts | 8 + arch/arm/boot/dts/sun8i-h3-orangepi-pc-plus.dts | 5 + arch/arm/boot/dts/sun8i-h3-orangepi-pc.dts | 8 + arch/arm/boot/dts/sun8i-h3-orangepi-plus.dts | 22 ++ arch/arm/boot/dts/sun8i-h3-orangepi-plus2e.dts | 16 + arch/arm/boot/dts/sunxi-h3-h5.dtsi | 47 +++ .../boot/dts/allwinner/sun50i-a64-bananapi-m64.dts | 16 + .../boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 15 + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 17 + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 16 + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 21 ++ .../boot/dts/allwinner/sun50i-h5-nanopi-neo2.dts | 17 + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 17 + .../dts/allwinner/sun50i-h5-orangepi-prime.dts | 17 + drivers/net/ethernet/stmicro/stmmac/Kconfig | 1 + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 361 +++++++++++++-------- .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 4 - drivers/of/of_mdio.c | 10 + 24 files changed, 745 insertions(+), 134 deletions(-) create mode 100644 Documentation/devicetree/bindings/net/dwmac-sun8i.txt