diff options
| author | Tom Rini <trini@konsulko.com> | 2020-10-06 08:36:10 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-10-06 08:36:10 -0400 |
| commit | 987ab49366f3fcd25039eab431bf099b587b3265 (patch) | |
| tree | 75defe86fd35339b1b2e695ea1beebc0bbf1bbaf /arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi | |
| parent | b24550accd7e3a62c6da773a9096dfd1471403d5 (diff) | |
| parent | 2d481b2e3e22f7be854d381a7bafd92a65e18b23 (diff) | |
| download | u-boot-987ab49366f3fcd25039eab431bf099b587b3265.tar.gz u-boot-987ab49366f3fcd25039eab431bf099b587b3265.tar.xz u-boot-987ab49366f3fcd25039eab431bf099b587b3265.zip | |
Merge tag 'u-boot-amlogic-20201005' of https://gitlab.denx.de/u-boot/custodians/u-boot-amlogic
- generate unique mac address from SoC serial on S400 board
- Add USB support for GXL and AXG SoCs
- Update Gadget code to use the new GXL and AXG USB glue driver
- Add a VIM3 board support to add dynamic PCIe enable in OS DT
- Fix AXG pinmux with requesting GPIOs
- Add missing GPIOA_18 for AXG pinctrl
- Add Amlogic PWM driver
Diffstat (limited to 'arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi')
| -rw-r--r-- | arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi b/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi index 7aecf2696b..c1763336cf 100644 --- a/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi +++ b/arch/arm/dts/meson-gxm-khadas-vim2-u-boot.dtsi @@ -12,10 +12,6 @@ }; }; -&dwc2 { - status = "okay"; -}; - &sd_emmc_c { status = "okay"; pinctrl-0 = <&emmc_pins>; |