Enable Amlogic (meson) SoCs for ARMv7/aarch64

46 files changed, 153 insertions, 39 deletions

diff --git a/baseconfig/CONFIG_MMC_MTK b/baseconfig/CONFIG_MMC_MTK
index 8d1b25c48..d92a9072c 100644
--- a/baseconfig/CONFIG_MMC_MTK
+++ b/baseconfig/CONFIG_MMC_MTK
@@ -1 +1 @@
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
diff --git a/baseconfig/arm/CONFIG_ARCH_MESON b/baseconfig/arm/CONFIG_ARCH_MESON
new file mode 100644
index 000000000..d13ebc08a
--- /dev/null
+++ b/baseconfig/arm/CONFIG_ARCH_MESON
@@ -0,0 +1 @@
+CONFIG_ARCH_MESON=y
diff --git a/baseconfig/arm/CONFIG_COMMON_CLK_PWM b/baseconfig/arm/CONFIG_COMMON_CLK_PWM
new file mode 100644
index 000000000..08193dd2c
--- /dev/null
+++ b/baseconfig/arm/CONFIG_COMMON_CLK_PWM
@@ -0,0 +1 @@
+CONFIG_COMMON_CLK_PWM=m
diff --git a/baseconfig/arm/CONFIG_DWMAC_MESON b/baseconfig/arm/CONFIG_DWMAC_MESON
new file mode 100644
index 000000000..ff4f84617
--- /dev/null
+++ b/baseconfig/arm/CONFIG_DWMAC_MESON
@@ -0,0 +1 @@
+CONFIG_DWMAC_MESON=m
diff --git a/baseconfig/arm/CONFIG_HW_RANDOM_MESON b/baseconfig/arm/CONFIG_HW_RANDOM_MESON
new file mode 100644
index 000000000..882698030
--- /dev/null
+++ b/baseconfig/arm/CONFIG_HW_RANDOM_MESON
@@ -0,0 +1 @@
+CONFIG_HW_RANDOM_MESON=m
diff --git a/baseconfig/arm/CONFIG_I2C_MESON b/baseconfig/arm/CONFIG_I2C_MESON
new file mode 100644
index 000000000..373686139
--- /dev/null
+++ b/baseconfig/arm/CONFIG_I2C_MESON
@@ -0,0 +1 @@
+CONFIG_I2C_MESON=m
diff --git a/baseconfig/arm/CONFIG_IR_MESON b/baseconfig/arm/CONFIG_IR_MESON
new file mode 100644
index 000000000..e248de441
--- /dev/null
+++ b/baseconfig/arm/CONFIG_IR_MESON
@@ -0,0 +1 @@
+CONFIG_IR_MESON=m
diff --git a/baseconfig/arm/CONFIG_MESON_EFUSE b/baseconfig/arm/CONFIG_MESON_EFUSE
new file mode 100644
index 000000000..832f28e6d
--- /dev/null
+++ b/baseconfig/arm/CONFIG_MESON_EFUSE
@@ -0,0 +1 @@
+CONFIG_MESON_EFUSE=m
diff --git a/baseconfig/arm/CONFIG_MESON_SM b/baseconfig/arm/CONFIG_MESON_SM
new file mode 100644
index 000000000..3cd5a9e30
--- /dev/null
+++ b/baseconfig/arm/CONFIG_MESON_SM
@@ -0,0 +1 @@
+CONFIG_MESON_SM=y
diff --git a/baseconfig/arm/CONFIG_PHY_MESON8B_USB2 b/baseconfig/arm/CONFIG_PHY_MESON8B_USB2
new file mode 100644
index 000000000..b238f12dc
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PHY_MESON8B_USB2
@@ -0,0 +1 @@
+CONFIG_PHY_MESON8B_USB2=m
diff --git a/baseconfig/arm/CONFIG_PLATFORM_MHU b/baseconfig/arm/CONFIG_PLATFORM_MHU
index b30b57613..4c29f9874 100644
--- a/baseconfig/arm/CONFIG_PLATFORM_MHU
+++ b/baseconfig/arm/CONFIG_PLATFORM_MHU
@@ -1 +1 @@
-# CONFIG_PLATFORM_MHU is not set
+CONFIG_PLATFORM_MHU=m
diff --git a/baseconfig/arm/CONFIG_PWM_MESON b/baseconfig/arm/CONFIG_PWM_MESON
new file mode 100644
index 000000000..bc2a778e3
--- /dev/null
+++ b/baseconfig/arm/CONFIG_PWM_MESON
@@ -0,0 +1 @@
+CONFIG_PWM_MESON=m
diff --git a/baseconfig/arm/CONFIG_SERIAL_MESON b/baseconfig/arm/CONFIG_SERIAL_MESON
new file mode 100644
index 000000000..aebe1f2c7
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SERIAL_MESON
@@ -0,0 +1 @@
+CONFIG_SERIAL_MESON=y
diff --git a/baseconfig/arm/CONFIG_SERIAL_MESON_CONSOLE b/baseconfig/arm/CONFIG_SERIAL_MESON_CONSOLE
new file mode 100644
index 000000000..0b1831e77
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SERIAL_MESON_CONSOLE
@@ -0,0 +1 @@
+CONFIG_SERIAL_MESON_CONSOLE=y
diff --git a/baseconfig/arm/CONFIG_SPI_MESON_SPIFC b/baseconfig/arm/CONFIG_SPI_MESON_SPIFC
new file mode 100644
index 000000000..a0f6a6247
--- /dev/null
+++ b/baseconfig/arm/CONFIG_SPI_MESON_SPIFC
@@ -0,0 +1 @@
+CONFIG_SPI_MESON_SPIFC=m
diff --git a/baseconfig/arm/arm64/CONFIG_DRM_MESON b/baseconfig/arm/arm64/CONFIG_DRM_MESON
new file mode 100644
index 000000000..638714333
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_DRM_MESON
@@ -0,0 +1 @@
+CONFIG_DRM_MESON=m
diff --git a/baseconfig/arm/arm64/CONFIG_MESON_GXBB_WATCHDOG b/baseconfig/arm/arm64/CONFIG_MESON_GXBB_WATCHDOG
new file mode 100644
index 000000000..a9c8de737
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_MESON_GXBB_WATCHDOG
@@ -0,0 +1 @@
+CONFIG_MESON_GXBB_WATCHDOG=m
diff --git a/baseconfig/arm/arm64/CONFIG_MESON_GXL_PHY b/baseconfig/arm/arm64/CONFIG_MESON_GXL_PHY
new file mode 100644
index 000000000..cc59580cc
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_MESON_GXL_PHY
@@ -0,0 +1 @@
+CONFIG_MESON_GXL_PHY=m
diff --git a/baseconfig/arm/arm64/CONFIG_MESON_WATCHDOG b/baseconfig/arm/arm64/CONFIG_MESON_WATCHDOG
new file mode 100644
index 000000000..2e5c153a9
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_MESON_WATCHDOG
@@ -0,0 +1 @@
+# CONFIG_MESON_WATCHDOG is not set
diff --git a/baseconfig/arm/arm64/CONFIG_MMC_MESON_GX b/baseconfig/arm/arm64/CONFIG_MMC_MESON_GX
new file mode 100644
index 000000000..f6d05988f
--- /dev/null
+++ b/baseconfig/arm/arm64/CONFIG_MMC_MESON_GX
@@ -0,0 +1 @@
+CONFIG_MMC_MESON_GX=m
diff --git a/baseconfig/arm/armv7/CONFIG_DRM_MESON b/baseconfig/arm/armv7/CONFIG_DRM_MESON
new file mode 100644
index 000000000..7a6179102
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_DRM_MESON
@@ -0,0 +1 @@
+# CONFIG_DRM_MESON is not set
diff --git a/baseconfig/arm/armv7/CONFIG_MESON_GXBB_WATCHDOG b/baseconfig/arm/armv7/CONFIG_MESON_GXBB_WATCHDOG
new file mode 100644
index 000000000..05aa86754
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_MESON_GXBB_WATCHDOG
@@ -0,0 +1 @@
+# CONFIG_MESON_GXBB_WATCHDOG is not set
diff --git a/baseconfig/arm/armv7/CONFIG_MESON_GXL_PHY b/baseconfig/arm/armv7/CONFIG_MESON_GXL_PHY
new file mode 100644
index 000000000..5e3300106
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_MESON_GXL_PHY
@@ -0,0 +1 @@
+# CONFIG_MESON_GXL_PHY is not set
diff --git a/baseconfig/arm/armv7/CONFIG_MESON_WATCHDOG b/baseconfig/arm/armv7/CONFIG_MESON_WATCHDOG
new file mode 100644
index 000000000..477ce5e06
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_MESON_WATCHDOG
@@ -0,0 +1 @@
+CONFIG_MESON_WATCHDOG=m
diff --git a/baseconfig/arm/armv7/CONFIG_MMC_MESON_GX b/baseconfig/arm/armv7/CONFIG_MMC_MESON_GX
new file mode 100644
index 000000000..92f0e7e77
--- /dev/null
+++ b/baseconfig/arm/armv7/CONFIG_MMC_MESON_GX
@@ -0,0 +1 @@
+# CONFIG_MMC_MESON_GX is not set
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
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 6f8ad1b6c..c33da88ca 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.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
@@ -1227,6 +1227,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
@@ -1361,6 +1362,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
@@ -1887,6 +1889,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
@@ -1936,6 +1939,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
@@ -2340,6 +2344,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
@@ -2804,7 +2809,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
@@ -2966,7 +2975,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
@@ -3840,6 +3850,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
@@ -3893,7 +3904,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
@@ -3984,6 +3995,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
@@ -4719,6 +4731,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
@@ -5097,6 +5111,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
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 6211460bc..850784886 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -917,7 +917,7 @@ CONFIG_COMMON_CLK_MAX77802=m
 # CONFIG_COMMON_CLK_MT8173 is not set
 # CONFIG_COMMON_CLK_OXNAS is not set
 CONFIG_COMMON_CLK_PALMAS=m
