Enable Amlogic (meson) SoCs for ARMv7/aarch64

1 files changed, 18 insertions, 3 deletions

diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index cc1b1b626..5e2372dfe 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -863,7 +863,7 @@ CONFIG_COMMON_CLK_MAX77686=m
 # CONFIG_COMMON_CLK_MT8135 is not set
 # CONFIG_COMMON_CLK_MT8173 is not set
 # CONFIG_COMMON_CLK_OXNAS is not set
-# CONFIG_COMMON_CLK_PWM is not set
+CONFIG_COMMON_CLK_PWM=m
 CONFIG_COMMON_CLK_QCOM=m
 CONFIG_COMMON_CLK_RK808=m
 CONFIG_COMMON_CLK_SCPI=m
@@ -1237,6 +1237,7 @@ CONFIG_DRM_I915_USERPTR=y
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
 CONFIG_DRM_MALI_DISPLAY=m
+CONFIG_DRM_MESON=m
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 # CONFIG_DRM_MSM_DSI is not set
@@ -1371,6 +1372,7 @@ CONFIG_DW_DMAC_CORE=m
 CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
 # CONFIG_DWMAC_IPQ806X is not set
+CONFIG_DWMAC_MESON=m
 CONFIG_DWMAC_ROCKCHIP=m
 CONFIG_DW_WATCHDOG=m
 CONFIG_DYNAMIC_DEBUG=y
@@ -1904,6 +1906,7 @@ CONFIG_HWPOISON_INJECT=m
 CONFIG_HW_RANDOM_BCM2835=m
 CONFIG_HW_RANDOM_CAVIUM=m
 CONFIG_HW_RANDOM_HISI=m
+CONFIG_HW_RANDOM_MESON=m
 CONFIG_HW_RANDOM_MSM=m
 CONFIG_HW_RANDOM_OMAP=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
@@ -1953,6 +1956,7 @@ CONFIG_I2C_HID=m
 # CONFIG_I2C_I801 is not set
 CONFIG_I2C_IMX_LPI2C=m
 # CONFIG_I2C_ISCH is not set
+CONFIG_I2C_MESON=m
 CONFIG_I2C_MLXCPLD=m
 CONFIG_I2C_MUX_GPIO=m
 CONFIG_I2C_MUX=m
@@ -2357,6 +2361,7 @@ CONFIG_IRLAN=m
 CONFIG_IR_LIRC_CODEC=m
 CONFIG_IR_MCE_KBD_DECODER=m
 CONFIG_IR_MCEUSB=m
+CONFIG_IR_MESON=m
 CONFIG_IR_NEC_DECODER=m
 CONFIG_IRNET=m
 CONFIG_IR_NUVOTON=m
@@ -2824,7 +2829,11 @@ CONFIG_MEMSTICK_TIFM_MS=m
 # CONFIG_MEMSTICK_UNSAFE_RESUME is not set
 # CONFIG_MEMTEST is not set
 # CONFIG_MEN_A21_WDT is not set
+CONFIG_MESON_EFUSE=m
+CONFIG_MESON_GXBB_WATCHDOG=m
 CONFIG_MESON_GXL_PHY=m
+CONFIG_MESON_SM=y
+# CONFIG_MESON_WATCHDOG is not set
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
@@ -2986,7 +2995,8 @@ CONFIG_MMC_DW_PCI=m
 CONFIG_MMC_DW_PLTFM=m
 CONFIG_MMC_DW_ROCKCHIP=m
 CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+CONFIG_MMC_MESON_GX=m
+# CONFIG_MMC_MTK is not set
 CONFIG_MMC_MVSDIO=m
 # CONFIG_MMC_QCOM_DML is not set
 CONFIG_MMC_REALTEK_PCI=m
@@ -3861,6 +3871,7 @@ CONFIG_PERSISTENT_KEYRINGS=y
 # CONFIG_PHONET is not set
 CONFIG_PHY_HI6220_USB=m
 CONFIG_PHYLIB=y
+CONFIG_PHY_MESON8B_USB2=m
 CONFIG_PHY_MVEBU_SATA=y
 # CONFIG_PHY_PXA_28NM_HSIC is not set
 # CONFIG_PHY_PXA_28NM_USB2 is not set
@@ -3914,7 +3925,7 @@ CONFIG_PKCS7_MESSAGE_PARSER=y
 # CONFIG_PKCS7_TEST_KEY is not set
 # CONFIG_PL320_MBOX is not set
 CONFIG_PL330_DMA=m
-# CONFIG_PLATFORM_MHU is not set
+CONFIG_PLATFORM_MHU=m
 # CONFIG_PLATFORM_SI4713 is not set
 # CONFIG_PLIP is not set
 CONFIG_PLX_HERMES=m
@@ -4006,6 +4017,7 @@ CONFIG_PTP_1588_CLOCK_PCH=m
 CONFIG_PWM_BCM2835=m
 # CONFIG_PWM_FSL_FTM is not set
 CONFIG_PWM_HIBVT=m
+CONFIG_PWM_MESON=m
 # CONFIG_PWM_PCA9685 is not set
 CONFIG_PWM_ROCKCHIP=m
 CONFIG_PWM_SUN4I=m
@@ -4741,6 +4753,8 @@ CONFIG_SERIAL_JSM=m
 # CONFIG_SERIAL_KGDB_NMI is not set
 # CONFIG_SERIAL_MAX3100 is not set
 # CONFIG_SERIAL_MAX310X is not set
+CONFIG_SERIAL_MESON_CONSOLE=y
+CONFIG_SERIAL_MESON=y
 CONFIG_SERIAL_MSM_CONSOLE=y
 CONFIG_SERIAL_MSM=y
 CONFIG_SERIAL_MVEBU_CONSOLE=y
@@ -5120,6 +5134,7 @@ CONFIG_SPI_GPIO=m
 # CONFIG_SPI_LM70_LLP is not set
 # CONFIG_SPI_LOOPBACK_TEST is not set
 CONFIG_SPI_MASTER=y
+CONFIG_SPI_MESON_SPIFC=m
 # CONFIG_SPI_OC_TINY is not set
 CONFIG_SPI_ORION=m
 CONFIG_SPI_PL022=m