Merge remote-tracking branch 'origin/master'kernel-4.10.0-0.rc1.git0.1.vanilla.knurd.1.fc25

1 files changed, 44 insertions, 28 deletions

diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 8ae8baab4..56aa69084 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -294,7 +294,7 @@ CONFIG_ARM_ERRATA_825619=y
 CONFIG_ARM_ERRATA_852421=y
 CONFIG_ARM_ERRATA_852423=y
 CONFIG_ARM_EXYNOS5440_CPUFREQ=m
-# CONFIG_ARM_EXYNOS_BUS_DEVFREQ is not set
+CONFIG_ARM_EXYNOS_BUS_DEVFREQ=m
 CONFIG_ARM_EXYNOS_CPUIDLE=y
 CONFIG_ARM_GIC_V2M=y
 CONFIG_ARM_GIC_V3_ITS=y
@@ -314,7 +314,7 @@ CONFIG_ARM_PMU=y
 CONFIG_ARM_PSCI_CHECKER=y
 CONFIG_ARM_PSCI=y
 # CONFIG_ARM_PTDUMP is not set
-# CONFIG_ARM_RK3399_DMC_DEVFREQ is not set
+CONFIG_ARM_RK3399_DMC_DEVFREQ=m
 CONFIG_ARM_SCPI_CPUFREQ=m
 CONFIG_ARM_SCPI_POWER_DOMAIN=m
 CONFIG_ARM_SCPI_PROTOCOL=m
@@ -817,7 +817,6 @@ CONFIG_CHARGER_MAX8997=m
 # CONFIG_CHARGER_RT9455 is not set
 CONFIG_CHARGER_SMB347=m
 CONFIG_CHARGER_TPS65090=m
-# CONFIG_CHARGER_TPS65217 is not set
 CONFIG_CHECKPOINT_RESTORE=y
 CONFIG_CHELSIO_T1_1G=y
 CONFIG_CHELSIO_T1=m
@@ -894,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
@@ -1048,6 +1047,7 @@ CONFIG_CRYPTO_SHA3=m
 CONFIG_CRYPTO_SHA512_ARM64=m
 CONFIG_CRYPTO_SHA512_ARM=y
 CONFIG_CRYPTO_SHA512=m
+CONFIG_CRYPTO_SIMD=y
 CONFIG_CRYPTO_TEA=m
 CONFIG_CRYPTO_TEST=m
 CONFIG_CRYPTO_TGR192=m
@@ -1149,14 +1149,14 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=32768
 # CONFIG_DEPRECATED_PARAM_STRUCT is not set
 # CONFIG_DETECT_HUNG_TASK is not set
 # CONFIG_DEV_APPLETALK is not set
-# CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP is not set
+CONFIG_DEVFREQ_EVENT_EXYNOS_NOCP=m
 CONFIG_DEVFREQ_EVENT_EXYNOS_PPMU=y
-# CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI is not set
-# CONFIG_DEVFREQ_GOV_PASSIVE is not set
-CONFIG_DEVFREQ_GOV_PERFORMANCE=y
-CONFIG_DEVFREQ_GOV_POWERSAVE=y
-CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=y
-CONFIG_DEVFREQ_GOV_USERSPACE=y
+CONFIG_DEVFREQ_EVENT_ROCKCHIP_DFI=m
+CONFIG_DEVFREQ_GOV_PASSIVE=m
+# CONFIG_DEVFREQ_GOV_PERFORMANCE is not set
+# CONFIG_DEVFREQ_GOV_POWERSAVE is not set
+CONFIG_DEVFREQ_GOV_SIMPLE_ONDEMAND=m
+# CONFIG_DEVFREQ_GOV_USERSPACE is not set
 CONFIG_DEVFREQ_THERMAL=y
 # CONFIG_DEVKMEM is not set
 CONFIG_DEVMEM=y
@@ -1239,7 +1239,7 @@ CONFIG_DRM_AST=m
 CONFIG_DRM_BOCHS=m
 CONFIG_DRM_CIRRUS_QEMU=m
 CONFIG_DRM_DP_AUX_CHARDEV=y
-# CONFIG_DRM_DUMB_VGA_DAC is not set
+CONFIG_DRM_DUMB_VGA_DAC=m
 CONFIG_DRM_DW_HDMI_AHB_AUDIO=m
 CONFIG_DRM_DW_HDMI_I2S_AUDIO=m
 CONFIG_DRM_DW_HDMI=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
