summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormattis fjallstrom <mattis@acm.org>2015-07-02 01:52:34 -0700
committermattis fjallstrom <mattis@acm.org>2015-07-02 01:52:34 -0700
commit745d0a31aad904aa6d25541e9220d12734591ac3 (patch)
tree52a2eba48916220040d6608b4b3bb0f2ddca3ccf
parentb40c8de18d0f070cb1182f18d643bb6c8917be0e (diff)
downloadolio-linux-3.10-745d0a31aad904aa6d25541e9220d12734591ac3.tar.xz
olio-linux-3.10-745d0a31aad904aa6d25541e9220d12734591ac3.zip
defconfig for PV board with ST chip
Change-Id: Iad9a8a466360b33e00d8633801a3fa99ae34c8be
-rw-r--r--arch/arm/configs/omap3_h1_defconfig31
1 files changed, 22 insertions, 9 deletions
diff --git a/arch/arm/configs/omap3_h1_defconfig b/arch/arm/configs/omap3_h1_defconfig
index e50a5475d7b..2d6538486ca 100644
--- a/arch/arm/configs/omap3_h1_defconfig
+++ b/arch/arm/configs/omap3_h1_defconfig
@@ -311,7 +311,10 @@ CONFIG_MACH_OMAP3_H1=y
# CONFIG_MACH_OMAP3_H1_EVT1 is not set
# CONFIG_MACH_OMAP3_H1_EVT2 is not set
# CONFIG_MACH_OMAP3_H1_DVT1 is not set
-CONFIG_MACH_OMAP3_H1_DVT2=y
+# CONFIG_MACH_OMAP3_H1_DVT2 is not set
+CONFIG_MACH_OMAP3_H1_PV=y
+# CONFIG_MACH_OMAP3_H1_PV1 is not set
+CONFIG_MACH_OMAP3_H1_PV2=y
# CONFIG_MACH_DEVKIT8000 is not set
# CONFIG_MACH_OMAP_LDP is not set
# CONFIG_MACH_OMAP3530_LV_SOM is not set
@@ -531,7 +534,7 @@ CONFIG_WAKELOCK=y
CONFIG_PM_SLEEP=y
CONFIG_PM_AUTOSLEEP=y
CONFIG_PM_WAKELOCKS=y
-CONFIG_PM_WAKELOCKS_LIMIT=100
+CONFIG_PM_WAKELOCKS_LIMIT=1000
CONFIG_PM_WAKELOCKS_GC=y
CONFIG_PM_RUNTIME=y
CONFIG_PM=y
@@ -935,7 +938,7 @@ CONFIG_FIB_RULES=y
# CONFIG_WIMAX is not set
CONFIG_RFKILL=y
# CONFIG_RFKILL_PM is not set
-# CONFIG_RFKILL_INPUT is not set
+CONFIG_RFKILL_INPUT=y
# CONFIG_RFKILL_REGULATOR is not set
CONFIG_RFKILL_GPIO=y
# CONFIG_RFKILL_WL18XX is not set
@@ -1279,7 +1282,7 @@ CONFIG_KEYBOARD_ATKBD=y
# CONFIG_KEYBOARD_QT1070 is not set
# CONFIG_KEYBOARD_QT2160 is not set
# CONFIG_KEYBOARD_LKKBD is not set
-# CONFIG_KEYBOARD_GPIO is not set
+CONFIG_KEYBOARD_GPIO=y
# CONFIG_KEYBOARD_TCA6416 is not set
# CONFIG_KEYBOARD_TCA8418 is not set
# CONFIG_KEYBOARD_MATRIX is not set
@@ -2343,11 +2346,9 @@ CONFIG_STAGING=y
# Triggers - standalone
#
# CONFIG_IIO_PERIODIC_RTC_TRIGGER is not set
-CONFIG_IIO_GPIO_TRIGGER=y
-CONFIG_IIO_SYSFS_TRIGGER=y
-CONFIG_INV_MPU_IIO=y
-# CONFIG_INV_IIO_MPU3050_ACCEL_SLAVE_BMA250 is not set
-# CONFIG_DTS_INV_MPU_IIO is not set
+# CONFIG_IIO_GPIO_TRIGGER is not set
+# CONFIG_IIO_SYSFS_TRIGGER is not set
+# CONFIG_INV_MPU_IIO is not set
# CONFIG_IIO_SIMPLE_DUMMY is not set
# CONFIG_ZSMALLOC is not set
# CONFIG_BCM_WIMAX is not set
@@ -2419,6 +2420,7 @@ CONFIG_IIO=y
CONFIG_IIO_BUFFER=y
CONFIG_IIO_BUFFER_CB=y
CONFIG_IIO_KFIFO_BUF=y
+CONFIG_IIO_TRIGGERED_BUFFER=y
CONFIG_IIO_TRIGGER=y
CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
@@ -2493,6 +2495,17 @@ CONFIG_IIO_CONSUMERS_PER_TRIGGER=2
# CONFIG_ITG3200 is not set
#
+# Inertial measurement units
+#
+# CONFIG_ADIS16400 is not set
+# CONFIG_ADIS16480 is not set
+# CONFIG_INV_MPU6050_IIO is not set
+CONFIG_ST_LSM6DS3_IIO=y
+CONFIG_ST_LSM6DS3_IIO_LIMIT_FIFO=0
+# CONFIG_ST_LSM6DS3_IIO_SENSORS_WAKEUP is not set
+# CONFIG_ST_LSM6DS3_IIO_MASTER_SUPPORT is not set
+
+#
# Light sensors
#
# CONFIG_ADJD_S311 is not set