Re: [PATCH v2 1/3] mfd: Add support for Cherry Trail Dollar Cove TI PMIC

From: Lee Jones
Date: Mon Sep 04 2017 - 09:37:43 EST


On Thu, 24 Aug 2017, Takashi Iwai wrote:

> This patch adds the MFD driver for Dollar Cove TI PMIC (ACPI INT33F5)
> that is found on some Intel Cherry Trail devices.
> The driver is based on the original work by Intel, found at:
> https://github.com/01org/ProductionKernelQuilts
>
> This is a minimal version for adding the basic resources. Currently,
> only ACPI PMIC opregion and the external power-button are used.
>
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=193891
> Signed-off-by: Takashi Iwai <tiwai@xxxxxxx>
> ---
> v1->v2:
> * Minor cleanups as suggested by Andy
>
> drivers/mfd/Kconfig | 13 +++
> drivers/mfd/Makefile | 1 +
> drivers/mfd/intel_soc_pmic_dc_ti.c | 182 +++++++++++++++++++++++++++++++++++++
> 3 files changed, 196 insertions(+)
> create mode 100644 drivers/mfd/intel_soc_pmic_dc_ti.c
>
> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
> index 94ad2c1c3d90..28c12bb50c9f 100644
> --- a/drivers/mfd/Kconfig
> +++ b/drivers/mfd/Kconfig
> @@ -496,6 +496,19 @@ config INTEL_SOC_PMIC_CHTWC
> available before any devices using it are probed. This option also
> causes the designware-i2c driver to be builtin for the same reason.
>
> +config INTEL_SOC_PMIC_DC_TI
> + tristate "Support for Dollar Cove TI PMIC"
> + depends on GPIOLIB
> + depends on I2C
> + depends on ACPI
> + depends on X86
> + select MFD_CORE
> + select REGMAP_I2C
> + select REGMAP_IRQ
> + help
> + Select this option for supporting Dollar Cove TI PMIC device that is
> + found on some Intel Cherry Trail systems.
> +
> config MFD_INTEL_LPSS
> tristate
> select COMMON_CLK
> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> index 080793b3fd0e..16c4fe519d30 100644
> --- a/drivers/mfd/Makefile
> +++ b/drivers/mfd/Makefile
> @@ -216,6 +216,7 @@ intel-soc-pmic-objs := intel_soc_pmic_core.o intel_soc_pmic_crc.o
> obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.o
> obj-$(CONFIG_INTEL_SOC_PMIC_BXTWC) += intel_soc_pmic_bxtwc.o
> obj-$(CONFIG_INTEL_SOC_PMIC_CHTWC) += intel_soc_pmic_chtwc.o
> +obj-$(CONFIG_INTEL_SOC_PMIC_DC_TI) += intel_soc_pmic_dc_ti.o
> obj-$(CONFIG_MFD_MT6397) += mt6397-core.o
>
> obj-$(CONFIG_MFD_ALTERA_A10SR) += altera-a10sr.o
> diff --git a/drivers/mfd/intel_soc_pmic_dc_ti.c b/drivers/mfd/intel_soc_pmic_dc_ti.c
> new file mode 100644
> index 000000000000..3ba1625eb44b
> --- /dev/null
> +++ b/drivers/mfd/intel_soc_pmic_dc_ti.c
> @@ -0,0 +1,182 @@
> +/*
> + * Device access for Dollar Cove TI PMIC

Nit: '\n' here please.

> + * Copyright (c) 2014, Intel Corporation.
> + * Author: Ramakrishna Pallala <ramakrishna.pallala@xxxxxxxxx>
> + *
> + * Cleanup and forward-ported
> + * Copyright (c) 2017 Takashi Iwai <tiwai@xxxxxxx>

No licence header?

> + */
> +
> +#include <linux/acpi.h>
> +#include <linux/interrupt.h>
> +#include <linux/i2c.h>
> +#include <linux/module.h>
> +#include <linux/regmap.h>
> +#include <linux/mfd/core.h>
> +#include <linux/mfd/intel_soc_pmic.h>

Alphabetical.

> +#define DC_TI_IRQLVL1 0x01
> +#define DC_TI_MASK_IRQLVL1 0x02
> +
> +/* Level 1 IRQs */
> +enum {
> + DC_TI_PWRBTN = 0, /* power button */
> + DC_TI_DIETMPWARN, /* thermal */
> + DC_TI_ADCCMPL, /* ADC */
> + /* no irq 3 */

"No IRQ 3"

> + DC_TI_VBATLOW = 4, /* battery */
> + DC_TI_VBUSDET, /* power source */
> + /* no irq 6 */

Here too.

> + DC_TI_CCEOCAL = 7, /* battery */
> +};
> +
> +static struct resource power_button_resources[] = {
> + DEFINE_RES_IRQ(DC_TI_PWRBTN),
> +};
> +
> +static struct resource thermal_resources[] = {
> + DEFINE_RES_IRQ(DC_TI_DIETMPWARN),
> +};
> +
> +static struct resource adc_resources[] = {
> + DEFINE_RES_IRQ(DC_TI_ADCCMPL),
> +};
> +
> +static struct resource pwrsrc_resources[] = {
> + DEFINE_RES_IRQ(DC_TI_VBUSDET),
> +};
> +
> +static struct resource battery_resources[] = {
> + DEFINE_RES_IRQ(DC_TI_VBATLOW),
> + DEFINE_RES_IRQ(DC_TI_CCEOCAL),
> +};

Nice. Thanks for using those.

