mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2026-07-16 17:57:38 -04:00
Merge tag 'mfd-next-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd
Pull MFD updates from Lee Jones: "New Drivers: - Freescale MXS Low Resolution ADC - Freescale i.MX23/i.MX28 LRADC touchscreen - Motorola CPCAP Power Button - TI LMU (Lighting Management Unit) - Atmel SMC (Static Memory Controller) New Device Support: - Add support for X-Powers AXP803 to axp20x - Add support for Dialog Semi DA9061 to da9062-core - Add support for Intel Cougar Mountain to lpc_ich - Add support for Intel Gemini Lake to lpc_ich New Functionality: - Add Device Tree support; wm831x-*, axp20x, ti-lmu, da9062, sun4i-gpadc - Add IRQ sense support; motorola-cpcap - Add ACPI support; cros_ec - Add Reset support; altera-a10sr - Add ADC support; axp20x - Add AC Power support; axp20x - Add Runtime PM support; atmel-ebi, exynos-lpass - Add Battery Power Supply support; axp20x - Add Clock support; exynos-lpass, hi655x-pmic Fix-ups: - Implicitly specify required headers; motorola-cpcap, intel_soc_pmic_bxtwc - Add .remove() method; stm32-timers, exynos-lpass - Remove unused code; intel_soc_pmic_core, intel-lpss-acpi, ipaq-micro, atmel-smc, menelaus - Rename variables for clarity; axp20x - Convert pr_warning() to pr_warn(); db8500-prcmu, sta2x11-mfd, twl4030-power - Improve formatting; arizona-core, axp20x - Use raw_spinlock_*() variants; asic3, t7l66xb, tc6393xb - Simplify/refactor code; arizona-core, atmel-ebi - Improve error checking; intel_soc_pmic_core Bug Fixes: - Ensure OMAP3630/3730 boards can successfully reboot; twl4030-power - Correct max-register value; stm32-timers - Extend timeout to account for clock stretching; cros_ec_spi - Use correct IRQ trigger type; motorola-cpcap - Fix bad use of IRQ sense register; motorola-cpcap - Logic error "||" should be "&&"; mxs-lradc-ts" * tag 'mfd-next-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd: (79 commits) input: touchscreen: mxs-lradc: || vs && typos dt-bindings: Add AXP803's regulator info mfd: axp20x: Support AXP803 variant dt-bindings: Add device tree binding for X-Powers AXP803 PMIC dt-bindings: Make AXP20X compatible strings one per line mfd: intel_soc_pmic_core: Fix unchecked return value mfd: menelaus: Remove obsolete local_irq_disable() and local_irq_enable() mfd: omap-usb-tll: Configure ULPIAUTOIDLE mfd: omap-usb-tll: Fix inverted bit use for USB TLL mode mfd: palmas: Fixed spelling mistake in error message mfd: lpc_ich: Add support for Intel Gemini Lake SoC mfd: hi655x: Add the clock cell to provide WiFi and Bluetooth mfd: intel_soc_pmic: Fix a mess with compilation units mfd: exynos-lpass: Add runtime PM support mfd: exynos-lpass: Add missing remove() function mfd: exynos-lpass: Add support for clocks mfd: exynos-lpass: Remove pad retention control iio: adc: add support for X-Powers AXP20X and AXP22X PMICs ADCs mfd: cpcap: Fix bad use of IRQ sense register mfd: cpcap: Use ack_invert interrupts ...
This commit is contained in:
Linus Torvalds
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
117
drivers/input/misc/cpcap-pwrbutton.c
Normal file
117
drivers/input/misc/cpcap-pwrbutton.c
Normal file
@@ -0,0 +1,117 @@
|
||||
/**
|
||||
* CPCAP Power Button Input Driver
|
||||
*
|
||||
* Copyright (C) 2017 Sebastian Reichel <sre@kernel.org>
|
||||
*
|
||||
* 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 <sre@kernel.org>");
|
||||
Reference in New Issue
Block a user