mfd: Intel SoC Power Management IC
Subsystems (4)
v5 cover mfd: Intel SoC Power Management IC
Devices based on Intel SoC products such as Baytrail have a Power Management IC. In the PMIC there are subsystems for voltage regulation, A/D conversion, GPIO and PWMs. The PMIC in Baytrail-T platform is called Crystal Cove.
This series contains common code for these PMICs, and device specific support for Crystal Cove.
v2:
- Use regmap instead of creating our own I2C read/write callbacks.
- Add one missing EXPORT_SYMBOL.
- Remove some duplicate code and put them into pmic_regmap_load_from_hw. v3:
- Use regmap-irq and remove lots of duplicate code.
- Remove 2 unused APIs.
- Some other cleanup.
v4:
- Remove all exported APIs which are wrappers of regmap API, export the regmap in data structure instead.
- Combine intel_soc_pmic_core.c and intel_soc_pmic_i2c.c
- Clean up include files.
- Remove useless members of struct intel_soc_pmic_config.
- Fix various coding style issues.
v5:
- Add comment to describe what is done in _find_gpio_irq().
- Remove i2c id. Only keep ACPI id and match it in _probe().
- Further fix of coding style issues.
- Add the GPIO patch, to merge it along with the MFD changes.
Zhu, Lejun (3):
mfd: intel_soc_pmic: Core driver
mfd: intel_soc_pmic: Crystal Cove support
gpio: Add support for Intel Crystal Cove PMIC
drivers/gpio/Kconfig | 13 ++ drivers/gpio/Makefile | 1 + drivers/gpio/gpio-crystalcove.c | 379 +++++++++++++++++++++++++++++++++++++ drivers/mfd/Kconfig | 12 ++ drivers/mfd/Makefile | 3 + drivers/mfd/intel_soc_pmic_core.c | 168 ++++++++++++++++ drivers/mfd/intel_soc_pmic_core.h | 32 ++++ drivers/mfd/intel_soc_pmic_crc.c | 158 ++++++++++++++++ include/linux/mfd/intel_soc_pmic.h | 30 +++ 9 files changed, 796 insertions(+) create mode 100644 drivers/gpio/gpio-crystalcove.c create mode 100644 drivers/mfd/intel_soc_pmic_core.c create mode 100644 drivers/mfd/intel_soc_pmic_core.h create mode 100644 drivers/mfd/intel_soc_pmic_crc.c create mode 100644 include/linux/mfd/intel_soc_pmic.h
Signature · 1 line
1.8.3.2
PATCH v5 1/3 mfd: intel_soc_pmic: Core driver
This patch provides the common I2C driver code for Intel SoC PMICs.
---
v2:
- Use regmap instead of creating our own I2C read/write callbacks.
- Add one missing EXPORT_SYMBOL.
- Remove duplicate code and put them into pmic_regmap_load_from_hw. v3:
- Use regmap-irq. Remove our own pmic_regmap_* and IRQ handling code.
- Remove intel_soc_pmic_dev() and intel_soc_pmic_set_pdata().
- Use EXPORT_SYMBOL_GPL for exposed APIs.
- Use gpiod interface instead of gpio numbers.
- Remove redundant I2C IDs.
- Use managed allocations.
v4:
- Remove all exported APIs which are wrappers of regmap API, export the regmap in data structure instead.
- Combine I2C and core .c files.
- Clean up include files.
- Use intel_soc_pmic_ prefix to replace pmic_ and intel_pmic_.
- Fix various coding style issues.
v5:
- Add comment to describe what is done in _find_gpio_irq().
- Remove i2c id. Only keep ACPI id and match it in _probe().
- Further fix of coding style issues.
--- drivers/mfd/intel_soc_pmic_core.c | 168 +++++++++++++++++++++++++++++++++++++ drivers/mfd/intel_soc_pmic_core.h | 32 +++++++ include/linux/mfd/intel_soc_pmic.h | 30 +++++++ 3 files changed, 230 insertions(+) create mode 100644 drivers/mfd/intel_soc_pmic_core.c create mode 100644 drivers/mfd/intel_soc_pmic_core.h create mode 100644 include/linux/mfd/intel_soc_pmic.h
drivers/mfd/intel_soc_pmic_core.c new file +168 -0
@@ -0,0 +1,168 @@ +/* +* intel_soc_pmic_core.c - Intel SoC PMIC MFD Driver +* +* Copyright (C) 2013, 2014 Intel Corporation. All rights reserved. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License version +* 2 as published by the Free Software Foundation. +* +* 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. +* +* Author: Yang, Bin <[email protected]> +* Author: Zhu, Lejun <[email protected]> +*/ + +#include <linux/module.h> +#include <linux/mfd/core.h> +#include <linux/i2c.h> +#include <linux/interrupt.h> +#include <linux/gpio/consumer.h> +#include <linux/acpi.h> +#include <linux/regmap.h> +#include <linux/mfd/intel_soc_pmic.h> +#include "intel_soc_pmic_core.h" + +/* +* On some boards the PMIC interrupt may come from a GPIO line. +* Try to lookup the ACPI table and see if such connection exists. If not, +* return -ENOENT and use the IRQ provided by I2C. +*/ +static int intel_soc_pmic_find_gpio_irq (struct device *dev) +{ +struct gpio_desc *desc; +int irq; + + desc =devm_gpiod_get_index (dev,"intel_soc_pmic" ,0 ); +if (IS_ERR (desc)) +return -ENOENT ; + + irq =gpiod_to_irq (desc); +if (irq <0 ) +dev_warn (dev,"Can't get irq: %d\n" , irq); + +return irq; +} + +static int intel_soc_pmic_i2c_probe (struct i2c_client *i2c, +const struct i2c_device_id *i2c_id) +{ +struct device *dev = &i2c->dev; +const struct acpi_device_id *id; +struct intel_soc_pmic_config *config; +struct intel_soc_pmic *pmic; +int ret; +int irq; + + id =acpi_match_device (dev->driver->acpi_match_table, dev); +if (!id || !id->driver_data) +return -ENODEV ; + + config = (struct intel_soc_pmic_config *)id->driver_data; + + pmic =devm_kzalloc (dev,sizeof (*pmic),GFP_KERNEL ); +dev_set_drvdata (dev, pmic); + + pmic->regmap =devm_regmap_init_i2c (i2c, config->regmap_config); + + irq =intel_soc_pmic_find_gpio_irq (dev); + pmic->irq = (irq <0 ) ? i2c->irq : irq; + + ret =regmap_add_irq_chip (pmic->regmap, pmic->irq, + config->irq_flags |IRQF_ONESHOT , +0 , config->irq_chip, + &pmic->irq_chip_data); +if (ret) +return ret; + + ret =enable_irq_wake (pmic->irq); +if (ret) +dev_warn (dev,"Can't enable IRQ as wake source: %d\n" , ret); + + ret =mfd_add_devices (dev,-1 , config->cell_dev, + config->n_cell_devs,NULL ,0 , +regmap_irq_get_domain (pmic->irq_chip_data)); +if (ret) + goto err_del_irq_chip; + +return 0 ; + +err_del_irq_chip: +regmap_del_irq_chip (pmic->irq, pmic->irq_chip_data); +return ret; +} + +static int intel_soc_pmic_i2c_remove (struct i2c_client *i2c) +{ +struct intel_soc_pmic *pmic =dev_get_drvdata (&i2c->dev); + +regmap_del_irq_chip (pmic->irq, pmic->irq_chip_data); + +mfd_remove_devices (&i2c->dev); + +return 0 ; +} + +static void intel_soc_pmic_shutdown (struct i2c_client *i2c) +{ +struct intel_soc_pmic *pmic =dev_get_drvdata (&i2c->dev); + +disable_irq (pmic->irq); + +return ; +} + +static int intel_soc_pmic_suspend (struct device *dev) +{ +struct intel_soc_pmic *pmic =dev_get_drvdata (dev); + +disable_irq (pmic->irq); + +return 0 ; +} + +static int intel_soc_pmic_resume (struct device *dev) +{ +struct intel_soc_pmic *pmic =dev_get_drvdata (dev); + +enable_irq (pmic->irq); + +return 0 ; +} + +static SIMPLE_DEV_PM_OPS(intel_soc_pmic_pm_ops, intel_soc_pmic_suspend, + intel_soc_pmic_resume); + +static const struct i2c_device_id intel_soc_pmic_i2c_id[] = { + { } +}; +MODULE_DEVICE_TABLE (i2c, intel_soc_pmic_i2c_id); + +static struct acpi_device_id intel_soc_pmic_acpi_match[] = { + {"INT33FD" , (kernel_ulong_t)&intel_soc_pmic_config_crc}, + { }, +}; +MODULE_DEVICE_TABLE (acpi, intel_soc_pmic_acpi_match); + +static struct i2c_driver intel_soc_pmic_i2c_driver = { + .driver = { + .name ="intel_soc_pmic_i2c" , + .owner =THIS_MODULE , + .pm = &intel_soc_pmic_pm_ops, + .acpi_match_table =ACPI_PTR (intel_soc_pmic_acpi_match), + }, + .probe = intel_soc_pmic_i2c_probe, + .remove = intel_soc_pmic_i2c_remove, + .id_table = intel_soc_pmic_i2c_id, + .shutdown = intel_soc_pmic_shutdown, +}; + +module_i2c_driver (intel_soc_pmic_i2c_driver); + +MODULE_DESCRIPTION ("I2C driver for Intel SoC PMIC" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_AUTHOR ("Yang, Bin <[email protected]>" ); +MODULE_AUTHOR ("Zhu, Lejun <[email protected]>" );
drivers/mfd/intel_soc_pmic_core.h new file +32 -0
@@ -0,0 +1,32 @@ +/* +* intel_soc_pmic_core.h - Intel SoC PMIC MFD Driver +* +* Copyright (C) 2012-2014 Intel Corporation. All rights reserved. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License version +* 2 as published by the Free Software Foundation. +* +* 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. +* +* Author: Yang, Bin <[email protected]> +* Author: Zhu, Lejun <[email protected]> +*/ + +#ifndef __INTEL_SOC_PMIC_CORE_H__ +#define __INTEL_SOC_PMIC_CORE_H__ + +struct intel_soc_pmic_config { +unsigned long irq_flags; +struct mfd_cell *cell_dev; +int n_cell_devs; +struct regmap_config *regmap_config; +struct regmap_irq_chip *irq_chip; +}; + +extern struct intel_soc_pmic_config intel_soc_pmic_config_crc; + +#endif /* __INTEL_SOC_PMIC_CORE_H__ */
include/linux/mfd/intel_soc_pmic.h new file +30 -0
@@ -0,0 +1,30 @@ +/* +* intel_soc_pmic.h - Intel SoC PMIC Driver +* +* Copyright (C) 2012-2014 Intel Corporation. All rights reserved. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License version +* 2 as published by the Free Software Foundation. +* +* 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. +* +* Author: Yang, Bin <[email protected]> +* Author: Zhu, Lejun <[email protected]> +*/ + +#ifndef __INTEL_SOC_PMIC_H__ +#define __INTEL_SOC_PMIC_H__ + +#include <linux/regmap.h> + +struct intel_soc_pmic { +int irq; +struct regmap *regmap; +struct regmap_irq_chip_data *irq_chip_data; +}; + +#endif /* __INTEL_SOC_PMIC_H__ */
Signature · 1 line
1.8.3.2
Re: [PATCH v5 1/3] mfd: intel_soc_pmic: Core driver
Quoted 27 lines
This patch provides the common I2C driver code for Intel SoC PMICs.
Signed-off-by Yang, Bin <[email protected]>Signed-off-by Zhu, Lejun <[email protected]>---
v2:
- Use regmap instead of creating our own I2C read/write callbacks.
- Add one missingEXPORT_SYMBOL.
- Remove duplicate code and put them intopmic_regmap_load_from_hw. v3:
- Use regmap-irq. Remove our own pmic_regmap_* and IRQ handling code.
- Removeintel_soc_pmic_dev()andintel_soc_pmic_set_pdata().
- UseEXPORT_SYMBOL_GPLfor exposed APIs.
- Use gpiod interface instead of gpio numbers.
- Remove redundant I2C IDs.
- Use managed allocations.
v4:
- Remove all exported APIs which are wrappers of regmap API, export the regmap in data structure instead.
- Combine I2C and core .c files.
- Clean up include files.
- Useintel_soc_pmic_prefix to replacepmic_andintel_pmic_.
- Fix various coding style issues.
v5:
- Add comment to describe what is done in_find_gpio_irq().
- Remove i2c id. Only keep ACPI id and match it in_probe().
- Further fix of coding style issues.
Quoted 8 lines
--- drivers/mfd/intel_soc_pmic_core.c | 168 +++++++++++++++++++++++++++++++++++++ drivers/mfd/intel_soc_pmic_core.h | 32 +++++++ include/linux/mfd/intel_soc_pmic.h | 30 +++++++ 3 files changed, 230 insertions(+) create mode 100644 drivers/mfd/intel_soc_pmic_core.c create mode 100644 drivers/mfd/intel_soc_pmic_core.h create mode 100644 include/linux/mfd/intel_soc_pmic.h
Looks good to me now, but the merge window is immenent. If there are no more comments in 2 weeks time I will apply for v3.17.
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH v5 1/3] mfd: intel_soc_pmic: Core driver
In reply to Zhu, LejunQuoted 4 lines · Lejun
This patch provides the common I2C driver code for Intel SoC PMICs.
Signed-off-by Yang, Bin <[email protected]>Signed-off-by Zhu, Lejun <[email protected]>
Looks good to me,
Lee Jones
AppliedRe: [PATCH v5 1/3] mfd: intel_soc_pmic: Core driver
In reply to Zhu, LejunQuoted 27 lines
This patch provides the common I2C driver code for Intel SoC PMICs.
Signed-off-by Yang, Bin <[email protected]>Signed-off-by Zhu, Lejun <[email protected]>---
v2:
- Use regmap instead of creating our own I2C read/write callbacks.
- Add one missingEXPORT_SYMBOL.
- Remove duplicate code and put them intopmic_regmap_load_from_hw. v3:
- Use regmap-irq. Remove our own pmic_regmap_* and IRQ handling code.
- Removeintel_soc_pmic_dev()andintel_soc_pmic_set_pdata().
- UseEXPORT_SYMBOL_GPLfor exposed APIs.
- Use gpiod interface instead of gpio numbers.
- Remove redundant I2C IDs.
- Use managed allocations.
v4:
- Remove all exported APIs which are wrappers of regmap API, export the regmap in data structure instead.
- Combine I2C and core .c files.
- Clean up include files.
- Useintel_soc_pmic_prefix to replacepmic_andintel_pmic_.
- Fix various coding style issues.
v5:
- Add comment to describe what is done in_find_gpio_irq().
- Remove i2c id. Only keep ACPI id and match it in_probe().
- Further fix of coding style issues.
Quoted 8 lines
--- drivers/mfd/intel_soc_pmic_core.c | 168 +++++++++++++++++++++++++++++++++++++ drivers/mfd/intel_soc_pmic_core.h | 32 +++++++ include/linux/mfd/intel_soc_pmic.h | 30 +++++++ 3 files changed, 230 insertions(+) create mode 100644 drivers/mfd/intel_soc_pmic_core.c create mode 100644 drivers/mfd/intel_soc_pmic_core.h create mode 100644 include/linux/mfd/intel_soc_pmic.h
Applied, thanks.
Quoted 248 lines
drivers/mfd/intel_soc_pmic_core.c new file +168
-0@@ -0,0 +1,168 @@ +/* +* intel_soc_pmic_core.c - Intel SoC PMIC MFD Driver +* +* Copyright (C) 2013, 2014 Intel Corporation. All rights reserved. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License version +* 2 as published by the Free Software Foundation. +* +* 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. +* +* Author: Yang, Bin <[email protected]> +* Author: Zhu, Lejun <[email protected]> +*/ + +#include <linux/module.h> +#include <linux/mfd/core.h> +#include <linux/i2c.h> +#include <linux/interrupt.h> +#include <linux/gpio/consumer.h> +#include <linux/acpi.h> +#include <linux/regmap.h> +#include <linux/mfd/intel_soc_pmic.h> +#include "intel_soc_pmic_core.h" + +/* +* On some boards the PMIC interrupt may come from a GPIO line. +* Try to lookup the ACPI table and see if such connection exists. If not, +* return -ENOENT and use the IRQ provided by I2C. +*/ +static int intel_soc_pmic_find_gpio_irq (struct device *dev) +{ +struct gpio_desc *desc; +int irq; + + desc =devm_gpiod_get_index (dev,"intel_soc_pmic" ,0 ); +if (IS_ERR (desc)) +return -ENOENT ; + + irq =gpiod_to_irq (desc); +if (irq <0 ) +dev_warn (dev,"Can't get irq: %d\n" , irq); + +return irq; +} + +static int intel_soc_pmic_i2c_probe (struct i2c_client *i2c, +const struct i2c_device_id *i2c_id) +{ +struct device *dev = &i2c->dev; +const struct acpi_device_id *id; +struct intel_soc_pmic_config *config; +struct intel_soc_pmic *pmic; +int ret; +int irq; + + id =acpi_match_device (dev->driver->acpi_match_table, dev); +if (!id || !id->driver_data) +return -ENODEV ; + + config = (struct intel_soc_pmic_config *)id->driver_data; + + pmic =devm_kzalloc (dev,sizeof (*pmic),GFP_KERNEL ); +dev_set_drvdata (dev, pmic); + + pmic->regmap =devm_regmap_init_i2c (i2c, config->regmap_config); + + irq =intel_soc_pmic_find_gpio_irq (dev); + pmic->irq = (irq <0 ) ? i2c->irq : irq; + + ret =regmap_add_irq_chip (pmic->regmap, pmic->irq, + config->irq_flags |IRQF_ONESHOT , +0 , config->irq_chip, + &pmic->irq_chip_data); +if (ret) +return ret; + + ret =enable_irq_wake (pmic->irq); +if (ret) +dev_warn (dev,"Can't enable IRQ as wake source: %d\n" , ret); + + ret =mfd_add_devices (dev,-1 , config->cell_dev, + config->n_cell_devs,NULL ,0 , +regmap_irq_get_domain (pmic->irq_chip_data)); +if (ret) + goto err_del_irq_chip; + +return 0 ; + +err_del_irq_chip: +regmap_del_irq_chip (pmic->irq, pmic->irq_chip_data); +return ret; +} + +static int intel_soc_pmic_i2c_remove (struct i2c_client *i2c) +{ +struct intel_soc_pmic *pmic =dev_get_drvdata (&i2c->dev); + +regmap_del_irq_chip (pmic->irq, pmic->irq_chip_data); + +mfd_remove_devices (&i2c->dev); + +return 0 ; +} + +static void intel_soc_pmic_shutdown (struct i2c_client *i2c) +{ +struct intel_soc_pmic *pmic =dev_get_drvdata (&i2c->dev); + +disable_irq (pmic->irq); + +return ; +} + +static int intel_soc_pmic_suspend (struct device *dev) +{ +struct intel_soc_pmic *pmic =dev_get_drvdata (dev); + +disable_irq (pmic->irq); + +return 0 ; +} + +static int intel_soc_pmic_resume (struct device *dev) +{ +struct intel_soc_pmic *pmic =dev_get_drvdata (dev); + +enable_irq (pmic->irq); + +return 0 ; +} + +static SIMPLE_DEV_PM_OPS(intel_soc_pmic_pm_ops, intel_soc_pmic_suspend, + intel_soc_pmic_resume); + +static const struct i2c_device_id intel_soc_pmic_i2c_id[] = { + { } +}; +MODULE_DEVICE_TABLE (i2c, intel_soc_pmic_i2c_id); + +static struct acpi_device_id intel_soc_pmic_acpi_match[] = { + {"INT33FD" , (kernel_ulong_t)&intel_soc_pmic_config_crc}, + { }, +}; +MODULE_DEVICE_TABLE (acpi, intel_soc_pmic_acpi_match); + +static struct i2c_driver intel_soc_pmic_i2c_driver = { + .driver = { + .name ="intel_soc_pmic_i2c" , + .owner =THIS_MODULE , + .pm = &intel_soc_pmic_pm_ops, + .acpi_match_table =ACPI_PTR (intel_soc_pmic_acpi_match), + }, + .probe = intel_soc_pmic_i2c_probe, + .remove = intel_soc_pmic_i2c_remove, + .id_table = intel_soc_pmic_i2c_id, + .shutdown = intel_soc_pmic_shutdown, +}; + +module_i2c_driver (intel_soc_pmic_i2c_driver); + +MODULE_DESCRIPTION ("I2C driver for Intel SoC PMIC" ); +MODULE_LICENSE ("GPL v2" ); +MODULE_AUTHOR ("Yang, Bin <[email protected]>" ); +MODULE_AUTHOR ("Zhu, Lejun <[email protected]>" );drivers/mfd/intel_soc_pmic_core.h new file +32
-0@@ -0,0 +1,32 @@ +/* +* intel_soc_pmic_core.h - Intel SoC PMIC MFD Driver +* +* Copyright (C) 2012-2014 Intel Corporation. All rights reserved. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License version +* 2 as published by the Free Software Foundation. +* +* 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. +* +* Author: Yang, Bin <[email protected]> +* Author: Zhu, Lejun <[email protected]> +*/ + +#ifndef __INTEL_SOC_PMIC_CORE_H__ +#define __INTEL_SOC_PMIC_CORE_H__ + +struct intel_soc_pmic_config { +unsigned long irq_flags; +struct mfd_cell *cell_dev; +int n_cell_devs; +struct regmap_config *regmap_config; +struct regmap_irq_chip *irq_chip; +}; + +extern struct intel_soc_pmic_config intel_soc_pmic_config_crc; + +#endif /* __INTEL_SOC_PMIC_CORE_H__ */ include/linux/mfd/intel_soc_pmic.h new file +30
-0@@ -0,0 +1,30 @@ +/* +* intel_soc_pmic.h - Intel SoC PMIC Driver +* +* Copyright (C) 2012-2014 Intel Corporation. All rights reserved. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License version +* 2 as published by the Free Software Foundation. +* +* 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. +* +* Author: Yang, Bin <[email protected]> +* Author: Zhu, Lejun <[email protected]> +*/ + +#ifndef __INTEL_SOC_PMIC_H__ +#define __INTEL_SOC_PMIC_H__ + +#include <linux/regmap.h> + +struct intel_soc_pmic { +int irq; +struct regmap *regmap; +struct regmap_irq_chip_data *irq_chip_data; +}; + +#endif /* __INTEL_SOC_PMIC_H__ */
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
PATCH v5 2/3 mfd: intel_soc_pmic: Crystal Cove support
In reply to Zhu, LejunThis patch provides chip-specific support for Crystal Cove. Crystal Cove is the PMIC in Baytrail-T platform.
Also adds Intel SoC PMIC support to the build files.
---
v2:
- Add regmap_config for Crystal Cove.
v3:
- Convert IRQ config to regmap_irq_chip.
v4:
- Cleanup include files.
- Remove useless init() function.
- Remove useless .label and .init from struct intel_soc_pmic_config.
- Fix various coding style issues.
v5:
- Use CRYSTAL_COVE_IRQ_ prefix for IRQ bits definition.
- Merge build files patch to here.
--- drivers/mfd/Kconfig | 12 +++ drivers/mfd/Makefile | 3 + drivers/mfd/intel_soc_pmic_crc.c | 158 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 173 insertions(+) create mode 100644 drivers/mfd/intel_soc_pmic_crc.c
drivers/mfd/Kconfig +12 -0
@@ -241,6 +241,18 @@ config LPC_SCH LPC bridge function of the Intel SCH provides support for System Management Bus and General Purpose I/O. +config INTEL_SOC_PMIC + bool "Support for Intel Atom SoC PMIC" + depends on I2C=y + select MFD_CORE + select REGMAP_I2C + select REGMAP_IRQ + help + Select this option to enable support for the PMIC device + on some Intel SoC systems. The PMIC provides ADC, GPIO, + thermal, charger and related power management functions + on these systems. + config MFD_INTEL_MSIC bool "Intel MSIC" depends on INTEL_SCU_IPC
drivers/mfd/Makefile +3 -0
@@ -166,3 +166,6 @@ obj-$(CONFIG_MFD_RETU) += retu-mfd.o obj-$(CONFIG_MFD_AS3711) += as3711.o obj-$(CONFIG_MFD_AS3722) += as3722.o obj-$(CONFIG_MFD_STW481X) += stw481x.o + +intel-soc-pmic-objs := intel_soc_pmic_core.o intel_soc_pmic_crc.o +obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.o
drivers/mfd/intel_soc_pmic_crc.c new file +158 -0
158 lines not on this page · raw message
Signature · 1 line
1.8.3.2
Re: [PATCH v5 2/3] mfd: intel_soc_pmic: Crystal Cove support
Quoted 20 lines · Lejun
This patch provides chip-specific support for Crystal Cove. Crystal Cove is the PMIC in Baytrail-T platform.
Also adds Intel SoC PMIC support to the build files.
Signed-off-by Yang, Bin <[email protected]>Signed-off-by Zhu, Lejun <[email protected]>---
v2:
- Addregmap_configfor Crystal Cove.
v3:
- Convert IRQ config toregmap_irq_chip.
v4:
- Cleanup include files.
- Remove uselessinit()function.
- Remove useless .label and .init from structintel_soc_pmic_config.
- Fix various coding style issues.
v5:
- UseCRYSTAL_COVE_IRQ_prefix for IRQ bits definition.
- Merge build files patch to here.
Quoted 6 lines
--- drivers/mfd/Kconfig | 12 +++ drivers/mfd/Makefile | 3 + drivers/mfd/intel_soc_pmic_crc.c | 158 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 173 insertions(+) create mode 100644 drivers/mfd/intel_soc_pmic_crc.c
Looks good to me now, but the merge-window is imminent. I'll apply this for v3.17 if there are no more comments.
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [PATCH v5 2/3] mfd: intel_soc_pmic: Crystal Cove support
In reply to Zhu, LejunQuoted 7 lines · Lejun
This patch provides chip-specific support for Crystal Cove. Crystal Cove is the PMIC in Baytrail-T platform.
Also adds Intel SoC PMIC support to the build files.
Signed-off-by Yang, Bin <[email protected]>Signed-off-by Zhu, Lejun <[email protected]>
Lee Jones
AppliedRe: [PATCH v5 2/3] mfd: intel_soc_pmic: Crystal Cove support
In reply to Zhu, LejunQuoted 20 lines · Lejun
This patch provides chip-specific support for Crystal Cove. Crystal Cove is the PMIC in Baytrail-T platform.
Also adds Intel SoC PMIC support to the build files.
Signed-off-by Yang, Bin <[email protected]>Signed-off-by Zhu, Lejun <[email protected]>---
v2:
- Addregmap_configfor Crystal Cove.
v3:
- Convert IRQ config toregmap_irq_chip.
v4:
- Cleanup include files.
- Remove uselessinit()function.
- Remove useless .label and .init from structintel_soc_pmic_config.
- Fix various coding style issues.
v5:
- UseCRYSTAL_COVE_IRQ_prefix for IRQ bits definition.
- Merge build files patch to here.
Quoted 6 lines
--- drivers/mfd/Kconfig | 12 +++ drivers/mfd/Makefile | 3 + drivers/mfd/intel_soc_pmic_crc.c | 158 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 173 insertions(+) create mode 100644 drivers/mfd/intel_soc_pmic_crc.c
Applied, thanks.
Quoted 198 lines
drivers/mfd/Kconfig +12
-0@@ -241,6 +241,18 @@ config LPC_SCH LPC bridge function of the Intel SCH provides support for System Management Bus and General Purpose I/O. +config INTEL_SOC_PMIC + bool "Support for Intel Atom SoC PMIC" + depends on I2C=y + select MFD_CORE + select REGMAP_I2C + select REGMAP_IRQ + help + Select this option to enable support for the PMIC device + on some Intel SoC systems. The PMIC provides ADC, GPIO, + thermal, charger and related power management functions + on these systems. + config MFD_INTEL_MSIC bool "Intel MSIC" depends on INTEL_SCU_IPCdrivers/mfd/Makefile +3
-0@@ -166,3 +166,6 @@ obj-$(CONFIG_MFD_RETU) += retu-mfd.o obj-$(CONFIG_MFD_AS3711) += as3711.o obj-$(CONFIG_MFD_AS3722) += as3722.o obj-$(CONFIG_MFD_STW481X) += stw481x.o + +intel-soc-pmic-objs := intel_soc_pmic_core.o intel_soc_pmic_crc.o +obj-$(CONFIG_INTEL_SOC_PMIC) += intel-soc-pmic.odrivers/mfd/intel_soc_pmic_crc.c new file +158
-0@@ -0,0 +1,158 @@ +/* +* intel_soc_pmic_crc.c - Device access for Crystal Cove PMIC +* +* Copyright (C) 2013, 2014 Intel Corporation. All rights reserved. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License version +* 2 as published by the Free Software Foundation. +* +* 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. +* +* Author: Yang, Bin <[email protected]> +* Author: Zhu, Lejun <[email protected]> +*/ + +#include <linux/mfd/core.h> +#include <linux/interrupt.h> +#include <linux/regmap.h> +#include <linux/mfd/intel_soc_pmic.h> +#include "intel_soc_pmic_core.h" + +#define CRYSTAL_COVE_MAX_REGISTER 0xC6 + +#define CRYSTAL_COVE_REG_IRQLVL1 0x02 +#define CRYSTAL_COVE_REG_MIRQLVL1 0x0E + +#define CRYSTAL_COVE_IRQ_PWRSRC 0 +#define CRYSTAL_COVE_IRQ_THRM 1 +#define CRYSTAL_COVE_IRQ_BCU 2 +#define CRYSTAL_COVE_IRQ_ADC 3 +#define CRYSTAL_COVE_IRQ_CHGR 4 +#define CRYSTAL_COVE_IRQ_GPIO 5 +#define CRYSTAL_COVE_IRQ_VHDMIOCP 6 + +static struct resource gpio_resources[] = { + { + .name ="GPIO" , + .start =CRYSTAL_COVE_IRQ_GPIO , + .end =CRYSTAL_COVE_IRQ_GPIO , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct resource pwrsrc_resources[] = { + { + .name ="PWRSRC" , + .start =CRYSTAL_COVE_IRQ_PWRSRC , + .end =CRYSTAL_COVE_IRQ_PWRSRC , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct resource adc_resources[] = { + { + .name ="ADC" , + .start =CRYSTAL_COVE_IRQ_ADC , + .end =CRYSTAL_COVE_IRQ_ADC , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct resource thermal_resources[] = { + { + .name ="THERMAL" , + .start =CRYSTAL_COVE_IRQ_THRM , + .end =CRYSTAL_COVE_IRQ_THRM , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct resource bcu_resources[] = { + { + .name ="BCU" , + .start =CRYSTAL_COVE_IRQ_BCU , + .end =CRYSTAL_COVE_IRQ_BCU , + .flags =IORESOURCE_IRQ , + }, +}; + +static struct mfd_cell crystal_cove_dev[] = { + { + .name ="crystal_cove_pwrsrc" , + .num_resources =ARRAY_SIZE (pwrsrc_resources), + .resources = pwrsrc_resources, + }, + { + .name ="crystal_cove_adc" , + .num_resources =ARRAY_SIZE (adc_resources), + .resources = adc_resources, + }, + { + .name ="crystal_cove_thermal" , + .num_resources =ARRAY_SIZE (thermal_resources), + .resources = thermal_resources, + }, + { + .name ="crystal_cove_bcu" , + .num_resources =ARRAY_SIZE (bcu_resources), + .resources = bcu_resources, + }, + { + .name ="crystal_cove_gpio" , + .num_resources =ARRAY_SIZE (gpio_resources), + .resources = gpio_resources, + }, +}; + +static struct regmap_config crystal_cove_regmap_config = { + .reg_bits =8 , + .val_bits =8 , + + .max_register =CRYSTAL_COVE_MAX_REGISTER , + .cache_type =REGCACHE_NONE , +}; + +static const struct regmap_irq crystal_cove_irqs[] = { + [CRYSTAL_COVE_IRQ_PWRSRC ] = { + .mask =BIT (CRYSTAL_COVE_IRQ_PWRSRC ), + }, + [CRYSTAL_COVE_IRQ_THRM ] = { + .mask =BIT (CRYSTAL_COVE_IRQ_THRM ), + }, + [CRYSTAL_COVE_IRQ_BCU ] = { + .mask =BIT (CRYSTAL_COVE_IRQ_BCU ), + }, + [CRYSTAL_COVE_IRQ_ADC ] = { + .mask =BIT (CRYSTAL_COVE_IRQ_ADC ), + }, + [CRYSTAL_COVE_IRQ_CHGR ] = { + .mask =BIT (CRYSTAL_COVE_IRQ_CHGR ), + }, + [CRYSTAL_COVE_IRQ_GPIO ] = { + .mask =BIT (CRYSTAL_COVE_IRQ_GPIO ), + }, + [CRYSTAL_COVE_IRQ_VHDMIOCP ] = { + .mask =BIT (CRYSTAL_COVE_IRQ_VHDMIOCP ), + }, +}; + +static struct regmap_irq_chip crystal_cove_irq_chip = { + .name ="Crystal Cove" , + .irqs = crystal_cove_irqs, + .num_irqs =ARRAY_SIZE (crystal_cove_irqs), + .num_regs =1 , + .status_base =CRYSTAL_COVE_REG_IRQLVL1 , + .mask_base =CRYSTAL_COVE_REG_MIRQLVL1 , +}; + +struct intel_soc_pmic_config intel_soc_pmic_config_crc = { + .irq_flags =IRQF_TRIGGER_RISING , + .cell_dev = crystal_cove_dev, + .n_cell_devs =ARRAY_SIZE (crystal_cove_dev), + .regmap_config = &crystal_cove_regmap_config, + .irq_chip = &crystal_cove_irq_chip, +};
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
PATCH v5 3/3 gpio: Add support for Intel Crystal Cove PMIC
In reply to Zhu, LejunDevices based on Intel SoC products such as Baytrail have a Power Management IC. In the PMIC there are subsystems for voltage regulation, A/D conversion, GPIO and PWMs. The PMIC in Baytrail-T platform is called Crystal Cove.
This patch adds support for the GPIO function in Crystal Cove.
---
v5:
- Fix the order of doing gpiochip_add() and gpiochip_irqchip_add().
- Add it to this patch set, to merge it along with the MFD changes.
--- drivers/gpio/Kconfig | 13 ++ drivers/gpio/Makefile | 1 + drivers/gpio/gpio-crystalcove.c | 379 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 393 insertions(+) create mode 100644 drivers/gpio/gpio-crystalcove.c
drivers/gpio/Kconfig +13 -0
@@ -440,6 +440,19 @@ config GPIO_ARIZONA help Support for GPIOs on Wolfson Arizona class devices. +config GPIO_CRYSTAL_COVE + tristate "GPIO support for Crystal Cove PMIC" + depends on INTEL_SOC_PMIC + select GPIOLIB_IRQCHIP + help + Support for GPIO pins on Crystal Cove PMIC. + + Say Yes if you have a Intel SoC based tablet with Crystal Cove PMIC + inside. + + This driver can also be built as a module. If so, the module will be + called gpio-crystalcove. + config GPIO_LP3943 tristate "TI/National Semiconductor LP3943 GPIO expander" depends on MFD_LP3943
drivers/gpio/Makefile +1 -0
@@ -20,6 +20,7 @@ obj-$(CONFIG_GPIO_BCM_KONA) += gpio-bcm-kona.o obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o obj-$(CONFIG_GPIO_CLPS711X) += gpio-clps711x.o obj-$(CONFIG_GPIO_CS5535) += gpio-cs5535.o +obj-$(CONFIG_GPIO_CRYSTAL_COVE) += gpio-crystalcove.o obj-$(CONFIG_GPIO_DA9052) += gpio-da9052.o obj-$(CONFIG_GPIO_DA9055) += gpio-da9055.o obj-$(CONFIG_GPIO_DAVINCI) += gpio-davinci.o
drivers/gpio/gpio-crystalcove.c new file +379 -0
379 lines not on this page · raw message
Signature · 1 line
1.8.3.2
Lee Jones
AppliedRe: [PATCH v5 3/3] gpio: Add support for Intel Crystal Cove PMIC
Quoted 16 lines · Lejun
Devices based on Intel SoC products such as Baytrail have a Power Management IC. In the PMIC there are subsystems for voltage regulation, A/D conversion, GPIO and PWMs. The PMIC in Baytrail-T platform is called Crystal Cove.
This patch adds support for the GPIO function in Crystal Cove.
Signed-off-by Yang, Bin <[email protected]>Signed-off-by Zhu, Lejun <[email protected]>Reviewed-by Mika Westerberg <[email protected]>Reviewed-by Alexandre Courbot <[email protected]>Reviewed-by Linus Walleij <[email protected]>---
v5:
- Fix the order of doinggpiochip_add()andgpiochip_irqchip_add().
- Add it to this patch set, to merge it along with the MFD changes.
Quoted 6 lines
--- drivers/gpio/Kconfig | 13 ++ drivers/gpio/Makefile | 1 + drivers/gpio/gpio-crystalcove.c | 379 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 393 insertions(+) create mode 100644 drivers/gpio/gpio-crystalcove.c
Applied, thanks.
I will send a pull-request out to GPIO momentarily.
Quoted 421 lines
drivers/gpio/Kconfig +13
-0@@ -440,6 +440,19 @@ config GPIO_ARIZONA help Support for GPIOs on Wolfson Arizona class devices. +config GPIO_CRYSTAL_COVE + tristate "GPIO support for Crystal Cove PMIC" + depends on INTEL_SOC_PMIC + select GPIOLIB_IRQCHIP + help + Support for GPIO pins on Crystal Cove PMIC. + + Say Yes if you have a Intel SoC based tablet with Crystal Cove PMIC + inside. + + This driver can also be built as a module. If so, the module will be + called gpio-crystalcove. + config GPIO_LP3943 tristate "TI/National Semiconductor LP3943 GPIO expander" depends on MFD_LP3943drivers/gpio/Makefile +1
-0@@ -20,6 +20,7 @@ obj-$(CONFIG_GPIO_BCM_KONA) += gpio-bcm-kona.o obj-$(CONFIG_GPIO_BT8XX) += gpio-bt8xx.o obj-$(CONFIG_GPIO_CLPS711X) += gpio-clps711x.o obj-$(CONFIG_GPIO_CS5535) += gpio-cs5535.o +obj-$(CONFIG_GPIO_CRYSTAL_COVE) += gpio-crystalcove.o obj-$(CONFIG_GPIO_DA9052) += gpio-da9052.o obj-$(CONFIG_GPIO_DA9055) += gpio-da9055.o obj-$(CONFIG_GPIO_DAVINCI) += gpio-davinci.odrivers/gpio/gpio-crystalcove.c new file +379
-0@@ -0,0 +1,379 @@ +/* +* gpio-crystalcove.c - Intel Crystal Cove GPIO Driver +* +* Copyright (C) 2012, 2014 Intel Corporation. All rights reserved. +* +* This program is free software; you can redistribute it and/or +* modify it under the terms of the GNU General Public License version +* 2 as published by the Free Software Foundation. +* +* 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. +* +* Author: Yang, Bin <[email protected]> +*/ + +#include <linux/interrupt.h> +#include <linux/platform_device.h> +#include <linux/gpio.h> +#include <linux/bitops.h> +#include <linux/regmap.h> +#include <linux/mfd/intel_soc_pmic.h> + +#define CRYSTALCOVE_GPIO_NUM 16 + +#define UPDATE_IRQ_TYPE BIT(0) +#define UPDATE_IRQ_MASK BIT(1) + +#define GPIO0IRQ 0x0b +#define GPIO1IRQ 0x0c +#define MGPIO0IRQS0 0x19 +#define MGPIO1IRQS0 0x1a +#define MGPIO0IRQSX 0x1b +#define MGPIO1IRQSX 0x1c +#define GPIO0P0CTLO 0x2b +#define GPIO0P0CTLI 0x33 +#define GPIO1P0CTLO 0x3b +#define GPIO1P0CTLI 0x43 + +#define CTLI_INTCNT_DIS (0) +#define CTLI_INTCNT_NE (1 << 1) +#define CTLI_INTCNT_PE (2 << 1) +#define CTLI_INTCNT_BE (3 << 1) + +#define CTLO_DIR_IN (0) +#define CTLO_DIR_OUT (1 << 5) + +#define CTLO_DRV_CMOS (0) +#define CTLO_DRV_OD (1 << 4) + +#define CTLO_DRV_REN (1 << 3) + +#define CTLO_RVAL_2KDW (0) +#define CTLO_RVAL_2KUP (1 << 1) +#define CTLO_RVAL_50KDW (2 << 1) +#define CTLO_RVAL_50KUP (3 << 1) + +#define CTLO_INPUT_SET (CTLO_DRV_CMOS | CTLO_DRV_REN | CTLO_RVAL_2KUP) +#define CTLO_OUTPUT_SET (CTLO_DIR_OUT | CTLO_INPUT_SET) + +enum ctrl_register { +CTRL_IN , +CTRL_OUT , +}; + +/** +* struct crystalcove_gpio - Crystal Cove GPIO controller +* @buslock: for bus lock/sync and unlock. +* @chip: the abstract gpio_chip structure. +* @regmap: the regmap from the parent device. +* @update: pending IRQ setting update, to be written to the chip upon unlock. +* @intcnt_value: the Interrupt Detect value to be written. +* @set_irq_mask: true if the IRQ mask needs to be set, false to clear. +*/ +struct crystalcove_gpio { +struct mutex buslock;/* irq_bus_lock */ +struct gpio_chip chip; +struct regmap *regmap; +int update; +int intcnt_value; +bool set_irq_mask; +}; + +static inline struct crystalcove_gpio *to_cg (struct gpio_chip *gc) +{ + return container_of(gc, struct crystalcove_gpio, chip); +} + +static inline int to_reg (int gpio,enum ctrl_register reg_type) +{ +int reg; + +if (reg_type ==CTRL_IN ) { +if (gpio <8 ) + reg =GPIO0P0CTLI ; +else + reg =GPIO1P0CTLI ; + }else { +if (gpio <8 ) + reg =GPIO0P0CTLO ; +else + reg =GPIO1P0CTLO ; + } + +return reg + gpio %8 ; +} + +static void crystalcove_update_irq_mask (struct crystalcove_gpio *cg, +int gpio) +{ +u8 mirqs0 = gpio <8 ?MGPIO0IRQS0 :MGPIO1IRQS0 ; +int mask =BIT (gpio %8 ); + +if (cg->set_irq_mask) +regmap_update_bits (cg->regmap, mirqs0, mask, mask); +else +regmap_update_bits (cg->regmap, mirqs0, mask,0 ); +} + +static void crystalcove_update_irq_ctrl (struct crystalcove_gpio *cg,int gpio) +{ +int reg =to_reg (gpio,CTRL_IN ); + +regmap_update_bits (cg->regmap, reg,CTLI_INTCNT_BE , cg->intcnt_value); +} + +static int crystalcove_gpio_dir_in (struct gpio_chip *chip,unsigned gpio) +{ +struct crystalcove_gpio *cg =to_cg (chip); + +return regmap_write (cg->regmap,to_reg (gpio,CTRL_OUT ), +CTLO_INPUT_SET ); +} + +static int crystalcove_gpio_dir_out (struct gpio_chip *chip,unsigned gpio, +int value) +{ +struct crystalcove_gpio *cg =to_cg (chip); + +return regmap_write (cg->regmap,to_reg (gpio,CTRL_OUT ), +CTLO_OUTPUT_SET | value); +} + +static int crystalcove_gpio_get (struct gpio_chip *chip,unsigned gpio) +{ +struct crystalcove_gpio *cg =to_cg (chip); +int ret; +unsigned int val; + + ret =regmap_read (cg->regmap,to_reg (gpio,CTRL_IN ), &val); +if (ret) +return ret; + +return val &0x1 ; +} + +static void crystalcove_gpio_set (struct gpio_chip *chip, +unsigned gpio,int value) +{ +struct crystalcove_gpio *cg =to_cg (chip); + +if (value) +regmap_update_bits (cg->regmap,to_reg (gpio,CTRL_OUT ),1 ,1 ); +else +regmap_update_bits (cg->regmap,to_reg (gpio,CTRL_OUT ),1 ,0 ); +} + +static int crystalcove_irq_type (struct irq_data *data,unsigned type) +{ +struct crystalcove_gpio *cg =to_cg (irq_data_get_irq_chip_data (data)); + +switch (type) { +case IRQ_TYPE_NONE : + cg->intcnt_value =CTLI_INTCNT_DIS ; +break ; +case IRQ_TYPE_EDGE_BOTH : + cg->intcnt_value =CTLI_INTCNT_BE ; +break ; +case IRQ_TYPE_EDGE_RISING : + cg->intcnt_value =CTLI_INTCNT_PE ; +break ; +case IRQ_TYPE_EDGE_FALLING : + cg->intcnt_value =CTLI_INTCNT_NE ; +break ; +default : +return -EINVAL ; + } + + cg->update |=UPDATE_IRQ_TYPE ; + +return 0 ; +} + +static void crystalcove_bus_lock (struct irq_data *data) +{ +struct crystalcove_gpio *cg =to_cg (irq_data_get_irq_chip_data (data)); + +mutex_lock (&cg->buslock); +} + +static void crystalcove_bus_sync_unlock (struct irq_data *data) +{ +struct crystalcove_gpio *cg =to_cg (irq_data_get_irq_chip_data (data)); +int gpio = data->hwirq; + +if (cg->update &UPDATE_IRQ_TYPE ) +crystalcove_update_irq_ctrl (cg, gpio); +if (cg->update &UPDATE_IRQ_MASK ) +crystalcove_update_irq_mask (cg, gpio); + cg->update =0 ; + +mutex_unlock (&cg->buslock); +} + +static void crystalcove_irq_unmask (struct irq_data *data) +{ +struct crystalcove_gpio *cg =to_cg (irq_data_get_irq_chip_data (data)); + + cg->set_irq_mask = false; + cg->update |=UPDATE_IRQ_MASK ; +} + +static void crystalcove_irq_mask (struct irq_data *data) +{ +struct crystalcove_gpio *cg =to_cg (irq_data_get_irq_chip_data (data)); + + cg->set_irq_mask = true; + cg->update |=UPDATE_IRQ_MASK ; +} + +static struct irq_chip crystalcove_irqchip = { + .name ="Crystal Cove" , + .irq_mask = crystalcove_irq_mask, + .irq_unmask = crystalcove_irq_unmask, + .irq_set_type = crystalcove_irq_type, + .irq_bus_lock = crystalcove_bus_lock, + .irq_bus_sync_unlock = crystalcove_bus_sync_unlock, +}; + +static irqreturn_t crystalcove_gpio_irq_handler (int irq,void *data) +{ +struct crystalcove_gpio *cg = data; +unsigned int p0, p1; +int pending; +int gpio; +unsigned int virq; + +if (regmap_read (cg->regmap,GPIO0IRQ , &p0) || +regmap_read (cg->regmap,GPIO1IRQ , &p1)) +return IRQ_NONE ; + +regmap_write (cg->regmap,GPIO0IRQ , p0); +regmap_write (cg->regmap,GPIO1IRQ , p1); + + pending = p0 | p1 <<8 ; + +for (gpio =0 ; gpio < cg->chip.ngpio; gpio++) { +if (pending &BIT (gpio)) { + virq =irq_find_mapping (cg->chip.irqdomain, gpio); +generic_handle_irq (virq); + } + } + +return IRQ_HANDLED ; +} + +static void crystalcove_gpio_dbg_show (struct seq_file *s, +struct gpio_chip *chip) +{ +struct crystalcove_gpio *cg =to_cg (chip); +int gpio, offset; +unsigned int ctlo, ctli, mirqs0, mirqsx, irq; + +for (gpio =0 ; gpio < cg->chip.ngpio; gpio++) { +regmap_read (cg->regmap,to_reg (gpio,CTRL_OUT ), &ctlo); +regmap_read (cg->regmap,to_reg (gpio,CTRL_IN ), &ctli); +regmap_read (cg->regmap, gpio <8 ?MGPIO0IRQS0 :MGPIO1IRQS0 , + &mirqs0); +regmap_read (cg->regmap, gpio <8 ?MGPIO0IRQSX :MGPIO1IRQSX , + &mirqsx); +regmap_read (cg->regmap, gpio <8 ?GPIO0IRQ :GPIO1IRQ , + &irq); + + offset = gpio %8 ; +seq_printf (s," gpio-%-2d %s %s %s %s ctlo=%2x,%s %s %s\n" , + gpio, ctlo &CTLO_DIR_OUT ?"out" :"in " , + ctli &0x1 ?"hi" :"lo" , + ctli &CTLI_INTCNT_NE ?"fall" :" " , + ctli &CTLI_INTCNT_PE ?"rise" :" " , + ctlo, + mirqs0 &BIT (offset) ?"s0 mask " :"s0 unmask" , + mirqsx &BIT (offset) ?"sx mask " :"sx unmask" , + irq &BIT (offset) ?"pending" :" " ); + } +} + +static int crystalcove_gpio_probe (struct platform_device *pdev) +{ +int irq =platform_get_irq (pdev,0 ); +struct crystalcove_gpio *cg; +int retval; +struct device *dev = pdev->dev.parent; +struct intel_soc_pmic *pmic =dev_get_drvdata (dev); + +if (irq <0 ) +return irq; + + cg =devm_kzalloc (&pdev->dev,sizeof (*cg),GFP_KERNEL ); +if (!cg) +return -ENOMEM ; + +platform_set_drvdata (pdev, cg); + +mutex_init (&cg->buslock); + cg->chip.label =KBUILD_MODNAME ; + cg->chip.direction_input = crystalcove_gpio_dir_in; + cg->chip.direction_output = crystalcove_gpio_dir_out; + cg->chip.get = crystalcove_gpio_get; + cg->chip.set = crystalcove_gpio_set; + cg->chip.base =-1 ; + cg->chip.ngpio =CRYSTALCOVE_GPIO_NUM ; + cg->chip.can_sleep = true; + cg->chip.dev = dev; + cg->chip.dbg_show = crystalcove_gpio_dbg_show; + cg->regmap = pmic->regmap; + + retval =gpiochip_add (&cg->chip); +if (retval) { +dev_warn (&pdev->dev,"add gpio chip error: %d\n" , retval); +return retval; + } + +gpiochip_irqchip_add (&cg->chip, &crystalcove_irqchip,0 , + handle_simple_irq,IRQ_TYPE_NONE ); + + retval =request_threaded_irq (irq,NULL , crystalcove_gpio_irq_handler, +IRQF_ONESHOT ,KBUILD_MODNAME , cg); + +if (retval) { +dev_warn (&pdev->dev,"request irq failed: %d\n" , retval); + goto out_remove_gpio; + } + +return 0 ; + +out_remove_gpio: +WARN_ON (gpiochip_remove (&cg->chip)); +return retval; +} + +static int crystalcove_gpio_remove (struct platform_device *pdev) +{ +struct crystalcove_gpio *cg =platform_get_drvdata (pdev); +int irq =platform_get_irq (pdev,0 ); +int err; + + err =gpiochip_remove (&cg->chip); + +if (irq >=0 ) +free_irq (irq, cg); + +return err; +} + +static struct platform_driver crystalcove_gpio_driver = { + .probe = crystalcove_gpio_probe, + .remove = crystalcove_gpio_remove, + .driver = { + .name ="crystal_cove_gpio" , + .owner =THIS_MODULE , + }, +}; + +module_platform_driver (crystalcove_gpio_driver); + +MODULE_AUTHOR ("Yang, Bin <[email protected]>" ); +MODULE_DESCRIPTION ("Intel Crystal Cove GPIO Driver" ); +MODULE_LICENSE ("GPL v2" );
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
[GIT PULL] LinusW - Immutable branch between MFD and GPIO
In reply to Zhu, LejunThe following changes since commit 7171511eaec5bf23fb06078f59784a3a0626b38f:
Linux 3.16-rc1 (2014-06-15 17:45:28 -1000)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/mfd-gpio-v3.17
for you to fetch changes up to 104fb1d5153c563f453cb9c048fa0a17318a2348:
gpio: Add support for Intel Crystal Cove PMIC (2014-06-17 15:59:52 +0100)
----------------------------------------------------------------
Immutable branch between MFD and GPIO for v3.17
----------------------------------------------------------------
Zhu, Lejun (3):
mfd: intel_soc_pmic: Core driver
mfd: intel_soc_pmic: Crystal Cove support
gpio: Add support for Intel Crystal Cove PMIC
drivers/gpio/Kconfig | 13 ++ drivers/gpio/Makefile | 1 + drivers/gpio/gpio-crystalcove.c | 379 +++++++++++++++++++++++++++++++++++++ drivers/mfd/Kconfig | 12 ++ drivers/mfd/Makefile | 3 + drivers/mfd/intel_soc_pmic_core.c | 168 ++++++++++++++++ drivers/mfd/intel_soc_pmic_core.h | 32 ++++ drivers/mfd/intel_soc_pmic_crc.c | 158 ++++++++++++++++ include/linux/mfd/intel_soc_pmic.h | 30 +++ 9 files changed, 796 insertions(+) create mode 100644 drivers/gpio/gpio-crystalcove.c create mode 100644 drivers/mfd/intel_soc_pmic_core.c create mode 100644 drivers/mfd/intel_soc_pmic_core.h create mode 100644 drivers/mfd/intel_soc_pmic_crc.c create mode 100644 include/linux/mfd/intel_soc_pmic.h
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
[GIT PULL v2] LinusW - Immutable branch between MFD and GPIO
Linus,
Slight amendment. I've applied a fix, as this branch broke PPC.
The following changes since commit 7171511eaec5bf23fb06078f59784a3a0626b38f:
Linux 3.16-rc1 (2014-06-15 17:45:28 -1000)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git tags/mfd-gpio-v3.17
for you to fetch changes up to 8dbf2aa3c308ade864261e8047b0dce1f4ed9a7e:
gpio: crystalcove: Fix implicit declaration of function 'seq_printf' error (2014-06-19 16:56:28 +0100)
----------------------------------------------------------------
Immutable branch between MFD and GPIO for v3.17.
----------------------------------------------------------------
Lee Jones (1):
gpio: crystalcove: Fix implicit declaration of function 'seq_printf' error
Zhu, Lejun (3):
mfd: intel_soc_pmic: Core driver
mfd: intel_soc_pmic: Crystal Cove support
gpio: Add support for Intel Crystal Cove PMIC
drivers/gpio/Kconfig | 13 ++ drivers/gpio/Makefile | 1 + drivers/gpio/gpio-crystalcove.c | 380 +++++++++++++++++++++++++++++++++++++ drivers/mfd/Kconfig | 12 ++ drivers/mfd/Makefile | 3 + drivers/mfd/intel_soc_pmic_core.c | 168 ++++++++++++++++ drivers/mfd/intel_soc_pmic_core.h | 32 ++++ drivers/mfd/intel_soc_pmic_crc.c | 158 +++++++++++++++ include/linux/mfd/intel_soc_pmic.h | 30 +++ 9 files changed, 797 insertions(+) create mode 100644 drivers/gpio/gpio-crystalcove.c create mode 100644 drivers/mfd/intel_soc_pmic_core.c create mode 100644 drivers/mfd/intel_soc_pmic_core.h create mode 100644 drivers/mfd/intel_soc_pmic_crc.c create mode 100644 include/linux/mfd/intel_soc_pmic.h
Signature · 4 lines
Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog
Re: [GIT PULL] LinusW - Immutable branch between MFD and GPIO
In reply to Lee JonesQuoted 11 lines · Lee Jones
The following changes since commit
7171511eaec5bf23fb06078f59784a3a0626b38f:Linux 3.16-rc1 (2014-06-15 17:45:28 -1000)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.gittags/mfd-gpio-v3.17for you to fetch changes up to
104fb1d5153c563f453cb9c048fa0a17318a2348:gpio: Add support for Intel Crystal Cove PMIC (2014-06-17 15:59:52 +0100)
I think I'll just optimistically assume this will merge nicely for v3.17. Less trouble, and does not require MFD to be merged before the GPIO tree in the merge window :-)
Yours,
Linus Walleij