Re: [PATCH V2] mfd: add Intel Broxton Whiskey Cove PMIC driver

[Lee Jones <lee.jones@linaro.org>]

On Tue, 19 May 2015, qipeng.zha wrote:

> From: "qipeng.zha" <qipeng.zha@intel.com>

Can you set your name up properly in your Git config?

> Add MFD core driver for Intel Broxton Whiskey Cove PMIC,
> which is specially accessed by hardware IPC, not a generic
> I2C device
> 
> Signed-off-by: qipeng.zha <qipeng.zha@intel.com>
> ---
>  drivers/mfd/Makefile               |   1 +
>  drivers/mfd/intel_soc_pmic_bxtwc.c | 457 +++++++++++++++++++++++++++++++++++++
>  include/linux/mfd/intel_bxtwc.h    |  69 ++++++
>  include/linux/mfd/intel_soc_pmic.h |   1 +
>  4 files changed, 528 insertions(+)
>  create mode 100644 drivers/mfd/intel_soc_pmic_bxtwc.c
>  create mode 100644 include/linux/mfd/intel_bxtwc.h
> 
> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile
> index 0e5cfeb..5e771a2 100644
> --- a/drivers/mfd/Makefile
> +++ b/drivers/mfd/Makefile
> @@ -183,5 +183,6 @@ obj-$(CONFIG_MFD_RT5033)	+= rt5033.o
>  obj-$(CONFIG_MFD_SKY81452)	+= sky81452.o
>  
>  intel-soc-pmic-objs		:= intel_soc_pmic_core.o intel_soc_pmic_crc.o
> +intel-soc-pmic-objs		+= intel_soc_pmic_bxtwc.o

Rather than duplicating the $(obj-y)s on the left, just append the
file to the original line.

>  obj-$(CONFIG_INTEL_SOC_PMIC)	+= intel-soc-pmic.o
>  obj-$(CONFIG_MFD_MT6397)	+= mt6397-core.o
> diff --git a/drivers/mfd/intel_soc_pmic_bxtwc.c b/drivers/mfd/intel_soc_pmic_bxtwc.c
> new file mode 100644
> index 0000000..4c4a65a
> --- /dev/null
> +++ b/drivers/mfd/intel_soc_pmic_bxtwc.c
> @@ -0,0 +1,457 @@
> +/*
> + * intel_soc_pmic_bxtwc.c: MFD core driver for Intel Broxton Whiskey Cove PMIC

Remove the filename, they have a habit of becoming incorrect.

> + * Copyright (C) 2015 Intel Corporation. All rights reserved.
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms and conditions of the GNU General Public License,
> + * version 2, as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope 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.
> + *

Remove this line.

> + */
> +
> +#include <linux/kernel.h>
> +#include <linux/module.h>
> +#include <linux/version.h>
> +#include <linux/err.h>
> +#include <linux/delay.h>
> +#include <linux/irq.h>
> +#include <linux/interrupt.h>
> +#include <linux/acpi.h>
> +#include <linux/mfd/core.h>
> +#include <linux/mfd/intel_bxtwc.h>

Alphabetical.

