Merge tag 'at91-ab-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abello...

defconfig update for 4.4:
- Add sama5d2 and its peripherals to sama5_defconfig and multi_v7_defconfig
- Trivial savedefconfig updates to at91_dt_defconfig and sama5_defconfig

* tag 'at91-ab-defconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux:
  ARM: multi_v7_defconfig: Add Atmel SDHCI device
  ARM: multi_v7_defconfig: Add Atmel Flexcom device
  ARM: multi_v7_defconfig: Add Atmel SAMA5D2 SoC
  ARM: at91/defconfig: add sama5d2 and its new devices to sama5 defconfig
  ARM: at91/defconfig: update at91_dt defconfig
  ARM: at91/defconfig: update sama5 defconfig

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

diff --combined arch/arm/configs/multi_v7_defconfig
index 25e403dda2bbf050e991eb334770dda1baefe9b9,3cafedc3f92b583c8197c3d0c3a54ea8c1b132a0..8d00705c61d1b23617a06ef93f94e32c571da3c9
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -21,11 -21,11 +21,12 @@@ CONFIG_MACH_ARMADA_39X=
  CONFIG_MACH_ARMADA_XP=y
  CONFIG_MACH_DOVE=y
  CONFIG_ARCH_AT91=y
+ CONFIG_SOC_SAMA5D2=y
  CONFIG_SOC_SAMA5D3=y
  CONFIG_SOC_SAMA5D4=y
  CONFIG_ARCH_BCM=y
  CONFIG_ARCH_BCM_CYGNUS=y
 +CONFIG_ARCH_BCM_NSP=y
  CONFIG_ARCH_BCM_21664=y
  CONFIG_ARCH_BCM_281XX=y
  CONFIG_ARCH_BCM_5301X=y
@@@ -86,6 -86,7 +87,6 @@@ CONFIG_ARCH_R8A7791=
  CONFIG_ARCH_R8A7793=y
  CONFIG_ARCH_R8A7794=y
  CONFIG_ARCH_SH73A0=y
 -CONFIG_MACH_MARZEN=y
  CONFIG_ARCH_SUNXI=y
  CONFIG_ARCH_SIRF=y
  CONFIG_ARCH_TEGRA=y
@@@ -153,7 -154,6 +154,7 @@@ CONFIG_CAN_DEV=
  CONFIG_CAN_AT91=m
  CONFIG_CAN_XILINXCAN=y
  CONFIG_CAN_MCP251X=y
 +CONFIG_CAN_SUN4I=y
  CONFIG_BT=m
  CONFIG_BT_MRVL=m
  CONFIG_BT_MRVL_SDIO=m
@@@ -208,7 -208,6 +209,7 @@@ CONFIG_NET_CALXEDA_XGMAC=
  CONFIG_IGB=y
  CONFIG_MV643XX_ETH=y
  CONFIG_MVNETA=y
 +CONFIG_PXA168_ETH=m
  CONFIG_KS8851=y
  CONFIG_R8169=y
  CONFIG_SH_ETH=y
@@@ -222,7 -221,6 +223,7 @@@ CONFIG_SMSC_PHY=
  CONFIG_BROADCOM_PHY=y
  CONFIG_ICPLUS_PHY=y
  CONFIG_MICREL_PHY=y
 +CONFIG_FIXED_PHY=y
  CONFIG_USB_PEGASUS=y
  CONFIG_USB_USBNET=y
  CONFIG_USB_NET_SMSC75XX=y
@@@ -305,7 -303,6 +306,7 @@@ CONFIG_I2C_GPIO=
  CONFIG_I2C_EXYNOS5=y
  CONFIG_I2C_MV64XXX=y
  CONFIG_I2C_RIIC=y
 +CONFIG_I2C_RK3X=y
  CONFIG_I2C_S3C2410=y
  CONFIG_I2C_SH_MOBILE=y
  CONFIG_I2C_SIRF=y
@@@ -322,7 -319,6 +323,7 @@@ CONFIG_SPI_DAVINCI=
  CONFIG_SPI_OMAP24XX=y
  CONFIG_SPI_ORION=y
  CONFIG_SPI_PL022=y
 +CONFIG_SPI_ROCKCHIP=m
  CONFIG_SPI_RSPI=y
  CONFIG_SPI_S3C64XX=m
  CONFIG_SPI_SH_MSIOF=m
@@@ -337,7 -333,6 +338,7 @@@ CONFIG_SPI_XILINX=
  CONFIG_SPI_SPIDEV=y
  CONFIG_PINCTRL_AS3722=y
  CONFIG_PINCTRL_PALMAS=y
 +CONFIG_PINCTRL_APQ8064=y
  CONFIG_PINCTRL_APQ8084=y
  CONFIG_GPIO_SYSFS=y
  CONFIG_GPIO_GENERIC_PLATFORM=y
