diff options
| author | Tom Rini <[email protected]> | 2020-05-12 09:23:15 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2020-05-12 09:23:15 -0400 |
| commit | 1e6d9f515dfa6dbaf33095bf1e04d733da9fc41b (patch) | |
| tree | 533fb609ba98d94946300e9170b92b6f4dae0a47 /arch | |
| parent | 2a38d2239d0bb4d128b00886bf097ab247a0b1a7 (diff) | |
| parent | 9bf87e256c26246fa6d8df491617e40cb7df89c2 (diff) | |
Merge tag 'u-boot-amlogic-20200511' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic
- Enable USB Host for Odroid-C2 board
- Add Open-Drain/Open-Source emulation in GPIO uclass
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi | 8 | ||||
| -rw-r--r-- | arch/sandbox/dts/test.dts | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi index c35158d7e9e..484b40504dc 100644 --- a/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi +++ b/arch/arm/dts/meson-gxbb-odroidc2-u-boot.dtsi @@ -5,3 +5,11 @@ */ #include "meson-gx-u-boot.dtsi" + +&usb0 { + status = "disabled"; +}; + +&usb1 { + hnp-srp-disable; +}; diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 15cd2330a38..5ce5e284764 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -104,7 +104,9 @@ <&gpio_c 2 GPIO_OUT>, <&gpio_c 3 (GPIO_IN|GPIO_PULL_UP)>, <&gpio_c 4 (GPIO_IN|GPIO_PULL_DOWN)>, - <&gpio_c 5 GPIO_IN>; + <&gpio_c 5 GPIO_IN>, + <&gpio_c 6 (GPIO_ACTIVE_LOW|GPIO_OUT|GPIO_OPEN_DRAIN)>, + <&gpio_c 7 (GPIO_ACTIVE_LOW|GPIO_OUT|GPIO_OPEN_SOURCE)>; int-value = <1234>; uint-value = <(-1234)>; int64-value = /bits/ 64 <0x1111222233334444>; |