| Message ID | 20210807111738.8391-1-matwey.kornilov@gmail.com |
|---|---|
| State | Accepted |
| Commit | 4c9289f52f004927a5fc87ff41137829312f10d6 |
| Headers | show |
| Series | am33xx: Fix USB for am335x boards | expand |
On Sat, 7 Aug 2021 14:17:38 +0300 "Matwey V. Kornilov" <matwey.kornilov@gmail.com> wrote: > USB nodes were mistakenly disabled in > > commit 942853dd96df ("arm: dts: Resync BeagleBone device trees") > > This commit is to fix the following issue: > > starting USB... > No working controllers found > USB is stopped. Please issue 'usb start' first. > starting USB... > No working controllers found > > Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0782e8572ce43f521ed6ff15e4a7ab9aa5acdc85 > Fixes: 942853dd96df ("arm: dts: Resync BeagleBone device trees") > Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> > --- > arch/arm/dts/am33xx.dtsi | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/arch/arm/dts/am33xx.dtsi b/arch/arm/dts/am33xx.dtsi > index ce07cec846..b5093020ee 100644 > --- a/arch/arm/dts/am33xx.dtsi > +++ b/arch/arm/dts/am33xx.dtsi > @@ -380,28 +380,24 @@ > #address-cells = <1>; > #size-cells = <1>; > ti,hwmods = "usb_otg_hs"; > - status = "disabled"; > > usb_ctrl_mod: control@44e10620 { > compatible = "ti,am335x-usb-ctrl-module"; > reg = <0x44e10620 0x10 > 0x44e10648 0x4>; > reg-names = "phy_ctrl", "wakeup"; > - status = "disabled"; > }; > > usb0_phy: usb-phy@47401300 { > compatible = "ti,am335x-usb-phy"; > reg = <0x47401300 0x100>; > reg-names = "phy"; > - status = "disabled"; > ti,ctrl_mod = <&usb_ctrl_mod>; > #phy-cells = <0>; > }; > > usb0: usb@47401000 { > compatible = "ti,musb-am33xx"; > - status = "disabled"; > reg = <0x47401400 0x400 > 0x47401000 0x200>; > reg-names = "mc", "control"; > @@ -443,14 +439,12 @@ > compatible = "ti,am335x-usb-phy"; > reg = <0x47401b00 0x100>; > reg-names = "phy"; > - status = "disabled"; > ti,ctrl_mod = <&usb_ctrl_mod>; > #phy-cells = <0>; > }; > > usb1: usb@47401800 { > compatible = "ti,musb-am33xx"; > - status = "disabled"; > reg = <0x47401c00 0x400 > 0x47401800 0x200>; > reg-names = "mc", "control"; This looks like the right approach to me. As you noted in your other email, just resyncing am33xx.dtsi isn't as trivial as it seems as all dts/dtsi files which include this would also need resyncing. I focused on just resyncing the files for the BeagleBone and its derivatives as that was more manageable. I did a quick check of am33xx.dtsi for potential incompatibilities but obviously missed this one, thanks for sending this patch to fix it. Reviewed-by: Paul Barker <paul.barker@sancloud.com> -- Paul Barker Principal Software Engineer SanCloud Ltd
Hi, On Sat, 2021-08-07 at 14:17 +0300, Matwey V. Kornilov wrote: > USB nodes were mistakenly disabled in > > commit 942853dd96df ("arm: dts: Resync BeagleBone device trees") To be precise, the problem is that only half of the device tree files were synced. am33xx.dtsi (and seemingly some more) were skipped, leading to the symptoms you found. I think it is likely that the upstream changes in am33xx.dtsi which we are missing right now will lead to more regressions of similar nature. So I'd say we should dig deeper into the problems you encountered while attempting to just sync the entirety of am33xx.dtsi. The end goal is that all device-tree files not ending in `-uboot` match what is in Linux, so it is inevitable that someone needs to look into this anyway. -- Harald > This commit is to fix the following issue: > > starting USB... > No working controllers found > USB is stopped. Please issue 'usb start' first. > starting USB... > No working controllers found > > Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0782e8572ce43f521ed6ff15e4a7ab9aa5acdc85 > Fixes: 942853dd96df ("arm: dts: Resync BeagleBone device trees") > Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> > --- > arch/arm/dts/am33xx.dtsi | 6 ------ > 1 file changed, 6 deletions(-) > > diff --git a/arch/arm/dts/am33xx.dtsi b/arch/arm/dts/am33xx.dtsi > index ce07cec846..b5093020ee 100644 > --- a/arch/arm/dts/am33xx.dtsi > +++ b/arch/arm/dts/am33xx.dtsi > @@ -380,28 +380,24 @@ > #address-cells = <1>; > #size-cells = <1>; > ti,hwmods = "usb_otg_hs"; > - status = "disabled"; > > usb_ctrl_mod: control@44e10620 { > compatible = "ti,am335x-usb-ctrl-module"; > reg = <0x44e10620 0x10 > 0x44e10648 0x4>; > reg-names = "phy_ctrl", "wakeup"; > - status = "disabled"; > }; > > usb0_phy: usb-phy@47401300 { > compatible = "ti,am335x-usb-phy"; > reg = <0x47401300 0x100>; > reg-names = "phy"; > - status = "disabled"; > ti,ctrl_mod = <&usb_ctrl_mod>; > #phy-cells = <0>; > }; > > usb0: usb@47401000 { > compatible = "ti,musb-am33xx"; > - status = "disabled"; > reg = <0x47401400 0x400 > 0x47401000 0x200>; > reg-names = "mc", "control"; > @@ -443,14 +439,12 @@ > compatible = "ti,am335x-usb-phy"; > reg = <0x47401b00 0x100>; > reg-names = "phy"; > - status = "disabled"; > ti,ctrl_mod = <&usb_ctrl_mod>; > #phy-cells = <0>; > }; > > usb1: usb@47401800 { > compatible = "ti,musb-am33xx"; > - status = "disabled"; > reg = <0x47401c00 0x400 > 0x47401800 0x200>; > reg-names = "mc", "control"; -- Harald DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-62 Fax: +49-8142-66989-80 Email: hws@denx.de
On Tue, Aug 10, 2021 at 12:04:23PM +0200, Harald Seiler wrote: > Hi, > > On Sat, 2021-08-07 at 14:17 +0300, Matwey V. Kornilov wrote: > > USB nodes were mistakenly disabled in > > > > commit 942853dd96df ("arm: dts: Resync BeagleBone device trees") > > To be precise, the problem is that only half of the device tree files > were synced. am33xx.dtsi (and seemingly some more) were skipped, > leading to the symptoms you found. I think it is likely that the > upstream changes in am33xx.dtsi which we are missing right now will lead > to more regressions of similar nature. > > So I'd say we should dig deeper into the problems you encountered while > attempting to just sync the entirety of am33xx.dtsi. The end goal is > that all device-tree files not ending in `-uboot` match what is in > Linux, so it is inevitable that someone needs to look into this anyway. Yes, there is a general need to re-sync all of the TI dts files with upstream. It's unclear to me right now if a full resync on the am33xx line will produce the same set of total failure that resyncing the rest of the omap5/j6/am57xx and later families have. -- Tom
On Sat, Aug 07, 2021 at 02:17:38PM +0300, Matwey V. Kornilov wrote: > USB nodes were mistakenly disabled in > > commit 942853dd96df ("arm: dts: Resync BeagleBone device trees") > > This commit is to fix the following issue: > > starting USB... > No working controllers found > USB is stopped. Please issue 'usb start' first. > starting USB... > No working controllers found > > Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0782e8572ce43f521ed6ff15e4a7ab9aa5acdc85 > Fixes: 942853dd96df ("arm: dts: Resync BeagleBone device trees") > Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> > Reviewed-by: Paul Barker <paul.barker@sancloud.com> Applied to u-boot/master, thanks! -- Tom
diff --git a/arch/arm/dts/am33xx.dtsi b/arch/arm/dts/am33xx.dtsi index ce07cec846..b5093020ee 100644 --- a/arch/arm/dts/am33xx.dtsi +++ b/arch/arm/dts/am33xx.dtsi @@ -380,28 +380,24 @@ #address-cells = <1>; #size-cells = <1>; ti,hwmods = "usb_otg_hs"; - status = "disabled"; usb_ctrl_mod: control@44e10620 { compatible = "ti,am335x-usb-ctrl-module"; reg = <0x44e10620 0x10 0x44e10648 0x4>; reg-names = "phy_ctrl", "wakeup"; - status = "disabled"; }; usb0_phy: usb-phy@47401300 { compatible = "ti,am335x-usb-phy"; reg = <0x47401300 0x100>; reg-names = "phy"; - status = "disabled"; ti,ctrl_mod = <&usb_ctrl_mod>; #phy-cells = <0>; }; usb0: usb@47401000 { compatible = "ti,musb-am33xx"; - status = "disabled"; reg = <0x47401400 0x400 0x47401000 0x200>; reg-names = "mc", "control"; @@ -443,14 +439,12 @@ compatible = "ti,am335x-usb-phy"; reg = <0x47401b00 0x100>; reg-names = "phy"; - status = "disabled"; ti,ctrl_mod = <&usb_ctrl_mod>; #phy-cells = <0>; }; usb1: usb@47401800 { compatible = "ti,musb-am33xx"; - status = "disabled"; reg = <0x47401c00 0x400 0x47401800 0x200>; reg-names = "mc", "control";
USB nodes were mistakenly disabled in commit 942853dd96df ("arm: dts: Resync BeagleBone device trees") This commit is to fix the following issue: starting USB... No working controllers found USB is stopped. Please issue 'usb start' first. starting USB... No working controllers found Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=0782e8572ce43f521ed6ff15e4a7ab9aa5acdc85 Fixes: 942853dd96df ("arm: dts: Resync BeagleBone device trees") Signed-off-by: Matwey V. Kornilov <matwey.kornilov@gmail.com> --- arch/arm/dts/am33xx.dtsi | 6 ------ 1 file changed, 6 deletions(-) -- 2.31.1