From 5e6535d2378eb2d41305c119c55303961e87648a Mon Sep 17 00:00:00 2001
From: Peter Robinson <pbrobinson@gmail.com>
Date: Wed, 16 Oct 2013 13:28:18 +0100
Subject: [PATCH] ARM config updates for IIO and enable sensors for ARM
 platforms

---
 config-arm-generic   | 11 +++++++++++
 config-armv7         | 25 +++++++++++++++++--------
 config-armv7-generic | 19 ++++++++++++++-----
 kernel.spec          |  5 ++++-
 4 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/config-arm-generic b/config-arm-generic
index 32511087e..96a95e5bb 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -7,7 +7,13 @@ CONFIG_HW_PERF_EVENTS=y
 CONFIG_MMC=y
 CONFIG_NFS_FS=y
 # CONFIG_PID_IN_CONTEXTIDR is not set
+
 CONFIG_PWM=y
+CONFIG_PWM_SYSFS=y
+
+CONFIG_RESET_CONTROLLER=y
+CONFIG_RESET_GPIO=y
+
 CONFIG_RCU_FANOUT_LEAF=16
 # CONFIG_RTC_DRV_SNVS is not set
 CONFIG_BACKLIGHT_PWM=m
@@ -63,6 +69,7 @@ CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_EXTCON=m
 CONFIG_OF_EXTCON=m
 CONFIG_EXTCON_GPIO=m
+CONFIG_EXTCON_ADC_JACK=m
 
 # MTD
 CONFIG_MTD_BLKDEVS=m
@@ -97,6 +104,10 @@ CONFIG_I2C_MUX_GPIO=m
 CONFIG_I2C_MUX_PINCTRL=m
 CONFIG_I2C_MUX_PCA9541=m
 
+# Sensors
+CONFIG_SENSORS_IIO_HWMON=m
+CONFIG_IIO_SYSFS_TRIGGER=m
+
 # MFD
 CONFIG_MFD_CORE=m
 
diff --git a/config-armv7 b/config-armv7
index d91cd4385..f3298da78 100644
--- a/config-armv7
+++ b/config-armv7
@@ -149,6 +149,7 @@ CONFIG_RTC_DRV_MAX8907=m
 CONFIG_RTC_DRV_TWL4030=y
 CONFIG_RTC_DRV_OMAP=y
 CONFIG_SENSORS_TWL4030_MADC=m
+CONFIG_TWL6030_GPADC=m
 
 # OMAP5 (possibly other devices too)
 CONFIG_MFD_PALMAS=y
@@ -321,6 +322,9 @@ CONFIG_TI_EDMA=y
 CONFIG_TI_CPPI41=m
 CONFIG_MFD_TI_AM335X_TSCADC=m
 CONFIG_CHARGER_BQ24190=m
+CONFIG_TI_ADC081C=m
+CONFIG_TI_AM335X_ADC=m
+CONFIG_PWM_TIPWMSS=y
 
 # Allwinner a1x
 CONFIG_PINCTRL_SUNXI=y
@@ -475,6 +479,19 @@ CONFIG_CW1200=m
 CONFIG_CW1200_WLAN_SDIO=m
 CONFIG_CW1200_WLAN_SPI=m
 CONFIG_UX500_WATCHDOG=m
+CONFIG_IIO_ST_ACCEL_3AXIS=m
+CONFIG_IIO_ST_GYRO_3AXIS=m
+CONFIG_IIO_ST_GYRO_I2C_3AXIS=m
+CONFIG_IIO_ST_GYRO_SPI_3AXIS=m
+CONFIG_IIO_ST_MAGN_3AXIS=m
+CONFIG_IIO_ST_MAGN_I2C_3AXIS=m
+CONFIG_IIO_ST_MAGN_SPI_3AXIS=m
+CONFIG_IIO_ST_PRESS=m
+CONFIG_IIO_ST_PRESS_I2C=m
+CONFIG_IIO_ST_PRESS_SPI=m
+CONFIG_IIO_ST_SENSORS_I2C=m
+CONFIG_IIO_ST_SENSORS_SPI=m
+CONFIG_IIO_ST_SENSORS_CORE=m
 
 # tegra
 CONFIG_ARCH_TEGRA_2x_SOC=y
