Merge tag 'omap-for-v4.12/defconfig-signed' of git://git.kernel.org/pub/scm/linux...

Defconfig updates for omaps for v4.12 merge window. Mostly
to update to use new ti-cpufreq driver, the rest is just
to enable drivers found on various devices:

- Update to use ti-cpufreq driver that we now have

- Enable SATA for ti81xx as a loadable module

- Enable Ethernet PHY for DP83848

- Enable modem related modules for PPP, QMI and USB ACM
  as loadable modules

- Enable droid 4 related drivers as lodable modules except
  for PMIC and regulator so eMMC can be used for root

* tag 'omap-for-v4.12/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: omap2plus_defconfig: Enable droid 4 devices
  ARM: omap2plus_defconfig: Add QMI, ACM and PPP as loadable modules
  ARM: omap2plus_defconfig: Enable TI Ethernet PHY
  ARM: omap2plus_defconfig: enable ahci-dm816 module
  ARM: omap2plus_defconfig: Enable support for ti-cpufreq

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

diff --combined arch/arm/configs/omap2plus_defconfig
index decd388d613d7e1d65c5d194f77fb23061ed37e0,6fffed6fe4cc2ed1c65f57f6588fb82a4649440d..a120ae81626003378ebab8afabe4c8358c789d3b
--- 1/arch/arm/configs/omap2plus_defconfig
--- 2/arch/arm/configs/omap2plus_defconfig
+++ b/arch/arm/configs/omap2plus_defconfig
@@@ -64,6 -64,7 +64,7 @@@ CONFIG_CPU_FREQ_GOV_POWERSAVE=
  CONFIG_CPU_FREQ_GOV_USERSPACE=y
  CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y
  CONFIG_CPUFREQ_DT=m
+ CONFIG_ARM_TI_CPUFREQ=y
  # CONFIG_ARM_OMAP2PLUS_CPUFREQ is not set
  CONFIG_CPU_IDLE=y
  CONFIG_BINFMT_MISC=y
@@@ -141,6 -142,7 +142,7 @@@ CONFIG_BLK_DEV_SD=
  CONFIG_SCSI_SCAN_ASYNC=y
  CONFIG_ATA=y
  CONFIG_SATA_AHCI_PLATFORM=y
+ CONFIG_AHCI_DM816=m
  CONFIG_NETDEVICES=y
  # CONFIG_NET_VENDOR_ARC is not set
  # CONFIG_NET_CADENCE is not set
@@@ -167,8 -169,18 +169,18 @@@ CONFIG_TI_CPTS=
  # CONFIG_NET_VENDOR_VIA is not set
  # CONFIG_NET_VENDOR_WIZNET is not set
  CONFIG_AT803X_PHY=y
+ CONFIG_DP83848_PHY=y
  CONFIG_MICREL_PHY=y
  CONFIG_SMSC_PHY=y
+ CONFIG_PPP=m
+ CONFIG_PPP_BSDCOMP=m
+ CONFIG_PPP_DEFLATE=m
+ CONFIG_PPP_FILTER=y
+ CONFIG_PPP_MPPE=m
+ CONFIG_PPP_MULTILINK=y
+ CONFIG_PPPOE=m
+ CONFIG_PPP_ASYNC=m
+ CONFIG_PPP_SYNC_TTY=m
  CONFIG_USB_USBNET=m
  CONFIG_USB_NET_SMSC75XX=m
  CONFIG_USB_NET_SMSC95XX=m
@@@ -176,6 -188,7 +188,7 @@@ CONFIG_USB_ALI_M5632=
  CONFIG_USB_AN2720=y
  CONFIG_USB_EPSON2888=y
  CONFIG_USB_KC2190=y
+ CONFIG_USB_NET_QMI_WWAN=m
  CONFIG_USB_CDC_PHONET=m
  CONFIG_LIBERTAS=m
  CONFIG_LIBERTAS_USB=m
@@@ -188,7 -201,6 +201,7 @@@ CONFIG_WL12XX=
  CONFIG_WL18XX=m
  CONFIG_WLCORE_SPI=m
  CONFIG_WLCORE_SDIO=m
 +CONFIG_INPUT_MOUSEDEV=m
  CONFIG_INPUT_JOYDEV=m
  CONFIG_INPUT_EVDEV=m
  CONFIG_KEYBOARD_ATKBD=m
@@@ -199,6 -211,7 +212,7 @@@ CONFIG_KEYBOARD_TWL4030=
  # CONFIG_INPUT_MOUSE is not set
  CONFIG_INPUT_TOUCHSCREEN=y
  CONFIG_TOUCHSCREEN_ADS7846=m
