Merge tag 'sunxi-defconfig-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel...

Pull "Allwinner defconfig additions for 3.18" from Maxime Ripard

Nothing major, just a few drivers additions and misc options

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
* tag 'sunxi-defconfig-for-3.18' of git://git.kernel.org/pub/scm/linux/kernel/git/mripard/linux:
  ARM: sunxi_defconfig: add NLS_CODEPAGE_437 and NLS_ISO8859_1
  ARM: sunxi: Add A31 RTC driver to multi_v7_defconfig
  ARM: sunxi: Add A31 RTC driver to sunxi_defconfig

diff --combined arch/arm/configs/multi_v7_defconfig
index fb59195a190713af3d1ebdf554b520bbd8a7a178,9320138abb7ac6caabc5e9c40c0d1d671117baf7..b84ae1cd832736cc80eea7c9e534f1e0aafc9ccd
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -29,7 -29,6 +29,7 @@@ CONFIG_ARCH_HISI=
  CONFIG_ARCH_HI3xxx=y
  CONFIG_ARCH_HIX5HD2=y
  CONFIG_ARCH_KEYSTONE=y
 +CONFIG_ARCH_MESON=y
  CONFIG_ARCH_MXC=y
  CONFIG_SOC_IMX51=y
  CONFIG_SOC_IMX53=y
@@@ -43,7 -42,6 +43,7 @@@ CONFIG_SOC_AM33XX=
  CONFIG_SOC_AM43XX=y
  CONFIG_SOC_DRA7XX=y
  CONFIG_ARCH_QCOM=y
 +CONFIG_ARCH_MEDIATEK=y
  CONFIG_ARCH_MSM8X60=y
  CONFIG_ARCH_MSM8960=y
  CONFIG_ARCH_MSM8974=y
@@@ -88,7 -86,6 +88,7 @@@ CONFIG_CPU_FREQ_STAT_DETAILS=
  CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y
  CONFIG_CPU_IDLE=y
  CONFIG_NEON=y
 +CONFIG_ARM_ZYNQ_CPUIDLE=y
  CONFIG_NET=y
  CONFIG_PACKET=y
  CONFIG_UNIX=y
@@@ -109,7 -106,6 +109,7 @@@ CONFIG_CAN=
  CONFIG_CAN_RAW=y
  CONFIG_CAN_BCM=y
  CONFIG_CAN_DEV=y
 +CONFIG_CAN_XILINXCAN=y
  CONFIG_CAN_MCP251X=y
  CONFIG_CFG80211=m
  CONFIG_MAC80211=m
@@@ -150,7 -146,6 +150,7 @@@ CONFIG_R8169=
  CONFIG_SMSC911X=y
  CONFIG_STMMAC_ETH=y
  CONFIG_TI_CPSW=y
 +CONFIG_XILINX_EMACLITE=y
  CONFIG_AT803X_PHY=y
  CONFIG_MARVELL_PHY=y
  CONFIG_ICPLUS_PHY=y
@@@ -178,8 -173,6 +178,8 @@@ CONFIG_SERIAL_8250_CONSOLE=
  CONFIG_SERIAL_8250_DW=y
  CONFIG_SERIAL_AMBA_PL011=y
  CONFIG_SERIAL_AMBA_PL011_CONSOLE=y
 +CONFIG_SERIAL_MESON=y
 +CONFIG_SERIAL_MESON_CONSOLE=y
  CONFIG_SERIAL_SAMSUNG=y
  CONFIG_SERIAL_SAMSUNG_CONSOLE=y
  CONFIG_SERIAL_SIRFSOC=y
@@@ -212,8 -205,6 +212,8 @@@ CONFIG_I2C_SIRF=
  CONFIG_I2C_TEGRA=y
  CONFIG_I2C_ST=y
  CONFIG_SPI=y
 +CONFIG_I2C_XILINX=y
 +CONFIG_SPI_CADENCE=y
  CONFIG_SPI_OMAP24XX=y
  CONFIG_SPI_ORION=y
  CONFIG_SPI_PL022=y
@@@ -223,14 -214,11 +223,14 @@@ CONFIG_SPI_SUN6I=
  CONFIG_SPI_TEGRA114=y
  CONFIG_SPI_TEGRA20_SFLASH=y
  CONFIG_SPI_TEGRA20_SLINK=y
 +CONFIG_SPI_XILINX=y
  CONFIG_PINCTRL_AS3722=y
  CONFIG_PINCTRL_PALMAS=y
  CONFIG_GPIO_SYSFS=y
  CONFIG_GPIO_GENERIC_PLATFORM=y
  CONFIG_GPIO_DWAPB=y
 +CONFIG_GPIO_XILINX=y
 +CONFIG_GPIO_ZYNQ=y
  CONFIG_GPIO_PCA953X=y
  CONFIG_GPIO_PCA953X_IRQ=y
  CONFIG_GPIO_TWL4030=y
