* [PATCH v2 0/3] mfd: lp87565: Add lp87565 PMIC support
@ 2017-05-23 12:16 Keerthy
2017-05-23 12:16 ` [PATCH v2 1/3] " Keerthy
` (2 more replies)
0 siblings, 3 replies; 12+ messages in thread
From: Keerthy @ 2017-05-23 12:16 UTC (permalink / raw)
To: broonie, lee.jones, robh+dt
Cc: j-keerthy, t-kristo, tony, mark.rutland, linux-omap,
linux-kernel, devicetree, afd
The LP87565 chip is a power management IC for Portable Navigation Systems
and Tablet Computing devices. It contains the following components:
- Regulators.
- Configurable General Purpose Output Signals(GPO).
PMIC interacts with the main processor through i2c. PMIC has
a bunch of regulatos (Step-Down DC-DC Converter Cores)
that can be programmed to be single phase or multi phase
regulators. PMIC also has a couple of GPOs(General Purpose Output
Signals).
The register sets and the individual bit fields of registers were
compared against lp87* PMICs. None were matching even close. Hence
came up with new drivers and is based on lp873x drivers.
Keerthy (3):
mfd: lp87565: Add lp87565 PMIC support
regulator: lp87565: Add support for lp87565 PMIC regulators
regulator: tps65917: Add support for SMPS12
Documentation/devicetree/bindings/mfd/lp87565.txt | 45 ++++
drivers/mfd/Kconfig | 14 ++
drivers/mfd/Makefile | 1 +
drivers/mfd/lp87565.c | 101 ++++++++
drivers/regulator/Kconfig | 8 +
drivers/regulator/Makefile | 1 +
drivers/regulator/lp87565-regulator.c | 237 +++++++++++++++++++
drivers/regulator/palmas-regulator.c | 18 +-
include/linux/mfd/lp87565.h | 271 ++++++++++++++++++++++
include/linux/mfd/palmas.h | 2 +
10 files changed, 695 insertions(+), 3 deletions(-)
create mode 100644 Documentation/devicetree/bindings/mfd/lp87565.txt
create mode 100644 drivers/mfd/lp87565.c
create mode 100644 drivers/regulator/lp87565-regulator.c
create mode 100644 include/linux/mfd/lp87565.h
--
1.9.1
^ permalink raw reply [flat|nested] 12+ messages in thread* [PATCH v2 1/3] mfd: lp87565: Add lp87565 PMIC support 2017-05-23 12:16 [PATCH v2 0/3] mfd: lp87565: Add lp87565 PMIC support Keerthy @ 2017-05-23 12:16 ` Keerthy 2017-05-30 9:23 ` Lee Jones 2017-05-23 12:16 ` [PATCH v2 2/3] regulator: lp87565: Add support for lp87565 PMIC regulators Keerthy 2017-05-23 12:16 ` [PATCH v2 3/3] regulator: tps65917: Add support for SMPS12 Keerthy 2 siblings, 1 reply; 12+ messages in thread From: Keerthy @ 2017-05-23 12:16 UTC (permalink / raw) To: broonie, lee.jones, robh+dt Cc: j-keerthy, t-kristo, tony, mark.rutland, linux-omap, linux-kernel, devicetree, afd The LP87565 chip is a power management IC for Portable Navigation Systems and Tablet Computing devices. It contains the following components: - Configurable Bucks(Single and multi-phase). - Configurable General Purpose Output Signals (GPO). The LP87565-Q1 variant device uses two 2-phase outputs configuration, Buck0 is master for Buck0/1 output and Buck2 is master for Buck2/3 output. Signed-off-by: Keerthy <j-keerthy@ti.com> --- Changes in v2: * Fixed a bunch of whitespace errors. * Changed the License to short form. * Added the generic compatible lp87565 * Removed i2c_device_id table. * Introduced probe_new function in place of probe. Documentation/devicetree/bindings/mfd/lp87565.txt | 45 ++++ drivers/mfd/Kconfig | 14 ++ drivers/mfd/Makefile | 1 + drivers/mfd/lp87565.c | 95 ++++++++ include/linux/mfd/lp87565.h | 271 ++++++++++++++++++++++ 5 files changed, 426 insertions(+) create mode 100644 Documentation/devicetree/bindings/mfd/lp87565.txt create mode 100644 drivers/mfd/lp87565.c create mode 100644 include/linux/mfd/lp87565.h diff --git a/Documentation/devicetree/bindings/mfd/lp87565.txt b/Documentation/devicetree/bindings/mfd/lp87565.txt new file mode 100644 index 0000000..f63d568 --- /dev/null +++ b/Documentation/devicetree/bindings/mfd/lp87565.txt @@ -0,0 +1,45 @@ +TI LP87565 PMIC MFD driver + +Required properties: + - compatible: "ti,lp87565", "ti,lp87565-q1" + - reg: I2C slave address. + - gpio-controller: Marks the device node as a GPIO Controller. + - #gpio-cells: Should be two. The first cell is the pin number and + the second cell is used to specify flags. + See ../gpio/gpio.txt for more information. + - xxx-in-supply: Phandle to parent supply node of each regulator + populated under regulators node. xxx should match + the supply_name populated in driver. + - regulators: List of child nodes that specify the regulator + initialization data. +Example: + +lp87565_pmic: lp87565@60 { + compatible = "ti,lp87565-q1"; + reg = <0x60>; + gpio-controller; + #gpio-cells = <2>; + + buck10-in-supply = <&vsys_3v3>; + buck23-in-supply = <&vsys_3v3>; + + regulators: regulators { + buck10_reg: buck10 { + /* VDD_MPU */ + regulator-name = "buck10"; + regulator-min-microvolt = <850000>; + regulator-max-microvolt = <1250000>; + regulator-always-on; + regulator-boot-on; + }; + + buck23_reg: buck23 { + /* VDD_GPU */ + regulator-name = "buck23"; + regulator-min-microvolt = <850000>; + regulator-max-microvolt = <1250000>; + regulator-boot-on; + regulator-always-on; + }; + }; +}; diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig index 3eb5c93..5e884f3 100644 --- a/drivers/mfd/Kconfig +++ b/drivers/mfd/Kconfig @@ -1325,6 +1325,20 @@ config MFD_TI_LP873X This driver can also be built as a module. If so, the module will be called lp873x. +config MFD_TI_LP87565 + tristate "TI LP87565 Power Management IC" + depends on I2C && OF + select MFD_CORE + select REGMAP_I2C + help + If you say yes here then you get support for the LP87565 series of + Power Management Integrated Circuits (PMIC). + These include voltage regulators, thermal protection, configurable + General Purpose Outputs (GPO) that are used in portable devices. + + This driver can also be built as a module. If so, the module + will be called lp87565. + config MFD_TPS65218 tristate "TI TPS65218 Power Management chips" depends on I2C diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile index c16bf1e..7edbe1b 100644 --- a/drivers/mfd/Makefile +++ b/drivers/mfd/Makefile @@ -25,6 +25,7 @@ obj-$(CONFIG_HTC_PASIC3) += htc-pasic3.o obj-$(CONFIG_HTC_I2CPLD) += htc-i2cpld.o obj-$(CONFIG_MFD_TI_LP873X) += lp873x.o +obj-$(CONFIG_MFD_TI_LP87565) += lp87565.o obj-$(CONFIG_MFD_DAVINCI_VOICECODEC) += davinci_voicecodec.o obj-$(CONFIG_MFD_DM355EVM_MSP) += dm355evm_msp.o diff --git a/drivers/mfd/lp87565.c b/drivers/mfd/lp87565.c new file mode 100644 index 0000000..7df7070 --- /dev/null +++ b/drivers/mfd/lp87565.c @@ -0,0 +1,95 @@ +/* + * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ + * + * Author: Keerthy <j-keerthy@ti.com> + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + */ + +#include <linux/interrupt.h> +#include <linux/mfd/core.h> +#include <linux/module.h> +#include <linux/of_device.h> +#include <linux/regmap.h> + +#include <linux/mfd/lp87565.h> + +static const struct regmap_config lp87565_regmap_config = { + .reg_bits = 8, + .val_bits = 8, + .max_register = LP87565_REG_MAX, +}; + +static const struct mfd_cell lp87565_cells[] = { + { .name = "lp87565-q1-regulator", }, + { .name = "lp87565-q1-gpio", }, +}; + +static const struct of_device_id of_lp87565_match_table[] = { + { + .compatible = "ti,lp87565", + }, + { + .compatible = "ti,lp87565-q1", + .data = (void *)LP87565_DEVICE_TYPE_LP87565_Q1, + }, + {} +}; +MODULE_DEVICE_TABLE(of, of_lp87565_match_table); + +static int lp87565_probe(struct i2c_client *client) +{ + struct lp87565 *lp87565; + const struct of_device_id *of_id; + int ret; + unsigned int otpid; + + lp87565 = devm_kzalloc(&client->dev, sizeof(*lp87565), GFP_KERNEL); + if (!lp87565) + return -ENOMEM; + + lp87565->dev = &client->dev; + + lp87565->regmap = devm_regmap_init_i2c(client, &lp87565_regmap_config); + if (IS_ERR(lp87565->regmap)) { + ret = PTR_ERR(lp87565->regmap); + dev_err(lp87565->dev, + "Failed to initialize register map: %d\n", ret); + return ret; + } + + ret = regmap_read(lp87565->regmap, LP87565_REG_OTP_REV, &otpid); + if (ret) { + dev_err(lp87565->dev, "Failed to read OTP ID\n"); + return ret; + } + + lp87565->rev = otpid & LP87565_OTP_REV_OTP_ID; + + of_id = of_match_device(of_lp87565_match_table, &client->dev); + if (of_id) + lp87565->dev_type = (enum lp87565_device_type)of_id->data; + + i2c_set_clientdata(client, lp87565); + + ret = mfd_add_devices(lp87565->dev, PLATFORM_DEVID_AUTO, lp87565_cells, + ARRAY_SIZE(lp87565_cells), NULL, 0, NULL); + + return ret; +} + +static struct i2c_driver lp87565_driver = { + .driver = { + .name = "lp87565", + .of_match_table = of_lp87565_match_table, + }, + .probe_new = lp87565_probe, +}; +module_i2c_driver(lp87565_driver); + +MODULE_AUTHOR("J Keerthy <j-keerthy@ti.com>"); +MODULE_DESCRIPTION("lp87565 chip family Multi-Function Device driver"); +MODULE_LICENSE("GPL v2"); diff --git a/include/linux/mfd/lp87565.h b/include/linux/mfd/lp87565.h new file mode 100644 index 0000000..b298c62 --- /dev/null +++ b/include/linux/mfd/lp87565.h @@ -0,0 +1,271 @@ +/* + * Functions to access LP87565 power management chip. + * + * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + */ + +#ifndef __LINUX_MFD_LP87565_H +#define __LINUX_MFD_LP87565_H + +#include <linux/i2c.h> +#include <linux/regulator/driver.h> +#include <linux/regulator/machine.h> + +enum lp87565_device_type { + LP87565_DEVICE_TYPE_UNKNOWN = 0, + LP87565_DEVICE_TYPE_LP87565_Q1, +}; + +/* All register addresses */ +#define LP87565_REG_DEV_REV 0X00 +#define LP87565_REG_OTP_REV 0X01 +#define LP87565_REG_BUCK0_CTRL_1 0X02 +#define LP87565_REG_BUCK0_CTRL_2 0X03 + +#define LP87565_REG_BUCK1_CTRL_1 0X04 +#define LP87565_REG_BUCK1_CTRL_2 0X05 + +#define LP87565_REG_BUCK2_CTRL_1 0X06 +#define LP87565_REG_BUCK2_CTRL_2 0X07 + +#define LP87565_REG_BUCK3_CTRL_1 0X08 +#define LP87565_REG_BUCK3_CTRL_2 0X09 + +#define LP87565_REG_BUCK0_VOUT 0X0A +#define LP87565_REG_BUCK0_FLOOR_VOUT 0X0B + +#define LP87565_REG_BUCK1_VOUT 0X0C +#define LP87565_REG_BUCK1_FLOOR_VOUT 0X0D + +#define LP87565_REG_BUCK2_VOUT 0X0E +#define LP87565_REG_BUCK2_FLOOR_VOUT 0X0F + +#define LP87565_REG_BUCK3_VOUT 0X10 +#define LP87565_REG_BUCK3_FLOOR_VOUT 0X11 + +#define LP87565_REG_BUCK0_DELAY 0X12 +#define LP87565_REG_BUCK1_DELAY 0X13 + +#define LP87565_REG_BUCK2_DELAY 0X14 +#define LP87565_REG_BUCK3_DELAY 0X15 + +#define LP87565_REG_GPO2_DELAY 0X16 +#define LP87565_REG_GPO3_DELAY 0X17 +#define LP87565_REG_RESET 0X18 +#define LP87565_REG_CONFIG 0X19 + +#define LP87565_REG_INT_TOP_1 0X1A +#define LP87565_REG_INT_TOP_2 0X1B + +#define LP87565_REG_INT_BUCK_0_1 0X1C +#define LP87565_REG_INT_BUCK_2_3 0X1D +#define LP87565_REG_TOP_STAT 0X1E +#define LP87565_REG_BUCK_0_1_STAT 0X1F +#define LP87565_REG_BUCK_2_3_STAT 0x20 + +#define LP87565_REG_TOP_MASK_1 0x21 +#define LP87565_REG_TOP_MASK_2 0x22 + +#define LP87565_REG_BUCK_0_1_MASK 0x23 +#define LP87565_REG_BUCK_2_3_MASK 0x24 +#define LP87565_REG_SEL_I_LOAD 0x25 + +#define LP87565_REG_I_LOAD_2 0x26 +#define LP87565_REG_I_LOAD_1 0x27 + +#define LP87565_REG_PGOOD_CTRL1 0x28 +#define LP87565_REG_PGOOD_CTRL2 0x29 +#define LP87565_REG_PGOOD_FLT 0x2A +#define LP87565_REG_PLL_CTRL 0x2B +#define LP87565_REG_PIN_FUNCTION 0x2C +#define LP87565_REG_GPIO_CONFIG 0x2D +#define LP87565_REG_GPIO_IN 0x2E +#define LP87565_REG_GPIO_OUT 0x2F + +#define LP87565_REG_MAX LP87565_REG_GPIO_OUT + +/* Register field definitions */ +#define LP87565_DEV_REV_DEV_ID 0xC0 +#define LP87565_DEV_REV_ALL_LAYER 0x30 +#define LP87565_DEV_REV_METAL_LAYER 0x0F + +#define LP87565_OTP_REV_OTP_ID 0xFF + +#define LP87565_BUCK_CTRL_1_EN BIT(7) +#define LP87565_BUCK_CTRL_1_EN_PIN_CTRL BIT(6) +#define LP87565_BUCK_CTRL_1_PIN_SELECT_EN 0x30 + +#define LP87565_BUCK_CTRL_1_ROOF_FLOOR_EN BIT(3) +#define LP87565_BUCK_CTRL_1_RDIS_EN BIT(2) +#define LP87565_BUCK_CTRL_1_FPWM BIT(1) +/* Bit0 is reserved for BUCK1 and BUCK3 and valid only for BUCK0 and BUCK2 */ +#define LP87565_BUCK_CTRL_1_FPWM_MP_0_2 BIT(0) + +#define LP87565_BUCK_CTRL_2_ILIM 0x38 +#define LP87565_BUCK_CTRL_2_SLEW_RATE 0x07 + +#define LP87565_BUCK_VSET 0xFF +#define LP87565_BUCK_FLOOR_VSET 0xFF + +#define LP87565_BUCK_SHUTDOWN_DELAY 0xF0 +#define LP87565_BUCK_STARTUP_DELAY 0x0F + +#define LP87565_GPIO_SHUTDOWN_DELAY 0xF0 +#define LP87565_GPIO_STARTUP_DELAY 0x0F + +#define LP87565_RESET_SW_RESET BIT(0) + +#define LP87565_CONFIG_DOUBLE_DELAY BIT(7) +#define LP87565_CONFIG_CLKIN_PD BIT(6) +#define LP87565_CONFIG_EN4_PD BIT(5) +#define LP87565_CONFIG_EN3_PD BIT(4) +#define LP87565_CONFIG_TDIE_WARN_LEVEL BIT(3) +#define LP87565_CONFIG_EN2_PD BIT(2) +#define LP87565_CONFIG_EN1_PD BIT(1) + +#define LP87565_INT_GPIO BIT(7) +#define LP87565_INT_BUCK23 BIT(6) +#define LP87565_INT_BUCK01 BIT(5) +#define LP87565_NO_SYNC_CLK BIT(4) +#define LP87565_TDIE_SD BIT(3) +#define LP87565_TDIE_WARN BIT(2) +#define LP87565_INT_OVP BIT(1) +#define LP87565_I_LOAD_READY BIT(0) + +#define LP87565_INT_TOP2_RESET_REG BIT(0) + +#define LP87565_BUCK1_PG_INT BIT(6) +#define LP87565_BUCK1_SC_INT BIT(5) +#define LP87565_BUCK1_ILIM_INT BIT(4) +#define LP87565_BUCK0_PG_INT BIT(2) +#define LP87565_BUCK0_SC_INT BIT(1) +#define LP87565_BUCK0_ILIM_INT BIT(0) + +#define LP87565_BUCK3_PG_INT BIT(6) +#define LP87565_BUCK3_SC_INT BIT(5) +#define LP87565_BUCK3_ILIM_INT BIT(4) +#define LP87565_BUCK2_PG_INT BIT(2) +#define LP87565_BUCK2_SC_INT BIT(1) +#define LP87565_BUCK2_ILIM_INT BIT(0) + +#define LP87565_SYNC_CLK_STAT BIT(4) +#define LP87565_TDIE_SD_STAT BIT(3) +#define LP87565_TDIE_WARN_STAT BIT(2) +#define LP87565_OVP_STAT BIT(1) + +#define LP87565_BUCK1_STAT BIT(7) +#define LP87565_BUCK1_PG_STAT BIT(6) +#define LP87565_BUCK1_ILIM_STAT BIT(4) +#define LP87565_BUCK0_STAT BIT(3) +#define LP87565_BUCK0_PG_STAT BIT(2) +#define LP87565_BUCK0_ILIM_STAT BIT(0) + +#define LP87565_BUCK3_STAT BIT(7) +#define LP87565_BUCK3_PG_STAT BIT(6) +#define LP87565_BUCK3_ILIM_STAT BIT(4) +#define LP87565_BUCK2_STAT BIT(3) +#define LP87565_BUCK2_PG_STAT BIT(2) +#define LP87565_BUCK2_ILIM_STAT BIT(0) + +#define LPL87565_GPIO_MASK BIT(7) +#define LPL87565_SYNC_CLK_MASK BIT(4) +#define LPL87565_TDIE_WARN_MASK BIT(2) +#define LPL87565_I_LOAD_READY_MASK BIT(0) + +#define LPL87565_RESET_REG_MASK BIT(0) + +#define LPL87565_BUCK1_PG_MASK BIT(6) +#define LPL87565_BUCK1_ILIM_MASK BIT(4) +#define LPL87565_BUCK0_PG_MASK BIT(2) +#define LPL87565_BUCK0_ILIM_MASK BIT(0) + +#define LPL87565_BUCK3_PG_MASK BIT(6) +#define LPL87565_BUCK3_ILIM_MASK BIT(4) +#define LPL87565_BUCK2_PG_MASK BIT(2) +#define LPL87565_BUCK2_ILIM_MASK BIT(0) + +#define LP87565_LOAD_CURRENT_BUCK_SELECT 0x3 + +#define LP87565_I_LOAD2_BUCK_LOAD_CURRENT 0x3 +#define LP87565_I_LOAD1_BUCK_LOAD_CURRENT 0xFF + +#define LP87565_PG3_SEL 0xC0 +#define LP87565_PG2_SEL 0x30 +#define LP87565_PG1_SEL 0x0C +#define LP87565_PG0_SEL 0x03 + +#define LP87565_HALF_DAY BIT(7) +#define LP87565_EN_PG0_NINT BIT(6) +#define LP87565_PGOOD_SET_DELAY BIT(5) +#define LP87565_EN_PGFLT_STAT BIT(4) +#define LP87565_PGOOD_WINDOW BIT(2) +#define LP87565_PGOOD_OD BIT(1) +#define LP87565_PGOOD_POL BIT(0) + +#define LP87565_PG3_FLT BIT(3) +#define LP87565_PG2_FLT BIT(2) +#define LP87565_PG1_FLT BIT(1) +#define LP87565_PG0_FLT BIT(0) + +#define LP87565_PLL_MODE 0xC0 +#define LP87565_EXT_CLK_FREQ 0x1F + +#define LP87565_EN_SPREAD_SPEC BIT(7) +#define LP87565_EN_PIN_CTRL_GPIO3 BIT(6) +#define LP87565_EN_PIN_SELECT_GPIO3 BIT(5) +#define LP87565_EN_PIN_CTRL_GPIO2 BIT(4) +#define LP87565_EN_PIN_SELECT_GPIO2 BIT(3) +#define LP87565_GPIO3_SEL BIT(2) +#define LP87565_GPIO2_SEL BIT(1) +#define LP87565_GPIO1_SEL BIT(0) + +#define LP87565_GOIO3_OD BIT(6) +#define LP87565_GOIO2_OD BIT(5) +#define LP87565_GOIO1_OD BIT(4) +#define LP87565_GOIO3_DIR BIT(2) +#define LP87565_GOIO2_DIR BIT(1) +#define LP87565_GOIO1_DIR BIT(0) + +#define LP87565_GOIO3_IN BIT(2) +#define LP87565_GOIO2_IN BIT(1) +#define LP87565_GOIO1_IN BIT(0) + +#define LP87565_GOIO3_OUT BIT(2) +#define LP87565_GOIO2_OUT BIT(1) +#define LP87565_GOIO1_OUT BIT(0) + +/* Number of step-down converters available */ +#define LP87565_NUM_BUCK 6 + +enum LP87565_regulator_id { + /* BUCK's */ + LP87565_BUCK_0, + LP87565_BUCK_1, + LP87565_BUCK_2, + LP87565_BUCK_3, + LP87565_BUCK_10, + LP87565_BUCK_23, +}; + +/** + * struct LP87565 - state holder for the LP87565 driver + * @dev: struct device pointer for MFD device + * @rev: revision of the LP87565 + * @dev_type: The device type for example lp87565-q1 + * @lock: lock guarding the data structure + * @regmap: register map of the LP87565 PMIC + * + * Device data may be used to access the LP87565 chip + */ +struct lp87565 { + struct device *dev; + u8 rev; + u8 dev_type; + struct regmap *regmap; +}; +#endif /* __LINUX_MFD_LP87565_H */ -- 1.9.1 ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 1/3] mfd: lp87565: Add lp87565 PMIC support 2017-05-23 12:16 ` [PATCH v2 1/3] " Keerthy @ 2017-05-30 9:23 ` Lee Jones 2017-05-30 9:54 ` Keerthy 0 siblings, 1 reply; 12+ messages in thread From: Lee Jones @ 2017-05-30 9:23 UTC (permalink / raw) To: Keerthy Cc: broonie, robh+dt, t-kristo, tony, mark.rutland, linux-omap, linux-kernel, devicetree, afd On Tue, 23 May 2017, Keerthy wrote: > The LP87565 chip is a power management IC for Portable Navigation Systems > and Tablet Computing devices. It contains the following components: > > - Configurable Bucks(Single and multi-phase). > - Configurable General Purpose Output Signals (GPO). > > The LP87565-Q1 variant device uses two 2-phase outputs configuration, > Buck0 is master for Buck0/1 output and Buck2 is master for Buck2/3 > output. > > Signed-off-by: Keerthy <j-keerthy@ti.com> > --- > > Changes in v2: > > * Fixed a bunch of whitespace errors. > * Changed the License to short form. > * Added the generic compatible lp87565 > * Removed i2c_device_id table. > * Introduced probe_new function in place of probe. > > Documentation/devicetree/bindings/mfd/lp87565.txt | 45 ++++ > drivers/mfd/Kconfig | 14 ++ > drivers/mfd/Makefile | 1 + > drivers/mfd/lp87565.c | 95 ++++++++ > include/linux/mfd/lp87565.h | 271 ++++++++++++++++++++++ > 5 files changed, 426 insertions(+) > create mode 100644 Documentation/devicetree/bindings/mfd/lp87565.txt > create mode 100644 drivers/mfd/lp87565.c > create mode 100644 include/linux/mfd/lp87565.h > > diff --git a/Documentation/devicetree/bindings/mfd/lp87565.txt b/Documentation/devicetree/bindings/mfd/lp87565.txt > new file mode 100644 > index 0000000..f63d568 > --- /dev/null > +++ b/Documentation/devicetree/bindings/mfd/lp87565.txt > @@ -0,0 +1,45 @@ > +TI LP87565 PMIC MFD driver > + > +Required properties: > + - compatible: "ti,lp87565", "ti,lp87565-q1" > + - reg: I2C slave address. > + - gpio-controller: Marks the device node as a GPIO Controller. > + - #gpio-cells: Should be two. The first cell is the pin number and > + the second cell is used to specify flags. > + See ../gpio/gpio.txt for more information. > + - xxx-in-supply: Phandle to parent supply node of each regulator > + populated under regulators node. xxx should match > + the supply_name populated in driver. > + - regulators: List of child nodes that specify the regulator > + initialization data. > +Example: > + > +lp87565_pmic: lp87565@60 { > + compatible = "ti,lp87565-q1"; > + reg = <0x60>; > + gpio-controller; > + #gpio-cells = <2>; > + > + buck10-in-supply = <&vsys_3v3>; > + buck23-in-supply = <&vsys_3v3>; > + > + regulators: regulators { > + buck10_reg: buck10 { > + /* VDD_MPU */ > + regulator-name = "buck10"; > + regulator-min-microvolt = <850000>; > + regulator-max-microvolt = <1250000>; > + regulator-always-on; > + regulator-boot-on; > + }; > + > + buck23_reg: buck23 { > + /* VDD_GPU */ > + regulator-name = "buck23"; > + regulator-min-microvolt = <850000>; > + regulator-max-microvolt = <1250000>; > + regulator-boot-on; > + regulator-always-on; > + }; > + }; > +}; > diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig > index 3eb5c93..5e884f3 100644 > --- a/drivers/mfd/Kconfig > +++ b/drivers/mfd/Kconfig > @@ -1325,6 +1325,20 @@ config MFD_TI_LP873X > This driver can also be built as a module. If so, the module > will be called lp873x. > > +config MFD_TI_LP87565 > + tristate "TI LP87565 Power Management IC" > + depends on I2C && OF > + select MFD_CORE > + select REGMAP_I2C > + help > + If you say yes here then you get support for the LP87565 series of > + Power Management Integrated Circuits (PMIC). > + These include voltage regulators, thermal protection, configurable > + General Purpose Outputs (GPO) that are used in portable devices. > + > + This driver can also be built as a module. If so, the module > + will be called lp87565. > + > config MFD_TPS65218 > tristate "TI TPS65218 Power Management chips" > depends on I2C > diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile > index c16bf1e..7edbe1b 100644 > --- a/drivers/mfd/Makefile > +++ b/drivers/mfd/Makefile > @@ -25,6 +25,7 @@ obj-$(CONFIG_HTC_PASIC3) += htc-pasic3.o > obj-$(CONFIG_HTC_I2CPLD) += htc-i2cpld.o > > obj-$(CONFIG_MFD_TI_LP873X) += lp873x.o > +obj-$(CONFIG_MFD_TI_LP87565) += lp87565.o > > obj-$(CONFIG_MFD_DAVINCI_VOICECODEC) += davinci_voicecodec.o > obj-$(CONFIG_MFD_DM355EVM_MSP) += dm355evm_msp.o > diff --git a/drivers/mfd/lp87565.c b/drivers/mfd/lp87565.c > new file mode 100644 > index 0000000..7df7070 > --- /dev/null > +++ b/drivers/mfd/lp87565.c > @@ -0,0 +1,95 @@ > +/* > + * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ > + * > + * Author: Keerthy <j-keerthy@ti.com> > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License as published by the > + * Free Software Foundation; either version 2 of the License, or (at your > + * option) any later version. > + */ > + > +#include <linux/interrupt.h> > +#include <linux/mfd/core.h> > +#include <linux/module.h> > +#include <linux/of_device.h> > +#include <linux/regmap.h> > + > +#include <linux/mfd/lp87565.h> > + > +static const struct regmap_config lp87565_regmap_config = { > + .reg_bits = 8, > + .val_bits = 8, > + .max_register = LP87565_REG_MAX, > +}; > + > +static const struct mfd_cell lp87565_cells[] = { > + { .name = "lp87565-q1-regulator", }, > + { .name = "lp87565-q1-gpio", }, > +}; > + > +static const struct of_device_id of_lp87565_match_table[] = { > + { > + .compatible = "ti,lp87565", > + }, Please place this one a single line.. > + { > + .compatible = "ti,lp87565-q1", > + .data = (void *)LP87565_DEVICE_TYPE_LP87565_Q1, > + }, > + {} > +}; > +MODULE_DEVICE_TABLE(of, of_lp87565_match_table); > + > +static int lp87565_probe(struct i2c_client *client) > +{ > + struct lp87565 *lp87565; > + const struct of_device_id *of_id; > + int ret; > + unsigned int otpid; > + > + lp87565 = devm_kzalloc(&client->dev, sizeof(*lp87565), GFP_KERNEL); > + if (!lp87565) > + return -ENOMEM; > + > + lp87565->dev = &client->dev; > + > + lp87565->regmap = devm_regmap_init_i2c(client, &lp87565_regmap_config); > + if (IS_ERR(lp87565->regmap)) { > + ret = PTR_ERR(lp87565->regmap); > + dev_err(lp87565->dev, > + "Failed to initialize register map: %d\n", ret); > + return ret; > + } > + > + ret = regmap_read(lp87565->regmap, LP87565_REG_OTP_REV, &otpid); > + if (ret) { > + dev_err(lp87565->dev, "Failed to read OTP ID\n"); > + return ret; > + } > + > + lp87565->rev = otpid & LP87565_OTP_REV_OTP_ID; > + > + of_id = of_match_device(of_lp87565_match_table, &client->dev); > + if (of_id) > + lp87565->dev_type = (enum lp87565_device_type)of_id->data; So you can interigate the device for a revision number, but not a device type ID, is that correct? > + i2c_set_clientdata(client, lp87565); > + > + ret = mfd_add_devices(lp87565->dev, PLATFORM_DEVID_AUTO, lp87565_cells, > + ARRAY_SIZE(lp87565_cells), NULL, 0, NULL); > + > + return ret; > +} > + > +static struct i2c_driver lp87565_driver = { > + .driver = { > + .name = "lp87565", > + .of_match_table = of_lp87565_match_table, > + }, > + .probe_new = lp87565_probe, > +}; What's with the random padding? Just use a single space before and after the '='. > +module_i2c_driver(lp87565_driver); > + > +MODULE_AUTHOR("J Keerthy <j-keerthy@ti.com>"); > +MODULE_DESCRIPTION("lp87565 chip family Multi-Function Device driver"); > +MODULE_LICENSE("GPL v2"); This does not match the header comment. > diff --git a/include/linux/mfd/lp87565.h b/include/linux/mfd/lp87565.h > new file mode 100644 > index 0000000..b298c62 > --- /dev/null > +++ b/include/linux/mfd/lp87565.h > @@ -0,0 +1,271 @@ > +/* > + * Functions to access LP87565 power management chip. > + * > + * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ > + * > + * This program is free software; you can redistribute it and/or modify it > + * under the terms of the GNU General Public License as published by the > + * Free Software Foundation; either version 2 of the License, or (at your > + * option) any later version. > + */ > + > +#ifndef __LINUX_MFD_LP87565_H > +#define __LINUX_MFD_LP87565_H > + > +#include <linux/i2c.h> > +#include <linux/regulator/driver.h> > +#include <linux/regulator/machine.h> > + > +enum lp87565_device_type { > + LP87565_DEVICE_TYPE_UNKNOWN = 0, > + LP87565_DEVICE_TYPE_LP87565_Q1, > +}; > + > +/* All register addresses */ > +#define LP87565_REG_DEV_REV 0X00 > +#define LP87565_REG_OTP_REV 0X01 > +#define LP87565_REG_BUCK0_CTRL_1 0X02 > +#define LP87565_REG_BUCK0_CTRL_2 0X03 > + > +#define LP87565_REG_BUCK1_CTRL_1 0X04 > +#define LP87565_REG_BUCK1_CTRL_2 0X05 > + > +#define LP87565_REG_BUCK2_CTRL_1 0X06 > +#define LP87565_REG_BUCK2_CTRL_2 0X07 > + > +#define LP87565_REG_BUCK3_CTRL_1 0X08 > +#define LP87565_REG_BUCK3_CTRL_2 0X09 > + > +#define LP87565_REG_BUCK0_VOUT 0X0A > +#define LP87565_REG_BUCK0_FLOOR_VOUT 0X0B > + > +#define LP87565_REG_BUCK1_VOUT 0X0C > +#define LP87565_REG_BUCK1_FLOOR_VOUT 0X0D > + > +#define LP87565_REG_BUCK2_VOUT 0X0E > +#define LP87565_REG_BUCK2_FLOOR_VOUT 0X0F > + > +#define LP87565_REG_BUCK3_VOUT 0X10 > +#define LP87565_REG_BUCK3_FLOOR_VOUT 0X11 > + > +#define LP87565_REG_BUCK0_DELAY 0X12 > +#define LP87565_REG_BUCK1_DELAY 0X13 > + > +#define LP87565_REG_BUCK2_DELAY 0X14 > +#define LP87565_REG_BUCK3_DELAY 0X15 > + > +#define LP87565_REG_GPO2_DELAY 0X16 > +#define LP87565_REG_GPO3_DELAY 0X17 > +#define LP87565_REG_RESET 0X18 > +#define LP87565_REG_CONFIG 0X19 > + > +#define LP87565_REG_INT_TOP_1 0X1A > +#define LP87565_REG_INT_TOP_2 0X1B > + > +#define LP87565_REG_INT_BUCK_0_1 0X1C > +#define LP87565_REG_INT_BUCK_2_3 0X1D > +#define LP87565_REG_TOP_STAT 0X1E > +#define LP87565_REG_BUCK_0_1_STAT 0X1F > +#define LP87565_REG_BUCK_2_3_STAT 0x20 > + > +#define LP87565_REG_TOP_MASK_1 0x21 > +#define LP87565_REG_TOP_MASK_2 0x22 > + > +#define LP87565_REG_BUCK_0_1_MASK 0x23 > +#define LP87565_REG_BUCK_2_3_MASK 0x24 > +#define LP87565_REG_SEL_I_LOAD 0x25 > + > +#define LP87565_REG_I_LOAD_2 0x26 > +#define LP87565_REG_I_LOAD_1 0x27 > + > +#define LP87565_REG_PGOOD_CTRL1 0x28 > +#define LP87565_REG_PGOOD_CTRL2 0x29 > +#define LP87565_REG_PGOOD_FLT 0x2A > +#define LP87565_REG_PLL_CTRL 0x2B > +#define LP87565_REG_PIN_FUNCTION 0x2C > +#define LP87565_REG_GPIO_CONFIG 0x2D > +#define LP87565_REG_GPIO_IN 0x2E > +#define LP87565_REG_GPIO_OUT 0x2F > + > +#define LP87565_REG_MAX LP87565_REG_GPIO_OUT > + > +/* Register field definitions */ > +#define LP87565_DEV_REV_DEV_ID 0xC0 > +#define LP87565_DEV_REV_ALL_LAYER 0x30 > +#define LP87565_DEV_REV_METAL_LAYER 0x0F > + > +#define LP87565_OTP_REV_OTP_ID 0xFF > + > +#define LP87565_BUCK_CTRL_1_EN BIT(7) > +#define LP87565_BUCK_CTRL_1_EN_PIN_CTRL BIT(6) > +#define LP87565_BUCK_CTRL_1_PIN_SELECT_EN 0x30 > + > +#define LP87565_BUCK_CTRL_1_ROOF_FLOOR_EN BIT(3) > +#define LP87565_BUCK_CTRL_1_RDIS_EN BIT(2) > +#define LP87565_BUCK_CTRL_1_FPWM BIT(1) > +/* Bit0 is reserved for BUCK1 and BUCK3 and valid only for BUCK0 and BUCK2 */ > +#define LP87565_BUCK_CTRL_1_FPWM_MP_0_2 BIT(0) > + > +#define LP87565_BUCK_CTRL_2_ILIM 0x38 > +#define LP87565_BUCK_CTRL_2_SLEW_RATE 0x07 > + > +#define LP87565_BUCK_VSET 0xFF > +#define LP87565_BUCK_FLOOR_VSET 0xFF > + > +#define LP87565_BUCK_SHUTDOWN_DELAY 0xF0 > +#define LP87565_BUCK_STARTUP_DELAY 0x0F > + > +#define LP87565_GPIO_SHUTDOWN_DELAY 0xF0 > +#define LP87565_GPIO_STARTUP_DELAY 0x0F > + > +#define LP87565_RESET_SW_RESET BIT(0) > + > +#define LP87565_CONFIG_DOUBLE_DELAY BIT(7) > +#define LP87565_CONFIG_CLKIN_PD BIT(6) > +#define LP87565_CONFIG_EN4_PD BIT(5) > +#define LP87565_CONFIG_EN3_PD BIT(4) > +#define LP87565_CONFIG_TDIE_WARN_LEVEL BIT(3) > +#define LP87565_CONFIG_EN2_PD BIT(2) > +#define LP87565_CONFIG_EN1_PD BIT(1) > + > +#define LP87565_INT_GPIO BIT(7) > +#define LP87565_INT_BUCK23 BIT(6) > +#define LP87565_INT_BUCK01 BIT(5) > +#define LP87565_NO_SYNC_CLK BIT(4) > +#define LP87565_TDIE_SD BIT(3) > +#define LP87565_TDIE_WARN BIT(2) > +#define LP87565_INT_OVP BIT(1) > +#define LP87565_I_LOAD_READY BIT(0) > + > +#define LP87565_INT_TOP2_RESET_REG BIT(0) > + > +#define LP87565_BUCK1_PG_INT BIT(6) > +#define LP87565_BUCK1_SC_INT BIT(5) > +#define LP87565_BUCK1_ILIM_INT BIT(4) > +#define LP87565_BUCK0_PG_INT BIT(2) > +#define LP87565_BUCK0_SC_INT BIT(1) > +#define LP87565_BUCK0_ILIM_INT BIT(0) > + > +#define LP87565_BUCK3_PG_INT BIT(6) > +#define LP87565_BUCK3_SC_INT BIT(5) > +#define LP87565_BUCK3_ILIM_INT BIT(4) > +#define LP87565_BUCK2_PG_INT BIT(2) > +#define LP87565_BUCK2_SC_INT BIT(1) > +#define LP87565_BUCK2_ILIM_INT BIT(0) > + > +#define LP87565_SYNC_CLK_STAT BIT(4) > +#define LP87565_TDIE_SD_STAT BIT(3) > +#define LP87565_TDIE_WARN_STAT BIT(2) > +#define LP87565_OVP_STAT BIT(1) > + > +#define LP87565_BUCK1_STAT BIT(7) > +#define LP87565_BUCK1_PG_STAT BIT(6) > +#define LP87565_BUCK1_ILIM_STAT BIT(4) > +#define LP87565_BUCK0_STAT BIT(3) > +#define LP87565_BUCK0_PG_STAT BIT(2) > +#define LP87565_BUCK0_ILIM_STAT BIT(0) > + > +#define LP87565_BUCK3_STAT BIT(7) > +#define LP87565_BUCK3_PG_STAT BIT(6) > +#define LP87565_BUCK3_ILIM_STAT BIT(4) > +#define LP87565_BUCK2_STAT BIT(3) > +#define LP87565_BUCK2_PG_STAT BIT(2) > +#define LP87565_BUCK2_ILIM_STAT BIT(0) > + > +#define LPL87565_GPIO_MASK BIT(7) > +#define LPL87565_SYNC_CLK_MASK BIT(4) > +#define LPL87565_TDIE_WARN_MASK BIT(2) > +#define LPL87565_I_LOAD_READY_MASK BIT(0) > + > +#define LPL87565_RESET_REG_MASK BIT(0) > + > +#define LPL87565_BUCK1_PG_MASK BIT(6) > +#define LPL87565_BUCK1_ILIM_MASK BIT(4) > +#define LPL87565_BUCK0_PG_MASK BIT(2) > +#define LPL87565_BUCK0_ILIM_MASK BIT(0) > + > +#define LPL87565_BUCK3_PG_MASK BIT(6) > +#define LPL87565_BUCK3_ILIM_MASK BIT(4) > +#define LPL87565_BUCK2_PG_MASK BIT(2) > +#define LPL87565_BUCK2_ILIM_MASK BIT(0) > + > +#define LP87565_LOAD_CURRENT_BUCK_SELECT 0x3 > + > +#define LP87565_I_LOAD2_BUCK_LOAD_CURRENT 0x3 > +#define LP87565_I_LOAD1_BUCK_LOAD_CURRENT 0xFF > + > +#define LP87565_PG3_SEL 0xC0 > +#define LP87565_PG2_SEL 0x30 > +#define LP87565_PG1_SEL 0x0C > +#define LP87565_PG0_SEL 0x03 > + > +#define LP87565_HALF_DAY BIT(7) > +#define LP87565_EN_PG0_NINT BIT(6) > +#define LP87565_PGOOD_SET_DELAY BIT(5) > +#define LP87565_EN_PGFLT_STAT BIT(4) > +#define LP87565_PGOOD_WINDOW BIT(2) > +#define LP87565_PGOOD_OD BIT(1) > +#define LP87565_PGOOD_POL BIT(0) > + > +#define LP87565_PG3_FLT BIT(3) > +#define LP87565_PG2_FLT BIT(2) > +#define LP87565_PG1_FLT BIT(1) > +#define LP87565_PG0_FLT BIT(0) > + > +#define LP87565_PLL_MODE 0xC0 > +#define LP87565_EXT_CLK_FREQ 0x1F > + > +#define LP87565_EN_SPREAD_SPEC BIT(7) > +#define LP87565_EN_PIN_CTRL_GPIO3 BIT(6) > +#define LP87565_EN_PIN_SELECT_GPIO3 BIT(5) > +#define LP87565_EN_PIN_CTRL_GPIO2 BIT(4) > +#define LP87565_EN_PIN_SELECT_GPIO2 BIT(3) > +#define LP87565_GPIO3_SEL BIT(2) > +#define LP87565_GPIO2_SEL BIT(1) > +#define LP87565_GPIO1_SEL BIT(0) > + > +#define LP87565_GOIO3_OD BIT(6) > +#define LP87565_GOIO2_OD BIT(5) > +#define LP87565_GOIO1_OD BIT(4) > +#define LP87565_GOIO3_DIR BIT(2) > +#define LP87565_GOIO2_DIR BIT(1) > +#define LP87565_GOIO1_DIR BIT(0) > + > +#define LP87565_GOIO3_IN BIT(2) > +#define LP87565_GOIO2_IN BIT(1) > +#define LP87565_GOIO1_IN BIT(0) > + > +#define LP87565_GOIO3_OUT BIT(2) > +#define LP87565_GOIO2_OUT BIT(1) > +#define LP87565_GOIO1_OUT BIT(0) > + > +/* Number of step-down converters available */ > +#define LP87565_NUM_BUCK 6 > + > +enum LP87565_regulator_id { > + /* BUCK's */ > + LP87565_BUCK_0, > + LP87565_BUCK_1, > + LP87565_BUCK_2, > + LP87565_BUCK_3, > + LP87565_BUCK_10, > + LP87565_BUCK_23, > +}; > + > +/** > + * struct LP87565 - state holder for the LP87565 driver > + * @dev: struct device pointer for MFD device > + * @rev: revision of the LP87565 > + * @dev_type: The device type for example lp87565-q1 > + * @lock: lock guarding the data structure > + * @regmap: register map of the LP87565 PMIC > + * > + * Device data may be used to access the LP87565 chip > + */ > +struct lp87565 { > + struct device *dev; > + u8 rev; > + u8 dev_type; > + struct regmap *regmap; > +}; > +#endif /* __LINUX_MFD_LP87565_H */ -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 1/3] mfd: lp87565: Add lp87565 PMIC support 2017-05-30 9:23 ` Lee Jones @ 2017-05-30 9:54 ` Keerthy 2017-05-30 10:12 ` Lee Jones 0 siblings, 1 reply; 12+ messages in thread From: Keerthy @ 2017-05-30 9:54 UTC (permalink / raw) To: Lee Jones Cc: broonie, robh+dt, t-kristo, tony, mark.rutland, linux-omap, linux-kernel, devicetree, afd On Tuesday 30 May 2017 02:53 PM, Lee Jones wrote: > On Tue, 23 May 2017, Keerthy wrote: > >> The LP87565 chip is a power management IC for Portable Navigation Systems >> and Tablet Computing devices. It contains the following components: >> >> - Configurable Bucks(Single and multi-phase). >> - Configurable General Purpose Output Signals (GPO). >> >> The LP87565-Q1 variant device uses two 2-phase outputs configuration, >> Buck0 is master for Buck0/1 output and Buck2 is master for Buck2/3 >> output. >> >> Signed-off-by: Keerthy <j-keerthy@ti.com> >> --- >> >> Changes in v2: >> >> * Fixed a bunch of whitespace errors. >> * Changed the License to short form. >> * Added the generic compatible lp87565 >> * Removed i2c_device_id table. >> * Introduced probe_new function in place of probe. >> >> Documentation/devicetree/bindings/mfd/lp87565.txt | 45 ++++ >> drivers/mfd/Kconfig | 14 ++ >> drivers/mfd/Makefile | 1 + >> drivers/mfd/lp87565.c | 95 ++++++++ >> include/linux/mfd/lp87565.h | 271 ++++++++++++++++++++++ >> 5 files changed, 426 insertions(+) >> create mode 100644 Documentation/devicetree/bindings/mfd/lp87565.txt >> create mode 100644 drivers/mfd/lp87565.c >> create mode 100644 include/linux/mfd/lp87565.h >> >> diff --git a/Documentation/devicetree/bindings/mfd/lp87565.txt b/Documentation/devicetree/bindings/mfd/lp87565.txt >> new file mode 100644 >> index 0000000..f63d568 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/mfd/lp87565.txt >> @@ -0,0 +1,45 @@ >> +TI LP87565 PMIC MFD driver >> + >> +Required properties: >> + - compatible: "ti,lp87565", "ti,lp87565-q1" >> + - reg: I2C slave address. >> + - gpio-controller: Marks the device node as a GPIO Controller. >> + - #gpio-cells: Should be two. The first cell is the pin number and >> + the second cell is used to specify flags. >> + See ../gpio/gpio.txt for more information. >> + - xxx-in-supply: Phandle to parent supply node of each regulator >> + populated under regulators node. xxx should match >> + the supply_name populated in driver. >> + - regulators: List of child nodes that specify the regulator >> + initialization data. >> +Example: >> + >> +lp87565_pmic: lp87565@60 { >> + compatible = "ti,lp87565-q1"; >> + reg = <0x60>; >> + gpio-controller; >> + #gpio-cells = <2>; >> + >> + buck10-in-supply = <&vsys_3v3>; >> + buck23-in-supply = <&vsys_3v3>; >> + >> + regulators: regulators { >> + buck10_reg: buck10 { >> + /* VDD_MPU */ >> + regulator-name = "buck10"; >> + regulator-min-microvolt = <850000>; >> + regulator-max-microvolt = <1250000>; >> + regulator-always-on; >> + regulator-boot-on; >> + }; >> + >> + buck23_reg: buck23 { >> + /* VDD_GPU */ >> + regulator-name = "buck23"; >> + regulator-min-microvolt = <850000>; >> + regulator-max-microvolt = <1250000>; >> + regulator-boot-on; >> + regulator-always-on; >> + }; >> + }; >> +}; >> diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig >> index 3eb5c93..5e884f3 100644 >> --- a/drivers/mfd/Kconfig >> +++ b/drivers/mfd/Kconfig >> @@ -1325,6 +1325,20 @@ config MFD_TI_LP873X >> This driver can also be built as a module. If so, the module >> will be called lp873x. >> >> +config MFD_TI_LP87565 >> + tristate "TI LP87565 Power Management IC" >> + depends on I2C && OF >> + select MFD_CORE >> + select REGMAP_I2C >> + help >> + If you say yes here then you get support for the LP87565 series of >> + Power Management Integrated Circuits (PMIC). >> + These include voltage regulators, thermal protection, configurable >> + General Purpose Outputs (GPO) that are used in portable devices. >> + >> + This driver can also be built as a module. If so, the module >> + will be called lp87565. >> + >> config MFD_TPS65218 >> tristate "TI TPS65218 Power Management chips" >> depends on I2C >> diff --git a/drivers/mfd/Makefile b/drivers/mfd/Makefile >> index c16bf1e..7edbe1b 100644 >> --- a/drivers/mfd/Makefile >> +++ b/drivers/mfd/Makefile >> @@ -25,6 +25,7 @@ obj-$(CONFIG_HTC_PASIC3) += htc-pasic3.o >> obj-$(CONFIG_HTC_I2CPLD) += htc-i2cpld.o >> >> obj-$(CONFIG_MFD_TI_LP873X) += lp873x.o >> +obj-$(CONFIG_MFD_TI_LP87565) += lp87565.o >> >> obj-$(CONFIG_MFD_DAVINCI_VOICECODEC) += davinci_voicecodec.o >> obj-$(CONFIG_MFD_DM355EVM_MSP) += dm355evm_msp.o >> diff --git a/drivers/mfd/lp87565.c b/drivers/mfd/lp87565.c >> new file mode 100644 >> index 0000000..7df7070 >> --- /dev/null >> +++ b/drivers/mfd/lp87565.c >> @@ -0,0 +1,95 @@ >> +/* >> + * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ >> + * >> + * Author: Keerthy <j-keerthy@ti.com> >> + * >> + * This program is free software; you can redistribute it and/or modify it >> + * under the terms of the GNU General Public License as published by the >> + * Free Software Foundation; either version 2 of the License, or (at your >> + * option) any later version. >> + */ >> + >> +#include <linux/interrupt.h> >> +#include <linux/mfd/core.h> >> +#include <linux/module.h> >> +#include <linux/of_device.h> >> +#include <linux/regmap.h> >> + >> +#include <linux/mfd/lp87565.h> >> + >> +static const struct regmap_config lp87565_regmap_config = { >> + .reg_bits = 8, >> + .val_bits = 8, >> + .max_register = LP87565_REG_MAX, >> +}; >> + >> +static const struct mfd_cell lp87565_cells[] = { >> + { .name = "lp87565-q1-regulator", }, >> + { .name = "lp87565-q1-gpio", }, >> +}; >> + >> +static const struct of_device_id of_lp87565_match_table[] = { >> + { >> + .compatible = "ti,lp87565", >> + }, > > Please place this one a single line.. Okay. > >> + { >> + .compatible = "ti,lp87565-q1", >> + .data = (void *)LP87565_DEVICE_TYPE_LP87565_Q1, >> + }, >> + {} >> +}; >> +MODULE_DEVICE_TABLE(of, of_lp87565_match_table); >> + >> +static int lp87565_probe(struct i2c_client *client) >> +{ >> + struct lp87565 *lp87565; >> + const struct of_device_id *of_id; >> + int ret; >> + unsigned int otpid; >> + >> + lp87565 = devm_kzalloc(&client->dev, sizeof(*lp87565), GFP_KERNEL); >> + if (!lp87565) >> + return -ENOMEM; >> + >> + lp87565->dev = &client->dev; >> + >> + lp87565->regmap = devm_regmap_init_i2c(client, &lp87565_regmap_config); >> + if (IS_ERR(lp87565->regmap)) { >> + ret = PTR_ERR(lp87565->regmap); >> + dev_err(lp87565->dev, >> + "Failed to initialize register map: %d\n", ret); >> + return ret; >> + } >> + >> + ret = regmap_read(lp87565->regmap, LP87565_REG_OTP_REV, &otpid); >> + if (ret) { >> + dev_err(lp87565->dev, "Failed to read OTP ID\n"); >> + return ret; >> + } >> + >> + lp87565->rev = otpid & LP87565_OTP_REV_OTP_ID; >> + >> + of_id = of_match_device(of_lp87565_match_table, &client->dev); >> + if (of_id) >> + lp87565->dev_type = (enum lp87565_device_type)of_id->data; > > So you can interigate the device for a revision number, but not a > device type ID, is that correct? I hope you meant integrate? Revision of a particular type. Then device type can mean something like lp87565-q1 which is modeling 4 individual regulators as 2 dual phase regulators. There can be other devices which has 4 single phase regulators. I have no document which talks about that yet but possible. > >> + i2c_set_clientdata(client, lp87565); >> + >> + ret = mfd_add_devices(lp87565->dev, PLATFORM_DEVID_AUTO, lp87565_cells, >> + ARRAY_SIZE(lp87565_cells), NULL, 0, NULL); >> + >> + return ret; >> +} >> + >> +static struct i2c_driver lp87565_driver = { >> + .driver = { >> + .name = "lp87565", >> + .of_match_table = of_lp87565_match_table, >> + }, >> + .probe_new = lp87565_probe, >> +}; > > What's with the random padding? > > Just use a single space before and after the '='. Oops okay i will fix that. > >> +module_i2c_driver(lp87565_driver); >> + >> +MODULE_AUTHOR("J Keerthy <j-keerthy@ti.com>"); >> +MODULE_DESCRIPTION("lp87565 chip family Multi-Function Device driver"); >> +MODULE_LICENSE("GPL v2"); > > This does not match the header comment. It should be v2 only. I will correct the header comment. > >> diff --git a/include/linux/mfd/lp87565.h b/include/linux/mfd/lp87565.h >> new file mode 100644 >> index 0000000..b298c62 >> --- /dev/null >> +++ b/include/linux/mfd/lp87565.h >> @@ -0,0 +1,271 @@ >> +/* >> + * Functions to access LP87565 power management chip. >> + * >> + * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ >> + * >> + * This program is free software; you can redistribute it and/or modify it >> + * under the terms of the GNU General Public License as published by the >> + * Free Software Foundation; either version 2 of the License, or (at your >> + * option) any later version. >> + */ >> + >> +#ifndef __LINUX_MFD_LP87565_H >> +#define __LINUX_MFD_LP87565_H >> + >> +#include <linux/i2c.h> >> +#include <linux/regulator/driver.h> >> +#include <linux/regulator/machine.h> >> + >> +enum lp87565_device_type { >> + LP87565_DEVICE_TYPE_UNKNOWN = 0, >> + LP87565_DEVICE_TYPE_LP87565_Q1, >> +}; >> + >> +/* All register addresses */ >> +#define LP87565_REG_DEV_REV 0X00 >> +#define LP87565_REG_OTP_REV 0X01 >> +#define LP87565_REG_BUCK0_CTRL_1 0X02 >> +#define LP87565_REG_BUCK0_CTRL_2 0X03 >> + >> +#define LP87565_REG_BUCK1_CTRL_1 0X04 >> +#define LP87565_REG_BUCK1_CTRL_2 0X05 >> + >> +#define LP87565_REG_BUCK2_CTRL_1 0X06 >> +#define LP87565_REG_BUCK2_CTRL_2 0X07 >> + >> +#define LP87565_REG_BUCK3_CTRL_1 0X08 >> +#define LP87565_REG_BUCK3_CTRL_2 0X09 >> + >> +#define LP87565_REG_BUCK0_VOUT 0X0A >> +#define LP87565_REG_BUCK0_FLOOR_VOUT 0X0B >> + >> +#define LP87565_REG_BUCK1_VOUT 0X0C >> +#define LP87565_REG_BUCK1_FLOOR_VOUT 0X0D >> + >> +#define LP87565_REG_BUCK2_VOUT 0X0E >> +#define LP87565_REG_BUCK2_FLOOR_VOUT 0X0F >> + >> +#define LP87565_REG_BUCK3_VOUT 0X10 >> +#define LP87565_REG_BUCK3_FLOOR_VOUT 0X11 >> + >> +#define LP87565_REG_BUCK0_DELAY 0X12 >> +#define LP87565_REG_BUCK1_DELAY 0X13 >> + >> +#define LP87565_REG_BUCK2_DELAY 0X14 >> +#define LP87565_REG_BUCK3_DELAY 0X15 >> + >> +#define LP87565_REG_GPO2_DELAY 0X16 >> +#define LP87565_REG_GPO3_DELAY 0X17 >> +#define LP87565_REG_RESET 0X18 >> +#define LP87565_REG_CONFIG 0X19 >> + >> +#define LP87565_REG_INT_TOP_1 0X1A >> +#define LP87565_REG_INT_TOP_2 0X1B >> + >> +#define LP87565_REG_INT_BUCK_0_1 0X1C >> +#define LP87565_REG_INT_BUCK_2_3 0X1D >> +#define LP87565_REG_TOP_STAT 0X1E >> +#define LP87565_REG_BUCK_0_1_STAT 0X1F >> +#define LP87565_REG_BUCK_2_3_STAT 0x20 >> + >> +#define LP87565_REG_TOP_MASK_1 0x21 >> +#define LP87565_REG_TOP_MASK_2 0x22 >> + >> +#define LP87565_REG_BUCK_0_1_MASK 0x23 >> +#define LP87565_REG_BUCK_2_3_MASK 0x24 >> +#define LP87565_REG_SEL_I_LOAD 0x25 >> + >> +#define LP87565_REG_I_LOAD_2 0x26 >> +#define LP87565_REG_I_LOAD_1 0x27 >> + >> +#define LP87565_REG_PGOOD_CTRL1 0x28 >> +#define LP87565_REG_PGOOD_CTRL2 0x29 >> +#define LP87565_REG_PGOOD_FLT 0x2A >> +#define LP87565_REG_PLL_CTRL 0x2B >> +#define LP87565_REG_PIN_FUNCTION 0x2C >> +#define LP87565_REG_GPIO_CONFIG 0x2D >> +#define LP87565_REG_GPIO_IN 0x2E >> +#define LP87565_REG_GPIO_OUT 0x2F >> + >> +#define LP87565_REG_MAX LP87565_REG_GPIO_OUT >> + >> +/* Register field definitions */ >> +#define LP87565_DEV_REV_DEV_ID 0xC0 >> +#define LP87565_DEV_REV_ALL_LAYER 0x30 >> +#define LP87565_DEV_REV_METAL_LAYER 0x0F >> + >> +#define LP87565_OTP_REV_OTP_ID 0xFF >> + >> +#define LP87565_BUCK_CTRL_1_EN BIT(7) >> +#define LP87565_BUCK_CTRL_1_EN_PIN_CTRL BIT(6) >> +#define LP87565_BUCK_CTRL_1_PIN_SELECT_EN 0x30 >> + >> +#define LP87565_BUCK_CTRL_1_ROOF_FLOOR_EN BIT(3) >> +#define LP87565_BUCK_CTRL_1_RDIS_EN BIT(2) >> +#define LP87565_BUCK_CTRL_1_FPWM BIT(1) >> +/* Bit0 is reserved for BUCK1 and BUCK3 and valid only for BUCK0 and BUCK2 */ >> +#define LP87565_BUCK_CTRL_1_FPWM_MP_0_2 BIT(0) >> + >> +#define LP87565_BUCK_CTRL_2_ILIM 0x38 >> +#define LP87565_BUCK_CTRL_2_SLEW_RATE 0x07 >> + >> +#define LP87565_BUCK_VSET 0xFF >> +#define LP87565_BUCK_FLOOR_VSET 0xFF >> + >> +#define LP87565_BUCK_SHUTDOWN_DELAY 0xF0 >> +#define LP87565_BUCK_STARTUP_DELAY 0x0F >> + >> +#define LP87565_GPIO_SHUTDOWN_DELAY 0xF0 >> +#define LP87565_GPIO_STARTUP_DELAY 0x0F >> + >> +#define LP87565_RESET_SW_RESET BIT(0) >> + >> +#define LP87565_CONFIG_DOUBLE_DELAY BIT(7) >> +#define LP87565_CONFIG_CLKIN_PD BIT(6) >> +#define LP87565_CONFIG_EN4_PD BIT(5) >> +#define LP87565_CONFIG_EN3_PD BIT(4) >> +#define LP87565_CONFIG_TDIE_WARN_LEVEL BIT(3) >> +#define LP87565_CONFIG_EN2_PD BIT(2) >> +#define LP87565_CONFIG_EN1_PD BIT(1) >> + >> +#define LP87565_INT_GPIO BIT(7) >> +#define LP87565_INT_BUCK23 BIT(6) >> +#define LP87565_INT_BUCK01 BIT(5) >> +#define LP87565_NO_SYNC_CLK BIT(4) >> +#define LP87565_TDIE_SD BIT(3) >> +#define LP87565_TDIE_WARN BIT(2) >> +#define LP87565_INT_OVP BIT(1) >> +#define LP87565_I_LOAD_READY BIT(0) >> + >> +#define LP87565_INT_TOP2_RESET_REG BIT(0) >> + >> +#define LP87565_BUCK1_PG_INT BIT(6) >> +#define LP87565_BUCK1_SC_INT BIT(5) >> +#define LP87565_BUCK1_ILIM_INT BIT(4) >> +#define LP87565_BUCK0_PG_INT BIT(2) >> +#define LP87565_BUCK0_SC_INT BIT(1) >> +#define LP87565_BUCK0_ILIM_INT BIT(0) >> + >> +#define LP87565_BUCK3_PG_INT BIT(6) >> +#define LP87565_BUCK3_SC_INT BIT(5) >> +#define LP87565_BUCK3_ILIM_INT BIT(4) >> +#define LP87565_BUCK2_PG_INT BIT(2) >> +#define LP87565_BUCK2_SC_INT BIT(1) >> +#define LP87565_BUCK2_ILIM_INT BIT(0) >> + >> +#define LP87565_SYNC_CLK_STAT BIT(4) >> +#define LP87565_TDIE_SD_STAT BIT(3) >> +#define LP87565_TDIE_WARN_STAT BIT(2) >> +#define LP87565_OVP_STAT BIT(1) >> + >> +#define LP87565_BUCK1_STAT BIT(7) >> +#define LP87565_BUCK1_PG_STAT BIT(6) >> +#define LP87565_BUCK1_ILIM_STAT BIT(4) >> +#define LP87565_BUCK0_STAT BIT(3) >> +#define LP87565_BUCK0_PG_STAT BIT(2) >> +#define LP87565_BUCK0_ILIM_STAT BIT(0) >> + >> +#define LP87565_BUCK3_STAT BIT(7) >> +#define LP87565_BUCK3_PG_STAT BIT(6) >> +#define LP87565_BUCK3_ILIM_STAT BIT(4) >> +#define LP87565_BUCK2_STAT BIT(3) >> +#define LP87565_BUCK2_PG_STAT BIT(2) >> +#define LP87565_BUCK2_ILIM_STAT BIT(0) >> + >> +#define LPL87565_GPIO_MASK BIT(7) >> +#define LPL87565_SYNC_CLK_MASK BIT(4) >> +#define LPL87565_TDIE_WARN_MASK BIT(2) >> +#define LPL87565_I_LOAD_READY_MASK BIT(0) >> + >> +#define LPL87565_RESET_REG_MASK BIT(0) >> + >> +#define LPL87565_BUCK1_PG_MASK BIT(6) >> +#define LPL87565_BUCK1_ILIM_MASK BIT(4) >> +#define LPL87565_BUCK0_PG_MASK BIT(2) >> +#define LPL87565_BUCK0_ILIM_MASK BIT(0) >> + >> +#define LPL87565_BUCK3_PG_MASK BIT(6) >> +#define LPL87565_BUCK3_ILIM_MASK BIT(4) >> +#define LPL87565_BUCK2_PG_MASK BIT(2) >> +#define LPL87565_BUCK2_ILIM_MASK BIT(0) >> + >> +#define LP87565_LOAD_CURRENT_BUCK_SELECT 0x3 >> + >> +#define LP87565_I_LOAD2_BUCK_LOAD_CURRENT 0x3 >> +#define LP87565_I_LOAD1_BUCK_LOAD_CURRENT 0xFF >> + >> +#define LP87565_PG3_SEL 0xC0 >> +#define LP87565_PG2_SEL 0x30 >> +#define LP87565_PG1_SEL 0x0C >> +#define LP87565_PG0_SEL 0x03 >> + >> +#define LP87565_HALF_DAY BIT(7) >> +#define LP87565_EN_PG0_NINT BIT(6) >> +#define LP87565_PGOOD_SET_DELAY BIT(5) >> +#define LP87565_EN_PGFLT_STAT BIT(4) >> +#define LP87565_PGOOD_WINDOW BIT(2) >> +#define LP87565_PGOOD_OD BIT(1) >> +#define LP87565_PGOOD_POL BIT(0) >> + >> +#define LP87565_PG3_FLT BIT(3) >> +#define LP87565_PG2_FLT BIT(2) >> +#define LP87565_PG1_FLT BIT(1) >> +#define LP87565_PG0_FLT BIT(0) >> + >> +#define LP87565_PLL_MODE 0xC0 >> +#define LP87565_EXT_CLK_FREQ 0x1F >> + >> +#define LP87565_EN_SPREAD_SPEC BIT(7) >> +#define LP87565_EN_PIN_CTRL_GPIO3 BIT(6) >> +#define LP87565_EN_PIN_SELECT_GPIO3 BIT(5) >> +#define LP87565_EN_PIN_CTRL_GPIO2 BIT(4) >> +#define LP87565_EN_PIN_SELECT_GPIO2 BIT(3) >> +#define LP87565_GPIO3_SEL BIT(2) >> +#define LP87565_GPIO2_SEL BIT(1) >> +#define LP87565_GPIO1_SEL BIT(0) >> + >> +#define LP87565_GOIO3_OD BIT(6) >> +#define LP87565_GOIO2_OD BIT(5) >> +#define LP87565_GOIO1_OD BIT(4) >> +#define LP87565_GOIO3_DIR BIT(2) >> +#define LP87565_GOIO2_DIR BIT(1) >> +#define LP87565_GOIO1_DIR BIT(0) >> + >> +#define LP87565_GOIO3_IN BIT(2) >> +#define LP87565_GOIO2_IN BIT(1) >> +#define LP87565_GOIO1_IN BIT(0) >> + >> +#define LP87565_GOIO3_OUT BIT(2) >> +#define LP87565_GOIO2_OUT BIT(1) >> +#define LP87565_GOIO1_OUT BIT(0) >> + >> +/* Number of step-down converters available */ >> +#define LP87565_NUM_BUCK 6 >> + >> +enum LP87565_regulator_id { >> + /* BUCK's */ >> + LP87565_BUCK_0, >> + LP87565_BUCK_1, >> + LP87565_BUCK_2, >> + LP87565_BUCK_3, >> + LP87565_BUCK_10, >> + LP87565_BUCK_23, >> +}; >> + >> +/** >> + * struct LP87565 - state holder for the LP87565 driver >> + * @dev: struct device pointer for MFD device >> + * @rev: revision of the LP87565 >> + * @dev_type: The device type for example lp87565-q1 >> + * @lock: lock guarding the data structure >> + * @regmap: register map of the LP87565 PMIC >> + * >> + * Device data may be used to access the LP87565 chip >> + */ >> +struct lp87565 { >> + struct device *dev; >> + u8 rev; >> + u8 dev_type; >> + struct regmap *regmap; >> +}; >> +#endif /* __LINUX_MFD_LP87565_H */ > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 1/3] mfd: lp87565: Add lp87565 PMIC support 2017-05-30 9:54 ` Keerthy @ 2017-05-30 10:12 ` Lee Jones 2017-05-30 10:17 ` Keerthy 0 siblings, 1 reply; 12+ messages in thread From: Lee Jones @ 2017-05-30 10:12 UTC (permalink / raw) To: Keerthy Cc: broonie, robh+dt, t-kristo, tony, mark.rutland, linux-omap, linux-kernel, devicetree, afd On Tue, 30 May 2017, Keerthy wrote: > > > On Tuesday 30 May 2017 02:53 PM, Lee Jones wrote: > > On Tue, 23 May 2017, Keerthy wrote: > > > >> The LP87565 chip is a power management IC for Portable Navigation Systems > >> and Tablet Computing devices. It contains the following components: > >> > >> - Configurable Bucks(Single and multi-phase). > >> - Configurable General Purpose Output Signals (GPO). > >> > >> The LP87565-Q1 variant device uses two 2-phase outputs configuration, > >> Buck0 is master for Buck0/1 output and Buck2 is master for Buck2/3 > >> output. > >> > >> Signed-off-by: Keerthy <j-keerthy@ti.com> > >> --- > >> > >> Changes in v2: > >> > >> * Fixed a bunch of whitespace errors. > >> * Changed the License to short form. > >> * Added the generic compatible lp87565 > >> * Removed i2c_device_id table. > >> * Introduced probe_new function in place of probe. > >> > >> Documentation/devicetree/bindings/mfd/lp87565.txt | 45 ++++ > >> drivers/mfd/Kconfig | 14 ++ > >> drivers/mfd/Makefile | 1 + > >> drivers/mfd/lp87565.c | 95 ++++++++ > >> include/linux/mfd/lp87565.h | 271 ++++++++++++++++++++++ > >> 5 files changed, 426 insertions(+) > >> create mode 100644 Documentation/devicetree/bindings/mfd/lp87565.txt > >> create mode 100644 drivers/mfd/lp87565.c > >> create mode 100644 include/linux/mfd/lp87565.h [...] > >> +static int lp87565_probe(struct i2c_client *client) > >> +{ > >> + struct lp87565 *lp87565; > >> + const struct of_device_id *of_id; > >> + int ret; > >> + unsigned int otpid; > >> + > >> + lp87565 = devm_kzalloc(&client->dev, sizeof(*lp87565), GFP_KERNEL); > >> + if (!lp87565) > >> + return -ENOMEM; > >> + > >> + lp87565->dev = &client->dev; > >> + > >> + lp87565->regmap = devm_regmap_init_i2c(client, &lp87565_regmap_config); > >> + if (IS_ERR(lp87565->regmap)) { > >> + ret = PTR_ERR(lp87565->regmap); > >> + dev_err(lp87565->dev, > >> + "Failed to initialize register map: %d\n", ret); > >> + return ret; > >> + } > >> + > >> + ret = regmap_read(lp87565->regmap, LP87565_REG_OTP_REV, &otpid); > >> + if (ret) { > >> + dev_err(lp87565->dev, "Failed to read OTP ID\n"); > >> + return ret; > >> + } > >> + > >> + lp87565->rev = otpid & LP87565_OTP_REV_OTP_ID; > >> + > >> + of_id = of_match_device(of_lp87565_match_table, &client->dev); > >> + if (of_id) > >> + lp87565->dev_type = (enum lp87565_device_type)of_id->data; > > > > So you can interigate the device for a revision number, but not a > > device type ID, is that correct? > > I hope you meant integrate? Revision of a particular type. Then device > type can mean something like lp87565-q1 which is modeling 4 individual > regulators as 2 dual phase regulators. There can be other devices which > has 4 single phase regulators. I have no document which talks about that > yet but possible. No I meant "interrogate". Odd that my spell checker didn't pick that one up. I'll put it another way. You are able to read the revision number from the device, right? Is there another register that you can read from to obtain the device type? -- Lee Jones Linaro STMicroelectronics Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 1/3] mfd: lp87565: Add lp87565 PMIC support 2017-05-30 10:12 ` Lee Jones @ 2017-05-30 10:17 ` Keerthy 0 siblings, 0 replies; 12+ messages in thread From: Keerthy @ 2017-05-30 10:17 UTC (permalink / raw) To: Lee Jones Cc: broonie, robh+dt, t-kristo, tony, mark.rutland, linux-omap, linux-kernel, devicetree, afd On Tuesday 30 May 2017 03:42 PM, Lee Jones wrote: > On Tue, 30 May 2017, Keerthy wrote: > >> >> >> On Tuesday 30 May 2017 02:53 PM, Lee Jones wrote: >>> On Tue, 23 May 2017, Keerthy wrote: >>> >>>> The LP87565 chip is a power management IC for Portable Navigation Systems >>>> and Tablet Computing devices. It contains the following components: >>>> >>>> - Configurable Bucks(Single and multi-phase). >>>> - Configurable General Purpose Output Signals (GPO). >>>> >>>> The LP87565-Q1 variant device uses two 2-phase outputs configuration, >>>> Buck0 is master for Buck0/1 output and Buck2 is master for Buck2/3 >>>> output. >>>> >>>> Signed-off-by: Keerthy <j-keerthy@ti.com> >>>> --- >>>> >>>> Changes in v2: >>>> >>>> * Fixed a bunch of whitespace errors. >>>> * Changed the License to short form. >>>> * Added the generic compatible lp87565 >>>> * Removed i2c_device_id table. >>>> * Introduced probe_new function in place of probe. >>>> >>>> Documentation/devicetree/bindings/mfd/lp87565.txt | 45 ++++ >>>> drivers/mfd/Kconfig | 14 ++ >>>> drivers/mfd/Makefile | 1 + >>>> drivers/mfd/lp87565.c | 95 ++++++++ >>>> include/linux/mfd/lp87565.h | 271 ++++++++++++++++++++++ >>>> 5 files changed, 426 insertions(+) >>>> create mode 100644 Documentation/devicetree/bindings/mfd/lp87565.txt >>>> create mode 100644 drivers/mfd/lp87565.c >>>> create mode 100644 include/linux/mfd/lp87565.h > > [...] > >>>> +static int lp87565_probe(struct i2c_client *client) >>>> +{ >>>> + struct lp87565 *lp87565; >>>> + const struct of_device_id *of_id; >>>> + int ret; >>>> + unsigned int otpid; >>>> + >>>> + lp87565 = devm_kzalloc(&client->dev, sizeof(*lp87565), GFP_KERNEL); >>>> + if (!lp87565) >>>> + return -ENOMEM; >>>> + >>>> + lp87565->dev = &client->dev; >>>> + >>>> + lp87565->regmap = devm_regmap_init_i2c(client, &lp87565_regmap_config); >>>> + if (IS_ERR(lp87565->regmap)) { >>>> + ret = PTR_ERR(lp87565->regmap); >>>> + dev_err(lp87565->dev, >>>> + "Failed to initialize register map: %d\n", ret); >>>> + return ret; >>>> + } >>>> + >>>> + ret = regmap_read(lp87565->regmap, LP87565_REG_OTP_REV, &otpid); >>>> + if (ret) { >>>> + dev_err(lp87565->dev, "Failed to read OTP ID\n"); >>>> + return ret; >>>> + } >>>> + >>>> + lp87565->rev = otpid & LP87565_OTP_REV_OTP_ID; >>>> + >>>> + of_id = of_match_device(of_lp87565_match_table, &client->dev); >>>> + if (of_id) >>>> + lp87565->dev_type = (enum lp87565_device_type)of_id->data; >>> >>> So you can interigate the device for a revision number, but not a >>> device type ID, is that correct? >> >> I hope you meant integrate? Revision of a particular type. Then device >> type can mean something like lp87565-q1 which is modeling 4 individual >> regulators as 2 dual phase regulators. There can be other devices which >> has 4 single phase regulators. I have no document which talks about that >> yet but possible. > > No I meant "interrogate". Odd that my spell checker didn't pick that > one up. > > I'll put it another way. You are able to read the revision number > from the device, right? Is there another register that you can read > from to obtain the device type? Ah okay. Understood now. I went through data sheet all over again, unfortunately there is no register which tells me the device type. > ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 2/3] regulator: lp87565: Add support for lp87565 PMIC regulators 2017-05-23 12:16 [PATCH v2 0/3] mfd: lp87565: Add lp87565 PMIC support Keerthy 2017-05-23 12:16 ` [PATCH v2 1/3] " Keerthy @ 2017-05-23 12:16 ` Keerthy 2017-05-24 17:42 ` Applied "regulator: lp87565: Add support for lp87565 PMIC regulators" to the regulator tree Mark Brown 2017-05-23 12:16 ` [PATCH v2 3/3] regulator: tps65917: Add support for SMPS12 Keerthy 2 siblings, 1 reply; 12+ messages in thread From: Keerthy @ 2017-05-23 12:16 UTC (permalink / raw) To: broonie, lee.jones, robh+dt Cc: j-keerthy, t-kristo, tony, mark.rutland, linux-omap, linux-kernel, devicetree, afd The regulators set consists of 4 BUCKs. The output voltages are configurable and are meant to supply power to the main processor and other components. The ramp delay is configurable for all BUCKs. The BUCKs can be configured in single phase or multiphase modes. Signed-off-by: Keerthy <j-keerthy@ti.com> --- Changes in v2: * Removed couple of unwanted macros. * Changes the License to short form drivers/regulator/Kconfig | 8 ++ drivers/regulator/Makefile | 1 + drivers/regulator/lp87565-regulator.c | 237 ++++++++++++++++++++++++++++++++++ 3 files changed, 246 insertions(+) create mode 100644 drivers/regulator/lp87565-regulator.c diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 48db87d..7c34ff8 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -365,6 +365,14 @@ config REGULATOR_LP8755 chip contains six step-down DC/DC converters which can support 9 mode multiphase configuration. +config REGULATOR_LP87565 + tristate "TI LP87565 Power regulators" + depends on MFD_TI_LP87565 && OF + help + This driver supports LP87565 voltage regulator chips. LP87565 + provides four step-down converters. It supports software based + voltage control for different voltage domains + config REGULATOR_LP8788 tristate "TI LP8788 Power Regulators" depends on MFD_LP8788 diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index dc3503f..fee6b8c 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -46,6 +46,7 @@ obj-$(CONFIG_REGULATOR_LP3971) += lp3971.o obj-$(CONFIG_REGULATOR_LP3972) += lp3972.o obj-$(CONFIG_REGULATOR_LP872X) += lp872x.o obj-$(CONFIG_REGULATOR_LP873X) += lp873x-regulator.o +obj-$(CONFIG_REGULATOR_LP87565) += lp87565-regulator.o obj-$(CONFIG_REGULATOR_LP8788) += lp8788-buck.o obj-$(CONFIG_REGULATOR_LP8788) += lp8788-ldo.o obj-$(CONFIG_REGULATOR_LP8755) += lp8755.o diff --git a/drivers/regulator/lp87565-regulator.c b/drivers/regulator/lp87565-regulator.c new file mode 100644 index 0000000..71e7622 --- /dev/null +++ b/drivers/regulator/lp87565-regulator.c @@ -0,0 +1,237 @@ +/* + * Regulator driver for LP87565 PMIC + * + * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + */ + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +#include <linux/mfd/lp87565.h> + +#define LP87565_REGULATOR(_name, _id, _of, _ops, _n, _vr, _vm, _er, _em, \ + _delay, _lr, _cr) \ + [_id] = { \ + .desc = { \ + .name = _name, \ + .supply_name = _of "-in", \ + .id = _id, \ + .of_match = of_match_ptr(_of), \ + .regulators_node = of_match_ptr("regulators"),\ + .ops = &_ops, \ + .n_voltages = _n, \ + .type = REGULATOR_VOLTAGE, \ + .owner = THIS_MODULE, \ + .vsel_reg = _vr, \ + .vsel_mask = _vm, \ + .enable_reg = _er, \ + .enable_mask = _em, \ + .ramp_delay = _delay, \ + .linear_ranges = _lr, \ + .n_linear_ranges = ARRAY_SIZE(_lr), \ + }, \ + .ctrl2_reg = _cr, \ + } + +struct lp87565_regulator { + struct regulator_desc desc; + unsigned int ctrl2_reg; +}; + +static const struct lp87565_regulator regulators[]; + +static const struct regulator_linear_range buck0_1_2_3_ranges[] = { + REGULATOR_LINEAR_RANGE(500000, 0x0, 0x17, 10000), + REGULATOR_LINEAR_RANGE(735000, 0x18, 0x9d, 5000), + REGULATOR_LINEAR_RANGE(1420000, 0x9e, 0xff, 20000), +}; + +static unsigned int lp87565_buck_ramp_delay[] = { + 30000, 15000, 10000, 7500, 3800, 1900, 940, 470 +}; + +/* LP87565 BUCK current limit */ +static const unsigned int lp87565_buck_uA[] = { + 1500000, 2000000, 2500000, 3000000, 3500000, 4000000, 4500000, 5000000, +}; + +static int lp87565_buck_set_ramp_delay(struct regulator_dev *rdev, + int ramp_delay) +{ + int id = rdev_get_id(rdev); + struct lp87565 *lp87565 = rdev_get_drvdata(rdev); + unsigned int reg; + int ret; + + if (ramp_delay <= 470) + reg = 7; + else if (ramp_delay <= 940) + reg = 6; + else if (ramp_delay <= 1900) + reg = 5; + else if (ramp_delay <= 3800) + reg = 4; + else if (ramp_delay <= 7500) + reg = 3; + else if (ramp_delay <= 10000) + reg = 2; + else if (ramp_delay <= 15000) + reg = 1; + else + reg = 0; + + ret = regmap_update_bits(lp87565->regmap, regulators[id].ctrl2_reg, + LP87565_BUCK_CTRL_2_SLEW_RATE, + reg << __ffs(LP87565_BUCK_CTRL_2_SLEW_RATE)); + if (ret) { + dev_err(lp87565->dev, "SLEW RATE write failed: %d\n", ret); + return ret; + } + + rdev->constraints->ramp_delay = lp87565_buck_ramp_delay[reg]; + + return 0; +} + +static int lp87565_buck_set_current_limit(struct regulator_dev *rdev, + int min_uA, int max_uA) +{ + int id = rdev_get_id(rdev); + struct lp87565 *lp87565 = rdev_get_drvdata(rdev); + int i; + + for (i = ARRAY_SIZE(lp87565_buck_uA) - 1; i >= 0; i--) { + if (lp87565_buck_uA[i] >= min_uA && + lp87565_buck_uA[i] <= max_uA) + return regmap_update_bits(lp87565->regmap, + regulators[id].ctrl2_reg, + LP87565_BUCK_CTRL_2_ILIM, + i << __ffs(LP87565_BUCK_CTRL_2_ILIM)); + } + + return -EINVAL; +} + +static int lp87565_buck_get_current_limit(struct regulator_dev *rdev) +{ + int id = rdev_get_id(rdev); + struct lp87565 *lp87565 = rdev_get_drvdata(rdev); + int ret; + unsigned int val; + + ret = regmap_read(lp87565->regmap, regulators[id].ctrl2_reg, &val); + if (ret) + return ret; + + val = (val & LP87565_BUCK_CTRL_2_ILIM) >> + __ffs(LP87565_BUCK_CTRL_2_ILIM); + + return (val < ARRAY_SIZE(lp87565_buck_uA)) ? + lp87565_buck_uA[val] : -EINVAL; +} + +/* Operations permitted on BUCK0, BUCK1 */ +static struct regulator_ops lp87565_buck_ops = { + .is_enabled = regulator_is_enabled_regmap, + .enable = regulator_enable_regmap, + .disable = regulator_disable_regmap, + .get_voltage_sel = regulator_get_voltage_sel_regmap, + .set_voltage_sel = regulator_set_voltage_sel_regmap, + .list_voltage = regulator_list_voltage_linear_range, + .map_voltage = regulator_map_voltage_linear_range, + .set_voltage_time_sel = regulator_set_voltage_time_sel, + .set_ramp_delay = lp87565_buck_set_ramp_delay, + .set_current_limit = lp87565_buck_set_current_limit, + .get_current_limit = lp87565_buck_get_current_limit, +}; + +static const struct lp87565_regulator regulators[] = { + LP87565_REGULATOR("BUCK0", LP87565_BUCK_0, "buck0", lp87565_buck_ops, + 256, LP87565_REG_BUCK0_VOUT, LP87565_BUCK_VSET, + LP87565_REG_BUCK0_CTRL_1, + LP87565_BUCK_CTRL_1_EN, 3800, + buck0_1_2_3_ranges, LP87565_REG_BUCK0_CTRL_2), + LP87565_REGULATOR("BUCK1", LP87565_BUCK_1, "buck1", lp87565_buck_ops, + 256, LP87565_REG_BUCK1_VOUT, LP87565_BUCK_VSET, + LP87565_REG_BUCK1_CTRL_1, + LP87565_BUCK_CTRL_1_EN, 3800, + buck0_1_2_3_ranges, LP87565_REG_BUCK1_CTRL_2), + LP87565_REGULATOR("BUCK2", LP87565_BUCK_2, "buck2", lp87565_buck_ops, + 256, LP87565_REG_BUCK2_VOUT, LP87565_BUCK_VSET, + LP87565_REG_BUCK2_CTRL_1, + LP87565_BUCK_CTRL_1_EN, 3800, + buck0_1_2_3_ranges, LP87565_REG_BUCK2_CTRL_2), + LP87565_REGULATOR("BUCK3", LP87565_BUCK_3, "buck3", lp87565_buck_ops, + 256, LP87565_REG_BUCK3_VOUT, LP87565_BUCK_VSET, + LP87565_REG_BUCK3_CTRL_1, + LP87565_BUCK_CTRL_1_EN, 3800, + buck0_1_2_3_ranges, LP87565_REG_BUCK3_CTRL_2), + LP87565_REGULATOR("BUCK10", LP87565_BUCK_10, "buck10", lp87565_buck_ops, + 256, LP87565_REG_BUCK0_VOUT, LP87565_BUCK_VSET, + LP87565_REG_BUCK0_CTRL_1, + LP87565_BUCK_CTRL_1_EN, 3800, + buck0_1_2_3_ranges, LP87565_REG_BUCK0_CTRL_2), + LP87565_REGULATOR("BUCK23", LP87565_BUCK_23, "buck23", lp87565_buck_ops, + 256, LP87565_REG_BUCK2_VOUT, LP87565_BUCK_VSET, + LP87565_REG_BUCK2_CTRL_1, + LP87565_BUCK_CTRL_1_EN, 3800, + buck0_1_2_3_ranges, LP87565_REG_BUCK2_CTRL_2), +}; + +static int lp87565_regulator_probe(struct platform_device *pdev) +{ + struct lp87565 *lp87565 = dev_get_drvdata(pdev->dev.parent); + struct regulator_config config = { }; + struct regulator_dev *rdev; + int i, min_idx = LP87565_BUCK_1, max_idx = LP87565_BUCK_3; + + platform_set_drvdata(pdev, lp87565); + + config.dev = &pdev->dev; + config.dev->of_node = lp87565->dev->of_node; + config.driver_data = lp87565; + config.regmap = lp87565->regmap; + + if (lp87565->dev_type == LP87565_DEVICE_TYPE_LP87565_Q1) { + min_idx = LP87565_BUCK_10; + max_idx = LP87565_BUCK_23; + } + + for (i = min_idx; i <= max_idx; i++) { + rdev = devm_regulator_register(&pdev->dev, ®ulators[i].desc, + &config); + if (IS_ERR(rdev)) { + dev_err(lp87565->dev, "failed to register %s regulator\n", + pdev->name); + return PTR_ERR(rdev); + } + } + + return 0; +} + +static const struct platform_device_id lp87565_regulator_id_table[] = { + { "lp87565-regulator", }, + { "lp87565-q1-regulator", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(platform, lp87565_regulator_id_table); + +static struct platform_driver lp87565_regulator_driver = { + .driver = { + .name = "lp87565-pmic", + }, + .probe = lp87565_regulator_probe, + .id_table = lp87565_regulator_id_table, +}; +module_platform_driver(lp87565_regulator_driver); + +MODULE_AUTHOR("J Keerthy <j-keerthy@ti.com>"); +MODULE_DESCRIPTION("LP87565 voltage regulator driver"); +MODULE_LICENSE("GPL v2"); -- 1.9.1 ^ permalink raw reply [flat|nested] 12+ messages in thread
* Applied "regulator: lp87565: Add support for lp87565 PMIC regulators" to the regulator tree 2017-05-23 12:16 ` [PATCH v2 2/3] regulator: lp87565: Add support for lp87565 PMIC regulators Keerthy @ 2017-05-24 17:42 ` Mark Brown 0 siblings, 0 replies; 12+ messages in thread From: Mark Brown @ 2017-05-24 17:42 UTC (permalink / raw) To: Keerthy Cc: Mark Brown, broonie, lee.jones, robh+dt, j-keerthy, t-kristo, tony, mark.rutland, linux-omap, linux-kernel, devicetree, afd, linux-kernel The patch regulator: lp87565: Add support for lp87565 PMIC regulators has been applied to the regulator tree at git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From f0168a9bfdfd6058c78207616348fed3cd52e739 Mon Sep 17 00:00:00 2001 From: Keerthy <j-keerthy@ti.com> Date: Tue, 23 May 2017 17:46:55 +0530 Subject: [PATCH] regulator: lp87565: Add support for lp87565 PMIC regulators The regulators set consists of 4 BUCKs. The output voltages are configurable and are meant to supply power to the main processor and other components. The ramp delay is configurable for all BUCKs. The BUCKs can be configured in single phase or multiphase modes. Signed-off-by: Keerthy <j-keerthy@ti.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- drivers/regulator/Kconfig | 8 ++ drivers/regulator/Makefile | 1 + drivers/regulator/lp87565-regulator.c | 237 ++++++++++++++++++++++++++++++++++ 3 files changed, 246 insertions(+) create mode 100644 drivers/regulator/lp87565-regulator.c diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 48db87d6dfef..7c34ff8a5884 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -365,6 +365,14 @@ config REGULATOR_LP8755 chip contains six step-down DC/DC converters which can support 9 mode multiphase configuration. +config REGULATOR_LP87565 + tristate "TI LP87565 Power regulators" + depends on MFD_TI_LP87565 && OF + help + This driver supports LP87565 voltage regulator chips. LP87565 + provides four step-down converters. It supports software based + voltage control for different voltage domains + config REGULATOR_LP8788 tristate "TI LP8788 Power Regulators" depends on MFD_LP8788 diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile index dc3503fb3e30..fee6b8cb80a8 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -46,6 +46,7 @@ obj-$(CONFIG_REGULATOR_LP3971) += lp3971.o obj-$(CONFIG_REGULATOR_LP3972) += lp3972.o obj-$(CONFIG_REGULATOR_LP872X) += lp872x.o obj-$(CONFIG_REGULATOR_LP873X) += lp873x-regulator.o +obj-$(CONFIG_REGULATOR_LP87565) += lp87565-regulator.o obj-$(CONFIG_REGULATOR_LP8788) += lp8788-buck.o obj-$(CONFIG_REGULATOR_LP8788) += lp8788-ldo.o obj-$(CONFIG_REGULATOR_LP8755) += lp8755.o diff --git a/drivers/regulator/lp87565-regulator.c b/drivers/regulator/lp87565-regulator.c new file mode 100644 index 000000000000..71e762292529 --- /dev/null +++ b/drivers/regulator/lp87565-regulator.c @@ -0,0 +1,237 @@ +/* + * Regulator driver for LP87565 PMIC + * + * Copyright (C) 2017 Texas Instruments Incorporated - http://www.ti.com/ + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License as published by the + * Free Software Foundation; either version 2 of the License, or (at your + * option) any later version. + */ + +#include <linux/module.h> +#include <linux/platform_device.h> +#include <linux/regmap.h> + +#include <linux/mfd/lp87565.h> + +#define LP87565_REGULATOR(_name, _id, _of, _ops, _n, _vr, _vm, _er, _em, \ + _delay, _lr, _cr) \ + [_id] = { \ + .desc = { \ + .name = _name, \ + .supply_name = _of "-in", \ + .id = _id, \ + .of_match = of_match_ptr(_of), \ + .regulators_node = of_match_ptr("regulators"),\ + .ops = &_ops, \ + .n_voltages = _n, \ + .type = REGULATOR_VOLTAGE, \ + .owner = THIS_MODULE, \ + .vsel_reg = _vr, \ + .vsel_mask = _vm, \ + .enable_reg = _er, \ + .enable_mask = _em, \ + .ramp_delay = _delay, \ + .linear_ranges = _lr, \ + .n_linear_ranges = ARRAY_SIZE(_lr), \ + }, \ + .ctrl2_reg = _cr, \ + } + +struct lp87565_regulator { + struct regulator_desc desc; + unsigned int ctrl2_reg; +}; + +static const struct lp87565_regulator regulators[]; + +static const struct regulator_linear_range buck0_1_2_3_ranges[] = { + REGULATOR_LINEAR_RANGE(500000, 0x0, 0x17, 10000), + REGULATOR_LINEAR_RANGE(735000, 0x18, 0x9d, 5000), + REGULATOR_LINEAR_RANGE(1420000, 0x9e, 0xff, 20000), +}; + +static unsigned int lp87565_buck_ramp_delay[] = { + 30000, 15000, 10000, 7500, 3800, 1900, 940, 470 +}; + +/* LP87565 BUCK current limit */ +static const unsigned int lp87565_buck_uA[] = { + 1500000, 2000000, 2500000, 3000000, 3500000, 4000000, 4500000, 5000000, +}; + +static int lp87565_buck_set_ramp_delay(struct regulator_dev *rdev, + int ramp_delay) +{ + int id = rdev_get_id(rdev); + struct lp87565 *lp87565 = rdev_get_drvdata(rdev); + unsigned int reg; + int ret; + + if (ramp_delay <= 470) + reg = 7; + else if (ramp_delay <= 940) + reg = 6; + else if (ramp_delay <= 1900) + reg = 5; + else if (ramp_delay <= 3800) + reg = 4; + else if (ramp_delay <= 7500) + reg = 3; + else if (ramp_delay <= 10000) + reg = 2; + else if (ramp_delay <= 15000) + reg = 1; + else + reg = 0; + + ret = regmap_update_bits(lp87565->regmap, regulators[id].ctrl2_reg, + LP87565_BUCK_CTRL_2_SLEW_RATE, + reg << __ffs(LP87565_BUCK_CTRL_2_SLEW_RATE)); + if (ret) { + dev_err(lp87565->dev, "SLEW RATE write failed: %d\n", ret); + return ret; + } + + rdev->constraints->ramp_delay = lp87565_buck_ramp_delay[reg]; + + return 0; +} + +static int lp87565_buck_set_current_limit(struct regulator_dev *rdev, + int min_uA, int max_uA) +{ + int id = rdev_get_id(rdev); + struct lp87565 *lp87565 = rdev_get_drvdata(rdev); + int i; + + for (i = ARRAY_SIZE(lp87565_buck_uA) - 1; i >= 0; i--) { + if (lp87565_buck_uA[i] >= min_uA && + lp87565_buck_uA[i] <= max_uA) + return regmap_update_bits(lp87565->regmap, + regulators[id].ctrl2_reg, + LP87565_BUCK_CTRL_2_ILIM, + i << __ffs(LP87565_BUCK_CTRL_2_ILIM)); + } + + return -EINVAL; +} + +static int lp87565_buck_get_current_limit(struct regulator_dev *rdev) +{ + int id = rdev_get_id(rdev); + struct lp87565 *lp87565 = rdev_get_drvdata(rdev); + int ret; + unsigned int val; + + ret = regmap_read(lp87565->regmap, regulators[id].ctrl2_reg, &val); + if (ret) + return ret; + + val = (val & LP87565_BUCK_CTRL_2_ILIM) >> + __ffs(LP87565_BUCK_CTRL_2_ILIM); + + return (val < ARRAY_SIZE(lp87565_buck_uA)) ? + lp87565_buck_uA[val] : -EINVAL; +} + +/* Operations permitted on BUCK0, BUCK1 */ +static struct regulator_ops lp87565_buck_ops = { + .is_enabled = regulator_is_enabled_regmap, + .enable = regulator_enable_regmap, + .disable = regulator_disable_regmap, + .get_voltage_sel = regulator_get_voltage_sel_regmap, + .set_voltage_sel = regulator_set_voltage_sel_regmap, + .list_voltage = regulator_list_voltage_linear_range, + .map_voltage = regulator_map_voltage_linear_range, + .set_voltage_time_sel = regulator_set_voltage_time_sel, + .set_ramp_delay = lp87565_buck_set_ramp_delay, + .set_current_limit = lp87565_buck_set_current_limit, + .get_current_limit = lp87565_buck_get_current_limit, +}; + +static const struct lp87565_regulator regulators[] = { + LP87565_REGULATOR("BUCK0", LP87565_BUCK_0, "buck0", lp87565_buck_ops, + 256, LP87565_REG_BUCK0_VOUT, LP87565_BUCK_VSET, + LP87565_REG_BUCK0_CTRL_1, + LP87565_BUCK_CTRL_1_EN, 3800, + buck0_1_2_3_ranges, LP87565_REG_BUCK0_CTRL_2), + LP87565_REGULATOR("BUCK1", LP87565_BUCK_1, "buck1", lp87565_buck_ops, + 256, LP87565_REG_BUCK1_VOUT, LP87565_BUCK_VSET, + LP87565_REG_BUCK1_CTRL_1, + LP87565_BUCK_CTRL_1_EN, 3800, + buck0_1_2_3_ranges, LP87565_REG_BUCK1_CTRL_2), + LP87565_REGULATOR("BUCK2", LP87565_BUCK_2, "buck2", lp87565_buck_ops, + 256, LP87565_REG_BUCK2_VOUT, LP87565_BUCK_VSET, + LP87565_REG_BUCK2_CTRL_1, + LP87565_BUCK_CTRL_1_EN, 3800, + buck0_1_2_3_ranges, LP87565_REG_BUCK2_CTRL_2), + LP87565_REGULATOR("BUCK3", LP87565_BUCK_3, "buck3", lp87565_buck_ops, + 256, LP87565_REG_BUCK3_VOUT, LP87565_BUCK_VSET, + LP87565_REG_BUCK3_CTRL_1, + LP87565_BUCK_CTRL_1_EN, 3800, + buck0_1_2_3_ranges, LP87565_REG_BUCK3_CTRL_2), + LP87565_REGULATOR("BUCK10", LP87565_BUCK_10, "buck10", lp87565_buck_ops, + 256, LP87565_REG_BUCK0_VOUT, LP87565_BUCK_VSET, + LP87565_REG_BUCK0_CTRL_1, + LP87565_BUCK_CTRL_1_EN, 3800, + buck0_1_2_3_ranges, LP87565_REG_BUCK0_CTRL_2), + LP87565_REGULATOR("BUCK23", LP87565_BUCK_23, "buck23", lp87565_buck_ops, + 256, LP87565_REG_BUCK2_VOUT, LP87565_BUCK_VSET, + LP87565_REG_BUCK2_CTRL_1, + LP87565_BUCK_CTRL_1_EN, 3800, + buck0_1_2_3_ranges, LP87565_REG_BUCK2_CTRL_2), +}; + +static int lp87565_regulator_probe(struct platform_device *pdev) +{ + struct lp87565 *lp87565 = dev_get_drvdata(pdev->dev.parent); + struct regulator_config config = { }; + struct regulator_dev *rdev; + int i, min_idx = LP87565_BUCK_1, max_idx = LP87565_BUCK_3; + + platform_set_drvdata(pdev, lp87565); + + config.dev = &pdev->dev; + config.dev->of_node = lp87565->dev->of_node; + config.driver_data = lp87565; + config.regmap = lp87565->regmap; + + if (lp87565->dev_type == LP87565_DEVICE_TYPE_LP87565_Q1) { + min_idx = LP87565_BUCK_10; + max_idx = LP87565_BUCK_23; + } + + for (i = min_idx; i <= max_idx; i++) { + rdev = devm_regulator_register(&pdev->dev, ®ulators[i].desc, + &config); + if (IS_ERR(rdev)) { + dev_err(lp87565->dev, "failed to register %s regulator\n", + pdev->name); + return PTR_ERR(rdev); + } + } + + return 0; +} + +static const struct platform_device_id lp87565_regulator_id_table[] = { + { "lp87565-regulator", }, + { "lp87565-q1-regulator", }, + { /* sentinel */ } +}; +MODULE_DEVICE_TABLE(platform, lp87565_regulator_id_table); + +static struct platform_driver lp87565_regulator_driver = { + .driver = { + .name = "lp87565-pmic", + }, + .probe = lp87565_regulator_probe, + .id_table = lp87565_regulator_id_table, +}; +module_platform_driver(lp87565_regulator_driver); + +MODULE_AUTHOR("J Keerthy <j-keerthy@ti.com>"); +MODULE_DESCRIPTION("LP87565 voltage regulator driver"); +MODULE_LICENSE("GPL v2"); -- 2.11.0 ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH v2 3/3] regulator: tps65917: Add support for SMPS12 2017-05-23 12:16 [PATCH v2 0/3] mfd: lp87565: Add lp87565 PMIC support Keerthy 2017-05-23 12:16 ` [PATCH v2 1/3] " Keerthy 2017-05-23 12:16 ` [PATCH v2 2/3] regulator: lp87565: Add support for lp87565 PMIC regulators Keerthy @ 2017-05-23 12:16 ` Keerthy 2017-05-24 17:20 ` Mark Brown 2 siblings, 1 reply; 12+ messages in thread From: Keerthy @ 2017-05-23 12:16 UTC (permalink / raw) To: broonie, lee.jones, robh+dt Cc: j-keerthy, t-kristo, tony, mark.rutland, linux-omap, linux-kernel, devicetree, afd App support for SMPS12 dual phase regulator. Signed-off-by: Keerthy <j-keerthy@ti.com> Acked-by: Lee Jones <lee.jones@linaro.org> --- Changes in v2: * Added Lee Jones's Ack. drivers/regulator/palmas-regulator.c | 18 +++++++++++++++--- include/linux/mfd/palmas.h | 2 ++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/drivers/regulator/palmas-regulator.c b/drivers/regulator/palmas-regulator.c index 31ae5ee..8018a44 100644 --- a/drivers/regulator/palmas-regulator.c +++ b/drivers/regulator/palmas-regulator.c @@ -264,6 +264,13 @@ .sleep_id = TPS65917_EXTERNAL_REQSTR_ID_SMPS5, }, { + .name = "SMPS12", + .sname = "smps1-in", + .vsel_addr = TPS65917_SMPS1_VOLTAGE, + .ctrl_addr = TPS65917_SMPS1_CTRL, + .sleep_id = TPS65917_EXTERNAL_REQSTR_ID_SMPS12, + }, + { .name = "LDO1", .sname = "ldo1-in", .vsel_addr = TPS65917_LDO1_VOLTAGE, @@ -367,6 +374,7 @@ EXTERNAL_REQUESTOR_TPS65917(SMPS3, 1, 2), EXTERNAL_REQUESTOR_TPS65917(SMPS4, 1, 3), EXTERNAL_REQUESTOR_TPS65917(SMPS5, 1, 4), + EXTERNAL_REQUESTOR_TPS65917(SMPS12, 1, 5), EXTERNAL_REQUESTOR_TPS65917(LDO1, 2, 0), EXTERNAL_REQUESTOR_TPS65917(LDO2, 2, 1), EXTERNAL_REQUESTOR_TPS65917(LDO3, 2, 2), @@ -1305,7 +1313,8 @@ static int tps65917_smps_registration(struct palmas_pmic *pmic, */ desc = &pmic->desc[id]; desc->n_linear_ranges = 3; - if ((id == TPS65917_REG_SMPS2) && pmic->smps12) + if ((id == TPS65917_REG_SMPS2 || id == TPS65917_REG_SMPS1) && + pmic->smps12) continue; /* Initialise sleep/init values from platform data */ @@ -1427,6 +1436,7 @@ static int tps65917_smps_registration(struct palmas_pmic *pmic, { .name = "smps3", }, { .name = "smps4", }, { .name = "smps5", }, + { .name = "smps12",}, { .name = "ldo1", }, { .name = "ldo2", }, { .name = "ldo3", }, @@ -1455,7 +1465,7 @@ static int tps65917_smps_registration(struct palmas_pmic *pmic, static struct palmas_pmic_driver_data tps65917_ddata = { .smps_start = TPS65917_REG_SMPS1, - .smps_end = TPS65917_REG_SMPS5, + .smps_end = TPS65917_REG_SMPS12, .ldo_begin = TPS65917_REG_LDO1, .ldo_end = TPS65917_REG_LDO5, .max_reg = TPS65917_NUM_REGS, @@ -1643,8 +1653,10 @@ static int palmas_regulators_probe(struct platform_device *pdev) if (ret) return ret; - if (reg & PALMAS_SMPS_CTRL_SMPS12_SMPS123_EN) + if (reg & PALMAS_SMPS_CTRL_SMPS12_SMPS123_EN) { pmic->smps123 = 1; + pmic->smps12 = 1; + } if (reg & PALMAS_SMPS_CTRL_SMPS45_SMPS457_EN) pmic->smps457 = 1; diff --git a/include/linux/mfd/palmas.h b/include/linux/mfd/palmas.h index 5c9a1d4..6dec438 100644 --- a/include/linux/mfd/palmas.h +++ b/include/linux/mfd/palmas.h @@ -250,6 +250,7 @@ enum tps65917_regulators { TPS65917_REG_SMPS3, TPS65917_REG_SMPS4, TPS65917_REG_SMPS5, + TPS65917_REG_SMPS12, /* LDO regulators */ TPS65917_REG_LDO1, TPS65917_REG_LDO2, @@ -317,6 +318,7 @@ enum tps65917_external_requestor_id { TPS65917_EXTERNAL_REQSTR_ID_SMPS3, TPS65917_EXTERNAL_REQSTR_ID_SMPS4, TPS65917_EXTERNAL_REQSTR_ID_SMPS5, + TPS65917_EXTERNAL_REQSTR_ID_SMPS12, TPS65917_EXTERNAL_REQSTR_ID_LDO1, TPS65917_EXTERNAL_REQSTR_ID_LDO2, TPS65917_EXTERNAL_REQSTR_ID_LDO3, -- 1.9.1 ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 3/3] regulator: tps65917: Add support for SMPS12 2017-05-23 12:16 ` [PATCH v2 3/3] regulator: tps65917: Add support for SMPS12 Keerthy @ 2017-05-24 17:20 ` Mark Brown 2017-05-25 3:35 ` Keerthy 0 siblings, 1 reply; 12+ messages in thread From: Mark Brown @ 2017-05-24 17:20 UTC (permalink / raw) To: Keerthy Cc: lee.jones, robh+dt, t-kristo, tony, mark.rutland, linux-omap, linux-kernel, devicetree, afd [-- Attachment #1: Type: text/plain, Size: 270 bytes --] On Tue, May 23, 2017 at 05:46:56PM +0530, Keerthy wrote: > App support for SMPS12 dual phase regulator. > > Signed-off-by: Keerthy <j-keerthy@ti.com> > Acked-by: Lee Jones <lee.jones@linaro.org> What's the relationship between this and support for the lp87565? [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 3/3] regulator: tps65917: Add support for SMPS12 2017-05-24 17:20 ` Mark Brown @ 2017-05-25 3:35 ` Keerthy 2017-05-25 16:24 ` Mark Brown 0 siblings, 1 reply; 12+ messages in thread From: Keerthy @ 2017-05-25 3:35 UTC (permalink / raw) To: Mark Brown Cc: lee.jones, robh+dt, t-kristo, tony, mark.rutland, linux-omap, linux-kernel, devicetree, afd On Wednesday 24 May 2017 10:50 PM, Mark Brown wrote: > On Tue, May 23, 2017 at 05:46:56PM +0530, Keerthy wrote: >> App support for SMPS12 dual phase regulator. >> >> Signed-off-by: Keerthy <j-keerthy@ti.com> >> Acked-by: Lee Jones <lee.jones@linaro.org> > > What's the relationship between this and support for the lp87565? Nothing related. I should have sent this separately. Should i send a v3 separately? > ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH v2 3/3] regulator: tps65917: Add support for SMPS12 2017-05-25 3:35 ` Keerthy @ 2017-05-25 16:24 ` Mark Brown 0 siblings, 0 replies; 12+ messages in thread From: Mark Brown @ 2017-05-25 16:24 UTC (permalink / raw) To: Keerthy Cc: lee.jones, robh+dt, t-kristo, tony, mark.rutland, linux-omap, linux-kernel, devicetree, afd [-- Attachment #1: Type: text/plain, Size: 255 bytes --] On Thu, May 25, 2017 at 09:05:25AM +0530, Keerthy wrote: > > What's the relationship between this and support for the lp87565? > Nothing related. I should have sent this separately. Should i send a v3 > separately? No, it's OK - thanks for clarifying. [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 488 bytes --] ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2017-05-30 10:18 UTC | newest] Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2017-05-23 12:16 [PATCH v2 0/3] mfd: lp87565: Add lp87565 PMIC support Keerthy 2017-05-23 12:16 ` [PATCH v2 1/3] " Keerthy 2017-05-30 9:23 ` Lee Jones 2017-05-30 9:54 ` Keerthy 2017-05-30 10:12 ` Lee Jones 2017-05-30 10:17 ` Keerthy 2017-05-23 12:16 ` [PATCH v2 2/3] regulator: lp87565: Add support for lp87565 PMIC regulators Keerthy 2017-05-24 17:42 ` Applied "regulator: lp87565: Add support for lp87565 PMIC regulators" to the regulator tree Mark Brown 2017-05-23 12:16 ` [PATCH v2 3/3] regulator: tps65917: Add support for SMPS12 Keerthy 2017-05-24 17:20 ` Mark Brown 2017-05-25 3:35 ` Keerthy 2017-05-25 16:24 ` Mark Brown
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®