summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBharat Nihalani <bnihalani@nvidia.com>2010-06-30 14:25:35 +0530
committerBharat Nihalani <bnihalani@nvidia.com>2010-06-30 02:36:06 -0700
commit4ae8df10a5687e51660dd2890c0d394cd969b2f4 (patch)
tree0673dcb3af58d81f832b3e1b60538cb2e402f5e3
parent0a2530f2dbffc846ff403703af1e632a924e1653 (diff)
[ARM] whistler: disable INPUT_TEGRA_ODM_ACCEL
Accelerometer generates fake events on some boards, hence disabling it from whistler defconfigs Bug 698867 Change-Id: I7d210fc0123ca65eadc238ba1f8655a09c28b60e Reviewed-on: http://git-master/r/3352 Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com> Tested-by: Bharat Nihalani <bnihalani@nvidia.com>
-rw-r--r--arch/arm/configs/tegra_whistler_android_defconfig12
-rw-r--r--arch/arm/configs/tegra_whistler_gnu_linux_defconfig4
2 files changed, 11 insertions, 5 deletions
diff --git a/arch/arm/configs/tegra_whistler_android_defconfig b/arch/arm/configs/tegra_whistler_android_defconfig
index 6e7070f990b1..dd5732c2d745 100644
--- a/arch/arm/configs/tegra_whistler_android_defconfig
+++ b/arch/arm/configs/tegra_whistler_android_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32.9
-# Thu Jun 17 10:37:00 2010
+# Wed Jun 30 14:24:32 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -21,6 +21,7 @@ CONFIG_ARCH_HAS_DEFAULT_IDLE=y
CONFIG_ARCH_HAS_CPUFREQ=y
CONFIG_GENERIC_HWEIGHT=y
CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_ZONE_DMA=y
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
CONFIG_ARCH_PROVIDES_UDELAY=y
CONFIG_VECTORS_BASE=0xffff0000
@@ -207,6 +208,8 @@ CONFIG_ARCH_TEGRA=y
#
CONFIG_ARCH_TEGRA_2x_SOC=y
CONFIG_MACH_TEGRA_GENERIC=y
+CONFIG_MACH_HARMONY=y
+CONFIG_MACH_VENTANA=y
CONFIG_TEGRA_ODM_KIT=y
CONFIG_TEGRA_DEBUG_UART_NONE=y
# CONFIG_TEGRA_DEBUG_UARTA is not set
@@ -228,6 +231,7 @@ CONFIG_TEGRA_USB_CHARGE=y
CONFIG_TEGRA_ODM_VIBRATE=y
CONFIG_TEGRA_USB_VBUS_DETECT_BY_PMU=y
# CONFIG_TEGRA_ODM_HARMONY is not set
+# CONFIG_TEGRA_ODM_VENTANA is not set
CONFIG_TEGRA_ODM_WHISTLER=y
#
@@ -267,6 +271,7 @@ CONFIG_TEGRA_ERRATA_657451=y
# CONFIG_ARM_ERRATA_458693 is not set
# CONFIG_ARM_ERRATA_460075 is not set
CONFIG_ARM_GIC=y
+CONFIG_DMABOUNCE=y
CONFIG_COMMON_CLKDEV=y
#
@@ -313,7 +318,8 @@ CONFIG_FLAT_NODE_MEM_MAP=y
CONFIG_PAGEFLAGS_EXTENDED=y
CONFIG_SPLIT_PTLOCK_CPUS=4
# CONFIG_PHYS_ADDR_T_64BIT is not set
-CONFIG_ZONE_DMA_FLAG=0
+CONFIG_ZONE_DMA_FLAG=1
+CONFIG_BOUNCE=y
CONFIG_VIRT_TO_BUS=y
CONFIG_HAVE_MLOCK=y
CONFIG_HAVE_MLOCKED_PAGE_BIT=y
@@ -943,7 +949,7 @@ CONFIG_INPUT_MISC=y
CONFIG_INPUT_UINPUT=y
# CONFIG_INPUT_GPIO is not set
# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-CONFIG_INPUT_TEGRA_ODM_ACCEL=y
+# CONFIG_INPUT_TEGRA_ODM_ACCEL is not set
CONFIG_INPUT_TEGRA_ODM_SCROLL=y
#
diff --git a/arch/arm/configs/tegra_whistler_gnu_linux_defconfig b/arch/arm/configs/tegra_whistler_gnu_linux_defconfig
index 194f52f8d7f1..f02518055e01 100644
--- a/arch/arm/configs/tegra_whistler_gnu_linux_defconfig
+++ b/arch/arm/configs/tegra_whistler_gnu_linux_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.32.9
-# Fri Jun 25 12:06:14 2010
+# Wed Jun 30 14:21:49 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -802,7 +802,7 @@ CONFIG_INPUT_MISC=y
CONFIG_INPUT_UINPUT=y
# CONFIG_INPUT_GPIO is not set
# CONFIG_INPUT_GPIO_ROTARY_ENCODER is not set
-CONFIG_INPUT_TEGRA_ODM_ACCEL=y
+# CONFIG_INPUT_TEGRA_ODM_ACCEL is not set
CONFIG_INPUT_TEGRA_ODM_SCROLL=y
#