diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-10 07:15:12 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-10 07:15:12 -0500 |
| commit | 48d299a799f8e60342f10309dc3d4eb8e4b453a1 (patch) | |
| tree | 61176a4b76589978db8bc785727924f5af037e5e /arch | |
| parent | 53287a89e90a842f7265446be89c3c6b2aff3271 (diff) | |
| parent | 532ededd5cbff3d55e8c8e5b6377cec9e90f2152 (diff) | |
| download | u-boot-48d299a799f8e60342f10309dc3d4eb8e4b453a1.zip u-boot-48d299a799f8e60342f10309dc3d4eb8e4b453a1.tar.gz u-boot-48d299a799f8e60342f10309dc3d4eb8e4b453a1.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-usb
- DWC3 and UDC cleanup
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/dts/omap5-u-boot.dtsi | 4 | ||||
| -rw-r--r-- | arch/sandbox/dts/test.dts | 6 |
3 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 13ba774..7f513ce 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -932,6 +932,7 @@ config ARCH_ZYNQMP_R5 select DM_SERIAL select OF_CONTROL imply CMD_DM + imply DM_USB_GADGET config ARCH_ZYNQMP bool "Xilinx ZynqMP based platform" @@ -949,6 +950,7 @@ config ARCH_ZYNQMP imply CMD_DM imply FAT_WRITE imply MP + imply DM_USB_GADGET config TEGRA bool "NVIDIA Tegra" diff --git a/arch/arm/dts/omap5-u-boot.dtsi b/arch/arm/dts/omap5-u-boot.dtsi index bf2684c..a6a7801 100644 --- a/arch/arm/dts/omap5-u-boot.dtsi +++ b/arch/arm/dts/omap5-u-boot.dtsi @@ -15,6 +15,10 @@ ocp { u-boot,dm-spl; + ocp2scp@4a080000 { + compatible = "ti,omap-ocp2scp", "simple-bus"; + }; + ocp2scp@4a090000 { compatible = "ti,omap-ocp2scp", "simple-bus"; }; diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 082fcec..6b1c269 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -460,6 +460,8 @@ test4 { compatible = "denx,u-boot-probe-test"; + first-syscon = <&syscon0>; + second-sys-ctrl = <&another_system_controller>; }; }; @@ -540,12 +542,12 @@ }; }; - syscon@0 { + syscon0: syscon@0 { compatible = "sandbox,syscon0"; reg = <0x10 16>; }; - syscon@1 { + another_system_controller: syscon@1 { compatible = "sandbox,syscon1"; reg = <0x20 5 0x28 6 |