Merge tag 'samsung-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk...

Two fixes for v4.7 cycle for build issues:
1. Fix samsung-keypad build error if INPUT is selected as module.
   The error though depends on some uncommon build settings so it
   is not as easy to trigger.

2. Get rid of 'samsung_device_dma_mask' defined but not used warning.

* tag 'samsung-fixes-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: exynos: don't select keyboard driver
  ARM: samsung: improve static dma_mask definition

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm/configs/exynos_defconfig
index 10f49ab,1a197fc..47195e8
--- 1/arch/arm/configs/exynos_defconfig
--- 2/arch/arm/configs/exynos_defconfig
+++ b/arch/arm/configs/exynos_defconfig
@@@ -28,10 -28,6 +28,10 @@@ CONFIG_CMDLINE="root=/dev/ram0 rw ramdi
  CONFIG_CPU_FREQ=y
  CONFIG_CPU_FREQ_STAT_DETAILS=y
  CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 +CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 +CONFIG_CPU_FREQ_GOV_USERSPACE=m
 +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=m
  CONFIG_CPUFREQ_DT=y
  CONFIG_CPU_IDLE=y
  CONFIG_ARM_EXYNOS_CPUIDLE=y
@@@ -78,10 -74,10 +78,11 @@@ CONFIG_KEYBOARD_CROS_EC=
  CONFIG_MOUSE_CYAPA=y
  CONFIG_INPUT_TOUCHSCREEN=y
  CONFIG_TOUCHSCREEN_ATMEL_MXT=y
 +CONFIG_TOUCHSCREEN_MMS114=y
  CONFIG_INPUT_MISC=y
  CONFIG_INPUT_MAX77693_HAPTIC=y
  CONFIG_INPUT_MAX8997_HAPTIC=y
+ CONFIG_KEYBOARD_SAMSUNG=y
  CONFIG_SERIAL_8250=y
  CONFIG_SERIAL_SAMSUNG=y
  CONFIG_SERIAL_SAMSUNG_CONSOLE=y
@@@ -98,7 -94,6 +99,7 @@@ CONFIG_SPI=
  CONFIG_SPI_GPIO=y
  CONFIG_SPI_S3C64XX=y
  CONFIG_DEBUG_GPIO=y
 +CONFIG_GPIO_WM8994=y
  CONFIG_POWER_SUPPLY=y
  CONFIG_BATTERY_SBS=y
  CONFIG_BATTERY_MAX17040=y
@@@ -140,7 -135,6 +141,7 @@@ CONFIG_REGULATOR_S2MPA01=
  CONFIG_REGULATOR_S2MPS11=y
  CONFIG_REGULATOR_S5M8767=y
  CONFIG_REGULATOR_TPS65090=y
 +CONFIG_REGULATOR_WM8994=y
  CONFIG_MEDIA_SUPPORT=m
  CONFIG_MEDIA_CAMERA_SUPPORT=y
  CONFIG_MEDIA_USB_SUPPORT=y
@@@ -167,8 -161,6 +168,8 @@@ CONFIG_SOUND=
  CONFIG_SND=y
  CONFIG_SND_SOC=y
  CONFIG_SND_SOC_SAMSUNG=y
 +CONFIG_SND_SOC_SAMSUNG_SMDK_WM8994=y
 +CONFIG_SND_SOC_SMDK_WM8994_PCM=y
  CONFIG_SND_SOC_SNOW=y
  CONFIG_SND_SOC_ODROIDX2=y
  CONFIG_SND_SIMPLE_CARD=y
@@@ -219,8 -211,6 +220,8 @@@ CONFIG_EXTCON_MAX77693=
  CONFIG_EXTCON_MAX8997=y
  CONFIG_IIO=y
  CONFIG_EXYNOS_ADC=y
 +CONFIG_CM36651=y
 +CONFIG_AK8975=y
  CONFIG_PWM=y
  CONFIG_PWM_SAMSUNG=y
  CONFIG_PHY_EXYNOS5250_SATA=y

diff --combined arch/arm/configs/multi_v7_defconfig
index 8f85756,ad97a41..8a5fff1
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -105,6 -105,7 +105,6 @@@ CONFIG_ARCH_UNIPHIER=
  CONFIG_ARCH_U8500=y
  CONFIG_MACH_HREFV60=y
  CONFIG_MACH_SNOWBALL=y
 -CONFIG_MACH_UX500_DT=y
  CONFIG_ARCH_VEXPRESS=y
  CONFIG_ARCH_VEXPRESS_CA9X4=y
  CONFIG_ARCH_VEXPRESS_TC2_PM=y