+ CONFIG_TOUCHSCREEN_ATMEL_MXT=m
  CONFIG_TOUCHSCREEN_EDT_FT5X06=m
  CONFIG_TOUCHSCREEN_TI_AM335X_TSC=m
  CONFIG_TOUCHSCREEN_PIXCIR=m
@@@ -206,6 -219,7 +220,7 @@@ CONFIG_TOUCHSCREEN_TSC2004=
  CONFIG_TOUCHSCREEN_TSC2005=m
  CONFIG_TOUCHSCREEN_TSC2007=m
  CONFIG_INPUT_MISC=y
+ CONFIG_INPUT_CPCAP_PWRBUTTON=m
  CONFIG_INPUT_TPS65218_PWRBUTTON=m
  CONFIG_INPUT_TWL4030_PWRBUTTON=m
  CONFIG_INPUT_PALMAS_PWRBUTTON=m
@@@ -241,6 -255,7 +256,7 @@@ CONFIG_W1=
  CONFIG_HDQ_MASTER_OMAP=m
  CONFIG_POWER_AVS=y
  CONFIG_POWER_RESET=y
+ CONFIG_POWER_RESET_GPIO=y
  CONFIG_BATTERY_BQ27XXX=m
  CONFIG_CHARGER_ISP1704=m
  CONFIG_CHARGER_TWL4030=m
@@@ -263,6 -278,7 +279,7 @@@ CONFIG_DRA752_THERMAL=
  CONFIG_WATCHDOG=y
  CONFIG_OMAP_WATCHDOG=m
  CONFIG_TWL4030_WATCHDOG=m
+ CONFIG_MFD_CPCAP=y
  CONFIG_MFD_TI_AM335X_TSCADC=m
  CONFIG_MFD_PALMAS=y
  CONFIG_MFD_TPS65217=y
@@@ -270,7 -286,9 +287,9 @@@ CONFIG_MFD_TI_LP873X=
  CONFIG_MFD_TPS65218=y
  CONFIG_MFD_TPS65910=y
  CONFIG_TWL6040_CORE=y
+ CONFIG_REGULATOR_CPCAP=y
  CONFIG_REGULATOR_GPIO=y
+ CONFIG_REGULATOR_LM363X=m
  CONFIG_REGULATOR_LP872X=y
  CONFIG_REGULATOR_LP873X=y
  CONFIG_REGULATOR_PALMAS=y
@@@ -339,6 -357,7 +358,7 @@@ CONFIG_SND_SOC=
  CONFIG_SND_EDMA_SOC=m
  CONFIG_SND_AM33XX_SOC_EVM=m
  CONFIG_SND_OMAP_SOC=m
+ CONFIG_SND_OMAP_SOC_HDMI_AUDIO=m
  CONFIG_SND_OMAP_SOC_OMAP_TWL4030=m
  CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=m
  CONFIG_SND_OMAP_SOC_OMAP3_PANDORA=m
@@@ -354,6 -373,7 +374,7 @@@ CONFIG_USB_XHCI_HCD=
  CONFIG_USB_EHCI_HCD=m
  CONFIG_USB_OHCI_HCD=m
  CONFIG_USB_WDM=m
+ CONFIG_USB_ACM=m
  CONFIG_USB_STORAGE=m
  CONFIG_USB_MUSB_HDRC=m
  CONFIG_USB_MUSB_TUSB6010=m
@@@ -402,6 -422,7 +423,7 @@@ CONFIG_MMC_OMAP=
  CONFIG_MMC_OMAP_HS=y
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=m
+ CONFIG_LEDS_CPCAP=m
  CONFIG_LEDS_GPIO=m
  CONFIG_LEDS_PCA963X=m
  CONFIG_LEDS_PWM=m
@@@ -420,6 -441,7 +442,7 @@@ CONFIG_RTC_DRV_TWL92330=
  CONFIG_RTC_DRV_TWL4030=m
  CONFIG_RTC_DRV_PALMAS=m
  CONFIG_RTC_DRV_OMAP=m
+ CONFIG_RTC_DRV_CPCAP=m
  CONFIG_DMADEVICES=y
  CONFIG_DMA_OMAP=y
  CONFIG_TI_EDMA=y
@@@ -432,6 -454,7 +455,7 @@@ CONFIG_IIO=
  CONFIG_IIO_SW_DEVICE=m
  CONFIG_IIO_SW_TRIGGER=m
  CONFIG_IIO_ST_ACCEL_3AXIS=m
+ CONFIG_CPCAP_ADC=m
  CONFIG_TI_AM335X_ADC=m
  CONFIG_BMP280=m
  CONFIG_PWM=y