On Sat, 7 Aug 2021 14:17:38 +0300 "Matwey V. Kornilov" <matwey.korni...@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.korni...@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.bar...@sancloud.com>
--
Paul Barker
Principal Software Engineer
SanCloud Ltd
pgp7yiXfHvest.pgp
Description: OpenPGP digital signature
