ARM: OMAP: Fix AIC23 sleep power consumption on 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 90f794e7c461f5d51b39c5abf2bd8b595155a18a..02b980d77b12d2079e84d23a27eea010005707be 100644 (file)
--- a/arch/arm/mach-omap1/board-nokia770.c
+++ b/arch/arm/mach-omap1/board-nokia770.c
@@ -12,6 +12,7 @@
 #include <linux/init.h>
 #include <linux/platform_device.h>
 #include <linux/input.h>
+#include <linux/clk.h>
 
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
@@ -27,25 +28,37 @@
 #include <asm/arch/board.h>
 #include <asm/arch/keypad.h>
 #include <asm/arch/common.h>
+#include <asm/arch/dsp_common.h>
+#include <asm/arch/aic23.h>
+#include <asm/arch/gpio.h>
 
 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();
 }
 
 static int nokia770_keymap[] = {
-       KEY(0, 1, KEY_UP),
-       KEY(0, 2, KEY_F5),
-       KEY(1, 0, KEY_LEFT),
-       KEY(1, 1, KEY_ENTER),
-       KEY(1, 2, KEY_RIGHT),
-       KEY(2, 0, KEY_ESC),
-       KEY(2, 1, KEY_DOWN),
-       KEY(2, 2, KEY_F4),
-       KEY(3, 0, KEY_F7),
-       KEY(3, 1, KEY_F8),
-       KEY(3, 2, KEY_F6),
+       KEY(0, 1, GROUP_0 | KEY_UP),
+       KEY(0, 2, GROUP_1 | KEY_F5),
+       KEY(1, 0, GROUP_0 | KEY_LEFT),
+       KEY(1, 1, GROUP_0 | KEY_ENTER),
+       KEY(1, 2, GROUP_0 | KEY_RIGHT),
+       KEY(2, 0, GROUP_1 | KEY_ESC),
+       KEY(2, 1, GROUP_0 | KEY_DOWN),
+       KEY(2, 2, GROUP_1 | KEY_F4),
+       KEY(3, 0, GROUP_2 | KEY_F7),
+       KEY(3, 1, GROUP_2 | KEY_F8),
+       KEY(3, 2, GROUP_2 | KEY_F6),
        0
 };
 
@@ -80,9 +93,10 @@ 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,
-       .pressure_max   = 200,
-
+       .x_plate_ohms   = 180,
+       .pressure_max   = 255,
+       .debounce_max   = 10,
+       .debounce_tol   = 3,
 };
 
 static struct spi_board_info nokia770_spi_board_info[] __initdata = {
@@ -135,6 +149,94 @@ static struct omap_board_config_kernel nokia770_config[] = {
        { OMAP_TAG_MMC,         &nokia770_mmc_config },
 };
 
+/*
+ * audio power control
+ */
+#define        HEADPHONE_GPIO          14
+#define        AMPLIFIER_CTRL_GPIO     58
+
+static struct clk *dspxor_ck;
+static DECLARE_MUTEX(audio_pwr_sem);
+/*
+ * audio_pwr_state
+ * +--+-------------------------+---------------------------------------+
+ * |-1|down                    |power-up request -> 0                  |
+ * +--+-------------------------+---------------------------------------+
+ * | 0|up                      |power-down(1) request -> 1             |
+ * |  |                                |power-down(2) request -> (ignore)      |
+ * +--+-------------------------+---------------------------------------+
+ * | 1|up,                     |power-up request -> 0                  |
+ * |  |received down(1) request        |power-down(2) request -> -1            |
+ * +--+-------------------------+---------------------------------------+
+ */
+static int audio_pwr_state = -1;
+
+/*
+ * audio_pwr_up / down should be called under audio_pwr_sem
+ */
+static void nokia770_audio_pwr_up(void)
+{
+       clk_enable(dspxor_ck);
+
+       /* Turn on codec */
+       tlv320aic23_power_up();
+
+       if (omap_get_gpio_datain(HEADPHONE_GPIO))
+               /* HP not connected, turn on amplifier */
+               omap_set_gpio_dataout(AMPLIFIER_CTRL_GPIO, 1);
+       else
+               /* HP connected, do not turn on amplifier */
+               printk("HP connected\n");
+}
+
+static void codec_delayed_power_down(void *arg)
+{
+       down(&audio_pwr_sem);
+       if (audio_pwr_state == -1)
+               tlv320aic23_power_down();
+       clk_disable(dspxor_ck);
+       up(&audio_pwr_sem);
+}
+
+static DECLARE_WORK(codec_power_down_work, codec_delayed_power_down, NULL);
+
+static void nokia770_audio_pwr_down(void)
+{
+       /* Turn off amplifier */
+       omap_set_gpio_dataout(AMPLIFIER_CTRL_GPIO, 0);
+
+       /* Turn off codec: schedule delayed work */
+       schedule_delayed_work(&codec_power_down_work, HZ / 20); /* 50ms */
+}
+
+void nokia770_audio_pwr_up_request(int stage)
+{
+       down(&audio_pwr_sem);
+       if (audio_pwr_state == -1)
+               nokia770_audio_pwr_up();
+       /* force audio_pwr_state = 0, even if it was 1. */
+       audio_pwr_state = 0;
+       up(&audio_pwr_sem);
+}
+
+void nokia770_audio_pwr_down_request(int stage)
+{
+       down(&audio_pwr_sem);
+       switch (stage) {
+       case 1:
+               if (audio_pwr_state == 0)
+                       audio_pwr_state = 1;
+               break;
+       case 2:
+               if (audio_pwr_state == 1) {
+                       nokia770_audio_pwr_down();
+                       audio_pwr_state = -1;
+               }
+               break;
+       }
+       up(&audio_pwr_sem);
+}
+
 static void __init omap_nokia770_init(void)
 {
        nokia770_config[0].data = &nokia770_usb_config;
@@ -145,6 +247,9 @@ static void __init omap_nokia770_init(void)
        omap_board_config = nokia770_config;
        omap_board_config_size = ARRAY_SIZE(nokia770_config);
        omap_serial_init();
+       omap_dsp_audio_pwr_up_request = nokia770_audio_pwr_up_request;
+       omap_dsp_audio_pwr_down_request = nokia770_audio_pwr_down_request;
+       dspxor_ck = clk_get(0, "dspxor_ck");
 }
 
 static void __init omap_nokia770_map_io(void)