@@@ -371,7 -366,6 +372,7 @@@ CONFIG_SENSORS_LM95245=
  CONFIG_SENSORS_NTC_THERMISTOR=m
  CONFIG_THERMAL=y
  CONFIG_CPU_THERMAL=y
 +CONFIG_ROCKCHIP_THERMAL=y
  CONFIG_RCAR_THERMAL=y
  CONFIG_ARMADA_THERMAL=y
  CONFIG_DAVINCI_WATCHDOG=m
@@@ -389,6 -383,7 +390,7 @@@ CONFIG_MESON_WATCHDOG=
  CONFIG_DIGICOLOR_WATCHDOG=y
  CONFIG_MFD_AS3711=y
  CONFIG_MFD_AS3722=y
+ CONFIG_MFD_ATMEL_FLEXCOM=y
  CONFIG_MFD_BCM590XX=y
  CONFIG_MFD_AXP20X=y
  CONFIG_MFD_CROS_EC=y
@@@ -398,9 -393,6 +400,9 @@@ CONFIG_MFD_MAX14577=
  CONFIG_MFD_MAX77686=y
  CONFIG_MFD_MAX77693=y
  CONFIG_MFD_MAX8907=y
 +CONFIG_MFD_RK808=y
 +CONFIG_MFD_PM8921_CORE=y
 +CONFIG_MFD_QCOM_RPM=y
  CONFIG_MFD_SEC_CORE=y
  CONFIG_MFD_STMPE=y
  CONFIG_MFD_PALMAS=y
@@@ -408,14 -400,11 +410,14 @@@ CONFIG_MFD_TPS65090=
  CONFIG_MFD_TPS6586X=y
  CONFIG_MFD_TPS65910=y
  CONFIG_REGULATOR_AB8500=y
 +CONFIG_REGULATOR_ACT8865=y
  CONFIG_REGULATOR_AS3711=y
  CONFIG_REGULATOR_AS3722=y
  CONFIG_REGULATOR_AXP20X=y
  CONFIG_REGULATOR_BCM590XX=y
  CONFIG_REGULATOR_DA9210=y
 +CONFIG_REGULATOR_FAN53555=y
 +CONFIG_REGULATOR_RK808=y
  CONFIG_REGULATOR_GPIO=y
  CONFIG_MFD_SYSCON=y
  CONFIG_POWER_RESET_SYSCON=y
@@@ -428,8 -417,6 +430,8 @@@ CONFIG_REGULATOR_MAX77802=
  CONFIG_REGULATOR_PALMAS=y
  CONFIG_REGULATOR_PBIAS=y
  CONFIG_REGULATOR_PWM=m
 +CONFIG_REGULATOR_QCOM_RPM=y
 +CONFIG_REGULATOR_QCOM_SMD_RPM=y
  CONFIG_REGULATOR_S2MPS11=y
  CONFIG_REGULATOR_S5M8767=y
  CONFIG_REGULATOR_TPS51632=y
@@@ -456,7 -443,6 +458,7 @@@ CONFIG_VIDEO_RENESAS_VSP1=
  CONFIG_VIDEO_ADV7180=m
  CONFIG_VIDEO_ML86V7667=m
  CONFIG_DRM=y
 +CONFIG_DRM_I2C_ADV7511=m
  # CONFIG_DRM_I2C_CH7006 is not set
  # CONFIG_DRM_I2C_SIL164 is not set
  CONFIG_DRM_NXP_PTN3460=m
@@@ -466,11 -452,7 +468,11 @@@ CONFIG_DRM_EXYNOS=
  CONFIG_DRM_EXYNOS_DSI=y
  CONFIG_DRM_EXYNOS_FIMD=y
  CONFIG_DRM_EXYNOS_HDMI=y
 +CONFIG_DRM_ROCKCHIP=m
 +CONFIG_ROCKCHIP_DW_HDMI=m
  CONFIG_DRM_RCAR_DU=m
 +CONFIG_DRM_RCAR_HDMI=y
 +CONFIG_DRM_RCAR_LVDS=y
  CONFIG_DRM_TEGRA=y
  CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
  CONFIG_DRM_PANEL_SIMPLE=y
@@@ -514,7 -496,6 +516,7 @@@ CONFIG_USB=
  CONFIG_USB_XHCI_HCD=y
  CONFIG_USB_XHCI_MVEBU=y
  CONFIG_USB_EHCI_HCD=y
 +CONFIG_USB_EHCI_MSM=m
  CONFIG_USB_EHCI_EXYNOS=y
  CONFIG_USB_EHCI_TEGRA=y
  CONFIG_USB_EHCI_HCD_STI=y
