Enable Amlogic (meson) SoCs for ARMv7/aarch64

1 files changed, 19 insertions, 4 deletions

diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index d300d97a2..59619fe55 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -893,7 +893,7 @@ CONFIG_COMMON_CLK_MAX77802=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_RK808=m
 CONFIG_COMMON_CLK_S2MPS11=m
 CONFIG_COMMON_CLK_SCPI=m
@@ -1293,6 +1293,7 @@ CONFIG_DRM_I915_USERPTR=y
 CONFIG_DRM_LOAD_EDID_FIRMWARE=y
 CONFIG_DRM=m
 CONFIG_DRM_MALI_DISPLAY=m
+# CONFIG_DRM_MESON is not set
 CONFIG_DRM_MGAG200=m
 # CONFIG_DRM_MGA is not set
 CONFIG_DRM_MXSFB=m
@@ -1428,6 +1429,7 @@ CONFIG_DW_DMAC=m
 CONFIG_DW_DMAC_PCI=m
 CONFIG_DWMAC_GENERIC=m
 # CONFIG_DWMAC_IPQ806X is not set
+CONFIG_DWMAC_MESON=m
 CONFIG_DWMAC_ROCKCHIP=m
 CONFIG_DWMAC_SUNXI=m
 CONFIG_DW_WATCHDOG=m
@@ -1974,6 +1976,7 @@ CONFIG_HW_PERF_EVENTS=y
 CONFIG_HWPOISON_INJECT=m
 CONFIG_HW_RANDOM_BCM2835=m
 CONFIG_HW_RANDOM_EXYNOS=m
+CONFIG_HW_RANDOM_MESON=m
 CONFIG_HW_RANDOM_OMAP=m
 CONFIG_HW_RANDOM_TIMERIOMEM=m
 CONFIG_HW_RANDOM_TPM=m
@@ -2020,6 +2023,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
@@ -2425,6 +2429,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
@@ -2919,7 +2924,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_GXL_PHY=m
+CONFIG_MESON_EFUSE=m
+# CONFIG_MESON_GXBB_WATCHDOG is not set
+# CONFIG_MESON_GXL_PHY is not set
+CONFIG_MESON_SM=y
+CONFIG_MESON_WATCHDOG=m
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
 # CONFIG_MFD_88PM800 is not set
 # CONFIG_MFD_88PM805 is not set
@@ -3084,7 +3093,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 is not set
+# CONFIG_MMC_MTK is not set
 CONFIG_MMC_MVSDIO=m
 CONFIG_MMC_OMAP_HS=m
 # CONFIG_MMC_QCOM_DML is not set
@@ -3979,6 +3989,7 @@ CONFIG_PHY_EXYNOS5_USBDRD=m
 CONFIG_PHY_EXYNOS_DP_VIDEO=m
 CONFIG_PHY_EXYNOS_MIPI_VIDEO=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
@@ -4030,7 +4041,7 @@ CONFIG_PL310_ERRATA_753970=y
 CONFIG_PL310_ERRATA_769419=y
 CONFIG_PL320_MBOX=y
 CONFIG_PL330_DMA=m
-# CONFIG_PLATFORM_MHU is not set
+CONFIG_PLATFORM_MHU=m
 # CONFIG_PLATFORM_SI4713 is not set
 # CONFIG_PLAT_SPEAR is not set
 # CONFIG_PLIP is not set
@@ -4123,6 +4134,7 @@ CONFIG_PWM_BCM2835=m
 CONFIG_PWM_CROS_EC=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_SAMSUNG=m
@@ -4866,6 +4878,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_MPS2_UART is not set
 CONFIG_SERIAL_MVEBU_CONSOLE=y
 CONFIG_SERIAL_MVEBU_UART=y
@@ -5293,6 +5307,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