Merge pull request #1810 from lanefu/lepotato-fix-to-master

port lepotato fixes from v20.02 to master

config/kernel/linux-meson64-current.config

@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm64 5.4.13 Kernel Configuration
+# Linux/arm64 5.4.20 Kernel Configuration
 #
 
 #
@@ -5351,6 +5351,12 @@ CONFIG_SND_DESIGNWARE_I2S=m
 #
 # ASoC support for Amlogic platforms
 #
+CONFIG_SND_MESON_AIU_BUS=m
+CONFIG_SND_MESON_AIU_FIFO=m
+CONFIG_SND_MESON_AIU_I2S_FIFO=m
+CONFIG_SND_MESON_AIU_SPDIF_FIFO=m
+CONFIG_SND_MESON_AIU_I2S_ENCODER=m
+CONFIG_SND_MESON_AIU_SPDIF_ENCODER=m
 CONFIG_SND_MESON_AXG_FIFO=m
 CONFIG_SND_MESON_AXG_FRDDR=m
 CONFIG_SND_MESON_AXG_TODDR=m
@@ -5362,12 +5368,11 @@ CONFIG_SND_MESON_AXG_SOUND_CARD=m
 CONFIG_SND_MESON_AXG_SPDIFOUT=m
 CONFIG_SND_MESON_AXG_SPDIFIN=m
 CONFIG_SND_MESON_AXG_PDM=m
+CONFIG_SND_MESON_CARD_UTILS=m
+CONFIG_SND_MESON_GX_SOUND_CARD=m
 CONFIG_SND_MESON_G12A_TOHDMITX=m
 # end of ASoC support for Amlogic platforms
 
-CONFIG_SND_SOC_MESON_GX=m
-CONFIG_SND_SOC_MESON_GX_I2S=m
-CONFIG_SND_SOC_MESON_GX_SPDIF=m
 # CONFIG_SND_SOC_SOF_TOPLEVEL is not set
 
 #
@@ -7883,8 +7888,6 @@ CONFIG_CRYPTO_DEV_CCREE=m
 CONFIG_CRYPTO_DEV_HISI_QM=m
 CONFIG_CRYPTO_HISI_SGL=m
 CONFIG_CRYPTO_DEV_HISI_ZIP=m
-CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m
-# CONFIG_CRYPTO_DEV_AMLOGIC_GXL_DEBUG is not set
 CONFIG_ASYMMETRIC_KEY_TYPE=y
 CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y
 CONFIG_ASYMMETRIC_TPM_KEY_SUBTYPE=m
@@ -8025,7 +8028,6 @@ CONFIG_FONT_SUPPORT=y
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
 CONFIG_FONT_8x16=y
-CONFIG_SG_SPLIT=y
 CONFIG_SG_POOL=y
 CONFIG_SBITMAP=y
 # CONFIG_STRING_SELFTEST is not set