@@@ -535,7 -516,6 +537,7 @@@ CONFIG_KEYSTONE_USB_PHY=
  CONFIG_OMAP_USB3=y
  CONFIG_USB_GPIO_VBUS=y
  CONFIG_USB_ISP1301=y
 +CONFIG_USB_MSM_OTG=m
  CONFIG_USB_MXS_PHY=y
  CONFIG_USB_RCAR_PHY=m
  CONFIG_USB_GADGET=y
@@@ -546,6 -526,7 +548,7 @@@ CONFIG_MMC_ARMMMCI=
  CONFIG_MMC_SDHCI=y
  CONFIG_MMC_SDHCI_PLTFM=y
  CONFIG_MMC_SDHCI_OF_ARASAN=y
+ CONFIG_MMC_SDHCI_OF_AT91=y
  CONFIG_MMC_SDHCI_ESDHC_IMX=y
  CONFIG_MMC_SDHCI_DOVE=y
  CONFIG_MMC_SDHCI_TEGRA=y
@@@ -588,10 -569,8 +591,10 @@@ CONFIG_EDAC_HIGHBANK_L2=
  CONFIG_RTC_CLASS=y
  CONFIG_RTC_DRV_AS3722=y
  CONFIG_RTC_DRV_DS1307=y
 +CONFIG_RTC_DRV_HYM8563=m
  CONFIG_RTC_DRV_MAX8907=y
  CONFIG_RTC_DRV_MAX77686=y
 +CONFIG_RTC_DRV_RK808=m
  CONFIG_RTC_DRV_MAX77802=m
  CONFIG_RTC_DRV_RS5C372=m
  CONFIG_RTC_DRV_PALMAS=y
@@@ -629,7 -608,6 +632,7 @@@ CONFIG_IMX_SDMA=
  CONFIG_IMX_DMA=y
  CONFIG_MXS_DMA=y
  CONFIG_DMA_OMAP=y
 +CONFIG_QCOM_BAM_DMA=y
  CONFIG_XILINX_VDMA=y
  CONFIG_DMA_SUN6I=y
  CONFIG_STAGING=y
@@@ -642,9 -620,6 +645,9 @@@ CONFIG_NVEC_POWER=
  CONFIG_NVEC_PAZ00=y
  CONFIG_QCOM_GSBI=y
  CONFIG_QCOM_PM=y
 +CONFIG_QCOM_SMD=y
 +CONFIG_QCOM_SMD_RPM=y
 +CONFIG_QCOM_SMEM=y
  CONFIG_COMMON_CLK_QCOM=y
  CONFIG_CHROME_PLATFORMS=y
  CONFIG_CROS_EC_CHARDEV=m
@@@ -655,8 -630,6 +658,8 @@@ CONFIG_APQ_MMCC_8084=
  CONFIG_MSM_GCC_8660=y
  CONFIG_MSM_MMCC_8960=y
  CONFIG_MSM_MMCC_8974=y
 +CONFIG_HWSPINLOCK_QCOM=y
 +CONFIG_ROCKCHIP_IOMMU=y
  CONFIG_TEGRA_IOMMU_GART=y
  CONFIG_TEGRA_IOMMU_SMMU=y
  CONFIG_PM_DEVFREQ=y
@@@ -666,7 -639,6 +669,7 @@@ CONFIG_EXTCON=
  CONFIG_TI_AEMIF=y
  CONFIG_IIO=y
  CONFIG_AT91_ADC=m
 +CONFIG_BERLIN2_ADC=m
  CONFIG_EXYNOS_ADC=m
  CONFIG_XILINX_XADC=y
  CONFIG_AK8975=y
@@@ -674,7 -646,6 +677,7 @@@ CONFIG_PWM=
  CONFIG_PWM_ATMEL=m
  CONFIG_PWM_ATMEL_TCB=m
  CONFIG_PWM_RENESAS_TPU=y
 +CONFIG_PWM_ROCKCHIP=m
  CONFIG_PWM_SAMSUNG=m
  CONFIG_PWM_SUN4I=y
  CONFIG_PWM_TEGRA=y
@@@ -683,10 -654,6 +686,10 @@@ CONFIG_PHY_HIX5HD2_SATA=
  CONFIG_PWM_STI=m
  CONFIG_OMAP_USB2=y
  CONFIG_TI_PIPE3=y
 +CONFIG_PHY_BERLIN_USB=y
 +CONFIG_PHY_BERLIN_SATA=y
 +CONFIG_PHY_ROCKCHIP_USB=m
 +CONFIG_PHY_QCOM_APQ8064_SATA=m
  CONFIG_PHY_MIPHY28LP=y
  CONFIG_PHY_MIPHY365X=y
  CONFIG_PHY_RCAR_GEN2=m