> +/* Interrupt Status Registers */
> +#define BXTWC_IRQLVL1		0x4E02
> +#define BXTWC_PWRBTNIRQ		0x4E03
> +
> +#define BXTWC_THRM0IRQ		0x4E04
> +#define BXTWC_THRM1IRQ		0x4E05
> +#define BXTWC_THRM2IRQ		0x4E06
> +#define BXTWC_BCUIRQ		0x4E07
> +#define BXTWC_ADCIRQ		0x4E08
> +#define BXTWC_CHGR0IRQ		0x4E09
> +#define BXTWC_CHGR1IRQ		0x4E0A
> +#define BXTWC_GPIOIRQ0		0x4E0B
> +#define BXTWC_GPIOIRQ1		0x4E0C
> +#define BXTWC_CRITIRQ		0x4E0D
> +
> +/* Interrupt MASK Registers */
> +#define BXTWC_MIRQLVL1		0x4E0E
> +#define BXTWC_MPWRTNIRQ		0x4E0F
> +
> +#define BXTWC_MTHRM0IRQ		0x4E12
> +#define BXTWC_MTHRM1IRQ		0x4E13
> +#define BXTWC_MTHRM2IRQ		0x4E14
> +#define BXTWC_MBCUIRQ		0x4E15
> +#define BXTWC_MADCIRQ		0x4E16
> +#define BXTWC_MCHGR0IRQ		0x4E17
> +#define BXTWC_MCHGR1IRQ		0x4E18
> +#define BXTWC_MGPIO0IRQ		0x4E19
> +#define BXTWC_MGPIO1IRQ		0x4E1A
> +#define BXTWC_MCRITIRQ		0x4E1B
> +
> +/* Whiskey Cove PMIC share same ACPI ID between different platforms */
> +#define BROXTON_PMIC_WC_HRV	4
> +
> +/* Manage in two irq chips since mask registers are not consecutive*/
> +enum bxtwc_irqs {
> +	/* Level 1 */
> +	BXTWC_PWRBTN_LVL1_IRQ = 0,
> +	BXTWC_TMU_LVL1_IRQ,
> +	BXTWC_THRM_LVL1_IRQ,
> +	BXTWC_BCU_LVL1_IRQ,
> +	BXTWC_ADC_LVL1_IRQ,
> +	BXTWC_CHGR_LVL1_IRQ,
> +	BXTWC_GPIO_LVL1_IRQ,
> +	BXTWC_CRIT_LVL1_IRQ,
> +
> +	/* Level 2 */
> +	BXTWC_PWRBTN_IRQ,
> +};
> +
> +enum bxtwc_irqs_level2 {
> +	/* Level 2 */
> +	BXTWC_THRM0_IRQ = 0,
> +	BXTWC_THRM1_IRQ,
> +	BXTWC_THRM2_IRQ,
> +	BXTWC_BCU_IRQ,
> +	BXTWC_ADC_IRQ,
> +	BXTWC_CHGR0_IRQ,
> +	BXTWC_CHGR1_IRQ,
> +	BXTWC_GPIO0_IRQ,
> +	BXTWC_GPIO1_IRQ,
> +	BXTWC_CRIT_IRQ,
> +};

I can't help but think that these would be better off in a header
file.

