ARM: OMAP: update ads7846 x_plate_ohm for N770

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap1 / board-nokia770.c

diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c
index 8133b5944abebc92eb9581ada47175835124c8aa..c8ea991a79e235c21f5a4ccdd2115d044b171882 100644 (file)
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -34,6 +34,15 @@
 
 static void __init omap_nokia770_init_irq(void)
 {
+       /* On Nokia 770, the SleepX signal is masked with an
+        * MPUIO line by default.  It has to be unmasked for it
+        * to become functional */
+
+       /* SleepX mask direction */
+       omap_writew((omap_readw(0xfffb5008) & ~2), 0xfffb5008);
+       /* Unmask SleepX signal */
+       omap_writew((omap_readw(0xfffb5004) & ~2), 0xfffb5004);
+
        omap1_init_common_hw();
        omap_init_irq();
 }
@@ -84,7 +93,7 @@ static struct platform_device *nokia770_devices[] __initdata = {
 static struct ads7846_platform_data nokia770_ads7846_platform_data __initdata = {
        .x_max          = 0x0fff,
        .y_max          = 0x0fff,
-       .x_plate_ohms   = 120,
+       .x_plate_ohms   = 180,
        .pressure_max   = 200,
        .debounce_max   = 10,
        .debounce_tol   = 3,