diff options
| author | Tom Rini <trini@konsulko.com> | 2021-05-14 22:59:59 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-05-14 22:59:59 -0400 |
| commit | 666afca0df559ee27a66fcc37685adc22162411a (patch) | |
| tree | a0b9d8152dffcfbf03221bc55a768658bd586ec3 /arch | |
| parent | 579e07501a4f755e29953b9c21527354cb3ac74c (diff) | |
| parent | 4c2eb955cfd77d667485c5141cda2821aa1f97ef (diff) | |
| download | u-boot-666afca0df559ee27a66fcc37685adc22162411a.zip u-boot-666afca0df559ee27a66fcc37685adc22162411a.tar.gz u-boot-666afca0df559ee27a66fcc37685adc22162411a.tar.bz2 | |
Merge tag 'u-boot-amlogic-20210514' of https://source.denx.de/u-boot/custodians/u-boot-amlogic
- dts: add missing -u-boot.dtsi to enable HDMI on Beelink GTKing/King-Pro
- usb: dwc3-meson-g12a: skip phy on -ENODATA aswell
- net: dwmac_meson8b: do not set TX delay in TXID & RXID
- net: designware: meson8b: add g12a compatible
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/dts/meson-g12b-gtking-pro-u-boot.dtsi | 7 | ||||
| -rw-r--r-- | arch/arm/dts/meson-g12b-gtking-u-boot.dtsi | 7 |
2 files changed, 14 insertions, 0 deletions
diff --git a/arch/arm/dts/meson-g12b-gtking-pro-u-boot.dtsi b/arch/arm/dts/meson-g12b-gtking-pro-u-boot.dtsi new file mode 100644 index 0000000..236f246 --- /dev/null +++ b/arch/arm/dts/meson-g12b-gtking-pro-u-boot.dtsi @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2019 BayLibre, SAS. + * Author: Neil Armstrong <narmstrong@baylibre.com> + */ + +#include "meson-g12-common-u-boot.dtsi" diff --git a/arch/arm/dts/meson-g12b-gtking-u-boot.dtsi b/arch/arm/dts/meson-g12b-gtking-u-boot.dtsi new file mode 100644 index 0000000..236f246 --- /dev/null +++ b/arch/arm/dts/meson-g12b-gtking-u-boot.dtsi @@ -0,0 +1,7 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Copyright (c) 2019 BayLibre, SAS. + * Author: Neil Armstrong <narmstrong@baylibre.com> + */ + +#include "meson-g12-common-u-boot.dtsi" |