@@ -572,12 +589,8 @@ CONFIG_MFD_T7L66XB=y
 CONFIG_MFD_TC6387XB=y
 
 # Generic drivers
-
 CONFIG_REMOTEPROC=m
 
-# Need at some point for am33xx and others
-# CONFIG_IIO is not set
-
 # Regulator drivers
 CONFIG_REGULATOR_FAN53555=m
 # CONFIG_REGULATOR_88PM800 is not set
@@ -594,10 +607,6 @@ CONFIG_REGULATOR_MAX8907=m
 CONFIG_REGULATOR_MAX8952=m
 CONFIG_REGULATOR_MAX8973=m
 
-CONFIG_CHARGER_MANAGER=y
-CONFIG_CHARGER_GPIO=m
-CONFIG_PDA_POWER=m
-
 # usb gadget 
 CONFIG_USB_GADGET=m
 CONFIG_USB_GADGET_MUSB_HDRC=m
diff --git a/config-armv7-generic b/config-armv7-generic
index 67b43d132..1d12b449b 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -316,7 +316,6 @@ CONFIG_RTC_DRV_TPS80031=m
 # Regulators
 CONFIG_REGULATOR=y
 CONFIG_RFKILL_REGULATOR=m
-CONFIG_CHARGER_MANAGER=y
 # CONFIG_REGULATOR_DUMMY is not set
 CONFIG_REGULATOR_FIXED_VOLTAGE=m
 CONFIG_REGULATOR_VIRTUAL_CONSUMER=m
@@ -347,15 +346,25 @@ CONFIG_REGULATOR_TPS6586X=m
 CONFIG_REGULATOR_TPS65910=m
 CONFIG_REGULATOR_TPS65912=m
 CONFIG_REGULATOR_TPS80031=m
-CONFIG_CHARGER_TPS65090=m
 
+CONFIG_CHARGER_MANAGER=y
+CONFIG_CHARGER_TPS65090=m
+CONFIG_PDA_POWER=m
+CONFIG_GENERIC_ADC_BATTERY=m
+
+# Sensors
+CONFIG_TMP006=m
+CONFIG_BMP085=y
+CONFIG_BMP085_I2C=m
+CONFIG_BMP085_SPI=m
 CONFIG_SENSORS_AD7314=m
 CONFIG_SENSORS_ADCXX=m
+CONFIG_SENSORS_ADS7871=m
+CONFIG_SENSORS_GPIO_FAN=m
+CONFIG_SENSORS_HTU21=m
+CONFIG_SENSORS_LIS3_SPI=m
 CONFIG_SENSORS_LM70=m
 CONFIG_SENSORS_MAX1111=m
-CONFIG_SENSORS_ADS7871=m
-CONFIG_SENSORS_LIS3_SPI=m
-CONFIG_SENSORS_GPIO_FAN=m
 
 CONFIG_LCD_L4F00242T03=m
 CONFIG_LCD_LMS283GF05=m
diff --git a/kernel.spec b/kernel.spec
index bedb01c71..7528609c1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -2275,7 +2275,10 @@ fi
 #                                    ||----w |
 #                                    ||     ||
 %changelog
-* Wed Oct 15 2013 Josh Boyer <jwboyer@fedoraproject.org>
+* Wed Oct 16 2013 Peter Robinson <pbrobinson@fedoraproject.org>
+- ARM config updates for IIO and enable sensors for ARM platforms
+
+* Wed Oct 16 2013 Josh Boyer <jwboyer@fedoraproject.org>
 - Enable VIRTIO_CONSOLE as a module on all ARM (rhbz 1005551)
 
 * Tue Oct 15 2013 Josh Boyer <jwboyer@fedoraproject.org>