Skip to contentSkip to conversation

input: add suspend wakeup support to sh_keysc

PATCH In review Magnus Damm 2 participants 6 messages Mar 10, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 input: add suspend wakeup support to sh_keysc

From: Magnus Damm <[email protected]>

This patch adds wakeup support to the sh_keysc driver. With this feature the ".../power/wakeup" file can be used to enable and disable if the device takes the system out of suspend. Default is enabled.

---

 drivers/input/keyboard/sh_keysc.c |   29 +++++++++++++++++++++++++----
 1 file changed, 25 insertions(+), 4 deletions(-)
drivers/input/keyboard/sh_keysc.c +25 -4
@@ -219,6 +219,8 @@ static int __devinit sh_keysc_probe(stru
 		  pdata->scan_timing, priv->iomem_base + KYCR1_OFFS);
 	iowrite16(0, priv->iomem_base + KYOUTDR_OFFS);
 	iowrite16(KYCR2_IRQ_LEVEL, priv->iomem_base + KYCR2_OFFS);
+
+	device_init_wakeup(&pdev->dev, 1);
 	return 0;
  err5:
 	free_irq(irq, pdev);
@@ -253,17 +255,36 @@ static int __devexit sh_keysc_remove(str
 	return 0;
 }
 
+static int sh_keysc_suspend(struct device *dev)
+{
+	struct platform_device *pdev;
+	struct sh_keysc_priv *priv;
+	unsigned short value;
+
+	pdev = container_of(dev, struct platform_device, dev);
+	priv = platform_get_drvdata(pdev);
+
+	value = ioread16(priv->iomem_base + KYCR1_OFFS);
+
+	if (device_may_wakeup(dev))
+		value |= 0x80;
+	else
+		value &= ~0x80;
 
-#define sh_keysc_suspend NULL
-#define sh_keysc_resume NULL
+	iowrite16(value, priv->iomem_base + KYCR1_OFFS);
+	return 0;
+}
+
+static struct dev_pm_ops sh_keysc_dev_pm_ops = {
+	.suspend = sh_keysc_suspend,
+};
 
 struct platform_driver sh_keysc_device_driver = {
 	.probe		= sh_keysc_probe,
 	.remove		= __devexit_p(sh_keysc_remove),
-	.suspend	= sh_keysc_suspend,
-	.resume		= sh_keysc_resume,
 	.driver		= {
 		.name	= "sh_keysc",
+		.pm	= &sh_keysc_dev_pm_ops,
 	}
 };
 
#1 lore raw

Hi Magnus,

Quoted 3 lines

+
+       device_init_wakeup(&pdev->dev, 1);
       return 0;

Please add device_init_wakeup(&pdev->dev, 0) in sh_keysc_remove.

Quoted 4 lines

 err5:
       free_irq(irq, pdev);