@@@ -118,7 -119,7 +118,7 @@@ CONFIG_PCI_MSI=
  CONFIG_PCI_MVEBU=y
  CONFIG_PCI_TEGRA=y
  CONFIG_PCI_RCAR_GEN2=y
 -CONFIG_PCI_RCAR_GEN2_PCIE=y
 +CONFIG_PCIE_RCAR=y
  CONFIG_PCIEPORTBUS=y
  CONFIG_SMP=y
  CONFIG_NR_CPUS=16
@@@ -130,10 -131,6 +130,10 @@@ CONFIG_KEXEC=
  CONFIG_CPU_FREQ=y
  CONFIG_CPU_FREQ_STAT_DETAILS=y
  CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
 +CONFIG_CPU_FREQ_GOV_POWERSAVE=m
 +CONFIG_CPU_FREQ_GOV_USERSPACE=m
 +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m
 +CONFIG_CPU_FREQ_GOV_SCHEDUTIL=m
  CONFIG_QORIQ_CPUFREQ=y
  CONFIG_CPU_IDLE=y
  CONFIG_ARM_CPUIDLE=y
@@@ -186,7 -183,6 +186,7 @@@ CONFIG_MTD_CMDLINE_PARTS=
  CONFIG_MTD_BLOCK=y
  CONFIG_MTD_M25P80=y
  CONFIG_MTD_NAND=y
 +CONFIG_MTD_NAND_DENALI_DT=y
  CONFIG_MTD_NAND_ATMEL=y
  CONFIG_MTD_NAND_BRCMNAND=y
  CONFIG_MTD_NAND_VF610_NFC=y
@@@ -264,6 -260,7 +264,7 @@@ CONFIG_KEYBOARD_TEGRA=
  CONFIG_KEYBOARD_SPEAR=y
  CONFIG_KEYBOARD_ST_KEYSCAN=y
  CONFIG_KEYBOARD_CROS_EC=m
+ CONFIG_KEYBOARD_SAMSUNG=m
  CONFIG_MOUSE_PS2_ELANTECH=y
  CONFIG_MOUSE_CYAPA=m
  CONFIG_MOUSE_ELAN_I2C=y
@@@ -326,7 -323,6 +327,7 @@@ CONFIG_I2C_MUX=
  CONFIG_I2C_ARB_GPIO_CHALLENGE=m
  CONFIG_I2C_MUX_PCA954x=y
  CONFIG_I2C_MUX_PINCTRL=y
 +CONFIG_I2C_DEMUX_PINCTRL=y
  CONFIG_I2C_AT91=m
  CONFIG_I2C_BCM2835=y
  CONFIG_I2C_CADENCE=y
@@@ -350,7 -346,6 +351,7 @@@ CONFIG_I2C_UNIPHIER_F=
  CONFIG_I2C_XILINX=y
  CONFIG_I2C_RCAR=y
  CONFIG_I2C_CROS_EC_TUNNEL=m
 +CONFIG_I2C_SLAVE_EEPROM=y
  CONFIG_SPI=y
  CONFIG_SPI_ATMEL=m
  CONFIG_SPI_BCM2835=y
@@@ -416,7 -411,6 +417,7 @@@ CONFIG_POWER_RESET_GPIO=
  CONFIG_POWER_RESET_GPIO_RESTART=y
  CONFIG_POWER_RESET_KEYSTONE=y
  CONFIG_POWER_RESET_RMOBILE=y
 +CONFIG_POWER_RESET_ST=y
  CONFIG_POWER_AVS=y
  CONFIG_ROCKCHIP_IODOMAIN=y
  CONFIG_SENSORS_IIO_HWMON=y
@@@ -437,8 -431,6 +438,8 @@@ CONFIG_WATCHDOG=
  CONFIG_DA9063_WATCHDOG=m
  CONFIG_XILINX_WATCHDOG=y
  CONFIG_ARM_SP805_WATCHDOG=y
 +CONFIG_AT91SAM9X_WATCHDOG=y
 +CONFIG_SAMA5D4_WATCHDOG=y
  CONFIG_ORION_WATCHDOG=y
  CONFIG_ST_LPC_WATCHDOG=y
  CONFIG_SUNXI_WATCHDOG=y
