input: cpcap-pwrbutton: new driver
Subsystems (4)
PATCH 1/1 input: cpcap-pwrbutton: new driver
Motorola CPCAP is a PMIC found in multiple smartphones. This driver adds support for the power/on button and has been tested with Droid 4.
--- .../devicetree/bindings/input/cpcap-pwrbutton.txt | 20 ++++ drivers/input/misc/Kconfig | 10 ++ drivers/input/misc/Makefile | 1 + drivers/input/misc/cpcap-pwrbutton.c | 119 +++++++++++++++++++++ 4 files changed, 150 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/cpcap-pwrbutton.txt create mode 100644 drivers/input/misc/cpcap-pwrbutton.c
Documentation/devicetree/bindings/input/cpcap-pwrbutton.txt new file +20 -0
@@ -0,0 +1,20 @@ +Motorola CPCAP on key + +This module is part of the CPCAP. For more details about the whole +chip see Documentation/devicetree/bindings/mfd/motorola-cpcap.txt. + +This module provides a simple power button event via an Interrupt. + +Required properties: +- compatible: should be one of the following + - "motorola,cpcap-pwrbutton" +- interrupts: irq specifier for CPCAP's ON IRQ + +Example: + +&cpcap { + cpcap_pwrbutton: pwrbutton { + compatible = "motorola,cpcap-pwrbutton"; + interrupts = <23 IRQ_TYPE_NONE>; + }; +};
drivers/input/misc/Kconfig +10 -0
@@ -316,6 +316,16 @@ config INPUT_COBALT_BTNS To compile this driver as a module, choose M here: the module will be called cobalt_btns. +config INPUT_CPCAP_PWRBUTTON + tristate "CPCAP OnKey" + depends on MFD_CPCAP + help + Say Y here if you want to enable power key reporting via the + Motorola CPCAP chip. + + To compile this driver as a module, choose M here. The module will + be called cpcap-pwrbutton. + config INPUT_WISTRON_BTNS tristate "x86 Wistron laptop button interface" depends on X86_32
drivers/input/misc/Makefile +1 -0
@@ -24,6 +24,7 @@ obj-$(CONFIG_INPUT_CM109) += cm109.o obj-$(CONFIG_INPUT_CMA3000) += cma3000_d0x.o obj-$(CONFIG_INPUT_CMA3000_I2C) += cma3000_d0x_i2c.o obj-$(CONFIG_INPUT_COBALT_BTNS) += cobalt_btns.o +obj-$(CONFIG_INPUT_CPCAP_PWRBUTTON) += cpcap-pwrbutton.o obj-$(CONFIG_INPUT_DA9052_ONKEY) += da9052_onkey.o obj-$(CONFIG_INPUT_DA9055_ONKEY) += da9055_onkey.o obj-$(CONFIG_INPUT_DA9063_ONKEY) += da9063_onkey.o
drivers/input/misc/cpcap-pwrbutton.c new file +119 -0
119 lines not on this page · raw message
Signature · 6 lines
2.11.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Dmitry Torokhov
maintainerHi Sebastian,
Quoted 97 lines · Sebastian Reichel
Motorola CPCAP is a PMIC found in multiple smartphones. This driver adds support for the power/on button and has been tested with Droid 4.
Signed-off-by Sebastian Reichel <[email protected]>--- .../devicetree/bindings/input/cpcap-pwrbutton.txt | 20 ++++ drivers/input/misc/Kconfig | 10 ++ drivers/input/misc/Makefile | 1 + drivers/input/misc/cpcap-pwrbutton.c | 119 +++++++++++++++++++++ 4 files changed, 150 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/cpcap-pwrbutton.txt create mode 100644 drivers/input/misc/cpcap-pwrbutton.cDocumentation/devicetree/bindings/input/cpcap-pwrbutton.txt new file +20
-0@@ -0,0 +1,20 @@ +Motorola CPCAP on key + +This module is part of the CPCAP. For more details about the whole +chip see Documentation/devicetree/bindings/mfd/motorola-cpcap.txt. + +This module provides a simple power button event via an Interrupt. + +Required properties: +- compatible: should be one of the following + - "motorola,cpcap-pwrbutton" +- interrupts: irq specifier for CPCAP's ON IRQ + +Example: + +&cpcap { + cpcap_pwrbutton: pwrbutton { + compatible = "motorola,cpcap-pwrbutton"; + interrupts = <23 IRQ_TYPE_NONE>; + }; +};drivers/input/misc/Kconfig +10
-0@@ -316,6 +316,16 @@ config INPUT_COBALT_BTNS To compile this driver as a module, choose M here: the module will be called cobalt_btns. +config INPUT_CPCAP_PWRBUTTON + tristate "CPCAP OnKey" + depends on MFD_CPCAP + help + Say Y here if you want to enable power key reporting via the + Motorola CPCAP chip. + + To compile this driver as a module, choose M here. The module will + be called cpcap-pwrbutton. + config INPUT_WISTRON_BTNS tristate "x86 Wistron laptop button interface" depends on X86_32drivers/input/misc/Makefile +1
-0@@ -24,6 +24,7 @@ obj-$(CONFIG_INPUT_CM109) += cm109.o obj-$(CONFIG_INPUT_CMA3000) += cma3000_d0x.o obj-$(CONFIG_INPUT_CMA3000_I2C) += cma3000_d0x_i2c.o obj-$(CONFIG_INPUT_COBALT_BTNS) += cobalt_btns.o +obj-$(CONFIG_INPUT_CPCAP_PWRBUTTON) += cpcap-pwrbutton.o obj-$(CONFIG_INPUT_DA9052_ONKEY) += da9052_onkey.o obj-$(CONFIG_INPUT_DA9055_ONKEY) += da9055_onkey.o obj-$(CONFIG_INPUT_DA9063_ONKEY) += da9063_onkey.odrivers/input/misc/cpcap-pwrbutton.c new file +18
-0@@ -0,0 +1,119 @@ +/** +* CPCAP Power Button Input Driver +* +* Copyright (C) 2017 Sebastian Reichel <[email protected]> +* +* This file is subject to the terms and conditions of the GNU General +* Public License. See the file "COPYING" in the main directory of this +* archive for more details. +* +* 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. +*/ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/kernel.h>
drivers/input/misc/cpcap-pwrbutton.c line 28
Quoted 10 lines
drivers/input/misc/cpcap-pwrbutton.c new file +10
-0+#include <linux/errno.h> +#include <linux/input.h> +#include <linux/interrupt.h> +#include <linux/regmap.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/mfd/motorola-cpcap.h> + +#define CPCAP_IRQ_ON 23 +#define CPCAP_IRQ_ON_BITMASK (1 << (CPCAP_IRQ_ON % 16))
Is this truly static or it could depend= on IRQ returned by platform_get_irq()?
Quoted 9 lines
drivers/input/misc/cpcap-pwrbutton.c new file +9
-0+ +struct cpcap_power_button { +struct regmap *regmap; +struct input_dev *idev; +struct device *dev; +}; + +static irqreturn_t powerbutton_irq (int irq,void *_button) +{
drivers/input/misc/cpcap-pwrbutton.c line 47
Quoted 10 lines
drivers/input/misc/cpcap-pwrbutton.c new file +10
-0+struct cpcap_power_button *button = _button; +bool key_pressed; +int err, val; + + err =regmap_read (button->regmap,CPCAP_REG_INTS2 , &val); +if (err) { +dev_err (button->dev,"read failed: %d" , err); +return IRQ_HANDLED ; + } + key_pressed = !!(val &CPCAP_IRQ_ON_BITMASK );
No need to do this, input_report_key() already "normalizes" the value, so simply do
input_report_key(button->idev, KEY_POWER, val & CPCAP_IRQ_ON_BITMASK);
Quoted 24 lines
drivers/input/misc/cpcap-pwrbutton.c new file +24
-0+ +pm_wakeup_event (button->dev,0 ); +input_report_key (button->idev,KEY_POWER , key_pressed); +input_sync (button->idev); + +return IRQ_HANDLED ; +} + +static int cpcap_power_button_probe (struct platform_device *pdev) +{ +struct cpcap_power_button *button; +int irq =platform_get_irq (pdev,0 ); +int err; + + button =devm_kmalloc (&pdev->dev,sizeof (*button),GFP_KERNEL ); +if (!button) +return -ENOMEM ; + + button->idev =devm_input_allocate_device (&pdev->dev); +if (!button->idev) +return -ENOMEM ; + + button->regmap =dev_get_regmap (pdev->dev.parent,NULL ); +if (!button->regmap)
drivers/input/misc/cpcap-pwrbutton.c line 81
Quoted 10 lines
drivers/input/misc/cpcap-pwrbutton.c new file +10
-0+return -ENODEV ; + + button->dev = &pdev->dev; + + button->idev->name ="cpcap-pwrbutton" ; + button->idev->phys ="cpcap-pwrbutton/input0" ; + button->idev->dev.parent = button->dev; +input_set_capability (button->idev,EV_KEY ,KEY_POWER ); + + err = devm_request_threaded_irq(&button->idev->dev, irq, NULL,
This is wrong device to attach devm to: we never bind input device to a driver, so interrupt will never be released. You want to use &pdev->dev as with the rest of devm resources.
Quoted 41 lines
drivers/input/misc/cpcap-pwrbutton.c new file +38
-0+ powerbutton_irq, IRQF_ONESHOT, "cpcap_pwrbutton", button); +if (err <0 ) { +dev_err (&pdev->dev,"IRQ request failed: %d\n" , err); +return err; + } + + err =input_register_device (button->idev); +if (err) { +dev_err (&pdev->dev,"Input register failed: %d\n" , err); +return err; + } + +device_init_wakeup (&pdev->dev, true); + +return 0 ; +} + +#ifdef CONFIG_OF +static const struct of_device_id cpcap_pwrbutton_dt_match_table[] = { + { .compatible ="motorola,cpcap-pwrbutton" }, + {}, +}; +MODULE_DEVICE_TABLE (of, cpcap_pwrbutton_dt_match_table); +#endif + +static struct platform_driver cpcap_power_button_driver = { + .probe = cpcap_power_button_probe, + .driver = { + .name ="cpcap-pwrbutton" , + .of_match_table =of_match_ptr (cpcap_pwrbutton_dt_match_table), + }, +}; +module_platform_driver (cpcap_power_button_driver); + +MODULE_ALIAS ("platform:cpcap-pwrbutton" ); +MODULE_DESCRIPTION ("CPCAP Power Button" ); +MODULE_LICENSE ("GPL" ); +MODULE_AUTHOR ("Sebastian Reichel <[email protected]>" );Signature · 1 line
2.11.0
Thanks.
Signature · 1 line
Dmitry
Quoted 8 lines · Dmitry Torokhov
drivers/input/misc/cpcap-pwrbutton.c line 28
Quoted 4 lines · Sebastian Reichel
drivers/input/misc/cpcap-pwrbutton.c new file +4
-0+#include <linux/mfd/motorola-cpcap.h> + +#define CPCAP_IRQ_ON 23 +#define CPCAP_IRQ_ON_BITMASK (1 << (CPCAP_IRQ_ON % 16))Is this truly static or it could depend= on IRQ returned by
platform_get_irq()?
I suggest we add it to include/linux/mfd/motorola-cpcap.h:
static inline int cpcap_get_irq_status(struct device *dev,
struct regmap *regmap, int irq, u16 *status);
Or do you guys have better ideas?
I'll be needing that for the USB PHY driver too for multiple bits so we want to return the whole bank register in status.
We may want to change to do that later to avoid dependencies or set up an immutable branch with just that change.
Other than that things work for me based on a quick test.
Regards,
Tony
Quoted 10 lines · Tony Lindgren
Quoted 8 lines · Dmitry Torokhov
drivers/input/misc/cpcap-pwrbutton.c line 28
Quoted 4 lines · Sebastian Reichel
drivers/input/misc/cpcap-pwrbutton.c new file +4
-0+#include <linux/mfd/motorola-cpcap.h> + +#define CPCAP_IRQ_ON 23 +#define CPCAP_IRQ_ON_BITMASK (1 << (CPCAP_IRQ_ON % 16))Is this truly static or it could depend= on IRQ returned by
platform_get_irq()?
Quoted 8 lines
I suggest we add it to
include/linux/mfd/motorola-cpcap.h:static inline int cpcap_get_irq_status(struct device *dev,
struct regmap *regmap, int irq, u16 *status);Or do you guys have better ideas?
Actually after thinking about it, a macro like Sebastian has is probably better. Otherwise the interface will be confusing unless we limit it to getting just one bit instead of the whole bank. So I now suggest let's just keep it in Sebastian's driver, then we can move it later as it's just a one line.
Regards,
Tony
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 7 lines · Sebastian Reichel
Motorola CPCAP is a PMIC found in multiple smartphones. This driver adds support for the power/on button and has been tested with Droid 4.
Signed-off-by Sebastian Reichel <[email protected]>--- .../devicetree/bindings/input/cpcap-pwrbutton.txt | 20 ++++
Quoted 6 lines
drivers/input/misc/Kconfig | 10 ++ drivers/input/misc/Makefile | 1 + drivers/input/misc/cpcap-pwrbutton.c | 119 +++++++++++++++++++++ 4 files changed, 150 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/cpcap-pwrbutton.txt create mode 100644 drivers/input/misc/cpcap-pwrbutton.c
PATCH v2 1/2 mfd: cpcap: implement irq sense helper
In reply to Sebastian ReichelCPCAP can sense if IRQ is currently set or not. This functionality is required for a few subdevices, such as the power button and usb phy modules.
---
Changes since PATCHv1:
- Newly introduced patch
--- drivers/mfd/motorola-cpcap.c | 25 +++++++++++++++++++++++++ include/linux/mfd/motorola-cpcap.h | 2 ++ 2 files changed, 27 insertions(+)
drivers/mfd/motorola-cpcap.c +25 -0
@@ -32,6 +32,31 @@ struct cpcap_ddata {struct regmap *regmap; }; +static int cpcap_sense_irq (struct regmap *regmap,int irq) +{ +int reg =CPCAP_REG_INTS1 + (irq /16 ) *4 ; +int mask =1 << (irq %16 ); +int err, val; + +if (irq <0 || irq >64 ) +return -EINVAL ; + + err =regmap_read (regmap, reg, &val); +if (err) +return err; + +return !!(val & mask); +} + +int cpcap_sense_virq (struct regmap *regmap,int virq) +{ +struct regmap_irq_chip_data *d =irq_get_chip_data (virq); +int base =regmap_irq_chip_get_base (d); + +return cpcap_sense_irq (regmap, virq - base); +} +EXPORT_SYMBOL_GPL (cpcap_sense_irq); +static int cpcap_check_revision (struct cpcap_ddata *cpcap) {u16 vendor, rev;
include/linux/mfd/motorola-cpcap.h +2 -0
@@ -290,3 +290,5 @@ static inline int cpcap_get_vendor(struct device *dev,return 0 ; } + +int cpcap_sense_virq (struct regmap *regmap,int virq);
Signature · 1 line
2.11.0
PATCH v2 2/2 input: cpcap-pwrbutton: new driver
Motorola CPCAP is a PMIC found in multiple smartphones. This driver adds support for the power/on button and has been tested in Droid 4.
---
Changes since PATCHv1:
- Fix device for devm_request_threaded_irq()
- Add Acked-By from Rob Herring (for the DT binding)
- Use newly introduced cpcap_sense_virq to sense the IRQ pin
--- .../devicetree/bindings/input/cpcap-pwrbutton.txt | 20 ++++ drivers/input/misc/Kconfig | 10 ++ drivers/input/misc/Makefile | 1 + drivers/input/misc/cpcap-pwrbutton.c | 117 +++++++++++++++++++++ 4 files changed, 148 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/cpcap-pwrbutton.txt create mode 100644 drivers/input/misc/cpcap-pwrbutton.c
Documentation/devicetree/bindings/input/cpcap-pwrbutton.txt new file +20 -0
@@ -0,0 +1,20 @@ +Motorola CPCAP on key + +This module is part of the CPCAP. For more details about the whole +chip see Documentation/devicetree/bindings/mfd/motorola-cpcap.txt. + +This module provides a simple power button event via an Interrupt. + +Required properties: +- compatible: should be one of the following + - "motorola,cpcap-pwrbutton" +- interrupts: irq specifier for CPCAP's ON IRQ + +Example: + +&cpcap { + cpcap_pwrbutton: pwrbutton { + compatible = "motorola,cpcap-pwrbutton"; + interrupts = <23 IRQ_TYPE_NONE>; + }; +};
drivers/input/misc/Kconfig +10 -0
@@ -316,6 +316,16 @@ config INPUT_COBALT_BTNS To compile this driver as a module, choose M here: the module will be called cobalt_btns. +config INPUT_CPCAP_PWRBUTTON + tristate "CPCAP OnKey" + depends on MFD_CPCAP + help + Say Y here if you want to enable power key reporting via the + Motorola CPCAP chip. + + To compile this driver as a module, choose M here. The module will + be called cpcap-pwrbutton. + config INPUT_WISTRON_BTNS tristate "x86 Wistron laptop button interface" depends on X86_32
drivers/input/misc/Makefile +1 -0
@@ -24,6 +24,7 @@ obj-$(CONFIG_INPUT_CM109) += cm109.o obj-$(CONFIG_INPUT_CMA3000) += cma3000_d0x.o obj-$(CONFIG_INPUT_CMA3000_I2C) += cma3000_d0x_i2c.o obj-$(CONFIG_INPUT_COBALT_BTNS) += cobalt_btns.o +obj-$(CONFIG_INPUT_CPCAP_PWRBUTTON) += cpcap-pwrbutton.o obj-$(CONFIG_INPUT_DA9052_ONKEY) += da9052_onkey.o obj-$(CONFIG_INPUT_DA9055_ONKEY) += da9055_onkey.o obj-$(CONFIG_INPUT_DA9063_ONKEY) += da9063_onkey.o
drivers/input/misc/cpcap-pwrbutton.c new file +117 -0
117 lines not on this page · raw message
Signature · 6 lines
2.11.0 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 11 lines · Sebastian Reichel
Motorola CPCAP is a PMIC found in multiple smartphones. This driver adds support for the power/on button and has been tested in Droid 4.
Acked-by Rob Herring <[email protected]>Signed-off-by Sebastian Reichel <[email protected]>---
Changes since PATCHv1:
- Fix device fordevm_request_threaded_irq()
- Add Acked-By from Rob Herring (for the DT binding)
- Use newly introducedcpcap_sense_virqto sense the IRQ pin
OK, so will this be merged through MFD? If so:
Quoted 194 lines
--- .../devicetree/bindings/input/cpcap-pwrbutton.txt | 20 ++++ drivers/input/misc/Kconfig | 10 ++ drivers/input/misc/Makefile | 1 + drivers/input/misc/cpcap-pwrbutton.c | 117 +++++++++++++++++++++ 4 files changed, 148 insertions(+) create mode 100644 Documentation/devicetree/bindings/input/cpcap-pwrbutton.txt create mode 100644 drivers/input/misc/cpcap-pwrbutton.cDocumentation/devicetree/bindings/input/cpcap-pwrbutton.txt new file +20
-0@@ -0,0 +1,20 @@ +Motorola CPCAP on key + +This module is part of the CPCAP. For more details about the whole +chip see Documentation/devicetree/bindings/mfd/motorola-cpcap.txt. + +This module provides a simple power button event via an Interrupt. + +Required properties: +- compatible: should be one of the following + - "motorola,cpcap-pwrbutton" +- interrupts: irq specifier for CPCAP's ON IRQ + +Example: + +&cpcap { + cpcap_pwrbutton: pwrbutton { + compatible = "motorola,cpcap-pwrbutton"; + interrupts = <23 IRQ_TYPE_NONE>; + }; +};drivers/input/misc/Kconfig +10
-0@@ -316,6 +316,16 @@ config INPUT_COBALT_BTNS To compile this driver as a module, choose M here: the module will be called cobalt_btns. +config INPUT_CPCAP_PWRBUTTON + tristate "CPCAP OnKey" + depends on MFD_CPCAP + help + Say Y here if you want to enable power key reporting via the + Motorola CPCAP chip. + + To compile this driver as a module, choose M here. The module will + be called cpcap-pwrbutton. + config INPUT_WISTRON_BTNS tristate "x86 Wistron laptop button interface" depends on X86_32drivers/input/misc/Makefile +1
-0@@ -24,6 +24,7 @@ obj-$(CONFIG_INPUT_CM109) += cm109.o obj-$(CONFIG_INPUT_CMA3000) += cma3000_d0x.o obj-$(CONFIG_INPUT_CMA3000_I2C) += cma3000_d0x_i2c.o obj-$(CONFIG_INPUT_COBALT_BTNS) += cobalt_btns.o +obj-$(CONFIG_INPUT_CPCAP_PWRBUTTON) += cpcap-pwrbutton.o obj-$(CONFIG_INPUT_DA9052_ONKEY) += da9052_onkey.o obj-$(CONFIG_INPUT_DA9055_ONKEY) += da9055_onkey.o obj-$(CONFIG_INPUT_DA9063_ONKEY) += da9063_onkey.odrivers/input/misc/cpcap-pwrbutton.c new file +117
-0@@ -0,0 +1,117 @@ +/** +* CPCAP Power Button Input Driver +* +* Copyright (C) 2017 Sebastian Reichel <[email protected]> +* +* This file is subject to the terms and conditions of the GNU General +* Public License. See the file "COPYING" in the main directory of this +* archive for more details. +* +* 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. +*/ + +#include <linux/module.h> +#include <linux/init.h> +#include <linux/kernel.h> +#include <linux/errno.h> +#include <linux/input.h> +#include <linux/interrupt.h> +#include <linux/regmap.h> +#include <linux/of.h> +#include <linux/platform_device.h> +#include <linux/mfd/motorola-cpcap.h> + +#define CPCAP_IRQ_ON 23 +#define CPCAP_IRQ_ON_BITMASK (1 << (CPCAP_IRQ_ON % 16)) + +struct cpcap_power_button { +struct regmap *regmap; +struct input_dev *idev; +struct device *dev; +}; + +static irqreturn_t powerbutton_irq (int irq,void *_button) +{ +struct cpcap_power_button *button = _button; +int val; + + val =cpcap_sense_virq (button->regmap, irq); +if (val <0 ) { +dev_err (button->dev,"irq read failed: %d" , val); +return IRQ_HANDLED ; + } + +pm_wakeup_event (button->dev,0 ); +input_report_key (button->idev,KEY_POWER , val); +input_sync (button->idev); + +return IRQ_HANDLED ; +} + +static int cpcap_power_button_probe (struct platform_device *pdev) +{ +struct cpcap_power_button *button; +int irq =platform_get_irq (pdev,0 ); +int err; + + button =devm_kmalloc (&pdev->dev,sizeof (*button),GFP_KERNEL ); +if (!button) +return -ENOMEM ; + + button->idev =devm_input_allocate_device (&pdev->dev); +if (!button->idev) +return -ENOMEM ; + + button->regmap =dev_get_regmap (pdev->dev.parent,NULL ); +if (!button->regmap) +return -ENODEV ; + + button->dev = &pdev->dev; + + button->idev->name ="cpcap-pwrbutton" ; + button->idev->phys ="cpcap-pwrbutton/input0" ; + button->idev->dev.parent = button->dev; +input_set_capability (button->idev,EV_KEY ,KEY_POWER ); + + err =devm_request_threaded_irq (&pdev->dev, irq,NULL , + powerbutton_irq,IRQF_ONESHOT ,"cpcap_pwrbutton" , button); +if (err <0 ) { +dev_err (&pdev->dev,"IRQ request failed: %d\n" , err); +return err; + } + + err =input_register_device (button->idev); +if (err) { +dev_err (&pdev->dev,"Input register failed: %d\n" , err); +return err; + } + +device_init_wakeup (&pdev->dev, true); + +return 0 ; +} + +#ifdef CONFIG_OF +static const struct of_device_id cpcap_pwrbutton_dt_match_table[] = { + { .compatible ="motorola,cpcap-pwrbutton" }, + {}, +}; +MODULE_DEVICE_TABLE (of, cpcap_pwrbutton_dt_match_table); +#endif + +static struct platform_driver cpcap_power_button_driver = { + .probe = cpcap_power_button_probe, + .driver = { + .name ="cpcap-pwrbutton" , + .of_match_table =of_match_ptr (cpcap_pwrbutton_dt_match_table), + }, +}; +module_platform_driver (cpcap_power_button_driver); + +MODULE_ALIAS ("platform:cpcap-pwrbutton" ); +MODULE_DESCRIPTION ("CPCAP Power Button" ); +MODULE_LICENSE ("GPL" ); +MODULE_AUTHOR ("Sebastian Reichel <[email protected]>" );Signature · 1 line
2.11.0
Signature · 1 line
Dmitry
Tony Lindgren
Tested-byQuoted 13 lines · Dmitry Torokhov
Quoted 11 lines · Sebastian Reichel
Motorola CPCAP is a PMIC found in multiple smartphones. This driver adds support for the power/on button and has been tested in Droid 4.
Acked-by Rob Herring <[email protected]>Signed-off-by Sebastian Reichel <[email protected]>---
Changes since PATCHv1:
- Fix device fordevm_request_threaded_irq()
- Add Acked-By from Rob Herring (for the DT binding)
- Use newly introducedcpcap_sense_virqto sense the IRQ pin
Quoted 3 lines
OK, so will this be merged through MFD? If so:
Acked-by Dmitry Torokhov <[email protected]>
Ideally we'd have an immutable branch against v4.11-rc1 when out with just these two patches somewhere that can get merged in as needed to MFD or input tree.
Anyways, this driver still works for me:
kbuild test robot
build botreproduce:
Hi Sebastian,
[auto build test ERROR on ljones-mfd/for-mfd-next]
[also build test ERROR on next-20170303]
[cannot apply to input/next v4.10]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Sebastian-Reichel/mfd-cpcap-implement-irq-sense-helper/20170304-192034 base: https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git for-mfd-next config: i386-allmodconfig (attached as .config) compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901 reproduce: # save the attached .config to linux build tree make ARCH=i386
All errors (new ones prefixed by >>):
>> ERROR: "cpcap_sense_virq" [drivers/input/misc/cpcap-pwrbutton.ko] undefined!
---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Re: [PATCHv2 1/2] mfd: cpcap: implement irq sense helper
In reply to Sebastian ReichelQuoted 8 lines · Sebastian Reichel
CPCAP can sense if IRQ is currently set or not. This functionality is required for a few subdevices, such as the power button and usb phy modules.
Signed-off-by Sebastian Reichel <[email protected]>---
Changes since PATCHv1:
- Newly introduced patch
Works for me:
Re: [PATCHv2 1/2] mfd: cpcap: implement irq sense helper
In reply to Sebastian ReichelQuoted 35 lines · Sebastian Reichel
CPCAP can sense if IRQ is currently set or not. This functionality is required for a few subdevices, such as the power button and usb phy modules.
Signed-off-by Sebastian Reichel <[email protected]>---
Changes since PATCHv1:
- Newly introduced patch--- drivers/mfd/motorola-cpcap.c | 25 +++++++++++++++++++++++++ include/linux/mfd/motorola-cpcap.h | 2 ++ 2 files changed, 27 insertions(+)drivers/mfd/motorola-cpcap.c +14
-0@@ -32,6 +32,31 @@ struct cpcap_ddata {struct regmap *regmap; }; +static int cpcap_sense_irq (struct regmap *regmap,int irq) +{ +int reg =CPCAP_REG_INTS1 + (irq /16 ) *4 ; +int mask =1 << (irq %16 ); +int err, val; + +if (irq <0 || irq >64 ) +return -EINVAL ; + + err =regmap_read (regmap, reg, &val); +if (err) +return err; + +return !!(val & mask);
drivers/mfd/motorola-cpcap.c struct cpcap_ddata { · line 58
Quoted 10 lines
drivers/mfd/motorola-cpcap.c +10
-0+} + +int cpcap_sense_virq (struct regmap *regmap,int virq) +{ +struct regmap_irq_chip_data *d =irq_get_chip_data (virq); +int base =regmap_irq_chip_get_base (d); + +return cpcap_sense_irq (regmap, virq - base); +} +EXPORT_SYMBOL_GPL (cpcap_sense_irq);
You have a typo here, should be cpcap_sense_virq for the exported one :)
Other than that my ack is still valid.
Regards,
Tony