diff options
| author | Tom Rini <trini@konsulko.com> | 2020-05-13 15:03:16 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-05-13 15:03:16 -0400 |
| commit | cae802924e423900df24dc58f382896ceb42a54b (patch) | |
| tree | 1c345ed694faf210c39ff73eacef36578af82b3c /arch | |
| parent | 10bca13ea6d9d4b85f80f02c8795227f63240f59 (diff) | |
| parent | bed6481940b1b9a2f3b48afeeced550dd84e2932 (diff) | |
| download | u-boot-cae802924e423900df24dc58f382896ceb42a54b.tar.gz | |
Merge tag 'arc-fixes-for-2020.07-rc3' of https://gitlab.denx.de/u-boot/custodians/u-boot-arc
Here we improve clock support for recently introduced HSDK-4xD
board as well as finally enable external reset for the USB controller,
which is needed to recover USB functionality after "usb reset".
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arc/dts/axs10x_mb.dtsi | 4 | ||||
| -rw-r--r-- | arch/arc/dts/hsdk-common.dtsi | 11 |
2 files changed, 11 insertions, 4 deletions
diff --git a/arch/arc/dts/axs10x_mb.dtsi b/arch/arc/dts/axs10x_mb.dtsi index 5b77642b8d..33b0593438 100644 --- a/arch/arc/dts/axs10x_mb.dtsi +++ b/arch/arc/dts/axs10x_mb.dtsi @@ -62,12 +62,12 @@ max-speed = <100>; }; - ehci@0x40000 { + ehci@40000 { compatible = "generic-ehci"; reg = < 0x40000 0x100 >; }; - ohci@0x60000 { + ohci@60000 { compatible = "generic-ohci"; reg = < 0x60000 0x100 >; }; diff --git a/arch/arc/dts/hsdk-common.dtsi b/arch/arc/dts/hsdk-common.dtsi index fd4245e164..9aa10e4b25 100644 --- a/arch/arc/dts/hsdk-common.dtsi +++ b/arch/arc/dts/hsdk-common.dtsi @@ -84,12 +84,19 @@ phy-mode = "gmii"; }; - ehci@0xf0040000 { + ehci@f0040000 { compatible = "generic-ehci"; reg = <0xf0040000 0x100>; + + /* + * OHCI and EHCI have reset line shared so we don't add + * reset property to OHCI node as it is probed later and + * it will reset sucessfuly probed and configured EHCI HW. + */ + resets = <&cgu_rst HSDK_USB_RESET>; }; - ohci@0xf0060000 { + ohci@f0060000 { compatible = "generic-ohci"; reg = <0xf0060000 0x100>; }; |