@@@ -447,11 -439,9 +448,11 @@@ CONFIG_TEGRA_WATCHDOG=
  CONFIG_MESON_WATCHDOG=y
  CONFIG_DW_WATCHDOG=y
  CONFIG_DIGICOLOR_WATCHDOG=y
 +CONFIG_BCM2835_WDT=y
  CONFIG_MFD_AS3711=y
  CONFIG_MFD_AS3722=y
  CONFIG_MFD_ATMEL_FLEXCOM=y
 +CONFIG_MFD_ATMEL_HLCDC=m
  CONFIG_MFD_BCM590XX=y
  CONFIG_MFD_AXP20X=y
  CONFIG_MFD_AXP20X_I2C=m
@@@ -499,7 -489,7 +500,7 @@@ CONFIG_REGULATOR_MAX77693=
  CONFIG_REGULATOR_MAX77802=m
  CONFIG_REGULATOR_PALMAS=y
  CONFIG_REGULATOR_PBIAS=y
 -CONFIG_REGULATOR_PWM=m
 +CONFIG_REGULATOR_PWM=y
  CONFIG_REGULATOR_QCOM_RPM=y
  CONFIG_REGULATOR_QCOM_SMD_RPM=y
  CONFIG_REGULATOR_S2MPS11=y
@@@ -525,7 -515,6 +526,7 @@@ CONFIG_V4L_PLATFORM_DRIVERS=
  CONFIG_SOC_CAMERA=m
  CONFIG_SOC_CAMERA_PLATFORM=m
  CONFIG_VIDEO_RCAR_VIN=m
 +CONFIG_VIDEO_ATMEL_ISI=m
  CONFIG_V4L_MEM2MEM_DRIVERS=y
  CONFIG_VIDEO_RENESAS_JPU=m
  CONFIG_VIDEO_RENESAS_VSP1=m
@@@ -544,11 -533,7 +545,11 @@@ CONFIG_DRM_EXYNOS_DSI=
  CONFIG_DRM_EXYNOS_FIMD=y
  CONFIG_DRM_EXYNOS_HDMI=y
  CONFIG_DRM_ROCKCHIP=m
 +CONFIG_ROCKCHIP_ANALOGIX_DP=m
  CONFIG_ROCKCHIP_DW_HDMI=m
 +CONFIG_ROCKCHIP_DW_MIPI_DSI=m
 +CONFIG_ROCKCHIP_INNO_HDMI=m
 +CONFIG_DRM_ATMEL_HLCDC=m
  CONFIG_DRM_RCAR_DU=m
  CONFIG_DRM_RCAR_HDMI=y
  CONFIG_DRM_RCAR_LVDS=y
@@@ -580,8 -565,6 +581,8 @@@ CONFIG_SND_USB_AUDIO=
  CONFIG_SND_SOC=m
  CONFIG_SND_ATMEL_SOC=m
  CONFIG_SND_ATMEL_SOC_WM8904=m
 +CONFIG_SND_ATMEL_SOC_PDMIC=m
 +CONFIG_SND_BCM2835_SOC_I2S=m
  CONFIG_SND_SOC_FSL_SAI=m
  CONFIG_SND_SOC_ROCKCHIP=m
  CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
@@@ -610,7 -593,6 +611,7 @@@ CONFIG_USB=
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_MVEBU=y
  CONFIG_USB_XHCI_RCAR=m
 +CONFIG_USB_XHCI_TEGRA=m
  CONFIG_USB_EHCI_HCD=y
  CONFIG_USB_EHCI_MSM=m
  CONFIG_USB_EHCI_EXYNOS=y
@@@ -628,7 -610,7 +629,7 @@@ CONFIG_USB_STORAGE=
  CONFIG_USB_MUSB_HDRC=m
  CONFIG_USB_MUSB_SUNXI=m
  CONFIG_USB_DWC3=y
 -CONFIG_USB_DWC2=m
 +CONFIG_USB_DWC2=y
  CONFIG_USB_CHIPIDEA=y
  CONFIG_USB_CHIPIDEA_UDC=y
  CONFIG_USB_CHIPIDEA_HOST=y
@@@ -659,6 -641,7 +660,6 @@@ CONFIG_MMC_SDHCI_SPEAR=
  CONFIG_MMC_SDHCI_S3C=y
  CONFIG_MMC_SDHCI_S3C_DMA=y
  CONFIG_MMC_SDHCI_BCM_KONA=y
 -CONFIG_MMC_SDHCI_BCM2835=y
  CONFIG_MMC_SDHCI_ST=y
  CONFIG_MMC_OMAP=y
  CONFIG_MMC_OMAP_HS=y
