summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPritesh Raithatha <praithatha@nvidia.com>2010-08-18 18:39:29 +0530
committerBharat Nihalani <bnihalani@nvidia.com>2010-08-18 06:34:43 -0700
commit97044f91ebed9521c666e1abcc3cf7ecca702a2a (patch)
treee9a42d4eb3bc0633071f4e8cb06accc0f17ca13d
parentdd8cc4f9f2d3935abd73b17d3385436ee7223da8 (diff)
tegra accelerometer: Changed default initialization parameters
Re-enabled accelerometer for whistler. Fixes bug 721469 Fixes bug 704850 Change-Id: I5eb9b04092df11b82b3e43e6c9699b579945576f Reviewed-on: http://git-master/r/5278 Tested-by: Pritesh Raithatha <praithatha@nvidia.com> Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
-rw-r--r--arch/arm/configs/tegra_whistler_android_defconfig12
-rw-r--r--arch/arm/mach-tegra/odm_kit/platform/accelerometer/nvodm_accelerometer_adi340.c8
2 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/configs/tegra_whistler_android_defconfig b/arch/arm/configs/tegra_whistler_android_defconfig
index 8d6ddae3704c..249a22ce3efb 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
-# Fri Aug 6 12:17:56 2010
+# Thu Aug 12 19:58:25 2010
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -953,7 +953,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 is not set
+CONFIG_INPUT_TEGRA_ODM_ACCEL=y
CONFIG_INPUT_TEGRA_ODM_SCROLL=y
#
@@ -975,9 +975,6 @@ CONFIG_HW_CONSOLE=y
CONFIG_VT_HW_CONSOLE_BINDING=y
CONFIG_DEVMEM=y
# CONFIG_DEVKMEM is not set
-CONFIG_DEVNVMAP=y
-# CONFIG_DEVNVMAP_PARANOID is not set
-CONFIG_DEVNVMAP_RECLAIM_UNPINNED_VM=y
# CONFIG_SERIAL_NONSTANDARD is not set
#
@@ -1199,13 +1196,16 @@ CONFIG_FB_TILEBLITTING=y
# Frame buffer hardware drivers
#
# CONFIG_FB_S1D13XXX is not set
-CONFIG_FB_TEGRA=y
# CONFIG_FB_VIRTUAL is not set
# CONFIG_FB_METRONOME is not set
# CONFIG_FB_MB862XX is not set
# CONFIG_FB_BROADSHEET is not set
+CONFIG_FB_TEGRA=y
CONFIG_FB_TEGRA_DUMMY=y
CONFIG_FB_TEGRA_GRHOST=y
+CONFIG_DEVNVMAP=y
+# CONFIG_DEVNVMAP_PARANOID is not set
+CONFIG_DEVNVMAP_RECLAIM_UNPINNED_VM=y
CONFIG_BACKLIGHT_LCD_SUPPORT=y
CONFIG_LCD_CLASS_DEVICE=y
# CONFIG_LCD_LMS283GF05 is not set
diff --git a/arch/arm/mach-tegra/odm_kit/platform/accelerometer/nvodm_accelerometer_adi340.c b/arch/arm/mach-tegra/odm_kit/platform/accelerometer/nvodm_accelerometer_adi340.c
index 9a6ae96a3b52..f93d0eac6c74 100644
--- a/arch/arm/mach-tegra/odm_kit/platform/accelerometer/nvodm_accelerometer_adi340.c
+++ b/arch/arm/mach-tegra/odm_kit/platform/accelerometer/nvodm_accelerometer_adi340.c
@@ -42,8 +42,8 @@
#define NV_ACCELEROMETER_REGISTER_RANGE 8
// When acc is put in horizontal, the max value from acc.
-#define NV_ADI340_ACCELEROMETER_NORMAL_THRESHOLD 30
-#define NV_ADI340_ACCELEROMETER_TAP_THRESHOLD 40
+#define NV_ADI340_ACCELEROMETER_NORMAL_THRESHOLD 57
+#define NV_ADI340_ACCELEROMETER_TAP_THRESHOLD 7
#define NV_ADI340_LOW_POWER_SAMPLERATE 3
#define NV_ADI340_FULL_RUN_SAMPLERATE 100
#define NV_ADI340_FORCE_FACTOR 1000
@@ -550,9 +550,9 @@ NvOdmAccelOpen(NvOdmAccelHandle* hDevice)
hAccel->CtrlRegsList[7].RegAddr = XLR_THRESHC; //0x1D
hAccel->CtrlRegsList[7].RegValue = NV_ADI340_ACCELEROMETER_TAP_THRESHOLD;
hAccel->CtrlRegsList[8].RegAddr = XLR_DUR; //0x21
- hAccel->CtrlRegsList[8].RegValue = 0x40;
+ hAccel->CtrlRegsList[8].RegValue = 0x2;
hAccel->CtrlRegsList[9].RegAddr = XLR_LATENT; //0x22
- hAccel->CtrlRegsList[9].RegValue = 0xff;
+ hAccel->CtrlRegsList[9].RegValue = 0x0;
hAccel->CtrlRegsList[10].RegAddr = XLR_INTVL; //0x23
hAccel->CtrlRegsList[10].RegValue = 0;
hAccel->CtrlRegsList[11].RegAddr = XLR_INTCONTROL2; //0x14