@@ -1507,9 +1509,7 @@ CONFIG_EXYNOS_ADC=m
 CONFIG_EXYNOS_AUDSS_CLK_CON=m
 # CONFIG_EXYNOS_IOMMU_DEBUG is not set
 # CONFIG_EXYNOS_IOMMU is not set
-CONFIG_EXYNOS_MIPI_DSI=y
 CONFIG_EXYNOS_THERMAL=y
-CONFIG_EXYNOS_VIDEO=y
 # CONFIG_EZNPS_GIC is not set
 # CONFIG_EZX_PCAP is not set
 # CONFIG_F2FS_CHECK_FS is not set
@@ -1655,6 +1655,8 @@ CONFIG_FSCACHE_STATS=y
 CONFIG_FS_DAX=y
 CONFIG_FS_ENCRYPTION=y
 # CONFIG_FSL_EDMA is not set
+# CONFIG_FSL_PQ_MDIO is not set
+# CONFIG_FSL_XGMAC_MDIO is not set
 CONFIG_FS_MBCACHE=y
 CONFIG_FSNOTIFY=y
 # CONFIG_FTL is not set
@@ -1717,7 +1719,7 @@ CONFIG_GPIO_74X164=m
 # CONFIG_GPIO_ALTERA is not set
 # CONFIG_GPIO_AMD8111 is not set
 # CONFIG_GPIO_AMDPT is not set
-# CONFIG_GPIO_AXP209 is not set
+CONFIG_GPIO_AXP209=m
 # CONFIG_GPIO_BT8XX is not set
 # CONFIG_GPIO_CS5535 is not set
 CONFIG_GPIO_DAVINCI=y
@@ -1749,10 +1751,9 @@ CONFIG_GPIO_PL061=y
 # CONFIG_GPIO_SCH is not set
 # CONFIG_GPIO_SX150X is not set
 CONFIG_GPIO_SYSCON=m
-CONFIG_GPIO_SYSFS=y
+# CONFIG_GPIO_SYSFS is not set
 CONFIG_GPIO_TEGRA=y
 # CONFIG_GPIO_TPIC2810 is not set
-# CONFIG_GPIO_TPS65218 is not set
 CONFIG_GPIO_TPS65910=y
 CONFIG_GPIO_TPS65912=m
 # CONFIG_GPIO_TS4900 is not set
@@ -1959,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
@@ -2005,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
@@ -2222,7 +2225,6 @@ CONFIG_INPUT_SOC_BUTTON_ARRAY=m
 CONFIG_INPUT_SPARSEKMAP=m
 CONFIG_INPUT_TABLET=y
 CONFIG_INPUT_TOUCHSCREEN=y
-# CONFIG_INPUT_TPS65218_PWRBUTTON is not set
 CONFIG_INPUT_UINPUT=m
 CONFIG_INPUT_WISTRON_BTNS=m
 CONFIG_INPUT_WM831X_ON=m
@@ -2411,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
@@ -2689,7 +2692,6 @@ CONFIG_LEDS_NS2=m
 # CONFIG_LEDS_PCA9532 is not set
 # CONFIG_LEDS_PCA955X is not set
 # CONFIG_LEDS_PCA963X is not set
-# CONFIG_LEDS_PM8058 is not set
 CONFIG_LEDS_PWM=m
 CONFIG_LEDS_REGULATOR=m
 # CONFIG_LEDS_S3C24XX is not set
@@ -2854,8 +2856,9 @@ CONFIG_MDIO_BITBANG=m
 CONFIG_MDIO_BUS_MUX_GPIO=m
 CONFIG_MDIO_BUS_MUX=m
 CONFIG_MDIO_BUS_MUX_MMIOREG=m
-# CONFIG_MDIO_GPIO is not set
+CONFIG_MDIO_GPIO=m
 # CONFIG_MDIO_HISI_FEMAC is not set
+# CONFIG_MDIO_OCTEON is not set
 CONFIG_MDIO_SUN4I=m
 # CONFIG_MDIO_THUNDER is not set
 CONFIG_MD_LINEAR=m
@@ -2870,7 +2873,6 @@ CONFIG_MEDIA_ANALOG_TV_SUPPORT=y
 CONFIG_MEDIA_ATTACH=y
 CONFIG_MEDIA_CAMERA_SUPPORT=y
 CONFIG_MEDIA_CEC_DEBUG=y