@@@ -785,7 -768,6 +786,7 @@@ CONFIG_EXTCON=
  CONFIG_TI_AEMIF=y
  CONFIG_IIO=y
  CONFIG_AT91_ADC=m
 +CONFIG_AT91_SAMA5D2_ADC=m
  CONFIG_BERLIN2_ADC=m
  CONFIG_EXYNOS_ADC=m
  CONFIG_VF610_ADC=m
@@@ -794,7 -776,6 +795,7 @@@ CONFIG_AK8975=
  CONFIG_RASPBERRYPI_POWER=y
  CONFIG_PWM=y
  CONFIG_PWM_ATMEL=m
 +CONFIG_PWM_ATMEL_HLCDC_PWM=m
  CONFIG_PWM_ATMEL_TCB=m
  CONFIG_PWM_FSL_FTM=m
  CONFIG_PWM_RENESAS_TPU=y
@@@ -804,13 -785,12 +805,13 @@@ CONFIG_PWM_SUN4I=
  CONFIG_PWM_TEGRA=y
  CONFIG_PWM_VT8500=y
  CONFIG_PHY_HIX5HD2_SATA=y
 -CONFIG_PWM_STI=m
 +CONFIG_PWM_STI=y
  CONFIG_PWM_BCM2835=y
  CONFIG_OMAP_USB2=y
  CONFIG_TI_PIPE3=y
  CONFIG_PHY_BERLIN_USB=y
  CONFIG_PHY_BERLIN_SATA=y
 +CONFIG_PHY_ROCKCHIP_DP=m
  CONFIG_PHY_ROCKCHIP_USB=m
  CONFIG_PHY_QCOM_APQ8064_SATA=m
  CONFIG_PHY_MIPHY28LP=y
@@@ -821,7 -801,6 +822,7 @@@ CONFIG_PHY_STIH407_USB=
  CONFIG_PHY_SUN4I_USB=y
  CONFIG_PHY_SUN9I_USB=y
  CONFIG_PHY_SAMSUNG_USB2=m
 +CONFIG_PHY_TEGRA_XUSB=y
  CONFIG_NVMEM=y
  CONFIG_NVMEM_SUNXI_SID=y
  CONFIG_BCM2835_MBOX=y
@@@ -851,9 -830,6 +852,9 @@@ CONFIG_LOCKUP_DETECTOR=
  CONFIG_CRYPTO_DEV_TEGRA_AES=y
  CONFIG_CPUFREQ_DT=y
  CONFIG_KEYSTONE_IRQ=y
 +CONFIG_HW_RANDOM=y
 +CONFIG_HW_RANDOM_ST=y
 +CONFIG_CRYPTO_DEV_MARVELL_CESA=m
  CONFIG_CRYPTO_DEV_SUN4I_SS=m
  CONFIG_CRYPTO_DEV_ROCKCHIP=m
  CONFIG_ARM_CRYPTO=y

diff --combined arch/arm/mach-exynos/Kconfig
index e65aa7d,c0d9f33..20dcf6e
--- 1/arch/arm/mach-exynos/Kconfig
--- 2/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@@ -18,7 -18,6 +18,7 @@@ menuconfig ARCH_EXYNO
        select COMMON_CLK_SAMSUNG
        select EXYNOS_THERMAL
        select EXYNOS_PMU
 +      select EXYNOS_SROM
        select HAVE_ARM_SCU if SMP
        select HAVE_S3C2410_I2C if I2C
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
@@@ -27,13 -26,11 +27,13 @@@
        select PINCTRL_EXYNOS
        select PM_GENERIC_DOMAINS if PM
        select S5P_DEV_MFC
 +      select SAMSUNG_MC
        select SOC_SAMSUNG
        select SRAM
        select THERMAL
        select THERMAL_OF
        select MFD_SYSCON
 +      select MEMORY
        select CLKSRC_EXYNOS_MCT
        select POWER_RESET
        select POWER_RESET_SYSCON
@@@ -61,7 -58,6 +61,6 @@@ config ARCH_EXYNOS
        select CLKSRC_SAMSUNG_PWM if CPU_EXYNOS4210
        select CPU_EXYNOS4210
        select GIC_NON_BANKED
-       select KEYBOARD_SAMSUNG if INPUT_KEYBOARD
        select MIGHT_HAVE_CACHE_L2X0
        help
          Samsung EXYNOS4 (Cortex-A9) SoC based systems