Merge tag 'qcom-defconfig-for-4.4' of git://codeaurora.org/quic/kernel/agross-msm...

Qualcomm ARM Based defconfig Updates for v4.4

* Enable QCOM SMD/RPM in multi_v7_defconfig
* Enable QCOM SMD/RPM in qcom_defconfig

* tag 'qcom-defconfig-for-4.4' of git://codeaurora.org/quic/kernel/agross-msm:
  ARM: multi_v7_defconfig: Enable QCOM SMD/RPM
  ARM: qcom_defconfig: Enable SMD-RPM regulators

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

diff --combined arch/arm/configs/multi_v7_defconfig
index 73f7d762704e2a1c04fe40c9c27815a4b235a2f2,41aecd75e2aa5fa797cf3db7cd210187c57889bc..a992c510723c005f5cb696a1ed808c2b232b2fad
--- 1/arch/arm/configs/multi_v7_defconfig
--- 2/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@@ -25,7 -25,6 +25,7 @@@ CONFIG_SOC_SAMA5D3=
  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 -85,7 +86,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
@@@ -207,7 -207,6 +207,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
@@@ -221,7 -220,6 +221,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
@@@ -304,7 -302,6 +304,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
@@@ -321,7 -318,6 +321,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
@@@ -336,7 -332,6 +336,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
@@@ -370,7 -365,6 +370,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
@@@ -397,9 -391,6 +397,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
@@@ -407,14 -398,11 +407,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
@@@ -427,7 -415,7 +427,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
@@@ -463,8 -451,6 +464,8 @@@ 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_TEGRA=y
  CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m
@@@ -509,7 -495,6 +510,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
@@@ -530,7 -515,6 +531,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
@@@ -583,10 -567,8 +584,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
@@@ -624,7 -606,6 +625,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
@@@ -637,6 -618,9 +638,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
@@@ -647,7 -631,7 +651,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
@@@ -657,7 -641,6 +662,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
@@@ -665,7 -648,6 +670,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
@@@ -674,10 -656,6 +679,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