From e7179d9d34b0a6078324fbe2c3666937937c0fde Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Thu, 4 Jun 2009 21:56:59 +0200 Subject: [PATCH 2/2] Add possibility to control the GPIO_STATUS shift This patch allows tweaking the behaviour of GPIO_STATUS register shift quirk that's in wm97xx-core. The problem with GPIO_STATUS register being shifted by one doesn't appear on all hardware it seems and causes problems with accelerated touchscreen drivers on Palm hardware. Therefore an accelerated touchscreen driver can select if the shift is/isn't happening on the hardware. Signed-off-by: Marek Vasut --- drivers/input/touchscreen/mainstone-wm97xx.c | 2 ++ drivers/input/touchscreen/wm97xx-core.c | 19 +++++++++---------- include/linux/wm97xx.h | 1 + 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/drivers/input/touchscreen/mainstone-wm97xx.c b/drivers/input/touchscreen/mainstone-wm97xx.c index de02f87..7b95741 100644 --- a/drivers/input/touchscreen/mainstone-wm97xx.c +++ b/drivers/input/touchscreen/mainstone-wm97xx.c @@ -198,6 +198,8 @@ static int wm97xx_acc_startup(struct wm97xx *wm) if (machine_is_palmt5() || machine_is_palmtx() || machine_is_palmld()) { pen_int = 1; irq = 27; + wm->gpio_offset = 0; /* interestingly, on Palm hardware, the + * GPIO_STATUS shift doesn't occur */ } else if (machine_is_mainstone() && pen_int) irq = 4; diff --git a/drivers/input/touchscreen/wm97xx-core.c b/drivers/input/touchscreen/wm97xx-core.c index 2957d48..6621c0e 100644 --- a/drivers/input/touchscreen/wm97xx-core.c +++ b/drivers/input/touchscreen/wm97xx-core.c @@ -204,10 +204,7 @@ void wm97xx_set_gpio(struct wm97xx *wm, u32 gpio, else reg &= ~gpio; - if (wm->id == WM9712_ID2) - wm97xx_reg_write(wm, AC97_GPIO_STATUS, reg << 1); - else - wm97xx_reg_write(wm, AC97_GPIO_STATUS, reg); + wm97xx_reg_write(wm, AC97_GPIO_STATUS, reg << wm->gpio_offset); mutex_unlock(&wm->codec_mutex); } EXPORT_SYMBOL_GPL(wm97xx_set_gpio); @@ -307,12 +304,8 @@ static void wm97xx_pen_irq_worker(struct work_struct *work) WM97XX_GPIO_13); } - if (wm->id == WM9712_ID2) - wm97xx_reg_write(wm, AC97_GPIO_STATUS, (status & - ~WM97XX_GPIO_13) << 1); - else - wm97xx_reg_write(wm, AC97_GPIO_STATUS, status & - ~WM97XX_GPIO_13); + wm97xx_reg_write(wm, AC97_GPIO_STATUS, (status & + ~WM97XX_GPIO_13) << wm->gpio_offset); mutex_unlock(&wm->codec_mutex); } @@ -582,6 +575,12 @@ static int wm97xx_probe(struct device *dev) wm->id = wm97xx_reg_read(wm, AC97_VENDOR_ID2); + /* On some versions of WM9712, the GPIO_STATUS register is shifted */ + if (wm->id == WM9712_ID2) + wm->gpio_offset = 1; + else + wm->gpio_offset = 0; + dev_info(wm->dev, "detected a wm97%02x codec\n", wm->id & 0xff); switch (wm->id & 0xff) { diff --git a/include/linux/wm97xx.h b/include/linux/wm97xx.h index 6f69968..c6dc15b 100644 --- a/include/linux/wm97xx.h +++ b/include/linux/wm97xx.h @@ -283,6 +283,7 @@ struct wm97xx { unsigned pen_is_down:1; /* Pen is down */ unsigned aux_waiting:1; /* aux measurement waiting */ unsigned pen_probably_down:1; /* used in polling mode */ + unsigned gpio_offset:1; /* gpio register offset */ u16 suspend_mode; /* PRP in suspend mode */ }; -- 1.6.3.3