From: Neil Armstrong <narmstrong@baylibre.com>
Date: Mon, 2 Aug 2021 12:33:35 +0000 (+0200)
Subject: Merge tags 'amlogic-arm-configs-for-v5.15', 'amlogic-arm64-dt-for-v5.15' and 'amlogic... 
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=6285af2a2821573b26d246b801b63e9057d695e1;p=users%2Fjedix%2Flinux-maple.git

Merge tags 'amlogic-arm-configs-for-v5.15', 'amlogic-arm64-dt-for-v5.15' and 'amlogic-arm-dt-for-v5.15' into for-next

Amlogic ARM configs change for v5.15:
- Enable CONFIG_MMC_MESON_MX_SDHC controller used on meson8/8b

Amlogic ARM64 DT changes for v5.15:
- nanoki-k2: enable bluetooth
- khadas vim & vim2: improve wifi

Amlogic ARM DT changes for v5.15:
- meson8: use a default higher default GPU clock to solve probe failure
- meson: add AIU audio controller and codec for ec100
- meson8b: fix pwm regulator supply property name
---

6285af2a2821573b26d246b801b63e9057d695e1