-# 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_S2MPS11=m
@@ -1347,6 +1347,7 @@ CONFIG_DRM_IMX_TVE=m
 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_MSM_DSI is not set
@@ -1502,6 +1503,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
@@ -2063,6 +2065,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_MSM=m
 CONFIG_HW_RANDOM_MXC_RNGA=m
 CONFIG_HW_RANDOM_OMAP3_ROM=m
@@ -2114,6 +2117,7 @@ CONFIG_I2C_HID=m
 CONFIG_I2C_IMX_LPI2C=m
 CONFIG_I2C_IMX=m
 # CONFIG_I2C_ISCH is not set
+CONFIG_I2C_MESON=m
 CONFIG_I2C_MLXCPLD=m
 CONFIG_I2C_MUX_GPIO=m
 CONFIG_I2C_MUX=m
@@ -2536,6 +2540,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
@@ -3045,7 +3050,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=m
 CONFIG_MFD_88PM805=m
@@ -3212,7 +3221,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_MXC=m
 CONFIG_MMC_OMAP_HS=m
@@ -4178,6 +4188,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
@@ -4242,7 +4253,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
@@ -4339,6 +4350,7 @@ CONFIG_PWM_CROS_EC=m
 # CONFIG_PWM_FSL_FTM is not set
 CONFIG_PWM_HIBVT=m
 CONFIG_PWM_IMX=m