-# CONFIG_MEDIA_CEC is not set
 CONFIG_MEDIA_CEC_SUPPORT=y
 # CONFIG_MEDIA_CONTROLLER_DVB is not set
 CONFIG_MEDIA_CONTROLLER=y
@@ -2903,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
@@ -2959,7 +2965,7 @@ CONFIG_MFD_MAX8997=y
 # CONFIG_MFD_PALMAS is not set
 # CONFIG_MFD_PCF50633 is not set
 # CONFIG_MFD_PM8921_CORE is not set
-CONFIG_MFD_PM8XXX=m
+# CONFIG_MFD_PM8XXX is not set
 # CONFIG_MFD_RC5T583 is not set
 # CONFIG_MFD_RDC321X is not set
 # CONFIG_MFD_RETU is not set
@@ -3068,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
@@ -3962,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
@@ -4013,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
@@ -4105,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
@@ -4126,6 +4135,7 @@ CONFIG_QCOM_ADSP_PIL=m
 # CONFIG_QCOM_SPMI_TEMP_ALARM is not set
 # CONFIG_QCOM_SPMI_VADC is not set
 CONFIG_QEDE=m
+CONFIG_QEDI=m
 CONFIG_QED=m
 CONFIG_QED_SRIOV=y
 # CONFIG_QFMT_V1 is not set
@@ -4225,7 +4235,7 @@ CONFIG_REGMAP_SPMI=m
 CONFIG_REGMAP=y
 # CONFIG_REGULATOR_ACT8865 is not set
 CONFIG_REGULATOR_AD5398=m
-CONFIG_REGULATOR_ANATOP=m
+# CONFIG_REGULATOR_ANATOP is not set
 CONFIG_REGULATOR_AS3722=m
 CONFIG_REGULATOR_AXP20X=m
 CONFIG_REGULATOR_DA9210=m
@@ -4847,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
@@ -5108,6 +5120,7 @@ CONFIG_SND_SOC_DMIC=m
 # CONFIG_SND_SOC_FSL_SSI is not set
 CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y
 # CONFIG_SND_SOC_GTM601 is not set
+CONFIG_SND_SOC_HDMI_CODEC=m
 # CONFIG_SND_SOC_IMG is not set
 # CONFIG_SND_SOC_IMX_AUDMUX is not set
 # CONFIG_SND_SOC_IMX_ES8328 is not set
@@ -5272,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
@@ -5438,9 +5452,11 @@ CONFIG_TEGRA124_EMC=y
 CONFIG_TEGRA20_APB_DMA=y
 # CONFIG_TEGRA20_MC is not set
 CONFIG_TEGRA_AHB=y
+CONFIG_TEGRA_BPMP=y
 CONFIG_TEGRA_GMI=m
 CONFIG_TEGRA_HOST1X_FIREWALL=y
 CONFIG_TEGRA_HOST1X=m
+CONFIG_TEGRA_HSP_MBOX=y
 # CONFIG_TEGRA_IOMMU_GART is not set
 CONFIG_TEGRA_IOMMU_SMMU=y
 CONFIG_TEGRA_IVC=y
@@ -6133,7 +6149,7 @@ CONFIG_VIDEO_SAA7146=m
 CONFIG_VIDEO_SAA7146_VV=m
 CONFIG_VIDEO_SAA7164=m
 CONFIG_VIDEO_SAMSUNG_EXYNOS4_IS=y
-CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC=m
+# CONFIG_VIDEO_SAMSUNG_EXYNOS_GSC is not set
 CONFIG_VIDEO_SAMSUNG_S5P_CEC=m
 CONFIG_VIDEO_SAMSUNG_S5P_G2D=m
 CONFIG_VIDEO_SAMSUNG_S5P_JPEG=m
@@ -6206,7 +6222,7 @@ CONFIG_VXLAN=m
 # CONFIG_VZ89X is not set
 CONFIG_W1_CON=y
 CONFIG_W1=m
-CONFIG_W1_MASTER_DS1WM=m
+# CONFIG_W1_MASTER_DS1WM is not set
 CONFIG_W1_MASTER_DS2482=m
 CONFIG_W1_MASTER_DS2490=m
 CONFIG_W1_MASTER_GPIO=m