@@@ -249,7 -237,6 +249,7 @@@ CONFIG_ARMADA_THERMAL=
  CONFIG_ST_THERMAL_SYSCFG=y
  CONFIG_ST_THERMAL_MEMMAP=y
  CONFIG_WATCHDOG=y
 +CONFIG_XILINX_WATCHDOG=y
  CONFIG_ORION_WATCHDOG=y
  CONFIG_SUNXI_WATCHDOG=y
  CONFIG_MFD_AS3722=y
@@@ -263,6 -250,7 +263,6 @@@ CONFIG_MFD_PALMAS=
  CONFIG_MFD_TPS65090=y
  CONFIG_MFD_TPS6586X=y
  CONFIG_MFD_TPS65910=y
 -CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
  CONFIG_REGULATOR_AB8500=y
  CONFIG_REGULATOR_AS3722=y
  CONFIG_REGULATOR_BCM590XX=y
@@@ -361,6 -349,7 +361,7 @@@ CONFIG_RTC_DRV_TPS65910=
  CONFIG_RTC_DRV_EM3027=y
  CONFIG_RTC_DRV_PL031=y
  CONFIG_RTC_DRV_VT8500=y
+ CONFIG_RTC_DRV_SUN6I=y
  CONFIG_RTC_DRV_SUNXI=y
  CONFIG_RTC_DRV_MV=y
  CONFIG_RTC_DRV_TEGRA=y
@@@ -376,7 -365,6 +377,7 @@@ CONFIG_IMX_SDMA=
  CONFIG_IMX_DMA=y
  CONFIG_MXS_DMA=y
  CONFIG_DMA_OMAP=y
 +CONFIG_XILINX_VDMA=y
  CONFIG_STAGING=y
  CONFIG_SENSORS_ISL29018=y
  CONFIG_SENSORS_ISL29028=y
@@@ -393,7 -381,6 +394,7 @@@ CONFIG_TEGRA_IOMMU_GART=
  CONFIG_TEGRA_IOMMU_SMMU=y
  CONFIG_MEMORY=y
  CONFIG_IIO=y
 +CONFIG_XILINX_XADC=y
  CONFIG_AK8975=y
  CONFIG_PWM=y
  CONFIG_PWM_TEGRA=y
@@@ -417,5 -404,3 +418,5 @@@ CONFIG_DEBUG_FS=
  CONFIG_MAGIC_SYSRQ=y
  CONFIG_LOCKUP_DETECTOR=y
  CONFIG_CRYPTO_DEV_TEGRA_AES=y
 +CONFIG_CPU_FREQ=y
 +CONFIG_GENERIC_CPUFREQ_CPU0=y

diff --combined arch/arm/configs/sunxi_defconfig
index 0fb9d73f76808bd46940ca18b3edb22f75af78e4,6c037f956e360b272f13e355b975fd70f13a1edc..c1a4ca4f6e6d096f634da538a61380c757240076
--- 1/arch/arm/configs/sunxi_defconfig
--- 2/arch/arm/configs/sunxi_defconfig
+++ b/arch/arm/configs/sunxi_defconfig
@@@ -75,6 -75,7 +75,6 @@@ CONFIG_POWER_RESET_SUN6I=
  CONFIG_WATCHDOG=y
  CONFIG_SUNXI_WATCHDOG=y
  CONFIG_MFD_AXP20X=y
 -CONFIG_REGULATOR_VIRTUAL_CONSUMER=y
  CONFIG_REGULATOR_GPIO=y
  CONFIG_USB=y
  CONFIG_USB_EHCI_HCD=y
@@@ -92,6 -93,7 +92,7 @@@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=
  CONFIG_RTC_CLASS=y
  # CONFIG_RTC_INTF_SYSFS is not set
  # CONFIG_RTC_INTF_PROC is not set
+ CONFIG_RTC_DRV_SUN6I=y
  CONFIG_RTC_DRV_SUNXI=y
  # CONFIG_IOMMU_SUPPORT is not set
  CONFIG_PHY_SUN4I_USB=y
@@@ -102,5 -104,7 +103,7 @@@ CONFIG_NFS_FS=
  CONFIG_NFS_V3_ACL=y
  CONFIG_NFS_V4=y
  CONFIG_ROOT_NFS=y
+ CONFIG_NLS_CODEPAGE_437=y
+ CONFIG_NLS_ISO8859_1=y
  CONFIG_PRINTK_TIME=y
  CONFIG_DEBUG_FS=y