diff options
| author |   Arnd Bergmann <arnd@arndb.de> | 2021-02-09 17:51:18 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-02-09 17:51:33 +0100 |
| commit | 79e3faa756b2cc1a271122f32cb2e653be8fac43 (patch) | |
| tree | 11ca2dd2dc2786d99858cc47670559dbedc5478d /arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts | |
| parent | Merge tag 'amlogic-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt (diff) | |
| parent | arm64: dts: meson: add initial device-tree for ODROID-HC4 (diff) | |
| download | linux-dev-79e3faa756b2cc1a271122f32cb2e653be8fac43.tar.xz linux-dev-79e3faa756b2cc1a271122f32cb2e653be8fac43.zip | |
Merge tag 'amlogic-dt64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic into arm/dt
arm64: dts: amlogic updates for v5.12
- new board: Hardkernel ODROID-HC4 (SoC: SM1)
- new board: Beelink GS-King-X (SoC: S922X)
- shorten shorten audio card names for alsa compatibility
- misc cleanups & fixes
* tag 'amlogic-dt64-1' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
arm64: dts: meson: add initial device-tree for ODROID-HC4
dt-bindings: arm: amlogic: add ODROID-HC4 bindings
arm64: dts: meson: convert meson-sm1-odroid-c4 to dtsi
arm64: dts: meson: sort Amlogic dtb Makefile
dt-bindings: arm: amlogic: sort SM1 bindings
arm64: dts: meson: fix broken wifi node for Khadas VIM3L
arm64: dts: meson: add i2c3/rtc nodes and rtc aliases to ODROID-N2 dtsi
ARM: dts: meson: add the AO ARC remote processor
dt-bindings: Amlogic: add the documentation for the SECBUS2 registers
dt-bindings: sram: Add compatible strings for the Meson AO ARC SRAM
arm64: dts: meson: shorten audio card names for alsa compatibility
arm64: dts: meson: add initial Beelink GS-King-X device-tree
dt-bindings: arm: amlogic: add support for the Beelink GS-King-X
arm64: dts: meson: Fix schema warnings for pwm-leds
arm64: dts: meson: vim3: whitespace fixups
arm64: dts: meson: switch TFLASH_VDD_EN pin to open drain on Odroid-C4
Revert "arm64: dts: amlogic: add missing ethernet reset ID"
arm64: dts: amlogic: meson-g12: Set FL-adj property value
Link: https://lore.kernel.org/soc/7heehq7ag3.fsf@baylibre.com/
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts')
| -rw-r--r-- | arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts index f2562c7de67c..6eae692792ec 100644 --- a/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts +++ b/arch/arm64/boot/dts/amlogic/meson-gxbb-wetek-play2.dts @@ -50,7 +50,7 @@ sound { compatible = "amlogic,gx-sound-card"; - model = "GXBB-WETEK-PLAY2"; + model = "WETEK-PLAY2"; assigned-clocks = <&clkc CLKID_MPLL0>, <&clkc CLKID_MPLL1>, <&clkc CLKID_MPLL2>; |