[PATCH] intel_mid_powerbtn: add power button driver for Medfield platform (#3)

[PATCH] intel_mid_powerbtn: add power button driver for Medfield platform (#3)

[Alan Cox]

From: Hong Liu <hong.liu@intel.com>

The power button is connected to MSIC on Medfield, we will get two
interrupts from IOAPIC when pressing or releasing the power button.

Signed-off-by: Hong Liu <hong.liu@intel.com>
[Minor fixes as noted by Dmitry]
Signed-off-by: Alan Cox <alan@linux.intel.com>
---

 drivers/platform/x86/Kconfig              |    8 ++
 drivers/platform/x86/Makefile             |    2 
 drivers/platform/x86/intel_mid_powerbtn.c |  144 +++++++++++++++++++++++++++++
 3 files changed, 154 insertions(+), 0 deletions(-)
 create mode 100644 drivers/platform/x86/intel_mid_powerbtn.c


diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index d163bc2..95817b0 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -654,4 +654,12 @@ config XO1_RFKILL
 	  Support for enabling/disabling the WLAN interface on the OLPC XO-1
 	  laptop.
 
+config INTEL_MID_POWER_BUTTON
+	tristate "power button driver for Intel MID platforms"
+	depends on INTEL_SCU_IPC
+	help
+	  This driver handles the power button on the Intel MID platforms.
+
+	  If unsure, say N.
+
 endif # X86_PLATFORM_DEVICES
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 4ec4ff8..a24cd62 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -34,3 +34,5 @@ obj-$(CONFIG_INTEL_IPS)		+= intel_ips.o
 obj-$(CONFIG_GPIO_INTEL_PMIC)	+= intel_pmic_gpio.o
 obj-$(CONFIG_XO1_RFKILL)	+= xo1-rfkill.o
 obj-$(CONFIG_IBM_RTL)		+= ibm_rtl.o
+obj-$(CONFIG_INTEL_MID_POWER_BUTTON)	+= intel_mid_powerbtn.o
+
diff --git a/drivers/platform/x86/intel_mid_powerbtn.c b/drivers/platform/x86/intel_mid_powerbtn.c
new file mode 100644
index 0000000..d503d29
--- /dev/null
+++ b/drivers/platform/x86/intel_mid_powerbtn.c
@@ -0,0 +1,144 @@
+/*
+ * Power button driver for Medfield.
+ *
+ * Copyright (C) 2010 Intel Corp
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/interrupt.h>
+#include <linux/slab.h>
+#include <linux/platform_device.h>
+#include <linux/input.h>
+#include <asm/intel_scu_ipc.h>
+
+#define DRIVER_NAME "msic_power_btn"
+
+#define MSIC_IRQ_STAT	0x02
+  #define MSIC_IRQ_PB	(1 << 0)
+#define MSIC_PB_CONFIG	0x3e
+#define MSIC_PB_STATUS	0x3f
+  #define MSIC_PB_LEVEL (1 << 3) /* 1 - release, 0 - press */
+
+struct mfld_pb_priv {
+	struct input_dev *input;
+	int irq;
+};
+
+static irqreturn_t mfld_pb_isr(int irq, void *dev_id)
+{
+	struct mfld_pb_priv *priv = dev_id;
+	int ret;
+	u8 pbstat;
+
+	ret = intel_scu_ipc_ioread8(MSIC_PB_STATUS, &pbstat);
+	if (ret < 0)
+		return IRQ_HANDLED;
+
+	input_event(priv->input, EV_KEY, KEY_POWER, !(pbstat & MSIC_PB_LEVEL));
+	input_sync(priv->input);
+
+	return IRQ_HANDLED;
+}
+
+static int __devinit mfld_pb_probe(struct platform_device *pdev)
+{
+	struct mfld_pb_priv *priv;
+	struct input_dev *input;
+	int ret;
+	int irq;
+
+	irq = platform_get_irq(pdev, 0);
+	if (irq < 0)
+		return -EINVAL;
+
+	priv = kzalloc(sizeof(struct mfld_pb_priv), GFP_KERNEL);
+	input = input_allocate_device();
+	if (!priv || !input) {
+		ret = -ENOMEM;
+		goto fail;
+	}
+
+	priv->input = input;
+	priv->irq = irq;
+	platform_set_drvdata(pdev, priv);
+
+	input->name = pdev->name;
+	input->phys = "power-button/input0";
+	input->dev.parent = &pdev->dev;
+
+	input_set_capability(input, EV_KEY, KEY_POWER);
+
+	ret = request_threaded_irq(priv->irq, NULL, mfld_pb_isr,
+				   0, DRIVER_NAME, priv);
+	if (ret) {
+		dev_err(&pdev->dev,
+			"unable to request irq %d for mfld power button\n",
+									irq);
+		goto fail;
+	}
+
+	ret = input_register_device(input);
+	if (ret == 0)
+		goto ok;
+
+	dev_err(&pdev->dev, "unable to register input dev, error %d\n", ret);
+	free_irq(priv->irq, priv);
+
+fail:
+	platform_set_drvdata(pdev, NULL);
+	input_free_device(input);
+	kfree(priv);
+ok:
+	return ret;
+}
+
+static int __devexit mfld_pb_remove(struct platform_device *pdev)
+{
+	struct mfld_pb_priv *priv = platform_get_drvdata(pdev);
+
+	free_irq(priv->irq, priv);
+	input_unregister_device(priv->input);
+	kfree(priv);
+
+	return 0;
+}
+
+static struct platform_driver mfld_pb_driver = {
+	.driver = {
+		.name = DRIVER_NAME,
+		.owner = THIS_MODULE,
+	},
+	.probe	= mfld_pb_probe,
+	.remove	= __devexit_p(mfld_pb_remove),
+};
+
+static int __init mfld_pb_init(void)
+{
+	return platform_driver_register(&mfld_pb_driver);
+}
+
+static void __exit mfld_pb_exit(void)
+{
+	platform_driver_unregister(&mfld_pb_driver);
+}
+
+module_init(mfld_pb_init);
+module_exit(mfld_pb_exit);
+
+MODULE_AUTHOR("Hong Liu <hong.liu@intel.com>");
+MODULE_DESCRIPTION("Intel Medfield Power Button Driver");
+MODULE_LICENSE("GPL v2");

Re: [PATCH] intel_mid_powerbtn: add power button driver for Medfield platform (#3)

[Dmitry Torokhov]

On Thu, Jan 27, 2011 at 01:52:13PM +0000, Alan Cox wrote:
> From: Hong Liu <hong.liu@intel.com>
> 
> The power button is connected to MSIC on Medfield, we will get two
> interrupts from IOAPIC when pressing or releasing the power button.
> 
> Signed-off-by: Hong Liu <hong.liu@intel.com>
> [Minor fixes as noted by Dmitry]
> Signed-off-by: Alan Cox <alan@linux.intel.com>

Acked-by: Dmitry Torokhov <dtor@mail.ru>

Input parts look good to me but you might want to fold in the following
patch.

Thanks.

-- 
Dmitry


intel_mid_powerbtn: add MODULE_ALIAS to facilitate autoloading

Also rework error handling path to be more in line with other drivers.

Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
---

 drivers/platform/x86/intel_mid_powerbtn.c |   46 ++++++++++++++++-------------
 1 files changed, 25 insertions(+), 21 deletions(-)


diff --git a/drivers/platform/x86/intel_mid_powerbtn.c b/drivers/platform/x86/intel_mid_powerbtn.c
index d503d29..213e79b 100644
--- a/drivers/platform/x86/intel_mid_powerbtn.c
+++ b/drivers/platform/x86/intel_mid_powerbtn.c
@@ -35,7 +35,7 @@
 
 struct mfld_pb_priv {
 	struct input_dev *input;
-	int irq;
+	unsigned int irq;
 };
 
 static irqreturn_t mfld_pb_isr(int irq, void *dev_id)
@@ -58,8 +58,8 @@ static int __devinit mfld_pb_probe(struct platform_device *pdev)
 {
 	struct mfld_pb_priv *priv;
 	struct input_dev *input;
-	int ret;
 	int irq;
+	int error;
 
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0)
@@ -68,42 +68,45 @@ static int __devinit mfld_pb_probe(struct platform_device *pdev)
 	priv = kzalloc(sizeof(struct mfld_pb_priv), GFP_KERNEL);
 	input = input_allocate_device();
 	if (!priv || !input) {
-		ret = -ENOMEM;
-		goto fail;
+		error = -ENOMEM;
+		goto err_free_mem;
 	}
 
 	priv->input = input;
 	priv->irq = irq;
-	platform_set_drvdata(pdev, priv);
 
 	input->name = pdev->name;
 	input->phys = "power-button/input0";
+	input->id.bustype = BUS_HOST;
 	input->dev.parent = &pdev->dev;
 
 	input_set_capability(input, EV_KEY, KEY_POWER);
 
-	ret = request_threaded_irq(priv->irq, NULL, mfld_pb_isr,
-				   0, DRIVER_NAME, priv);
-	if (ret) {
+	error = request_threaded_irq(priv->irq, NULL, mfld_pb_isr,
+				     0, DRIVER_NAME, priv);
+	if (error) {
 		dev_err(&pdev->dev,
 			"unable to request irq %d for mfld power button\n",
-									irq);
-		goto fail;
+			irq);
+		goto err_free_mem;
 	}
 
-	ret = input_register_device(input);
-	if (ret == 0)
-		goto ok;
+	error = input_register_device(input);
+	if (error) {
+		dev_err(&pdev->dev,
+			"unable to register input dev, error %d\n", error);
+		goto err_free_irq;
+	}
 
-	dev_err(&pdev->dev, "unable to register input dev, error %d\n", ret);
-	free_irq(priv->irq, priv);
+	platform_set_drvdata(pdev, priv);
+	return 0;
 
-fail:
-	platform_set_drvdata(pdev, NULL);
+err_free_irq:
+	free_irq(priv->irq, priv);
+err_free_mem:
 	input_free_device(input);
 	kfree(priv);
-ok:
-	return ret;
+	return error;
 }
 
 static int __devexit mfld_pb_remove(struct platform_device *pdev)
@@ -114,6 +117,7 @@ static int __devexit mfld_pb_remove(struct platform_device *pdev)
 	input_unregister_device(priv->input);
 	kfree(priv);
 
+	platform_set_drvdata(pdev, NULL);
 	return 0;
 }
 
@@ -130,15 +134,15 @@ static int __init mfld_pb_init(void)
 {
 	return platform_driver_register(&mfld_pb_driver);
 }
+module_init(mfld_pb_init);
 
 static void __exit mfld_pb_exit(void)
 {
 	platform_driver_unregister(&mfld_pb_driver);
 }
-
-module_init(mfld_pb_init);
 module_exit(mfld_pb_exit);
 
 MODULE_AUTHOR("Hong Liu <hong.liu@intel.com>");
 MODULE_DESCRIPTION("Intel Medfield Power Button Driver");
 MODULE_LICENSE("GPL v2");
+MODULE_ALIAS("platform:" DRIVER_NAME);

Re: [PATCH] intel_mid_powerbtn: add power button driver for Medfield platform (#3)

[Alan Cox]

On Sun, 30 Jan 2011 12:39:50 -0800
Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote:

> On Thu, Jan 27, 2011 at 01:52:13PM +0000, Alan Cox wrote:
> > From: Hong Liu <hong.liu@intel.com>
> > 
> > The power button is connected to MSIC on Medfield, we will get two
> > interrupts from IOAPIC when pressing or releasing the power button.
> > 
> > Signed-off-by: Hong Liu <hong.liu@intel.com>
> > [Minor fixes as noted by Dmitry]
> > Signed-off-by: Alan Cox <alan@linux.intel.com>
> 
> Acked-by: Dmitry Torokhov <dtor@mail.ru>
> 
> Input parts look good to me but you might want to fold in the following
> patch.

Ok I wouldn't move the module_init/exit around like that but no big deal
8)

Acked-by: Alan Cox <alan@linux.intel.com>

Re: [PATCH] intel_mid_powerbtn: add power button driver for Medfield platform (#3)

[Dmitry Torokhov]

On Wed, Feb 02, 2011 at 10:17:45AM +0000, Alan Cox wrote:
> On Sun, 30 Jan 2011 12:39:50 -0800
> Dmitry Torokhov <dmitry.torokhov@gmail.com> wrote:
> 
> > On Thu, Jan 27, 2011 at 01:52:13PM +0000, Alan Cox wrote:
> > > From: Hong Liu <hong.liu@intel.com>
> > > 
> > > The power button is connected to MSIC on Medfield, we will get two
> > > interrupts from IOAPIC when pressing or releasing the power button.
> > > 
> > > Signed-off-by: Hong Liu <hong.liu@intel.com>
> > > [Minor fixes as noted by Dmitry]
> > > Signed-off-by: Alan Cox <alan@linux.intel.com>
> > 
> > Acked-by: Dmitry Torokhov <dtor@mail.ru>
> > 
> > Input parts look good to me but you might want to fold in the following
> > patch.
> 
> Ok I wouldn't move the module_init/exit around like that but no big deal
> 8)

Yeah, I can't myself decide which style I like better :)

Well, anyway, aside from MODULE_ALIAS() anything else can be cut from
that patch so I'll leave it to Matthew to decide what he likes best.

Thanks.

-- 
Dmitry

Re: [PATCH] intel_mid_powerbtn: add power button driver for Medfield platform (#3)

[Matthew Garrett]

Applied, thanks.

-- 
Matthew Garrett | mjg59@srcf.ucam.org