+CONFIG_PWM_MESON=m
 CONFIG_PWM_OMAP_DMTIMER=m
 # CONFIG_PWM_PCA9685 is not set
 CONFIG_PWM_ROCKCHIP=m
@@ -5136,6 +5148,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_MSM_CONSOLE=y
 CONFIG_SERIAL_MSM=y
@@ -5632,6 +5646,7 @@ CONFIG_SPI_IMX=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_MXS=m
 # CONFIG_SPI_OC_TINY is not set
 CONFIG_SPI_OMAP24XX=m
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
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 9509b38cd..56aa69084 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.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
@@ -1284,6 +1284,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
@@ -1419,6 +1420,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
@@ -1958,6 +1960,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
@@ -2004,6 +2007,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
@@ -2409,6 +2413,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
@@ -2900,7 +2905,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
@@ -3065,7 +3074,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
@@ -3959,6 +3969,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
@@ -4010,7 +4021,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
@@ -4102,6 +4113,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
@@ -4845,6 +4857,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
@@ -5271,6 +5285,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
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 9367e532c..3c354b26b 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -917,7 +917,7 @@ CONFIG_COMMON_CLK_MAX77802=m
 # CONFIG_COMMON_CLK_MT8173 is not set
 # CONFIG_COMMON_CLK_OXNAS is not set
 CONFIG_COMMON_CLK_PALMAS=m
-# 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_S2MPS11=m
@@ -1338,6 +1338,7 @@ CONFIG_DRM_IMX_TVE=m
 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_MSM_DSI is not set
@@ -1493,6 +1494,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
@@ -2047,6 +2049,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_MSM=m
 CONFIG_HW_RANDOM_MXC_RNGA=m
 CONFIG_HW_RANDOM_OMAP3_ROM=m
@@ -2098,6 +2101,7 @@ CONFIG_I2C_HID=m
 CONFIG_I2C_IMX_LPI2C=m
 CONFIG_I2C_IMX=m
 # CONFIG_I2C_ISCH is not set
+CONFIG_I2C_MESON=m
 CONFIG_I2C_MLXCPLD=m
 CONFIG_I2C_MUX_GPIO=m
 CONFIG_I2C_MUX=m
@@ -2520,6 +2524,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
@@ -3026,7 +3031,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=m
 CONFIG_MFD_88PM805=m
@@ -3193,7 +3202,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_MXC=m
 CONFIG_MMC_OMAP_HS=m