> +#define INIT_REGMAP_IRQ(_irq, _off, _mask)		\
> +	[_irq] = { .reg_offset = (_off), .mask = (_mask) }
> +
> +static const struct regmap_irq bxtwc_regmap_irqs[] = {
> +	INIT_REGMAP_IRQ(BXTWC_PWRBTN_LVL1_IRQ, 0, BIT(0)),
> +	INIT_REGMAP_IRQ(BXTWC_TMU_LVL1_IRQ, 0, BIT(1)),
> +	INIT_REGMAP_IRQ(BXTWC_THRM_LVL1_IRQ, 0, BIT(2)),
> +	INIT_REGMAP_IRQ(BXTWC_BCU_LVL1_IRQ, 0, BIT(3)),
> +	INIT_REGMAP_IRQ(BXTWC_ADC_LVL1_IRQ, 0, BIT(4)),
> +	INIT_REGMAP_IRQ(BXTWC_CHGR_LVL1_IRQ, 0, BIT(5)),
> +	INIT_REGMAP_IRQ(BXTWC_GPIO_LVL1_IRQ, 0, BIT(6)),
> +	INIT_REGMAP_IRQ(BXTWC_CRIT_LVL1_IRQ, 0, BIT(7)),
> +	INIT_REGMAP_IRQ(BXTWC_PWRBTN_IRQ, 1, 0x03),
> +};
> +
> +static const struct regmap_irq bxtwc_regmap_irqs_level2[] = {
> +	INIT_REGMAP_IRQ(BXTWC_THRM0_IRQ, 0, 0xff),
> +	INIT_REGMAP_IRQ(BXTWC_THRM1_IRQ, 1, 0xbf),
> +	INIT_REGMAP_IRQ(BXTWC_THRM2_IRQ, 2, 0xff),
> +	INIT_REGMAP_IRQ(BXTWC_BCU_IRQ, 3, 0x1f),
> +	INIT_REGMAP_IRQ(BXTWC_ADC_IRQ, 4, 0xff),
> +	INIT_REGMAP_IRQ(BXTWC_CHGR0_IRQ, 5, 0x1f),
> +	INIT_REGMAP_IRQ(BXTWC_CHGR1_IRQ, 6, 0x1f),
> +	INIT_REGMAP_IRQ(BXTWC_GPIO0_IRQ, 7, 0xff),
> +	INIT_REGMAP_IRQ(BXTWC_GPIO1_IRQ, 8, 0x3f),
> +	INIT_REGMAP_IRQ(BXTWC_CRIT_IRQ, 9, 0x03),
> +};
> +
> +static struct regmap_irq_chip bxtwc_regmap_irq_chip = {
> +	.name = "bxtwc_irq_chip",
> +	.status_base = BXTWC_IRQLVL1,
> +	.mask_base = BXTWC_MIRQLVL1,
> +	.irqs = bxtwc_regmap_irqs,
> +	.num_irqs = ARRAY_SIZE(bxtwc_regmap_irqs),
> +	.num_regs = 2,
> +};
> +
> +static struct regmap_irq_chip bxtwc_regmap_irq_chip_level2 = {
> +	.name = "bxtwc_irq_chip_level2",
> +	.status_base = BXTWC_THRM0IRQ,
> +	.mask_base = BXTWC_MTHRM0IRQ,
> +	.irqs = bxtwc_regmap_irqs_level2,
> +	.num_irqs = ARRAY_SIZE(bxtwc_regmap_irqs_level2),
> +	.num_regs = 10,
> +};
> +
> +static const struct regmap_config bxtwc_regmap_config = {
> +	.reg_bits = 16,
> +	.val_bits = 8,
> +};
> +
> +static struct resource gpio_resources[] = {
> +	{
> +		.name	= "GPIO0",
> +		.start	= BXTWC_GPIO0_IRQ,
> +		.end	= BXTWC_GPIO0_IRQ,
> +		.flags	= IORESOURCE_IRQ,
> +	},
> +	{
> +		.name	= "GPIO1",
> +		.start	= BXTWC_GPIO1_IRQ,
> +		.end	= BXTWC_GPIO1_IRQ,
> +		.flags	= IORESOURCE_IRQ,
> +	},
> +};
> +
> +static struct resource adc_resources[] = {
> +	{
> +		.name  = "ADC",
> +		.start = BXTWC_ADC_IRQ,
> +		.end   = BXTWC_ADC_IRQ,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +};
> +
> +static struct resource charger_resources[] = {
> +	{
> +		.name  = "CHARGER",
> +		.start = BXTWC_CHGR0_IRQ,
> +		.end   = BXTWC_CHGR0_IRQ,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +	{
> +		.name  = "CHARGER1",
> +		.start = BXTWC_CHGR1_IRQ,
> +		.end   = BXTWC_CHGR1_IRQ,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +};
> +
> +static struct resource thermal_resources[] = {
> +	{
> +		.start = BXTWC_THRM0_IRQ,
> +		.end   = BXTWC_THRM0_IRQ,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +	{
> +		.start = BXTWC_THRM1_IRQ,
> +		.end   = BXTWC_THRM1_IRQ,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +	{
> +		.start = BXTWC_THRM2_IRQ,
> +		.end   = BXTWC_THRM2_IRQ,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +};
> +
> +static struct resource bcu_resources[] = {
> +	{
> +		.name  = "BCU",
> +		.start = BXTWC_BCU_IRQ,
> +		.end   = BXTWC_BCU_IRQ,
> +		.flags = IORESOURCE_IRQ,
> +	},
> +};

Can you use the DEFINE_RES_* macros instead please?

> +static struct mfd_cell bxt_wc_dev[] = {
> +	{
> +		.name = "bxt_wcove_gpadc",
> +		.num_resources = ARRAY_SIZE(adc_resources),
> +		.resources = adc_resources,
> +	},
> +	{
> +		.name = "bxt_wcove_thermal",
> +		.num_resources = ARRAY_SIZE(thermal_resources),
> +		.resources = thermal_resources,
> +	},
> +	{
> +		.name = "bxt_wcove_ext_charger",
> +		.num_resources = ARRAY_SIZE(charger_resources),
> +		.resources = charger_resources,
> +	},
> +	{
> +		.name = "bxt_wcove_bcu",
> +		.num_resources = ARRAY_SIZE(bcu_resources),
> +		.resources = bcu_resources,
> +	},
> +	{
> +		.name = "bxt_wcove_gpio",
> +		.num_resources = ARRAY_SIZE(gpio_resources),
> +		.resources = gpio_resources,
> +	},
> +	{
> +		.name = "bxt_wcove_sw_fuel_gauge",
> +		.num_resources = 0,
> +		.resources = NULL,
> +	},
> +	{
> +		.name = "bxt_wcove_sw_fuel_gauge_ha",
> +		.num_resources = 0,
> +		.resources = NULL,
> +	},
> +};
> +
> +/* Add r/w sysfs interfaces, so some registers can be accessed
> + * from user space init script and also useful for test and debug
> + */
> +static unsigned long bxtwc_reg_addr;
> +static ssize_t bxtwc_reg_show(struct device *dev,
> +		struct device_attribute *attr, char *buf)
> +{
> +	return sprintf(buf, "0x%lx\n", bxtwc_reg_addr);
> +}
> +
> +static ssize_t bxtwc_reg_store(struct device *dev,
> +	struct device_attribute *attr, const char *buf, size_t count)
> +{
> +	if (kstrtoul(buf, 0, &bxtwc_reg_addr)) {
> +		dev_err(dev, "Invalid register addr\n");
> +		return -EINVAL;
> +	}
> +	return count;
> +}
> +
> +static ssize_t bxtwc_val_show(struct device *dev,
> +		struct device_attribute *attr, char *buf)
> +{
> +	int ret;
> +	unsigned int val;
> +	struct intel_soc_pmic *pmic = dev_get_drvdata(dev);
> +
> +	ret = regmap_read(pmic->regmap, bxtwc_reg_addr, &val);
> +	if (ret < 0) {
> +		dev_err(dev, "Fail to read 0x%lx\n", bxtwc_reg_addr);
> +		return -EIO;
> +	}
> +
> +	return sprintf(buf, "0x%02x\n", val);
> +}
> +
> +static ssize_t bxtwc_val_store(struct device *dev,
> +	struct device_attribute *attr, const char *buf, size_t count)
> +{
> +	int ret;
> +	unsigned int val;
> +	struct intel_soc_pmic *pmic = dev_get_drvdata(dev);
> +
> +	if (kstrtoul(buf, 0, (unsigned long *)&val)) {
> +		dev_err(dev, "Invalid value\n");
> +		return -EINVAL;
> +	}
> +
> +	ret = regmap_write(pmic->regmap, bxtwc_reg_addr, val);
> +	if (ret) {
> +		dev_err(dev, "Write err: 0x%lx=0x%02x\n", bxtwc_reg_addr, val);
> +		return -EIO;
> +	}
> +	return count;
> +}

So you're allowing userspace to read and write directly from
registers here?  I would say that's not smart.  What are you expecting
the init script to do exactly?

> +static DEVICE_ATTR(addr, S_IWUSR | S_IRUSR, bxtwc_reg_show, bxtwc_reg_store);
> +static DEVICE_ATTR(val, S_IWUSR | S_IRUSR, bxtwc_val_show, bxtwc_val_store);
> +static struct attribute *bxtwc_attrs[] = {
> +	&dev_attr_addr.attr,
> +	&dev_attr_val.attr,
> +	NULL
> +};
> +
> +static const struct attribute_group bxtwc_group = {
> +	.attrs = bxtwc_attrs,
> +};
> +
> +static int bxtwc_probe(struct platform_device *pdev)
> +{
> +	struct intel_soc_pmic *pmic;
> +	unsigned long long hrv;
> +	acpi_handle handle;
> +	acpi_status status;
> +	int ret;
> +
> +	handle = ACPI_HANDLE(&pdev->dev);
> +	status = acpi_evaluate_integer(handle, "_HRV", NULL, &hrv);
> +	if (ACPI_FAILURE(status)) {
> +		dev_err(&pdev->dev, "ACPI error when get _HRV\n");
> +		return -ENODEV;
> +	}
> +	if (hrv != BROXTON_PMIC_WC_HRV) {
> +		dev_err(&pdev->dev, "Wrong _HRV %llu\n", hrv);
> +		return -ENODEV;
> +	}
> +
> +	pmic = devm_kzalloc(&pdev->dev, sizeof(*pmic), GFP_KERNEL);
> +	if (!pmic)
> +		return -ENOMEM;
> +
> +	pmic->irq = platform_get_irq(pdev, 0);
> +	if (pmic->irq < 0) {
> +		dev_err(&pdev->dev, "No irq resource?\n");

s/irq/IRQ/

And drop the '?', as it's a statement, not a question.

> +		return -ENOENT;
> +	}
> +
> +	dev_set_drvdata(&pdev->dev, pmic);
> +	pmic->dev = &pdev->dev;
> +	pmic->default_i2c_addr = BXTWC_DEVICE1_ADDR;
> +
> +	pmic->regmap = devm_regmap_init_pmic_ipc(pmic, &bxtwc_regmap_config);
> +	if (IS_ERR(pmic->regmap)) {
> +		ret = PTR_ERR(pmic->regmap);
> +		dev_err(&pdev->dev, "Fail to init pmic ipc regmap: %d\n", ret);
> +		return ret;
> +	}
> +
> +	ret = regmap_add_irq_chip(pmic->regmap, pmic->irq,
> +				  IRQF_ONESHOT | IRQF_SHARED,
> +				  0, &bxtwc_regmap_irq_chip,
> +				  &pmic->irq_chip_data);
> +	if (ret) {
> +		dev_err(&pdev->dev, "Fail to add irq chip\n");

s/Fail/Failed/

s/irq/IRQ/

> +		return ret;
> +	}
> +
> +	ret = regmap_add_irq_chip(pmic->regmap, pmic->irq,
> +				  IRQF_ONESHOT | IRQF_SHARED,
> +				  0, &bxtwc_regmap_irq_chip_level2,
> +				  &pmic->irq_chip_data_level2);
> +	if (ret) {
> +		dev_err(&pdev->dev, "Fail to add irq chip level2\n");

As above.

> +		goto err_irq_chip_level2;
> +	}
> +
> +	ret = mfd_add_devices(&pdev->dev, -1, bxt_wc_dev,

Use PLATFORM_DEVID_NONE instead.

> +			      ARRAY_SIZE(bxt_wc_dev), NULL, 0,
> +			      NULL);
> +	if (ret) {
> +		dev_err(&pdev->dev, "Fail to addr irq chip level2\n");

This makes no sense.  I assume you mean:

"Failed to add Level 2 IRQ chip"

> +		goto err_mfd;
> +	}
> +
> +	ret = sysfs_create_group(&pdev->dev.kobj, &bxtwc_group);
> +	if (ret) {
> +		dev_err(&pdev->dev, "Fail to create sysfs group %d\n", ret);

Failed.

> +		goto err_sysfs;
> +	}
> +
> +	return 0;
> +
> +err_sysfs:
> +	mfd_remove_devices(&pdev->dev);
> +err_mfd:
> +	regmap_del_irq_chip(pmic->irq, pmic->irq_chip_data_level2);
> +err_irq_chip_level2:
> +	regmap_del_irq_chip(pmic->irq, pmic->irq_chip_data);
> +
> +	return ret;
> +}
> +
> +static int bxtwc_remove(struct platform_device *pdev)
> +{
> +	struct intel_soc_pmic *pmic = dev_get_drvdata(&pdev->dev);
> +
> +	sysfs_remove_group(&pdev->dev.kobj, &bxtwc_group);
> +	mfd_remove_devices(&pdev->dev);
> +	regmap_del_irq_chip(pmic->irq, pmic->irq_chip_data);
> +	regmap_del_irq_chip(pmic->irq, pmic->irq_chip_data_level2);

'\n'

> +	return 0;
> +}
> +
> +static void bxtwc_shutdown(struct platform_device *pdev)
> +{
> +	struct intel_soc_pmic *pmic = dev_get_drvdata(&pdev->dev);
> +
> +	disable_irq(pmic->irq);
> +}
> +
> +#ifdef CONFIG_PM_SLEEP
> +static int bxtwc_suspend(struct device *dev)
> +{
> +	struct intel_soc_pmic *pmic = dev_get_drvdata(dev);
> +
> +	disable_irq(pmic->irq);

'\n'

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

'\n'

> +	return 0;
> +}
> +#endif
> +static SIMPLE_DEV_PM_OPS(bxtwc_pm_ops, bxtwc_suspend, bxtwc_resume);
> +
> +#ifdef CONFIG_ACPI
> +static const struct acpi_device_id bxtwc_acpi_ids[] = {
> +	{ "INT34D3", },
> +	{ }
> +};
> +MODULE_DEVICE_TABLE(acpi, pmic_acpi_ids);
> +#endif
> +
> +static struct platform_driver bxtwc_driver = {
> +	.probe = bxtwc_probe,
> +	.remove	= bxtwc_remove,
> +	.shutdown = bxtwc_shutdown,
> +	.driver	= {
> +		.name	= "bxtwc",
> +		.pm     = &bxtwc_pm_ops,
> +		.acpi_match_table = ACPI_PTR(bxtwc_acpi_ids),
> +	},
> +};
> +
> +module_platform_driver(bxtwc_driver);
> +
> +MODULE_LICENSE("GPL V2");
> +MODULE_AUTHOR("qipeng zha<qipeng.zha@intel.com>");

Capital letters for names and places.

Space between your name and your email.

> diff --git a/include/linux/mfd/intel_bxtwc.h b/include/linux/mfd/intel_bxtwc.h
> new file mode 100644
> index 0000000..1a0ee9d
> --- /dev/null
> +++ b/include/linux/mfd/intel_bxtwc.h
> @@ -0,0 +1,69 @@
> +/*
> + * intel_bxtwc.h - Header file for Intel Broxton Whiskey Cove PMIC

Remove the filename

> + * Copyright (C) 2015 Intel Corporation. All rights reserved.
> + *
> + * This program is free software; you can redistribute it and/or modify it
> + * under the terms and conditions of the GNU General Public License,
> + * version 2, as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope 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/mfd/intel_soc_pmic.h>
> +
> +#ifndef __INTEL_BXTWC_H__
> +#define __INTEL_BXTWC_H__
> +
> +/* BXT WC devices */
> +#define BXTWC_DEVICE1_ADDR		0x4E
> +#define BXTWC_DEVICE2_ADDR		0x4F
> +#define BXTWC_DEVICE3_ADDR		0x5E
> +
> +/* device1 Registers */
> +#define BXTWC_CHIPID			0x4E00
> +#define BXTWC_CHIPVER			0x4E01
> +
> +#define BXTWC_SCHGRIRQ0_ADDR		0x5E1A
> +#define BXTWC_CHGRCTRL0_ADDR		0x5E16
> +#define BXTWC_CHGRCTRL1_ADDR		0x5E17
> +#define BXTWC_CHGRCTRL2_ADDR		0x5E18
> +#define BXTWC_CHGRSTATUS_ADDR		0x5E19
> +#define BXTWC_THRMBATZONE_ADDR		0x4F22
> +
> +#define BXTWC_USBPATH_ADDR		0x5E19
> +#define BXTWC_USBPHYCTRL_ADDR		0x5E07
> +#define BXTWC_USBIDCTRL_ADDR		0x5E05
> +#define BXTWC_USBIDEN_MASK		0x01
> +#define BXTWC_USBIDSTAT_ADDR		0x00FF
> +#define BXTWC_USBSRCDETSTATUS_ADDR	0x5E29
> +
> +#define BXTWC_DBGUSBBC1_ADDR		0x5FE0
> +#define BXTWC_DBGUSBBC2_ADDR		0x5FE1
> +#define BXTWC_DBGUSBBCSTAT_ADDR		0x5FE2
> +
> +#define BXTWC_WAKESRC_ADDR		0x4E22
> +#define BXTWC_WAKESRC2_ADDR		0x4EE5
> +#define BXTWC_CHRTTADDR_ADDR		0x5E22
> +#define BXTWC_CHRTTDATA_ADDR		0x5E23
> +
> +#define BXTWC_STHRMIRQ0_ADDR		0x4F19
> +#define WC_MTHRMIRQ1_ADDR		0x4E12
> +#define WC_STHRMIRQ1_ADDR		0x4F1A
> +#define WC_STHRMIRQ2_ADDR		0x4F1B
> +
> +#define BXTWC_THRMZN0H_ADDR		0x4F44
> +#define BXTWC_THRMZN0L_ADDR		0x4F45
> +#define BXTWC_THRMZN1H_ADDR		0x4F46
> +#define BXTWC_THRMZN1L_ADDR		0x4F47
> +#define BXTWC_THRMZN2H_ADDR		0x4F48
> +#define BXTWC_THRMZN2L_ADDR		0x4F49
> +#define BXTWC_THRMZN3H_ADDR		0x4F4A
> +#define BXTWC_THRMZN3L_ADDR		0x4F4B
> +#define BXTWC_THRMZN4H_ADDR		0x4F4C
> +#define BXTWC_THRMZN4L_ADDR		0x4F4D
> +
> +#endif

Add a comment after the #endif /* __INTEL_BXTWC_H__ */

> diff --git a/include/linux/mfd/intel_soc_pmic.h b/include/linux/mfd/intel_soc_pmic.h
> index 74ee3d2..35e7904 100644
> --- a/include/linux/mfd/intel_soc_pmic.h
> +++ b/include/linux/mfd/intel_soc_pmic.h
> @@ -25,6 +25,7 @@ struct intel_soc_pmic {
>  	int irq;
>  	struct regmap *regmap;
>  	struct regmap_irq_chip_data *irq_chip_data;
> +	struct regmap_irq_chip_data *irq_chip_data_level2;
>  	struct device *dev;
>  	int default_i2c_addr;
>  };

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