From 2e4355e4c15e61729059434c975f81dd8e5bfefe Mon Sep 17 00:00:00 2001 From: Kate Hsuan Date: Fri, 20 Aug 2021 14:04:41 +0300 Subject: platform/x86: intel_chtdc_ti_pwrbtn: Move to intel sub-directory Move Intel Cherry Trail Dollar Cove TI power button driver to intel sub-directory to improve readability. Signed-off-by: Kate Hsuan Reviewed-by: Hans de Goede Signed-off-by: Andy Shevchenko Link: https://lore.kernel.org/r/20210820110458.73018-4-andriy.shevchenko@linux.intel.com Signed-off-by: Hans de Goede --- drivers/platform/x86/Kconfig | 11 ---- drivers/platform/x86/Makefile | 1 - drivers/platform/x86/intel/Kconfig | 11 ++++ drivers/platform/x86/intel/Makefile | 2 + drivers/platform/x86/intel/chtdc_ti_pwrbtn.c | 94 ++++++++++++++++++++++++++++ drivers/platform/x86/intel_chtdc_ti_pwrbtn.c | 94 ---------------------------- 6 files changed, 107 insertions(+), 106 deletions(-) create mode 100644 drivers/platform/x86/intel/chtdc_ti_pwrbtn.c delete mode 100644 drivers/platform/x86/intel_chtdc_ti_pwrbtn.c (limited to 'drivers') diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 084167d70f1b..ba0454450335 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -1159,17 +1159,6 @@ config INTEL_UNCORE_FREQ_CONTROL To compile this driver as a module, choose M here: the module will be called intel-uncore-frequency. -config INTEL_CHTDC_TI_PWRBTN - tristate "Intel Cherry Trail Dollar Cove TI power button driver" - depends on INTEL_SOC_PMIC_CHTDC_TI - depends on INPUT - help - This option adds a power button driver driver for Dollar Cove TI - PMIC on Intel Cherry Trail devices. - - To compile this driver as a module, choose M here: the module - will be called intel_chtdc_ti_pwrbtn. - config INTEL_MRFLD_PWRBTN tristate "Intel Merrifield Basin Cove power button driver" depends on INTEL_SOC_PMIC_MRFLD diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile index bcdd75a48a80..bf94af0749f5 100644 --- a/drivers/platform/x86/Makefile +++ b/drivers/platform/x86/Makefile @@ -127,7 +127,6 @@ obj-$(CONFIG_INTEL_TURBO_MAX_3) += intel_turbo_max_3.o obj-$(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += intel-uncore-frequency.o # Intel PMIC / PMC / P-Unit devices -obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN) += intel_chtdc_ti_pwrbtn.o obj-$(CONFIG_INTEL_MRFLD_PWRBTN) += intel_mrfld_pwrbtn.o obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core.o intel_pmc_core_pltdrv.o obj-$(CONFIG_INTEL_PUNIT_IPC) += intel_punit_ipc.o diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig index 46db129bee7f..3792a5492a8a 100644 --- a/drivers/platform/x86/intel/Kconfig +++ b/drivers/platform/x86/intel/Kconfig @@ -31,4 +31,15 @@ config INTEL_BXTWC_PMIC_TMU This driver enables the alarm wakeup functionality in the TMU unit of Whiskey Cove PMIC. +config INTEL_CHTDC_TI_PWRBTN + tristate "Intel Cherry Trail Dollar Cove TI power button driver" + depends on INTEL_SOC_PMIC_CHTDC_TI + depends on INPUT + help + This option adds a power button driver for Dollar Cove TI + PMIC on Intel Cherry Trail devices. + + To compile this driver as a module, choose M here: the module + will be called intel_chtdc_ti_pwrbtn. + endif # X86_PLATFORM_DRIVERS_INTEL diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile index dbdf4877ad10..52d7bc0948f3 100644 --- a/drivers/platform/x86/intel/Makefile +++ b/drivers/platform/x86/intel/Makefile @@ -12,3 +12,5 @@ obj-$(CONFIG_INTEL_PMT_CLASS) += pmt/ # Intel PMIC / PMC / P-Unit drivers intel_bxtwc_tmu-y := bxtwc_tmu.o obj-$(CONFIG_INTEL_BXTWC_PMIC_TMU) += intel_bxtwc_tmu.o +intel_chtdc_ti_pwrbtn-y := chtdc_ti_pwrbtn.o +obj-$(CONFIG_INTEL_CHTDC_TI_PWRBTN) += intel_chtdc_ti_pwrbtn.o diff --git a/drivers/platform/x86/intel/chtdc_ti_pwrbtn.c b/drivers/platform/x86/intel/chtdc_ti_pwrbtn.c new file mode 100644 index 000000000000..9606a994af22 --- /dev/null +++ b/drivers/platform/x86/intel/chtdc_ti_pwrbtn.c @@ -0,0 +1,94 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Power-button driver for Dollar Cove TI PMIC + * Copyright (C) 2014 Intel Corp + * Copyright (c) 2017 Takashi Iwai + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#define CHTDC_TI_SIRQ_REG 0x3 +#define SIRQ_PWRBTN_REL BIT(0) + +static irqreturn_t chtdc_ti_pwrbtn_interrupt(int irq, void *dev_id) +{ + struct input_dev *input = dev_id; + struct device *dev = input->dev.parent; + struct regmap *regmap = dev_get_drvdata(dev); + int state; + + if (!regmap_read(regmap, CHTDC_TI_SIRQ_REG, &state)) { + dev_dbg(dev, "SIRQ_REG=0x%x\n", state); + input_report_key(input, KEY_POWER, !(state & SIRQ_PWRBTN_REL)); + input_sync(input); + } + + return IRQ_HANDLED; +} + +static int chtdc_ti_pwrbtn_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct intel_soc_pmic *pmic = dev_get_drvdata(dev->parent); + struct input_dev *input; + int irq, err; + + irq = platform_get_irq(pdev, 0); + if (irq < 0) + return irq; + input = devm_input_allocate_device(dev); + if (!input) + return -ENOMEM; + input->name = pdev->name; + input->phys = "power-button/input0"; + input->id.bustype = BUS_HOST; + input_set_capability(input, EV_KEY, KEY_POWER); + err = input_register_device(input); + if (err) + return err; + + dev_set_drvdata(dev, pmic->regmap); + + err = devm_request_threaded_irq(dev, irq, NULL, + chtdc_ti_pwrbtn_interrupt, + IRQF_ONESHOT, KBUILD_MODNAME, input); + if (err) + return err; + + device_init_wakeup(dev, true); + dev_pm_set_wake_irq(dev, irq); + return 0; +} + +static int chtdc_ti_pwrbtn_remove(struct platform_device *pdev) +{ + dev_pm_clear_wake_irq(&pdev->dev); + device_init_wakeup(&pdev->dev, false); + return 0; +} + +static const struct platform_device_id chtdc_ti_pwrbtn_id_table[] = { + { .name = "chtdc_ti_pwrbtn" }, + {}, +}; +MODULE_DEVICE_TABLE(platform, chtdc_ti_pwrbtn_id_table); + +static struct platform_driver chtdc_ti_pwrbtn_driver = { + .driver = { + .name = KBUILD_MODNAME, + }, + .probe = chtdc_ti_pwrbtn_probe, + .remove = chtdc_ti_pwrbtn_remove, + .id_table = chtdc_ti_pwrbtn_id_table, +}; +module_platform_driver(chtdc_ti_pwrbtn_driver); + +MODULE_DESCRIPTION("Power-button driver for Dollar Cove TI PMIC"); +MODULE_LICENSE("GPL v2"); diff --git a/drivers/platform/x86/intel_chtdc_ti_pwrbtn.c b/drivers/platform/x86/intel_chtdc_ti_pwrbtn.c deleted file mode 100644 index 9606a994af22..000000000000 --- a/drivers/platform/x86/intel_chtdc_ti_pwrbtn.c +++ /dev/null @@ -1,94 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -/* - * Power-button driver for Dollar Cove TI PMIC - * Copyright (C) 2014 Intel Corp - * Copyright (c) 2017 Takashi Iwai - */ - -#include -#include -#include -#include -#include -#include -#include -#include - -#define CHTDC_TI_SIRQ_REG 0x3 -#define SIRQ_PWRBTN_REL BIT(0) - -static irqreturn_t chtdc_ti_pwrbtn_interrupt(int irq, void *dev_id) -{ - struct input_dev *input = dev_id; - struct device *dev = input->dev.parent; - struct regmap *regmap = dev_get_drvdata(dev); - int state; - - if (!regmap_read(regmap, CHTDC_TI_SIRQ_REG, &state)) { - dev_dbg(dev, "SIRQ_REG=0x%x\n", state); - input_report_key(input, KEY_POWER, !(state & SIRQ_PWRBTN_REL)); - input_sync(input); - } - - return IRQ_HANDLED; -} - -static int chtdc_ti_pwrbtn_probe(struct platform_device *pdev) -{ - struct device *dev = &pdev->dev; - struct intel_soc_pmic *pmic = dev_get_drvdata(dev->parent); - struct input_dev *input; - int irq, err; - - irq = platform_get_irq(pdev, 0); - if (irq < 0) - return irq; - input = devm_input_allocate_device(dev); - if (!input) - return -ENOMEM; - input->name = pdev->name; - input->phys = "power-button/input0"; - input->id.bustype = BUS_HOST; - input_set_capability(input, EV_KEY, KEY_POWER); - err = input_register_device(input); - if (err) - return err; - - dev_set_drvdata(dev, pmic->regmap); - - err = devm_request_threaded_irq(dev, irq, NULL, - chtdc_ti_pwrbtn_interrupt, - IRQF_ONESHOT, KBUILD_MODNAME, input); - if (err) - return err; - - device_init_wakeup(dev, true); - dev_pm_set_wake_irq(dev, irq); - return 0; -} - -static int chtdc_ti_pwrbtn_remove(struct platform_device *pdev) -{ - dev_pm_clear_wake_irq(&pdev->dev); - device_init_wakeup(&pdev->dev, false); - return 0; -} - -static const struct platform_device_id chtdc_ti_pwrbtn_id_table[] = { - { .name = "chtdc_ti_pwrbtn" }, - {}, -}; -MODULE_DEVICE_TABLE(platform, chtdc_ti_pwrbtn_id_table); - -static struct platform_driver chtdc_ti_pwrbtn_driver = { - .driver = { - .name = KBUILD_MODNAME, - }, - .probe = chtdc_ti_pwrbtn_probe, - .remove = chtdc_ti_pwrbtn_remove, - .id_table = chtdc_ti_pwrbtn_id_table, -}; -module_platform_driver(chtdc_ti_pwrbtn_driver); - -MODULE_DESCRIPTION("Power-button driver for Dollar Cove TI PMIC"); -MODULE_LICENSE("GPL v2"); -- cgit v1.2.3