Support CrystalCove PMIC ACPI operation region
Subsystems (5)
cover Support CrystalCove PMIC ACPI operation region
The two patches add support for CrystalCove PMIC ACPI operation region. The PMIC chip has two customized operation regions: one for power rail manipulation and one for thermal purpose: sensor temperature reading and trip point value reading/setting.
For an example ASL code on ASUS T100 with CrystalCove PMIC, see here:
https://gist.github.com/aaronlu/f5f65771a6c3251fae5d
Aaron Lu (2):
gpio / CrystalCove: support virtual GPIO
PMIC / opregion: support PMIC customized operation region for
CrystalCove
drivers/gpio/gpio-crystalcove.c | 19 +- drivers/mfd/Kconfig | 11 + drivers/mfd/Makefile | 1 + drivers/mfd/intel_soc_pmic_crc.c | 3 + drivers/mfd/intel_soc_pmic_crc_opregion.c | 229 +++++++++++++++++++ drivers/mfd/intel_soc_pmic_opregion.c | 350 ++++++++++++++++++++++++++++++ drivers/mfd/intel_soc_pmic_opregion.h | 35 +++ include/asm-generic/gpio.h | 2 +- 8 files changed, 646 insertions(+), 4 deletions(-) create mode 100644 drivers/mfd/intel_soc_pmic_crc_opregion.c create mode 100644 drivers/mfd/intel_soc_pmic_opregion.c create mode 100644 drivers/mfd/intel_soc_pmic_opregion.h
Signature · 1 line
1.9.3
PATCH 1/2 gpio / CrystalCove: support virtual GPIO
The virtual GPIO introduced in ACPI table of Baytrail-T based system is used to solve a problem under Windows. We do not have such problems under Linux so we do not actually need them. But we have to tell GPIO library that the Crystal Cove GPIO chip has this many GPIO pins or the common GPIO handler will refuse any access to those high number GPIO pins, which will resulted in a failure evaluation of every ACPI control method that is used to turn on/off power resource and/or report sensor temperatures.
Due to the high number of virtual GPIOs, the value of ARCH_NR_GPIOS is bumped from 256 to 512 to avoid failures on platforms that have various GPIO controllers.
--- drivers/gpio/gpio-crystalcove.c | 19 ++++++++++++++++--- include/asm-generic/gpio.h | 2 +- 2 files changed, 17 insertions(+), 4 deletions(-)
drivers/gpio/gpio-crystalcove.c +16 -3
@@ -24,6 +24,7 @@#include <linux/mfd/intel_soc_pmic.h> #define CRYSTALCOVE_GPIO_NUM 16 +#define CRYSTALCOVE_VGPIO_NUM 0x5e#define UPDATE_IRQ_TYPE BIT(0)#define UPDATE_IRQ_MASK BIT(1)
@@ -130,6 +131,9 @@ static int crystalcove_gpio_dir_in(struct gpio_chip *chip, unsigned gpio) {struct crystalcove_gpio *cg =to_cg (chip); +if (gpio >CRYSTALCOVE_VGPIO_NUM ) +return 0 ; +return regmap_write (cg->regmap,to_reg (gpio,CTRL_OUT ),CTLO_INPUT_SET ); }
@@ -139,6 +143,9 @@ static int crystalcove_gpio_dir_out(struct gpio_chip *chip, unsigned gpio, {struct crystalcove_gpio *cg =to_cg (chip); +if (gpio >CRYSTALCOVE_VGPIO_NUM ) +return 0 ; +return regmap_write (cg->regmap,to_reg (gpio,CTRL_OUT ),CTLO_OUTPUT_SET | value); }
@@ -149,6 +156,9 @@ static int crystalcove_gpio_get(struct gpio_chip *chip, unsigned gpio)int ret;unsigned int val; +if (gpio >CRYSTALCOVE_VGPIO_NUM ) +return 0 ; + ret =regmap_read (cg->regmap,to_reg (gpio,CTRL_IN ), &val);if (ret)return ret;
@@ -161,6 +171,9 @@ static void crystalcove_gpio_set(struct gpio_chip *chip, {struct crystalcove_gpio *cg =to_cg (chip); +if (gpio >CRYSTALCOVE_VGPIO_NUM ) +return ; +if (value)regmap_update_bits (cg->regmap,to_reg (gpio,CTRL_OUT ),1 ,1 );else
@@ -256,7 +269,7 @@ static irqreturn_t crystalcove_gpio_irq_handler(int irq, void *data) pending = p0 | p1 <<8 ; -for (gpio =0 ; gpio < cg->chip.ngpio; gpio++) { +for (gpio =0 ; gpio <CRYSTALCOVE_GPIO_NUM ; gpio++) {if (pending &BIT (gpio)) { virq =irq_find_mapping (cg->chip.irqdomain, gpio);generic_handle_irq (virq);
@@ -273,7 +286,7 @@ static void crystalcove_gpio_dbg_show(struct seq_file *s,int gpio, offset;unsigned int ctlo, ctli, mirqs0, mirqsx, irq; -for (gpio =0 ; gpio < cg->chip.ngpio; gpio++) { +for (gpio =0 ; gpio <CRYSTALCOVE_GPIO_NUM ; 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,
@@ -320,7 +333,7 @@ static int crystalcove_gpio_probe(struct platform_device *pdev) cg->chip.get = crystalcove_gpio_get; cg->chip.set = crystalcove_gpio_set; cg->chip.base =-1 ; - cg->chip.ngpio =CRYSTALCOVE_GPIO_NUM ; + cg->chip.ngpio =CRYSTALCOVE_VGPIO_NUM ; cg->chip.can_sleep = true; cg->chip.dev = dev; cg->chip.dbg_show = crystalcove_gpio_dbg_show;
include/asm-generic/gpio.h +1 -1
@@ -27,7 +27,7 @@*/ #ifndef ARCH_NR_GPIOS -#define ARCH_NR_GPIOS 256 +#define ARCH_NR_GPIOS 512#endif /*
Signature · 1 line
1.9.3
PATCH 2/2 PMIC / opregion: support PMIC customized operation region for CrystalCove
In reply to Aaron LuThe Baytrail-T platform firmware has defined two customized operation regions for PMIC chip Crystal Cove - one is for power resource handling and one is for thermal: sensor temperature reporting, trip point setting, etc. This patch adds support for them on top of the existing Crystal Cove PMIC driver.
The reason to split code into a separate file intel_soc_pmic_opregion.c is that there are more PMIC driver with ACPI operation region support coming and we can re-use those code. The intel_soc_pmic_opregion_data structure is created also for this purpose: when we need to support a new PMIC's operation region, we just need to fill those callbacks and the two register mapping tables.
--- drivers/mfd/Kconfig | 11 + drivers/mfd/Makefile | 1 + drivers/mfd/intel_soc_pmic_crc.c | 3 + drivers/mfd/intel_soc_pmic_crc_opregion.c | 229 +++++++++++++++++++ drivers/mfd/intel_soc_pmic_opregion.c | 350 ++++++++++++++++++++++++++++++ drivers/mfd/intel_soc_pmic_opregion.h | 35 +++ 6 files changed, 629 insertions(+) create mode 100644 drivers/mfd/intel_soc_pmic_crc_opregion.c create mode 100644 drivers/mfd/intel_soc_pmic_opregion.c create mode 100644 drivers/mfd/intel_soc_pmic_opregion.h
drivers/mfd/Kconfig +11 -0
@@ -266,6 +266,17 @@ config INTEL_SOC_PMIC thermal, charger and related power management functions on these systems. +config CRC_PMIC_OPREGION + tristate "ACPI operation region support for CrystalCove PMIC" + depends on ACPI + depends on INTEL_SOC_PMIC + help + Select this option to enable support for ACPI operation + region of the PMIC chip. The operation region can be used + to control power rails and sensor reading/writing on the + PMIC chip. This config addes ACPI operation region support + for CrystalCove PMIC. + config MFD_INTEL_MSIC bool "Intel MSIC" depends on INTEL_SCU_IPC
drivers/mfd/Makefile +1 -0
@@ -172,3 +172,4 @@ obj-$(CONFIG_MFD_IPAQ_MICRO) += ipaq-micro.o 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_CRC_PMIC_OPREGION) += intel_soc_pmic_crc_opregion.o intel_soc_pmic_opregion.o
drivers/mfd/intel_soc_pmic_crc.c +3 -0
@@ -106,6 +106,9 @@ static struct mfd_cell crystal_cove_dev[] = { .num_resources = ARRAY_SIZE(gpio_resources), .resources = gpio_resources, }, + { + .name = "crystal_cove_region", + }, };static struct regmap_config crystal_cove_regmap_config = {
drivers/mfd/intel_soc_pmic_crc_opregion.c new file +229 -0
229 lines not on this page · raw message
drivers/mfd/intel_soc_pmic_opregion.c new file +350 -0
350 lines not on this page · raw message
drivers/mfd/intel_soc_pmic_opregion.h new file +35 -0
@@ -0,0 +1,35 @@ +#ifndef __INTEL_SOC_PMIC_OPREGION_H +#define __INTEL_SOC_PMIC_OPREGION_H + +struct pmic_pwr_reg { +int reg;/* corresponding PMIC register */ +int bit;/* control bit for power */ +}; + +struct pmic_pwr_table { +int address;/* operation region address */ +struct pmic_pwr_reg pwr_reg; +}; + +struct pmic_dptf_table { +int address;/* operation region address */ +int reg;/* corresponding thermal register */ +}; + +struct intel_soc_pmic_opregion_data { +int (*get_power)(struct regmap *r,struct pmic_pwr_reg *preg,u64 *value); +int (*update_power)(struct regmap *r,struct pmic_pwr_reg *preg,bool on); +int (*get_raw_temp)(struct regmap *r,int reg); +int (*update_aux)(struct regmap *r,int reg,int raw_temp); +int (*get_policy)(struct regmap *r,int reg,u64 *value); +int (*update_policy)(struct regmap *r,int reg,int enable); +struct pmic_pwr_table *pwr_table; +int pwr_table_count; +struct pmic_dptf_table *dptf_table; +int dptf_table_count; +}; + +int intel_soc_pmic_install_opregion_handler (struct device *dev,acpi_handle handle,struct regmap *regmap,struct intel_soc_pmic_opregion_data *d); +void intel_soc_pmic_remove_opregion_handler (acpi_handle handle); + +#endif
Signature · 1 line
1.9.3