Message ID | 20210127112719.30632-5-kostap@marvell.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Add support for CP110 UTMI PHY | expand |
On Wed, Jan 27, 2021 at 01:27:19PM +0200, kostap@marvell.com wrote: > From: Konstantin Porotchkin <kostap@marvell.com> > > Enable support for CP110 UTMI driver in Armada SoC family platform > device trees. > > Signed-off-by: Konstantin Porotchkin <kostap@marvell.com> Reviewed-by: Lubomir Rintel <lkundrak@v3.sk> > --- > arch/arm64/boot/dts/marvell/armada-7040-db.dts | 12 ++++++++---- > arch/arm64/boot/dts/marvell/armada-8040-db.dts | 18 ++++++++++++++++-- > arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi | 16 ++++++++++++++-- > arch/arm64/boot/dts/marvell/cn9130-db.dts | 10 ++++++++-- > arch/arm64/boot/dts/marvell/cn9131-db.dts | 8 ++++++-- > arch/arm64/boot/dts/marvell/cn9132-db.dts | 9 +++++++-- > 6 files changed, 59 insertions(+), 14 deletions(-) > > diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts > index a7eb4e7697a2..ef792b932912 100644 > --- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts > +++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts > @@ -218,6 +218,10 @@ > }; > }; > > +&cp0_utmi { > + status = "okay"; > +}; > + > &cp0_comphy1 { > cp0_usbh0_con: connector { > compatible = "usb-a-connector"; > @@ -226,8 +230,8 @@ > }; > > &cp0_usb3_0 { > - phys = <&cp0_comphy1 0>; > - phy-names = "cp0-usb3h0-comphy"; > + phys = <&cp0_comphy1 0>, <&cp0_utmi0>; > + phy-names = "cp0-usb3h0-comphy", "utmi"; > status = "okay"; > }; > > @@ -239,8 +243,8 @@ > }; > > &cp0_usb3_1 { > - phys = <&cp0_comphy4 1>; > - phy-names = "cp0-usb3h1-comphy"; > + phys = <&cp0_comphy4 1>, <&cp0_utmi1>; > + phy-names = "cp0-usb3h1-comphy", "utmi"; > status = "okay"; > }; > > diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/boot/dts/marvell/armada-8040-db.dts > index 09fb5256f1db..f1af6beeb9f9 100644 > --- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts > +++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts > @@ -154,8 +154,14 @@ > }; > > /* CON9 on CP0 expansion */ > +&cp0_utmi { > + status = "okay"; > +}; > + > &cp0_usb3_0 { > usb-phy = <&cp0_usb3_0_phy>; > + phys = <&cp0_utmi0>; > + phy-names = "utmi"; > status = "okay"; > }; > > @@ -168,8 +174,8 @@ > > /* CON10 on CP0 expansion */ > &cp0_usb3_1 { > - phys = <&cp0_comphy4 1>; > - phy-names = "cp0-usb3h1-comphy"; > + phys = <&cp0_comphy4 1>, <&cp0_utmi1>; > + phy-names = "usb", "utmi"; > status = "okay"; > }; > > @@ -306,14 +312,22 @@ > }; > }; > > +&cp1_utmi { > + status = "okay"; > +}; > + > /* CON9 on CP1 expansion */ > &cp1_usb3_0 { > usb-phy = <&cp1_usb3_0_phy>; > + phys = <&cp1_utmi0>; > + phy-names = "utmi"; > status = "okay"; > }; > > /* CON10 on CP1 expansion */ > &cp1_usb3_1 { > + phys = <&cp1_utmi1>; > + phy-names = "utmi"; > status = "okay"; > }; > > diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi > index cbcb210cb6d8..b3258a3984a3 100644 > --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi > +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi > @@ -259,13 +259,21 @@ > vqmmc-supply = <&v_3_3>; > }; > > +&cp0_utmi { > + status = "okay"; > +}; > + > &cp0_usb3_0 { > /* J38? - USB2.0 only */ > + phys = <&cp0_utmi0>; > + phy-names = "utmi"; > status = "okay"; > }; > > &cp0_usb3_1 { > /* J38? - USB2.0 only */ > + phys = <&cp0_utmi1>; > + phy-names = "utmi"; > status = "okay"; > }; > > @@ -364,9 +372,13 @@ > }; > }; > > +&cp1_utmi { > + status = "okay"; > +}; > + > &cp1_usb3_0 { > /* CPS Lane 2 - CON7 */ > - phys = <&cp1_comphy2 0>; > - phy-names = "cp1-usb3h0-comphy"; > + phys = <&cp1_comphy2 0>, <&cp1_utmi0>; > + phy-names = "cp1-usb3h0-comphy", "utmi"; > status = "okay"; > }; > diff --git a/arch/arm64/boot/dts/marvell/cn9130-db.dts b/arch/arm64/boot/dts/marvell/cn9130-db.dts > index ce49a70d88a0..02218422509c 100644 > --- a/arch/arm64/boot/dts/marvell/cn9130-db.dts > +++ b/arch/arm64/boot/dts/marvell/cn9130-db.dts > @@ -390,14 +390,20 @@ > }; > }; > > +&cp0_utmi { > + status = "okay"; > +}; > + > &cp0_usb3_0 { > status = "okay"; > usb-phy = <&cp0_usb3_0_phy0>; > - phy-names = "usb"; > + phys = <&cp0_utmi0>; > + phy-names = "utmi"; > }; > > &cp0_usb3_1 { > status = "okay"; > usb-phy = <&cp0_usb3_0_phy1>; > - phy-names = "usb"; > + phys = <&cp0_utmi1>; > + phy-names = "utmi"; > }; > diff --git a/arch/arm64/boot/dts/marvell/cn9131-db.dts b/arch/arm64/boot/dts/marvell/cn9131-db.dts > index 3c975f98b2a3..17e189875182 100644 > --- a/arch/arm64/boot/dts/marvell/cn9131-db.dts > +++ b/arch/arm64/boot/dts/marvell/cn9131-db.dts > @@ -193,10 +193,14 @@ > }; > > /* CON58 */ > +&cp1_utmi { > + status = "okay"; > +}; > + > &cp1_usb3_1 { > status = "okay"; > usb-phy = <&cp1_usb3_0_phy0>; > /* Generic PHY, providing serdes lanes */ > - phys = <&cp1_comphy3 1>; > - phy-names = "usb"; > + phys = <&cp1_comphy3 1>, <&cp1_utmi1>; > + phy-names = "usb", "utmi"; > }; > diff --git a/arch/arm64/boot/dts/marvell/cn9132-db.dts b/arch/arm64/boot/dts/marvell/cn9132-db.dts > index 4ef0df3097ca..87da1dc3707c 100644 > --- a/arch/arm64/boot/dts/marvell/cn9132-db.dts > +++ b/arch/arm64/boot/dts/marvell/cn9132-db.dts > @@ -205,9 +205,14 @@ > }; > }; > > +&cp2_utmi { > + status = "okay"; > +}; > + > &cp2_usb3_0 { > status = "okay"; > usb-phy = <&cp2_usb3_0_phy0>; > + phys = <&cp2_utmi0>; > phy-names = "usb"; > }; > > @@ -215,7 +220,7 @@ > &cp2_usb3_1 { > status = "okay"; > usb-phy = <&cp2_usb3_0_phy1>; > - phy-names = "usb"; > /* Generic PHY, providing serdes lanes */ > - phys = <&cp2_comphy3 1>; > + phys = <&cp2_comphy3 1>, <&cp2_utmi1>; > + phy-names = "usb", "utmi"; > }; > -- > 2.17.1 >
diff --git a/arch/arm64/boot/dts/marvell/armada-7040-db.dts b/arch/arm64/boot/dts/marvell/armada-7040-db.dts index a7eb4e7697a2..ef792b932912 100644 --- a/arch/arm64/boot/dts/marvell/armada-7040-db.dts +++ b/arch/arm64/boot/dts/marvell/armada-7040-db.dts @@ -218,6 +218,10 @@ }; }; +&cp0_utmi { + status = "okay"; +}; + &cp0_comphy1 { cp0_usbh0_con: connector { compatible = "usb-a-connector"; @@ -226,8 +230,8 @@ }; &cp0_usb3_0 { - phys = <&cp0_comphy1 0>; - phy-names = "cp0-usb3h0-comphy"; + phys = <&cp0_comphy1 0>, <&cp0_utmi0>; + phy-names = "cp0-usb3h0-comphy", "utmi"; status = "okay"; }; @@ -239,8 +243,8 @@ }; &cp0_usb3_1 { - phys = <&cp0_comphy4 1>; - phy-names = "cp0-usb3h1-comphy"; + phys = <&cp0_comphy4 1>, <&cp0_utmi1>; + phy-names = "cp0-usb3h1-comphy", "utmi"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/marvell/armada-8040-db.dts b/arch/arm64/boot/dts/marvell/armada-8040-db.dts index 09fb5256f1db..f1af6beeb9f9 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-db.dts +++ b/arch/arm64/boot/dts/marvell/armada-8040-db.dts @@ -154,8 +154,14 @@ }; /* CON9 on CP0 expansion */ +&cp0_utmi { + status = "okay"; +}; + &cp0_usb3_0 { usb-phy = <&cp0_usb3_0_phy>; + phys = <&cp0_utmi0>; + phy-names = "utmi"; status = "okay"; }; @@ -168,8 +174,8 @@ /* CON10 on CP0 expansion */ &cp0_usb3_1 { - phys = <&cp0_comphy4 1>; - phy-names = "cp0-usb3h1-comphy"; + phys = <&cp0_comphy4 1>, <&cp0_utmi1>; + phy-names = "usb", "utmi"; status = "okay"; }; @@ -306,14 +312,22 @@ }; }; +&cp1_utmi { + status = "okay"; +}; + /* CON9 on CP1 expansion */ &cp1_usb3_0 { usb-phy = <&cp1_usb3_0_phy>; + phys = <&cp1_utmi0>; + phy-names = "utmi"; status = "okay"; }; /* CON10 on CP1 expansion */ &cp1_usb3_1 { + phys = <&cp1_utmi1>; + phy-names = "utmi"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi index cbcb210cb6d8..b3258a3984a3 100644 --- a/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi +++ b/arch/arm64/boot/dts/marvell/armada-8040-mcbin.dtsi @@ -259,13 +259,21 @@ vqmmc-supply = <&v_3_3>; }; +&cp0_utmi { + status = "okay"; +}; + &cp0_usb3_0 { /* J38? - USB2.0 only */ + phys = <&cp0_utmi0>; + phy-names = "utmi"; status = "okay"; }; &cp0_usb3_1 { /* J38? - USB2.0 only */ + phys = <&cp0_utmi1>; + phy-names = "utmi"; status = "okay"; }; @@ -364,9 +372,13 @@ }; }; +&cp1_utmi { + status = "okay"; +}; + &cp1_usb3_0 { /* CPS Lane 2 - CON7 */ - phys = <&cp1_comphy2 0>; - phy-names = "cp1-usb3h0-comphy"; + phys = <&cp1_comphy2 0>, <&cp1_utmi0>; + phy-names = "cp1-usb3h0-comphy", "utmi"; status = "okay"; }; diff --git a/arch/arm64/boot/dts/marvell/cn9130-db.dts b/arch/arm64/boot/dts/marvell/cn9130-db.dts index ce49a70d88a0..02218422509c 100644 --- a/arch/arm64/boot/dts/marvell/cn9130-db.dts +++ b/arch/arm64/boot/dts/marvell/cn9130-db.dts @@ -390,14 +390,20 @@ }; }; +&cp0_utmi { + status = "okay"; +}; + &cp0_usb3_0 { status = "okay"; usb-phy = <&cp0_usb3_0_phy0>; - phy-names = "usb"; + phys = <&cp0_utmi0>; + phy-names = "utmi"; }; &cp0_usb3_1 { status = "okay"; usb-phy = <&cp0_usb3_0_phy1>; - phy-names = "usb"; + phys = <&cp0_utmi1>; + phy-names = "utmi"; }; diff --git a/arch/arm64/boot/dts/marvell/cn9131-db.dts b/arch/arm64/boot/dts/marvell/cn9131-db.dts index 3c975f98b2a3..17e189875182 100644 --- a/arch/arm64/boot/dts/marvell/cn9131-db.dts +++ b/arch/arm64/boot/dts/marvell/cn9131-db.dts @@ -193,10 +193,14 @@ }; /* CON58 */ +&cp1_utmi { + status = "okay"; +}; + &cp1_usb3_1 { status = "okay"; usb-phy = <&cp1_usb3_0_phy0>; /* Generic PHY, providing serdes lanes */ - phys = <&cp1_comphy3 1>; - phy-names = "usb"; + phys = <&cp1_comphy3 1>, <&cp1_utmi1>; + phy-names = "usb", "utmi"; }; diff --git a/arch/arm64/boot/dts/marvell/cn9132-db.dts b/arch/arm64/boot/dts/marvell/cn9132-db.dts index 4ef0df3097ca..87da1dc3707c 100644 --- a/arch/arm64/boot/dts/marvell/cn9132-db.dts +++ b/arch/arm64/boot/dts/marvell/cn9132-db.dts @@ -205,9 +205,14 @@ }; }; +&cp2_utmi { + status = "okay"; +}; + &cp2_usb3_0 { status = "okay"; usb-phy = <&cp2_usb3_0_phy0>; + phys = <&cp2_utmi0>; phy-names = "usb"; }; @@ -215,7 +220,7 @@ &cp2_usb3_1 { status = "okay"; usb-phy = <&cp2_usb3_0_phy1>; - phy-names = "usb"; /* Generic PHY, providing serdes lanes */ - phys = <&cp2_comphy3 1>; + phys = <&cp2_comphy3 1>, <&cp2_utmi1>; + phy-names = "usb", "utmi"; };