drivers/input/keyboard/sh_keysc.c +0 -0
@@ -253,17 +255,36 @@ static int __devexit sh_keysc_remove(str
        return 0;

drivers/input/keyboard/sh_keysc.c static int __devexit sh_keysc_remove(str · line 265

Quoted 10 lines
drivers/input/keyboard/sh_keysc.c +8 -0
  }
 
+static int sh_keysc_suspend(struct device *dev)
+{
+       struct platform_device *pdev;
+       struct sh_keysc_priv *priv;
+       unsigned short value;
+
+       pdev = container_of(dev, struct platform_device, dev);
+       priv = platform_get_drvdata(pdev);

to_platform_device(...) ?

Signature · 3 lines
---Trilok Soni
http://triloksoni.wordpress.com
http://www.linkedin.com/in/triloksoni
#2 lore raw

Hi Trilok,

Thanks for your comments!

Quoted 8 lines · Trilok Soni

Hi Magnus,

Quoted 3 lines

+
+       device_init_wakeup(&pdev->dev, 1);
       return 0;

Please add device_init_wakeup(&pdev->dev, 0) in sh_keysc_remove.

Isn't this just flagging the device as wakeup capable? My first guess would be that the the wakeup state of a removed device is irrelevant since it won't be suspended anyway. Or am I misunderstanding? Please explain in more detail.

Quoted 6 lines
Quoted 6 lines

 err5:
       free_irq(irq, pdev);

drivers/input/keyboard/sh_keysc.c +0 -0
@@ -253,17 +255,36 @@ static int __devexit sh_keysc_remove(str
        return 0;
  }
 
Quoted 10 lines

drivers/input/keyboard/sh_keysc.c static int __devexit sh_keysc_remove(str · line 265

Quoted 8 lines
drivers/input/keyboard/sh_keysc.c +8 -0
+static int sh_keysc_suspend(struct device *dev)
+{
+       struct platform_device *pdev;
+       struct sh_keysc_priv *priv;
+       unsigned short value;
+
+       pdev = container_of(dev, struct platform_device, dev);
+       priv = platform_get_drvdata(pdev);

to_platform_device(...) ?

Thanks, much better!

/ magnus

#3 lore raw

Hi Magnus,

Quoted 7 lines
Quoted 2 lines

Please add device_init_wakeup(&pdev->dev, 0) in sh_keysc_remove.

Isn't this just flagging the device as wakeup capable? My first guess would be that the the wakeup state of a removed device is irrelevant since it won't be suspended anyway. Or am I misunderstanding? Please explain in more detail.

I may not have complete answer, but I am thinking of someone depending/reading on wakeup file state to determine the state of your device in userspace will get confused, so better to disable to wakeup capability on remove.

Signature · 3 lines
---Trilok Soni
http://triloksoni.wordpress.com
http://www.linkedin.com/in/triloksoni
#4 lore raw
In reply to Magnus Damm
Quoted 10 lines · Trilok Soni
Quoted 6 lines
Quoted 1 line

Please add device_init_wakeup(&pdev->dev, 0) in sh_keysc_remove.

Isn't this just flagging the device as wakeup capable? My first guess would be that the the wakeup state of a removed device is irrelevant since it won't be suspended anyway. Or am I misunderstanding? Please explain in more detail.

I may not have complete answer, but I am thinking of someone depending/reading on wakeup file state to determine the state of your device in userspace will get confused, so better to disable to wakeup capability on remove.

I think the per device wakeup file will disappear from sysfs when the device gets removed, so resetting the flag in the remove() callback just makes the driver code more confusing in my opinion. =)

Cheers,

/ magnus

#5 lore raw

Hi Magnus,

Quoted 8 lines · Magnus Damm
Quoted 7 lines · Trilok Soni
Quoted 6 lines
Quoted 1 line

Please add device_init_wakeup(&pdev->dev, 0) in sh_keysc_remove.

Isn't this just flagging the device as wakeup capable? My first guess would be that the the wakeup state of a removed device is irrelevant since it won't be suspended anyway. Or am I misunderstanding? Please explain in more detail.

Quoted 7 lines
Quoted 3 lines

I may not have complete answer, but I am thinking of someone depending/reading on wakeup file state to determine the state of your device in userspace will get confused, so better to disable to wakeup capability on remove.

I think the per device wakeup file will disappear from sysfs when the device gets removed, so resetting the flag in the remove() callback just makes the driver code more confusing in my opinion. =)

Yes, I thought the same but then I am surprised to find my drivers doing device_init_wakeup(...., 0)
on driver removal.

#grep "device_init_wakeup(&pdev->dev, 0)" -d recurse ./ | more ./usb/musb/musb_core.c: device_init_wakeup(&pdev->dev, 0);
./usb/gadget/at91_udc.c: device_init_wakeup(&pdev->dev, 0);
./usb/host/ohci-at91.c: device_init_wakeup(&pdev->dev, 0);
./serial/atmel_serial.c: device_init_wakeup(&pdev->dev, 0);
./input/keyboard/gpio_keys.c: device_init_wakeup(&pdev->dev, 0);
./rtc/rtc-at32ap700x.c: device_init_wakeup(&pdev->dev, 0);

./rtc/rtc-omap.c:       device_init_wakeup(&pdev->dev, 0);
./rtc/rtc-omap.c:       device_init_wakeup(&pdev->dev, 0);
./pcmcia/at91_cf.c:     device_init_wakeup(&pdev->dev, 0);
./pcmcia/at91_cf.c:     device_init_wakeup(&pdev->dev, 0);

./mfd/htc-egpio.c: device_init_wakeup(&pdev->dev, 0);
./mmc/host/at91_mci.c: device_init_wakeup(&pdev->dev, 0);

Signature · 3 lines
---Trilok Soni
http://triloksoni.wordpress.com
http://www.linkedin.com/in/triloksoni