@@ -4158,6 +4168,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
@@ -4222,7 +4233,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
@@ -4318,6 +4329,7 @@ CONFIG_PWM_CROS_EC=m
 # CONFIG_PWM_FSL_FTM is not set
 CONFIG_PWM_HIBVT=m
 CONFIG_PWM_IMX=m
+CONFIG_PWM_MESON=m
 CONFIG_PWM_OMAP_DMTIMER=m
 # CONFIG_PWM_PCA9685 is not set
 CONFIG_PWM_ROCKCHIP=m
@@ -5115,6 +5127,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_MSM_CONSOLE=y
 CONFIG_SERIAL_MSM=y
@@ -5610,6 +5624,7 @@ CONFIG_SPI_IMX=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_MXS=m
 # CONFIG_SPI_OC_TINY is not set
 CONFIG_SPI_OMAP24XX=m
diff --git a/kernel-i686-PAE.config b/kernel-i686-PAE.config
index 0ef59012b..f51a2a39d 100644
--- a/kernel-i686-PAE.config
+++ b/kernel-i686-PAE.config
@@ -2907,7 +2907,7 @@ CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_RICOH_MMC=y
diff --git a/kernel-i686-PAEdebug.config b/kernel-i686-PAEdebug.config
index 329c925b5..9005abf21 100644
--- a/kernel-i686-PAEdebug.config
+++ b/kernel-i686-PAEdebug.config
@@ -2926,7 +2926,7 @@ CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_RICOH_MMC=y
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 68a4ecab7..fa12551d7 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -2926,7 +2926,7 @@ CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_RICOH_MMC=y
diff --git a/kernel-i686.config b/kernel-i686.config
index fe789827d..7b81384a7 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -2907,7 +2907,7 @@ CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_RICOH_MMC=y
diff --git a/kernel-ppc64-debug.config b/kernel-ppc64-debug.config
index b2051cd9c..36ba0fd4a 100644
--- a/kernel-ppc64-debug.config
+++ b/kernel-ppc64-debug.config
@@ -2809,7 +2809,7 @@ CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_RICOH_MMC=y
diff --git a/kernel-ppc64.config b/kernel-ppc64.config
index 7e8584efc..31b17d1db 100644
--- a/kernel-ppc64.config
+++ b/kernel-ppc64.config
@@ -2789,7 +2789,7 @@ CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_RICOH_MMC=y
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index e437b2cd8..6742c8fe4 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -2755,7 +2755,7 @@ CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_RICOH_MMC=y
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index adfc126ef..368fd3342 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -2735,7 +2735,7 @@ CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_RICOH_MMC=y
diff --git a/kernel-ppc64p7-debug.config b/kernel-ppc64p7-debug.config
index 1d514561a..ca5b410c3 100644
--- a/kernel-ppc64p7-debug.config
+++ b/kernel-ppc64p7-debug.config
@@ -2754,7 +2754,7 @@ CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_RICOH_MMC=y
diff --git a/kernel-ppc64p7.config b/kernel-ppc64p7.config
index 1c200d8da..bf35338c1 100644
--- a/kernel-ppc64p7.config
+++ b/kernel-ppc64p7.config
@@ -2734,7 +2734,7 @@ CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_RICOH_MMC=y
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 064dde2b8..1926b2bac 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -2693,7 +2693,7 @@ CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC is not set
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_RICOH_MMC=y
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 4ddada7af..07d4fcc91 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2673,7 +2673,7 @@ CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC is not set
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_RICOH_MMC=y
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 3037e009a..9b8f340ff 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -2957,7 +2957,7 @@ CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_RICOH_MMC=y
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index fc5a039a6..63e064ac5 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -2938,7 +2938,7 @@ CONFIG_MMC_BLOCK_MINORS=8
 CONFIG_MMC_CB710=m
 # CONFIG_MMC_DEBUG is not set
 CONFIG_MMC=m
-CONFIG_MMC_MTK=m
+# CONFIG_MMC_MTK is not set
 CONFIG_MMC_REALTEK_PCI=m
 CONFIG_MMC_REALTEK_USB=m
 CONFIG_MMC_RICOH_MMC=y
diff --git a/kernel.spec b/kernel.spec
index 9997d0aea..5a1fcbdcf 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2152,9 +2152,10 @@ fi
 #
 #
 %changelog
-* Mon Dec 26 2016 Peter Robinson <pbrobinson@fedoraproject.org>
+* Tue Dec 27 2016 Peter Robinson <pbrobinson@fedoraproject.org>
 - Linux v4.10-rc1
 - ARM config updates, minor general config cleanups
+- Enable Amlogic (meson) SoCs for ARMv7/aarch64
 
 * Fri Dec 23 2016 Justin M. Forbes <jforbes@fedoraproject.org> - 4.10.0-0.rc0.git9.1
 - Linux v4.9-11999-g50f6584