diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2020-12-09 00:06:33 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2020-12-09 00:06:33 +0100 |
| commit | 4f9f1415bb1386da26111d2d419e8a73075431c2 (patch) | |
| tree | 1165a13a71423fe3d0cc16490afba84118e252a0 /arch/arm | |
| parent | b4e217d0b3204010782f2d9a176cb04e66bdbf0c (diff) | |
| parent | 7704b100719cf0fead976a1bc839c60ee552d045 (diff) | |
Merge tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt
arm64: dts: amlogic updates for v5.11, round 2
- audio support for several more boards
- PHY timing fixes
* tag 'amlogic-dt64-2' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
arm64: dts: meson: add i2c3/rtc nodes and vrtc alias to GT-King/GT-King-Pro
arm64: dts: meson: g12b: w400: fix PHY deassert timing requirements
arm64: dts: meson: g12a: x96-max: fix PHY deassert timing requirements
ARM: dts: meson: fix PHY deassert timing requirements
arm64: dts: meson: fix PHY deassert timing requirements
arm64: dts: meson: g12b: odroid-n2: fix PHY deassert timing requirements
arm64: dts: meson: minor fixups for Khadas VIM/VIM2 dts
arm64: dts: meson: add audio playback to wetek-play2
arm64: dts: meson: add audio playback to wetek-hub
arm64: dts: meson: add audio playback to odroid-c2
arm64: dts: meson: add audio playback to nanopi-k2
arm64: dts: meson: add audio playback to khadas-vim2
arm64: dts: meson: add audio playback to khadas-vim
arm64: dts: meson: add audio playback to a95x
arm64: dts: meson-axg: add GE2D node
Link: https://lore.kernel.org/r/7ho8j4gkxo.fsf@baylibre.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/meson8b-odroidc1.dts | 2 | ||||
| -rw-r--r-- | arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/meson8b-odroidc1.dts b/arch/arm/boot/dts/meson8b-odroidc1.dts index 0c26467de4d0..5963566dbcc9 100644 --- a/arch/arm/boot/dts/meson8b-odroidc1.dts +++ b/arch/arm/boot/dts/meson8b-odroidc1.dts @@ -224,7 +224,7 @@ reg = <0>; reset-assert-us = <10000>; - reset-deassert-us = <30000>; + reset-deassert-us = <80000>; reset-gpios = <&gpio GPIOH_4 GPIO_ACTIVE_LOW>; interrupt-parent = <&gpio_intc>; diff --git a/arch/arm/boot/dts/meson8m2-mxiii-plus.dts b/arch/arm/boot/dts/meson8m2-mxiii-plus.dts index cc498191ddd1..8f4eb1ed4581 100644 --- a/arch/arm/boot/dts/meson8m2-mxiii-plus.dts +++ b/arch/arm/boot/dts/meson8m2-mxiii-plus.dts @@ -81,7 +81,7 @@ reg = <0>; reset-assert-us = <10000>; - reset-deassert-us = <30000>; + reset-deassert-us = <80000>; reset-gpios = <&gpio GPIOH_4 GPIO_ACTIVE_LOW>; }; }; |