Hi Maxime,
This series primarily adds the dwc3 DT node which activates the usb3 controller on
the stih407-b2120, stih410-b2120 and stih418-b2199 platforms.
As part of getting this working I noticed an error with the picophyreset which
stops the controller working which I've also fixed.
regards,
Peter.
Changes in v3:
- Add miphys8lp options properties for stih418 (Pete)
- Add support for stih418-b2199 (Max)
- Only enable usb3 controller in the board file (Max)
- Fix superflous '\n' (Lee)
- Rebase series on v4.1-rc1 (Pete)
NB: Since v2 some patches were taken into the phy and ahci trees which I've now
removed from the series.
Changes in v2:
- Update commit to explicitly say no ABI breakage (Rob)
- Rebase series on v4.0-rc6 (Pete)
- Collect up Acks (Pete)
Peter Griffin (6):
ARM: DT: STi: STiH407: Update picophyreset for the usb3 controllers
usb2 phy
ARM: DT: STi: STiH407: Add dwc3 usb3 DT node.
usb: dwc3: dwc3-st: Update the incorrect DT dwc3 example.
ARM: DT: STi: stihxxx-b2120: Enable USB3 port on stih407-b2120 and
stih410-b2120
ARM: DT: STi: STiH418: Add miphy28lp optional oscillator clock
properties
ARM: DT: STi: STiH418: Enable USB3 port on stih418-b2199.
Documentation/devicetree/bindings/usb/dwc3-st.txt | 7 +++---
arch/arm/boot/dts/stih407-family.dtsi | 30 ++++++++++++++++++++++-
arch/arm/boot/dts/stih418-b2199.dts | 15 ++++++++++++
arch/arm/boot/dts/stihxxx-b2120.dtsi | 5 ++++
4 files changed, 52 insertions(+), 5 deletions(-)
--
1.9.1
Ths picophyreset is incorrectly defined, which stops the usb2 phy being
taken out of reset.
Signed-off-by: Peter Griffin <[email protected]>
Acked-by: Lee Jones <[email protected]>
---
arch/arm/boot/dts/stih407-family.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index c06a546..186412d 100644
--- a/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@ -280,7 +280,7 @@
#phy-cells = <0>;
st,syscfg = <&syscfg_core 0x100 0xf4>;
resets = <&softreset STIH407_PICOPHY_SOFTRESET>,
- <&picophyreset STIH407_PICOPHY0_RESET>;
+ <&picophyreset STIH407_PICOPHY2_RESET>;
reset-names = "global", "port";
};
--
1.9.1
Now that both usb2 and usb3 phy drivers, and also the ST dwc3 glue code
are all present upstream, we can add the dwc3 DT node and have a working
usb3 controller on stih407-b2120 and stih410-b2020.
Signed-off-by: Peter Griffin <[email protected]>
Acked-by: Lee Jones <[email protected]>
Acked-by: Maxime Coquelin <[email protected]>
---
arch/arm/boot/dts/stih407-family.dtsi | 28 ++++++++++++++++++++++++++++
1 file changed, 28 insertions(+)
diff --git a/arch/arm/boot/dts/stih407-family.dtsi b/arch/arm/boot/dts/stih407-family.dtsi
index 186412d..821598e 100644
--- a/arch/arm/boot/dts/stih407-family.dtsi
+++ b/arch/arm/boot/dts/stih407-family.dtsi
@@ -7,6 +7,7 @@
* publishhed by the Free Software Foundation.
*/
#include "stih407-pinctrl.dtsi"
+#include <dt-bindings/phy/phy.h>
#include <dt-bindings/reset-controller/stih407-resets.h>
/ {
#address-cells = <1>;
@@ -336,5 +337,32 @@
resets = <&softreset STIH407_MIPHY2_SOFTRESET>;
};
};
+
+ st_dwc3: dwc3@8f94000 {
+ compatible = "st,stih407-dwc3";
+ reg = <0x08f94000 0x1000>, <0x110 0x4>;
+ reg-names = "reg-glue", "syscfg-reg";
+ st,syscfg = <&syscfg_core>;
+ resets = <&powerdown STIH407_USB3_POWERDOWN>,
+ <&softreset STIH407_MIPHY2_SOFTRESET>;
+ reset-names = "powerdown", "softreset";
+ #address-cells = <1>;
+ #size-cells = <1>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&pinctrl_usb3>;
+ ranges;
+
+ status = "disabled";
+
+ dwc3: dwc3@9900000 {
+ compatible = "snps,dwc3";
+ reg = <0x09900000 0x100000>;
+ interrupts = <GIC_SPI 155 IRQ_TYPE_NONE>;
+ dr_mode = "host";
+ phy-names = "usb2-phy", "usb3-phy";
+ phys = <&usb2_picophy0>,
+ <&phy_port2 PHY_TYPE_USB3>;
+ };
+ };
};
};
--
1.9.1
There is a subtle typo phys-names should be phy-names. Using the
current example means you don't have working usb (as you fail to
obtain the phys). Also update the example to use the generic phy
type constants which are now used for miphy28.
Additionally also remove the unnecessary new line in the example.
Signed-off-by: Peter Griffin <[email protected]>
Acked-by: Rob Herring <[email protected]>
Acked-by: Maxime Coquelin <[email protected]>
---
Documentation/devicetree/bindings/usb/dwc3-st.txt | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/Documentation/devicetree/bindings/usb/dwc3-st.txt b/Documentation/devicetree/bindings/usb/dwc3-st.txt
index f9d7025..01c71b1 100644
--- a/Documentation/devicetree/bindings/usb/dwc3-st.txt
+++ b/Documentation/devicetree/bindings/usb/dwc3-st.txt
@@ -49,8 +49,7 @@ st_dwc3: dwc3@8f94000 {
st,syscfg = <&syscfg_core>;
resets = <&powerdown STIH407_USB3_POWERDOWN>,
<&softreset STIH407_MIPHY2_SOFTRESET>;
- reset-names = "powerdown",
- "softreset";
+ reset-names = "powerdown", "softreset";
#address-cells = <1>;
#size-cells = <1>;
pinctrl-names = "default";
@@ -62,7 +61,7 @@ st_dwc3: dwc3@8f94000 {
reg = <0x09900000 0x100000>;
interrupts = <GIC_SPI 155 IRQ_TYPE_NONE>;
dr_mode = "host";
- phys-names = "usb2-phy", "usb3-phy";
- phys = <&usb2_picophy2>, <&phy_port2 MIPHY_TYPE_USB>;
+ phy-names = "usb2-phy", "usb3-phy";
+ phys = <&usb2_picophy2>, <&phy_port2 PHY_TYPE_USB3>;
};
};
--
1.9.1
The USB3 controller is present on both variants of the b2120 board so
enable the controller in the generic stihxxx-b2120.dtsi file.
Signed-off-by: Peter Griffin <[email protected]>
---
arch/arm/boot/dts/stihxxx-b2120.dtsi | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/boot/dts/stihxxx-b2120.dtsi b/arch/arm/boot/dts/stihxxx-b2120.dtsi
index c1d8590..bef9128 100644
--- a/arch/arm/boot/dts/stihxxx-b2120.dtsi
+++ b/arch/arm/boot/dts/stihxxx-b2120.dtsi
@@ -66,5 +66,10 @@
st,osc-force-ext;
};
};
+
+ st_dwc3: dwc3@8f94000 {
+ status = "okay";
+ };
+
};
};
--
1.9.1
STiH418 miphy28lp port0/1 need the oscillator clock configured in the same way
as on STiH407/STiH410 platforms.
Signed-off-by: Peter Griffin <[email protected]>
---
arch/arm/boot/dts/stih418-b2199.dts | 11 +++++++++++
1 file changed, 11 insertions(+)
diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts
index 926235c..e0e5b23 100644
--- a/arch/arm/boot/dts/stih418-b2199.dts
+++ b/arch/arm/boot/dts/stih418-b2199.dts
@@ -74,5 +74,16 @@
st,i2c-min-scl-pulse-width-us = <0>;
st,i2c-min-sda-pulse-width-us = <5>;
};
+
+ miphy28lp_phy: miphy28lp@9b22000 {
+
+ phy_port0: port@9b22000 {
+ st,osc-rdy;
+ };
+
+ phy_port1: port@9b2a000 {
+ st,osc-force-ext;
+ };
+ };
};
};
--
1.9.1
The USB3 controller is present on the b2199 board, so enable
it in the board specific DT file.
Signed-off-by: Peter Griffin <[email protected]>
---
arch/arm/boot/dts/stih418-b2199.dts | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/boot/dts/stih418-b2199.dts b/arch/arm/boot/dts/stih418-b2199.dts
index e0e5b23..5e59b46 100644
--- a/arch/arm/boot/dts/stih418-b2199.dts
+++ b/arch/arm/boot/dts/stih418-b2199.dts
@@ -85,5 +85,9 @@
st,osc-force-ext;
};
};
+
+ st_dwc3: dwc3@8f94000 {
+ status = "okay";
+ };
};
};
--
1.9.1
Hi Felipe,
On Thu, 30 Apr 2015, Peter Griffin wrote:
> There is a subtle typo phys-names should be phy-names. Using the
> current example means you don't have working usb (as you fail to
> obtain the phys). Also update the example to use the generic phy
> type constants which are now used for miphy28.
>
> Additionally also remove the unnecessary new line in the example.
>
> Signed-off-by: Peter Griffin <[email protected]>
> Acked-by: Rob Herring <[email protected]>
> Acked-by: Maxime Coquelin <[email protected]>
Can you take this dwc3 DT doc update patch via your tree?
regards,
Peter.
On Thu, May 07, 2015 at 04:13:58PM +0100, Peter Griffin wrote:
> Hi Felipe,
>
> On Thu, 30 Apr 2015, Peter Griffin wrote:
>
> > There is a subtle typo phys-names should be phy-names. Using the
> > current example means you don't have working usb (as you fail to
> > obtain the phys). Also update the example to use the generic phy
> > type constants which are now used for miphy28.
> >
> > Additionally also remove the unnecessary new line in the example.
> >
> > Signed-off-by: Peter Griffin <[email protected]>
> > Acked-by: Rob Herring <[email protected]>
> > Acked-by: Maxime Coquelin <[email protected]>
>
> Can you take this dwc3 DT doc update patch via your tree?
only this patch ? Sure. Just post on linux-usb and I'll fetch it from
there.
--
balbi
Hi Felipe,
On Thu, 07 May 2015, Felipe Balbi wrote:
> On Thu, May 07, 2015 at 04:13:58PM +0100, Peter Griffin wrote:
> > Hi Felipe,
> >
> > On Thu, 30 Apr 2015, Peter Griffin wrote:
> >
> > > There is a subtle typo phys-names should be phy-names. Using the
> > > current example means you don't have working usb (as you fail to
> > > obtain the phys). Also update the example to use the generic phy
> > > type constants which are now used for miphy28.
> > >
> > > Additionally also remove the unnecessary new line in the example.
> > >
> > > Signed-off-by: Peter Griffin <[email protected]>
> > > Acked-by: Rob Herring <[email protected]>
> > > Acked-by: Maxime Coquelin <[email protected]>
> >
> > Can you take this dwc3 DT doc update patch via your tree?
>
> only this patch ?
Yes, I think the test will go via Maximes STI tree
> Sure. Just post on linux-usb and I'll fetch it from
> there.
Brilliant, thanks. I've sent it see here https://lkml.org/lkml/2015/5/7/809
with linux-usb on CC (sorry for missing that off the first time round)
regards,
Peter.
On Fri, May 08, 2015 at 11:31:40AM +0100, Peter Griffin wrote:
> Hi Felipe,
>
> On Thu, 07 May 2015, Felipe Balbi wrote:
>
> > On Thu, May 07, 2015 at 04:13:58PM +0100, Peter Griffin wrote:
> > > Hi Felipe,
> > >
> > > On Thu, 30 Apr 2015, Peter Griffin wrote:
> > >
> > > > There is a subtle typo phys-names should be phy-names. Using the
> > > > current example means you don't have working usb (as you fail to
> > > > obtain the phys). Also update the example to use the generic phy
> > > > type constants which are now used for miphy28.
> > > >
> > > > Additionally also remove the unnecessary new line in the example.
> > > >
> > > > Signed-off-by: Peter Griffin <[email protected]>
> > > > Acked-by: Rob Herring <[email protected]>
> > > > Acked-by: Maxime Coquelin <[email protected]>
> > >
> > > Can you take this dwc3 DT doc update patch via your tree?
> >
> > only this patch ?
>
> Yes, I think the test will go via Maximes STI tree
>
> > Sure. Just post on linux-usb and I'll fetch it from
> > there.
>
> Brilliant, thanks. I've sent it see here https://lkml.org/lkml/2015/5/7/809
> with linux-usb on CC (sorry for missing that off the first time round)
it's in my testing/next now.
--
balbi
Hi Peter,
On 04/30/2015 03:30 PM, Peter Griffin wrote:
> Hi Maxime,
>
> This series primarily adds the dwc3 DT node which activates the usb3 controller on
> the stih407-b2120, stih410-b2120 and stih418-b2199 platforms.
>
> As part of getting this working I noticed an error with the picophyreset which
> stops the controller working which I've also fixed.
>
> regards,
>
> Peter.
>
> Changes in v3:
> - Add miphys8lp options properties for stih418 (Pete)
> - Add support for stih418-b2199 (Max)
> - Only enable usb3 controller in the board file (Max)
> - Fix superflous '\n' (Lee)
> - Rebase series on v4.1-rc1 (Pete)
>
> NB: Since v2 some patches were taken into the phy and ahci trees which I've now
> removed from the series.
>
> Changes in v2:
> - Update commit to explicitly say no ABI breakage (Rob)
> - Rebase series on v4.0-rc6 (Pete)
> - Collect up Acks (Pete)
>
> Peter Griffin (6):
> ARM: DT: STi: STiH407: Update picophyreset for the usb3 controllers
> usb2 phy
> ARM: DT: STi: STiH407: Add dwc3 usb3 DT node.
> usb: dwc3: dwc3-st: Update the incorrect DT dwc3 example.
> ARM: DT: STi: stihxxx-b2120: Enable USB3 port on stih407-b2120 and
> stih410-b2120
> ARM: DT: STi: STiH418: Add miphy28lp optional oscillator clock
> properties
> ARM: DT: STi: STiH418: Enable USB3 port on stih418-b2199.
>
> Documentation/devicetree/bindings/usb/dwc3-st.txt | 7 +++---
> arch/arm/boot/dts/stih407-family.dtsi | 30 ++++++++++++++++++++++-
> arch/arm/boot/dts/stih418-b2199.dts | 15 ++++++++++++
> arch/arm/boot/dts/stihxxx-b2120.dtsi | 5 ++++
> 4 files changed, 52 insertions(+), 5 deletions(-)
>
All DT patches of the series applied to STi DT branch for v4.2.
Thanks!
Maxime