> +static struct mfd_cell dc_ti_dev[] = {
> + {
> + .name = "dc_ti_pwrbtn",
> + .num_resources = ARRAY_SIZE(power_button_resources),
> + .resources = power_button_resources,
> + },
> + {

Place these on the same line.

> + .name = "dc_ti_adc",
> + .num_resources = ARRAY_SIZE(adc_resources),
> + .resources = adc_resources,
> + },
> + {
> + .name = "dc_ti_thermal",
> + .num_resources = ARRAY_SIZE(thermal_resources),
> + .resources = thermal_resources,
> + },
> + {
> + .name = "dc_ti_pwrsrc",
> + .num_resources = ARRAY_SIZE(pwrsrc_resources),
> + .resources = pwrsrc_resources,
> + },
> + {
> + .name = "dc_ti_battery",
> + .num_resources = ARRAY_SIZE(battery_resources),
> + .resources = battery_resources,
> + },
> + {
> + .name = "dc_ti_region",
> + },

This should be a one line entry:

{ .name = "dc_ti_region" },

> +};
> +
> +static const struct regmap_config dc_ti_regmap_config = {
> + .reg_bits = 8,
> + .val_bits = 8,
> + .max_register = 128,
> + .cache_type = REGCACHE_NONE,
> +};
> +
> +static const struct regmap_irq dc_ti_irqs[] = {
> + REGMAP_IRQ_REG(DC_TI_PWRBTN, 0, BIT(DC_TI_PWRBTN)),
> + REGMAP_IRQ_REG(DC_TI_DIETMPWARN, 0, BIT(DC_TI_DIETMPWARN)),
> + REGMAP_IRQ_REG(DC_TI_ADCCMPL, 0, BIT(DC_TI_ADCCMPL)),
> + REGMAP_IRQ_REG(DC_TI_VBATLOW, 0, BIT(DC_TI_VBATLOW)),
> + REGMAP_IRQ_REG(DC_TI_VBUSDET, 0, BIT(DC_TI_VBUSDET)),
> + REGMAP_IRQ_REG(DC_TI_CCEOCAL, 0, BIT(DC_TI_CCEOCAL)),
> +};
> +
> +static const struct regmap_irq_chip dc_ti_irq_chip = {
> + .name = KBUILD_MODNAME,
> + .irqs = dc_ti_irqs,
> + .num_irqs = ARRAY_SIZE(dc_ti_irqs),
> + .num_regs = 1,
> + .status_base = DC_TI_IRQLVL1,
> + .mask_base = DC_TI_MASK_IRQLVL1,
> + .ack_base = DC_TI_IRQLVL1,
> +};
> +
> +static int dc_ti_probe(struct i2c_client *i2c)
> +{
> + struct device *dev = &i2c->dev;
> + struct intel_soc_pmic *pmic;
> + int ret;
> +
> + pmic = devm_kzalloc(dev, sizeof(*pmic), GFP_KERNEL);
> + if (!pmic)
> + return -ENOMEM;
> +
> + i2c_set_clientdata(i2c, pmic);
> +
> + pmic->regmap = devm_regmap_init_i2c(i2c, &dc_ti_regmap_config);
> + if (IS_ERR(pmic->regmap))
> + return PTR_ERR(pmic->regmap);
> + pmic->irq = i2c->irq;
> +
> + ret = devm_regmap_add_irq_chip(dev, pmic->regmap, pmic->irq,
> + IRQF_ONESHOT, 0,
> + &dc_ti_irq_chip, &pmic->irq_chip_data);
> + if (ret)
> + return ret;
> +
> + return devm_mfd_add_devices(dev, PLATFORM_DEVID_NONE, dc_ti_dev,
> + ARRAY_SIZE(dc_ti_dev), NULL, 0,
> + regmap_irq_get_domain(pmic->irq_chip_data));
> +}
> +
> +static void dc_ti_shutdown(struct i2c_client *i2c)
> +{
> + struct intel_soc_pmic *pmic = i2c_get_clientdata(i2c);
> +
> + disable_irq(pmic->irq);
> +}
> +
> +static int __maybe_unused dc_ti_suspend(struct device *dev)
> +{
> + struct intel_soc_pmic *pmic = dev_get_drvdata(dev);
> +
> + disable_irq(pmic->irq);

'\n' here.

> + return 0;
> +}
> +
> +static int __maybe_unused dc_ti_resume(struct device *dev)
> +{
> + struct intel_soc_pmic *pmic = dev_get_drvdata(dev);
> +
> + enable_irq(pmic->irq);

'\n' here.

> + return 0;
> +}
> +
> +static SIMPLE_DEV_PM_OPS(dc_ti_pm_ops, dc_ti_suspend, dc_ti_resume);
> +
> +static const struct acpi_device_id dc_ti_acpi_ids[] = {
> + { "INT33F5" },
> + { },
> +};
> +MODULE_DEVICE_TABLE(acpi, dc_ti_acpi_ids);
> +
> +static struct i2c_driver dc_ti_i2c_driver = {
> + .driver = {
> + .name = KBUILD_MODNAME,

This makes grepping for device/driver matches difficult. Please just
use the raw "" string.

> + .pm = &dc_ti_pm_ops,
> + .acpi_match_table = dc_ti_acpi_ids,
> + },
> + .probe_new = dc_ti_probe,
> + .shutdown = dc_ti_shutdown,
> +};
> +module_i2c_driver(dc_ti_i2c_driver);
> +
> +MODULE_DESCRIPTION("I2C driver for Intel SoC Dollar Cove TI PMIC");
> +MODULE_LICENSE("GPL v2");

--
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org â Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog