This series picks up a few patches from the TI BSP tree that
unfortunately didn't make it upstream thusfar.
The first patch improve SD card compatibility (allowing U1 class cards
to be used), the remaining ones add USB support.
The type-c connector isn't entirely modelled with these changes as
it goes through a TPS6598 PD controller. Unfortunately the dtb bindings
for that currently require an irq line, which is not connected on E1 and
E2 version boards. The patchese to support this setup unfortunately didn't land
yet[0].. As such the last patch ignored the PD controller and simply
configures usb0 as periphal only rather then mode switch capable, which
at least gives some basic usability of that USB port.
0: https://lore.kernel.org/lkml/[email protected]/T/
Aswath Govindraju (2):
arm64: dts: ti: k3-am62-main: Add support for USB
arm64: dts: ti: k3-am625-sk: Add support for USB
Nitin Yadav (1):
arm64: dts: ti: k3-am62-main: Update OTAP and ITAP delay select
arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 90 ++++++++++++++++++------
arch/arm64/boot/dts/ti/k3-am625-sk.dts | 22 ++++++
2 files changed, 90 insertions(+), 22 deletions(-)
--
2.39.0
From: Aswath Govindraju <[email protected]>
AM62 SoC has two instances of USB on it. Therefore, add support for the
same.
Signed-off-by: Aswath Govindraju <[email protected]>
Signed-off-by: Vignesh Raghavendra <[email protected]>
[cherry-pick from vendor BSP]]
Signed-off-by: Sjoerd Simons <[email protected]>
---
arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 44 ++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
index 28c250a8d1ec..105ffbf94a75 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
@@ -442,6 +442,50 @@ sdhci2: mmc@fa20000 {
ti,clkbuf-sel = <0x7>;
};
+ usbss0: dwc3-usb@f900000 {
+ compatible = "ti,am62-usb";
+ reg = <0x00 0x0f900000 0x00 0x800>;
+ clocks = <&k3_clks 161 3>;
+ clock-names = "ref";
+ ti,syscon-phy-pll-refclk = <&wkup_conf 0x4008>;
+ #address-cells = <2>;
+ #size-cells = <2>;
+ power-domains = <&k3_pds 178 TI_SCI_PD_EXCLUSIVE>;
+ ranges;
+
+ usb0: usb@31000000 {
+ compatible = "snps,dwc3";
+ reg =<0x00 0x31000000 0x00 0x50000>;
+ interrupts = <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>, /* irq.0 */
+ <GIC_SPI 188 IRQ_TYPE_LEVEL_HIGH>; /* irq.0 */
+ interrupt-names = "host", "peripheral";
+ maximum-speed = "high-speed";
+ dr_mode = "otg";
+ };
+ };
+
+ usbss1: dwc3-usb@f910000 {
+ compatible = "ti,am62-usb";
+ reg = <0x00 0x0f910000 0x00 0x800>;
+ clocks = <&k3_clks 162 3>;
+ clock-names = "ref";
+ ti,syscon-phy-pll-refclk = <&wkup_conf 0x4018>;
+ #address-cells = <2>;
+ #size-cells = <2>;
+ power-domains = <&k3_pds 179 TI_SCI_PD_EXCLUSIVE>;
+ ranges;
+
+ usb1: usb@31100000 {
+ compatible = "snps,dwc3";
+ reg =<0x00 0x31100000 0x00 0x50000>;
+ interrupts = <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>, /* irq.0 */
+ <GIC_SPI 226 IRQ_TYPE_LEVEL_HIGH>; /* irq.0 */
+ interrupt-names = "host", "peripheral";
+ maximum-speed = "high-speed";
+ dr_mode = "otg";
+ };
+ };
+
fss: bus@fc00000 {
compatible = "simple-bus";
reg = <0x00 0x0fc00000 0x00 0x70000>;
--
2.39.0
From: Nitin Yadav <[email protected]>
UHS Class U1 sd-card are not getting detected due to incorrect
OTAP/ITAP delay select values in linux. Update OTAP and ITAP
delay select values for various speed modes. For sdhci0, update
OTAP delay values for ddr52 & HS200 and add ITAP delay for legacy
& mmc-hs. For sdhci1 & sdhci2, update OTAP & ITAP delay select
recommended as in RIOT for various speed modes.
Signed-off-by: Nitin Yadav <[email protected]>
[cherry-pick from vendor BSP]
Signed-off-by: Sjoerd Simons <[email protected]>
---
arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 46 ++++++++++++------------
1 file changed, 24 insertions(+), 22 deletions(-)
diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
index 03660476364f..28c250a8d1ec 100644
--- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
+++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
@@ -391,8 +391,10 @@ sdhci0: mmc@fa10000 {
ti,clkbuf-sel = <0x7>;
ti,otap-del-sel-legacy = <0x0>;
ti,otap-del-sel-mmc-hs = <0x0>;
- ti,otap-del-sel-ddr52 = <0x9>;
- ti,otap-del-sel-hs200 = <0x6>;
+ ti,otap-del-sel-ddr52 = <0x5>;
+ ti,otap-del-sel-hs200 = <0x5>;
+ ti,itap-del-sel-legacy = <0xa>;
+ ti,itap-del-sel-mmc-hs = <0x1>;
};
sdhci1: mmc@fa00000 {
@@ -403,17 +405,17 @@ sdhci1: mmc@fa00000 {
clocks = <&k3_clks 58 5>, <&k3_clks 58 6>;
clock-names = "clk_ahb", "clk_xin";
ti,trm-icp = <0x2>;
- ti,otap-del-sel-legacy = <0x0>;
+ ti,otap-del-sel-legacy = <0x8>;
ti,otap-del-sel-sd-hs = <0x0>;
- ti,otap-del-sel-sdr12 = <0xf>;
- ti,otap-del-sel-sdr25 = <0xf>;
- ti,otap-del-sel-sdr50 = <0xc>;
- ti,otap-del-sel-sdr104 = <0x6>;
- ti,otap-del-sel-ddr50 = <0x9>;
- ti,itap-del-sel-legacy = <0x0>;
- ti,itap-del-sel-sd-hs = <0x0>;
- ti,itap-del-sel-sdr12 = <0x0>;
- ti,itap-del-sel-sdr25 = <0x0>;
+ ti,otap-del-sel-sdr12 = <0x0>;
+ ti,otap-del-sel-sdr25 = <0x0>;
+ ti,otap-del-sel-sdr50 = <0x8>;
+ ti,otap-del-sel-sdr104 = <0x7>;
+ ti,otap-del-sel-ddr50 = <0x4>;
+ ti,itap-del-sel-legacy = <0xa>;
+ ti,itap-del-sel-sd-hs = <0x1>;
+ ti,itap-del-sel-sdr12 = <0xa>;
+ ti,itap-del-sel-sdr25 = <0x1>;
ti,clkbuf-sel = <0x7>;
bus-width = <4>;
};
@@ -426,17 +428,17 @@ sdhci2: mmc@fa20000 {
clocks = <&k3_clks 184 5>, <&k3_clks 184 6>;
clock-names = "clk_ahb", "clk_xin";
ti,trm-icp = <0x2>;
- ti,otap-del-sel-legacy = <0x0>;
+ ti,otap-del-sel-legacy = <0x8>;
ti,otap-del-sel-sd-hs = <0x0>;
- ti,otap-del-sel-sdr12 = <0xf>;
- ti,otap-del-sel-sdr25 = <0xf>;
- ti,otap-del-sel-sdr50 = <0xc>;
- ti,otap-del-sel-sdr104 = <0x6>;
- ti,otap-del-sel-ddr50 = <0x9>;
- ti,itap-del-sel-legacy = <0x0>;
- ti,itap-del-sel-sd-hs = <0x0>;
- ti,itap-del-sel-sdr12 = <0x0>;
- ti,itap-del-sel-sdr25 = <0x0>;
+ ti,otap-del-sel-sdr12 = <0x0>;
+ ti,otap-del-sel-sdr25 = <0x0>;
+ ti,otap-del-sel-sdr50 = <0x8>;
+ ti,otap-del-sel-sdr104 = <0x7>;
+ ti,otap-del-sel-ddr50 = <0x8>;
+ ti,itap-del-sel-legacy = <0xa>;
+ ti,itap-del-sel-sd-hs = <0xa>;
+ ti,itap-del-sel-sdr12 = <0xa>;
+ ti,itap-del-sel-sdr25 = <0x1>;
ti,clkbuf-sel = <0x7>;
};
--
2.39.0
On Fri, 2022-12-16 at 15:36 +0100, Sjoerd Simons wrote:
>
> This series picks up a few patches from the TI BSP tree that
> unfortunately didn't make it upstream thusfar.
>
> The first patch improve SD card compatibility (allowing U1 class
> cards
> to be used), the remaining ones add USB support.
>
> The type-c connector isn't entirely modelled with these changes as
> it goes through a TPS6598 PD controller. Unfortunately the dtb
> bindings
> for that currently require an irq line, which is not connected on E1
> and
> E2 version boards. The patchese to support this setup unfortunately
> didn't land
> yet[0].. As such the last patch ignored the PD controller and simply
> configures usb0 as periphal only rather then mode switch capable,
> which
> at least gives some basic usability of that USB port.
>
> 0:
> https://lore.kernel.org/lkml/[email protected]/T/
>
>
Series tested with known problematic SD Card and checking for detection
of inserted USB device.
Tested-by: Martyn Welch <[email protected]>
> Aswath Govindraju (2):
> arm64: dts: ti: k3-am62-main: Add support for USB
> arm64: dts: ti: k3-am625-sk: Add support for USB
>
> Nitin Yadav (1):
> arm64: dts: ti: k3-am62-main: Update OTAP and ITAP delay select
>
> arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 90 ++++++++++++++++++----
> --
> arch/arm64/boot/dts/ti/k3-am625-sk.dts | 22 ++++++
> 2 files changed, 90 insertions(+), 22 deletions(-)
>
Hi,
On 16/12/22 8:06 pm, Sjoerd Simons wrote:
>
> This series picks up a few patches from the TI BSP tree that
> unfortunately didn't make it upstream thusfar.
>
> The first patch improve SD card compatibility (allowing U1 class cards
> to be used), the remaining ones add USB support.
>
> The type-c connector isn't entirely modelled with these changes as
> it goes through a TPS6598 PD controller. Unfortunately the dtb bindings
> for that currently require an irq line, which is not connected on E1 and
> E2 version boards. The patchese to support this setup unfortunately didn't land
> yet[0].. As such the last patch ignored the PD controller and simply
> configures usb0 as periphal only rather then mode switch capable, which
> at least gives some basic usability of that USB port.
>
> 0: https://lore.kernel.org/lkml/[email protected]/T/
>
>
Really appreciate porting and posting these patches to mainline!
Wondering what tree are these patches based on?
I cannot apply cleanly on linux-next.
> Aswath Govindraju (2):
> arm64: dts: ti: k3-am62-main: Add support for USB
> arm64: dts: ti: k3-am625-sk: Add support for USB
>
> Nitin Yadav (1):
> arm64: dts: ti: k3-am62-main: Update OTAP and ITAP delay select
>
> arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 90 ++++++++++++++++++------
> arch/arm64/boot/dts/ti/k3-am625-sk.dts | 22 ++++++
> 2 files changed, 90 insertions(+), 22 deletions(-)
>
Regards
Vignesh
On 16/12/22 8:06 pm, Sjoerd Simons wrote:
> From: Nitin Yadav <[email protected]>
>
> UHS Class U1 sd-card are not getting detected due to incorrect
> OTAP/ITAP delay select values in linux. Update OTAP and ITAP
> delay select values for various speed modes. For sdhci0, update
> OTAP delay values for ddr52 & HS200 and add ITAP delay for legacy
> & mmc-hs. For sdhci1 & sdhci2, update OTAP & ITAP delay select
> recommended as in RIOT for various speed modes.
>
> Signed-off-by: Nitin Yadav <[email protected]>
> [cherry-pick from vendor BSP]
> Signed-off-by: Sjoerd Simons <[email protected]>
> ---
>
> arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 46 ++++++++++++------------
> 1 file changed, 24 insertions(+), 22 deletions(-)
>
> diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
> index 03660476364f..28c250a8d1ec 100644
> --- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
> +++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
> @@ -391,8 +391,10 @@ sdhci0: mmc@fa10000 {
> ti,clkbuf-sel = <0x7>;
> ti,otap-del-sel-legacy = <0x0>;
> ti,otap-del-sel-mmc-hs = <0x0>;
> - ti,otap-del-sel-ddr52 = <0x9>;
> - ti,otap-del-sel-hs200 = <0x6>;
> + ti,otap-del-sel-ddr52 = <0x5>;
> + ti,otap-del-sel-hs200 = <0x5>;
> + ti,itap-del-sel-legacy = <0xa>;
This is pretty useless without corresponding driver changes
to pick up ti,itap-del-sel-legacy as well
https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/drivers/mmc/host/sdhci_am654.c?h=ti-linux-5.10.y&id=93d22fc56007ee13e589debf0d32c8b1d5fdc6d8
https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/drivers/mmc/host/sdhci_am654.c?h=ti-linux-5.10.y&id=9c878c3dc642f7f1f3ab6ca7f812cd43fe7ed7d8
Could you list that cards affected and fixed by this change?
Regards
Vignesh
[...]
Hey Vignesh,
On Tue, 2022-12-20 at 17:02 +0530, Vignesh Raghavendra wrote:
> Hi,
>
> On 16/12/22 8:06 pm, Sjoerd Simons wrote:
> >
> > This series picks up a few patches from the TI BSP tree that
> > unfortunately didn't make it upstream thusfar.
...
> > 0:
> > https://lore.kernel.org/lkml/[email protected]/T/
> >
> >
> Really appreciate porting and posting these patches to mainline!
> Wondering what tree are these patches based on?
> I cannot apply cleanly on linux-next.
These are against Linux 6.1 ; I'll happy rebase agains next for the
next round or is there a specific tree you prefer to base against?
Regards,
--
Sjoerd Simons
Collabora Ltd.
Hey Vignesh
On Tue, 2022-12-20 at 16:49 +0530, Vignesh Raghavendra wrote:
>
>
> On 16/12/22 8:06 pm, Sjoerd Simons wrote:
> > From: Nitin Yadav <[email protected]>
> >
> > UHS Class U1 sd-card are not getting detected due to incorrect
> > OTAP/ITAP delay select values in linux. Update OTAP and ITAP
> > delay select values for various speed modes. For sdhci0, update
> > OTAP delay values for ddr52 & HS200 and add ITAP delay for legacy
> > & mmc-hs. For sdhci1 & sdhci2, update OTAP & ITAP delay select
> > recommended as in RIOT for various speed modes.
> >
> > Signed-off-by: Nitin Yadav <[email protected]>
> > [cherry-pick from vendor BSP]
> > Signed-off-by: Sjoerd Simons <[email protected]>
> > ---
> >
> > arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 46 ++++++++++++--------
> > ----
> > 1 file changed, 24 insertions(+), 22 deletions(-)
> >
> > diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
> > b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
> > index 03660476364f..28c250a8d1ec 100644
> > --- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
> > +++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
> > @@ -391,8 +391,10 @@ sdhci0: mmc@fa10000 {
> > ti,clkbuf-sel = <0x7>;
> > ti,otap-del-sel-legacy = <0x0>;
> > ti,otap-del-sel-mmc-hs = <0x0>;
> > - ti,otap-del-sel-ddr52 = <0x9>;
> > - ti,otap-del-sel-hs200 = <0x6>;
> > + ti,otap-del-sel-ddr52 = <0x5>;
> > + ti,otap-del-sel-hs200 = <0x5>;
> > + ti,itap-del-sel-legacy = <0xa>;
>
> This is pretty useless without corresponding driver changes
> to pick up ti,itap-del-sel-legacy as well
Right; itap-del-sel-legacy is properly documented in the device-tree
binding and was already previously set ofcourse so i didn't pick up it
needed more driver changes. That said the dtb change itself should
still be valid even if not actually applied.
> https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/drivers/mmc/host/sdhci_am654.c?h=ti-linux-5.10.y&id=93d22fc56007ee13e589debf0d32c8b1d5fdc6d8
> https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/drivers/mmc/host/sdhci_am654.c?h=ti-linux-5.10.y&id=9c878c3dc642f7f1f3ab6ca7f812cd43fe7ed7d8
>
> Could you list that cards affected and fixed by this change?
It's a Collabora branded UHS class 1 (SDR104) card; Matching the commit
message indication given by Nitin. So that in particular i guess, will
have been fixed by the change to the ti,otap-del-sel-sdr104 value for
sdhci1.
For the two patches you highlighted above; Is TI planning to upstream
those as well?
--
Sjoerd Simons
Collabora Ltd.
Hi Sjoerd
On 12/20/2022 6:11 PM, Sjoerd Simons wrote:
> Hey Vignesh,
>
> On Tue, 2022-12-20 at 17:02 +0530, Vignesh Raghavendra wrote:
>> Hi,
>>
>> On 16/12/22 8:06 pm, Sjoerd Simons wrote:
>>>
>>> This series picks up a few patches from the TI BSP tree that
>>> unfortunately didn't make it upstream thusfar.
> ...
>>> 0:
>>> https://lore.kernel.org/lkml/[email protected]/T/
>>>
>>>
>> Really appreciate porting and posting these patches to mainline!
>> Wondering what tree are these patches based on?
>> I cannot apply cleanly on linux-next.
>
> These are against Linux 6.1 ; I'll happy rebase agains next for the
> next round or is there a specific tree you prefer to base against?
>
TI K3 patch queue is at:
https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti-next
This is part of linux-next. So, yes, I would like all patches to be
based on -next or above tree.
I see you have already done that in v2.. Thanks!
Regards
Vignesh
On 12/20/2022 6:37 PM, Sjoerd Simons wrote:
> Hey Vignesh
>
> On Tue, 2022-12-20 at 16:49 +0530, Vignesh Raghavendra wrote:
>>
>>
>> On 16/12/22 8:06 pm, Sjoerd Simons wrote:
>>> From: Nitin Yadav <[email protected]>
>>>
>>> UHS Class U1 sd-card are not getting detected due to incorrect
>>> OTAP/ITAP delay select values in linux. Update OTAP and ITAP
>>> delay select values for various speed modes. For sdhci0, update
>>> OTAP delay values for ddr52 & HS200 and add ITAP delay for legacy
>>> & mmc-hs. For sdhci1 & sdhci2, update OTAP & ITAP delay select
>>> recommended as in RIOT for various speed modes.
>>>
>>> Signed-off-by: Nitin Yadav <[email protected]>
>>> [cherry-pick from vendor BSP]
>>> Signed-off-by: Sjoerd Simons <[email protected]>
>>> ---
>>>
>>> arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 46 ++++++++++++--------
>>> ----
>>> 1 file changed, 24 insertions(+), 22 deletions(-)
>>>
>>> diff --git a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
>>> b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
>>> index 03660476364f..28c250a8d1ec 100644
>>> --- a/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
>>> +++ b/arch/arm64/boot/dts/ti/k3-am62-main.dtsi
>>> @@ -391,8 +391,10 @@ sdhci0: mmc@fa10000 {
>>> ti,clkbuf-sel = <0x7>;
>>> ti,otap-del-sel-legacy = <0x0>;
>>> ti,otap-del-sel-mmc-hs = <0x0>;
>>> - ti,otap-del-sel-ddr52 = <0x9>;
>>> - ti,otap-del-sel-hs200 = <0x6>;
>>> + ti,otap-del-sel-ddr52 = <0x5>;
>>> + ti,otap-del-sel-hs200 = <0x5>;
>>> + ti,itap-del-sel-legacy = <0xa>;
>>
>> This is pretty useless without corresponding driver changes
>> to pick up ti,itap-del-sel-legacy as well
>
> Right; itap-del-sel-legacy is properly documented in the device-tree
> binding and was already previously set ofcourse so i didn't pick up it
> needed more driver changes. That said the dtb change itself should
> still be valid even if not actually applied.
>
>> https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/drivers/mmc/host/sdhci_am654.c?h=ti-linux-5.10.y&id=93d22fc56007ee13e589debf0d32c8b1d5fdc6d8
>> https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/commit/drivers/mmc/host/sdhci_am654.c?h=ti-linux-5.10.y&id=9c878c3dc642f7f1f3ab6ca7f812cd43fe7ed7d8
>>
>> Could you list that cards affected and fixed by this change?
>
> It's a Collabora branded UHS class 1 (SDR104) card; Matching the commit
> message indication given by Nitin. So that in particular i guess, will
> have been fixed by the change to the ti,otap-del-sel-sdr104 value for
> sdhci1.
>
> For the two patches you highlighted above; Is TI planning to upstream
> those as well?
>
Yes, the plan is to post those patches to mmc list post 6.2-rc1
Regards
Vignesh