Satya Priya (9):
dt-bindings: mfd: pm8008: Add reset-gpios
dt-bindings: mfd: pm8008: Change the address cells
dt-bindings: mfd: pm8008: Add regulators for pm8008
mfd: pm8008: Add reset-gpios
mfd: pm8008: Remove the regmap member from pm8008_data struct
mfd: pm8008: Use i2c_new_dummy_device() API
regulator: Add a regulator driver for the PM8008 PMIC
arm64: dts: qcom: pm8008: Add base dts file
arm64: dts: qcom: sc7280: Add pm8008 support for sc7280-idp
.../devicetree/bindings/mfd/qcom,pm8008.yaml | 69 ++++++-
arch/arm64/boot/dts/qcom/pm8008.dtsi | 54 +++++
arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 66 ++++++
drivers/mfd/qcom-pm8008.c | 60 ++++--
drivers/regulator/Kconfig | 9 +
drivers/regulator/Makefile | 1 +
drivers/regulator/qcom-pm8008-regulator.c | 225 +++++++++++++++++++++
include/linux/mfd/qcom_pm8008.h | 8 +
8 files changed, 474 insertions(+), 18 deletions(-)
create mode 100644 arch/arm64/boot/dts/qcom/pm8008.dtsi
create mode 100644 drivers/regulator/qcom-pm8008-regulator.c
create mode 100644 include/linux/mfd/qcom_pm8008.h
--
2.7.4
Qualcomm Technologies, Inc. PM8008 is an I2C controlled PMIC
containing 7 LDO regulators. Add a PM8008 regulator driver to
support PMIC regulator management via the regulator framework.
Signed-off-by: Satya Priya <[email protected]>
Reported-by: kernel test robot <[email protected]>
Reported-by: Dan Carpenter <[email protected]>
---
Changes in V13:
- Added if check to avoid buffer overflow warnings.
for (i = 0; i < ARRAY_SIZE(reg_data); i++)
if (strstr(name, reg_data[i].name))
break;
if (i == ARRAY_SIZE(reg_data)) {
dev_err(dev, "Invalid regulator name %s\n", name);
return -EINVAL;
}
- Removed unused headers.
Changes in V12:
- Get base from reg property in DT node.
Changes in V11:
- Added of_device_id table and compatible to register the ldos.
drivers/regulator/Kconfig | 9 ++
drivers/regulator/Makefile | 1 +
drivers/regulator/qcom-pm8008-regulator.c | 225 ++++++++++++++++++++++++++++++
3 files changed, 235 insertions(+)
create mode 100644 drivers/regulator/qcom-pm8008-regulator.c
diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index cbe0f96..2c6d9c2 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -925,6 +925,15 @@ config REGULATOR_PWM
This driver supports PWM controlled voltage regulators. PWM
duty cycle can increase or decrease the voltage.
+config REGULATOR_QCOM_PM8008
+ tristate "Qualcomm Technologies, Inc. PM8008 PMIC regulators"
+ depends on MFD_QCOM_PM8008
+ help
+ Select this option to get support for the voltage regulators
+ of Qualcomm Technologies, Inc. PM8008 PMIC chip. PM8008 has 7 LDO
+ regulators. This driver provides support for basic operations like
+ set/get voltage and enable/disable.
+
config REGULATOR_QCOM_RPM
tristate "Qualcomm RPM regulator driver"
depends on MFD_QCOM_RPM
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 8d3ee8b..169e686 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -101,6 +101,7 @@ obj-$(CONFIG_REGULATOR_MT6380) += mt6380-regulator.o
obj-$(CONFIG_REGULATOR_MT6397) += mt6397-regulator.o
obj-$(CONFIG_REGULATOR_MTK_DVFSRC) += mtk-dvfsrc-regulator.o
obj-$(CONFIG_REGULATOR_QCOM_LABIBB) += qcom-labibb-regulator.o
+obj-$(CONFIG_REGULATOR_QCOM_PM8008) += qcom-pm8008-regulator.o
obj-$(CONFIG_REGULATOR_QCOM_RPM) += qcom_rpm-regulator.o
obj-$(CONFIG_REGULATOR_QCOM_RPMH) += qcom-rpmh-regulator.o
obj-$(CONFIG_REGULATOR_QCOM_SMD_RPM) += qcom_smd-regulator.o
diff --git a/drivers/regulator/qcom-pm8008-regulator.c b/drivers/regulator/qcom-pm8008-regulator.c
new file mode 100644
index 0000000..6e815c6
--- /dev/null
+++ b/drivers/regulator/qcom-pm8008-regulator.c
@@ -0,0 +1,225 @@
+// SPDX-License-Identifier: GPL-2.0-only
+/* Copyright (c) 2022, The Linux Foundation. All rights reserved. */
+
+#include <linux/device.h>
+#include <linux/kernel.h>
+#include <linux/mfd/qcom_pm8008.h>
+#include <linux/module.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regmap.h>
+#include <linux/regulator/driver.h>
+
+#define VSET_STEP_MV 8
+#define VSET_STEP_UV (VSET_STEP_MV * 1000)
+
+#define LDO_ENABLE_REG(base) ((base) + 0x46)
+#define ENABLE_BIT BIT(7)
+
+#define LDO_VSET_LB_REG(base) ((base) + 0x40)
+
+#define LDO_STEPPER_CTL_REG(base) ((base) + 0x3b)
+#define DEFAULT_VOLTAGE_STEPPER_RATE 38400
+#define STEP_RATE_MASK GENMASK(1, 0)
+
+struct pm8008_regulator_data {
+ const char *name;
+ const char *supply_name;
+ int min_uv;
+ int max_uv;
+ int min_dropout_uv;
+ const struct linear_range *voltage_range;
+};
+
+struct pm8008_regulator {
+ struct device *dev;
+ struct regmap *regmap;
+ struct regulator_desc rdesc;
+ u16 base;
+ int step_rate;
+ int voltage_selector;
+};
+
+static const struct linear_range nldo_ranges[] = {
+ REGULATOR_LINEAR_RANGE(528000, 0, 122, 8000),
+};
+
+static const struct linear_range pldo_ranges[] = {
+ REGULATOR_LINEAR_RANGE(1504000, 0, 237, 8000),
+};
+
+static const struct pm8008_regulator_data reg_data[] = {
+ /* name parent min_uv max_uv headroom_uv voltage_range */
+ { "ldo1", "vdd_l1_l2", 528000, 1504000, 225000, nldo_ranges, },
+ { "ldo2", "vdd_l1_l2", 528000, 1504000, 225000, nldo_ranges, },
+ { "ldo3", "vdd_l3_l4", 1504000, 3400000, 300000, pldo_ranges, },
+ { "ldo4", "vdd_l3_l4", 1504000, 3400000, 300000, pldo_ranges, },
+ { "ldo5", "vdd_l5", 1504000, 3400000, 200000, pldo_ranges, },
+ { "ldo6", "vdd_l6", 1504000, 3400000, 200000, pldo_ranges, },
+ { "ldo7", "vdd_l7", 1504000, 3400000, 200000, pldo_ranges, },
+};
+
+static int pm8008_regulator_get_voltage(struct regulator_dev *rdev)
+{
+ struct pm8008_regulator *pm8008_reg = rdev_get_drvdata(rdev);
+
+ return pm8008_reg->voltage_selector;
+}
+
+static inline int pm8008_write_voltage(struct pm8008_regulator *pm8008_reg,
+ int mV)
+{
+ __le16 vset_raw;
+
+ vset_raw = cpu_to_le16(mV);
+
+ return regmap_bulk_write(pm8008_reg->regmap,
+ LDO_VSET_LB_REG(pm8008_reg->base),
+ (const void *)&vset_raw, sizeof(vset_raw));
+}
+
+static int pm8008_regulator_set_voltage_time(struct regulator_dev *rdev,
+ int old_uV, int new_uv)
+{
+ struct pm8008_regulator *pm8008_reg = rdev_get_drvdata(rdev);
+
+ return DIV_ROUND_UP(abs(new_uv - old_uV), pm8008_reg->step_rate);
+}
+
+static int pm8008_regulator_set_voltage(struct regulator_dev *rdev,
+ unsigned int selector)
+{
+ struct pm8008_regulator *pm8008_reg = rdev_get_drvdata(rdev);
+ int rc, mV;
+
+ /* voltage control register is set with voltage in millivolts */
+ mV = DIV_ROUND_UP(regulator_list_voltage_linear_range(rdev, selector),
+ 1000);
+ if (mV < 0)
+ return mV;
+
+ rc = pm8008_write_voltage(pm8008_reg, mV);
+ if (rc < 0)
+ return rc;
+
+ pm8008_reg->voltage_selector = selector;
+ dev_dbg(&rdev->dev, "voltage set to %d\n", mV * 1000);
+ return 0;
+}
+
+static const struct regulator_ops pm8008_regulator_ops = {
+ .enable = regulator_enable_regmap,
+ .disable = regulator_disable_regmap,
+ .is_enabled = regulator_is_enabled_regmap,
+ .set_voltage_sel = pm8008_regulator_set_voltage,
+ .get_voltage_sel = pm8008_regulator_get_voltage,
+ .list_voltage = regulator_list_voltage_linear,
+ .set_voltage_time = pm8008_regulator_set_voltage_time,
+};
+
+static int pm8008_regulator_probe(struct platform_device *pdev)
+{
+ int rc, i;
+ u32 base;
+ unsigned int reg;
+ const char *name;
+ struct device *dev = &pdev->dev;
+ struct regulator_config reg_config = {};
+ struct regulator_dev *rdev;
+ const struct pm8008_data *chip = dev_get_drvdata(pdev->dev.parent);
+ struct pm8008_regulator *pm8008_reg;
+
+ pm8008_reg = devm_kzalloc(dev, sizeof(*pm8008_reg), GFP_KERNEL);
+ if (!pm8008_reg)
+ return -ENOMEM;
+
+ pm8008_reg->regmap = pm8008_get_regmap(chip);
+ if (!pm8008_reg->regmap) {
+ dev_err(dev, "parent regmap is missing\n");
+ return -EINVAL;
+ }
+
+ pm8008_reg->dev = dev;
+
+ rc = of_property_read_string(dev->of_node, "regulator-name", &name);
+ if (rc)
+ return rc;
+
+ /* get the required regulator data */
+ for (i = 0; i < ARRAY_SIZE(reg_data); i++)
+ if (strstr(name, reg_data[i].name))
+ break;
+
+ if (i == ARRAY_SIZE(reg_data)) {
+ dev_err(dev, "Invalid regulator name %s\n", name);
+ return -EINVAL;
+ }
+
+ rc = of_property_read_u32_index(dev->of_node, "reg", 1, &base);
+ if (rc < 0) {
+ dev_err(dev, "%s: failed to get regulator base rc=%d\n", name, rc);
+ return rc;
+ }
+ pm8008_reg->base = base;
+
+ /* get slew rate */
+ rc = regmap_bulk_read(pm8008_reg->regmap,
+ LDO_STEPPER_CTL_REG(pm8008_reg->base), ®, 1);
+ if (rc < 0) {
+ dev_err(dev, "failed to read step rate configuration rc=%d\n", rc);
+ return rc;
+ }
+ reg &= STEP_RATE_MASK;
+ pm8008_reg->step_rate = DEFAULT_VOLTAGE_STEPPER_RATE >> reg;
+
+ pm8008_reg->rdesc.type = REGULATOR_VOLTAGE;
+ pm8008_reg->rdesc.ops = &pm8008_regulator_ops;
+ pm8008_reg->rdesc.name = reg_data[i].name;
+ pm8008_reg->rdesc.supply_name = reg_data[i].supply_name;
+ pm8008_reg->rdesc.of_match = reg_data[i].name;
+ pm8008_reg->rdesc.uV_step = VSET_STEP_UV;
+ pm8008_reg->rdesc.min_uV = reg_data[i].min_uv;
+ pm8008_reg->rdesc.n_voltages
+ = ((reg_data[i].max_uv - reg_data[i].min_uv)
+ / pm8008_reg->rdesc.uV_step) + 1;
+ pm8008_reg->rdesc.linear_ranges = reg_data[i].voltage_range;
+ pm8008_reg->rdesc.n_linear_ranges = 1;
+ pm8008_reg->rdesc.enable_reg = LDO_ENABLE_REG(pm8008_reg->base);
+ pm8008_reg->rdesc.enable_mask = ENABLE_BIT;
+ pm8008_reg->rdesc.min_dropout_uV = reg_data[i].min_dropout_uv;
+ pm8008_reg->voltage_selector = -ENOTRECOVERABLE;
+
+ reg_config.dev = dev->parent;
+ reg_config.driver_data = pm8008_reg;
+ reg_config.regmap = pm8008_reg->regmap;
+
+ rdev = devm_regulator_register(dev, &pm8008_reg->rdesc, ®_config);
+ if (IS_ERR(rdev)) {
+ rc = PTR_ERR(rdev);
+ dev_err(dev, "%s: failed to register regulator rc=%d\n",
+ reg_data[i].name, rc);
+ return rc;
+ }
+
+ return 0;
+}
+
+static const struct of_device_id pm8008_regulator_match_table[] = {
+ { .compatible = "qcom,pm8008-regulator", },
+ { }
+};
+MODULE_DEVICE_TABLE(of, pm8008_regulator_match_table);
+
+static struct platform_driver pm8008_regulator_driver = {
+ .driver = {
+ .name = "qcom-pm8008-regulator",
+ .of_match_table = pm8008_regulator_match_table,
+ },
+ .probe = pm8008_regulator_probe,
+};
+
+module_platform_driver(pm8008_regulator_driver);
+
+MODULE_DESCRIPTION("Qualcomm PM8008 PMIC Regulator Driver");
+MODULE_LICENSE("GPL");
--
2.7.4
Add regulators and their parent supplies along with example.
Signed-off-by: Satya Priya <[email protected]>
Reviewed-by: Stephen Boyd <[email protected]>
Reviewed-by: Rob Herring <[email protected]>
---
Changes in V13:
- None.
Changes in V12:
- None.
Changes in V11:
- Add ldos directly under pm8008@8 node, remove the intermediate "regulators"
node.
Changes in V10:
- Regulators are added as a part of pm8008@8 device. Change bindings doc
accordingly.
.../devicetree/bindings/mfd/qcom,pm8008.yaml | 50 ++++++++++++++++++++++
1 file changed, 50 insertions(+)
diff --git a/Documentation/devicetree/bindings/mfd/qcom,pm8008.yaml b/Documentation/devicetree/bindings/mfd/qcom,pm8008.yaml
index a54d1ce0..fd3c51e 100644
--- a/Documentation/devicetree/bindings/mfd/qcom,pm8008.yaml
+++ b/Documentation/devicetree/bindings/mfd/qcom,pm8008.yaml
@@ -47,6 +47,21 @@ properties:
reset-gpios:
maxItems: 1
+ vdd_l1_l2-supply:
+ description: Input supply phandle of ldo1 and ldo2 regulators.
+
+ vdd_l3_l4-supply:
+ description: Input supply phandle of ldo3 and ldo4 regulators.
+
+ vdd_l5-supply:
+ description: Input supply phandle of ldo5 regulator.
+
+ vdd_l6-supply:
+ description: Input supply phandle of ldo6 regulator.
+
+ vdd_l7-supply:
+ description: Input supply phandle of ldo7 regulator.
+
patternProperties:
"^gpio@0,[0-9a-f]+$":
type: object
@@ -88,6 +103,27 @@ patternProperties:
additionalProperties: false
+ "^ldo[1-7]@[1],[0-9a-f]+$":
+ type: object
+
+ $ref: "/schemas/regulator/regulator.yaml#"
+
+ description: PM8008 regulator peripherals of PM8008 regulator device.
+
+ properties:
+ compatible:
+ const: qcom,pm8008-regulator
+
+ reg:
+ description: Peripheral offset and address of the ldo regulator.
+ maxItems: 1
+
+ required:
+ - compatible
+ - reg
+
+ unevaluatedProperties: false
+
required:
- compatible
- reg
@@ -120,6 +156,12 @@ examples:
reset-gpios = <&pm8350c_gpios 4 GPIO_ACTIVE_LOW>;
+ vdd_l1_l2-supply = <&vreg_s8b_1p2>;
+ vdd_l3_l4-supply = <&vreg_s1b_1p8>;
+ vdd_l5-supply = <&vreg_bob>;
+ vdd_l6-supply = <&vreg_bob>;
+ vdd_l7-supply = <&vreg_bob>;
+
pm8008_gpios: gpio@0,c000 {
compatible = "qcom,pm8008-gpio", "qcom,spmi-gpio";
reg = <0x0 0xc000>;
@@ -129,6 +171,14 @@ examples:
interrupt-controller;
#interrupt-cells = <2>;
};
+
+ ldo1@1,4000 {
+ compatible = "qcom,pm8008-regulator";
+ reg = <0x1 0x4000>;
+ regulator-name = "pm8008_ldo1";
+ regulator-min-microvolt = <950000>;
+ regulator-max-microvolt = <1300000>;
+ };
};
};
--
2.7.4
Remove the regmap member from pm8008_data struct as it is
not used outside of probe. Add a local variable for regmap
and pass it to the pm8008_probe_irq_peripherals()
API in pm8008_probe.
Signed-off-by: Satya Priya <[email protected]>
Reviewed-by: Stephen Boyd <[email protected]>
---
Changes in V13:
- None.
Changes in V12:
- None.
Changes in V11:
- New patch added from V11.
drivers/mfd/qcom-pm8008.c | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/mfd/qcom-pm8008.c b/drivers/mfd/qcom-pm8008.c
index 5a670b0..569ffd50 100644
--- a/drivers/mfd/qcom-pm8008.c
+++ b/drivers/mfd/qcom-pm8008.c
@@ -57,7 +57,6 @@ enum {
struct pm8008_data {
struct device *dev;
- struct regmap *regmap;
int irq;
struct regmap_irq_chip_data *irq_data;
};
@@ -151,7 +150,7 @@ static struct regmap_config qcom_mfd_regmap_cfg = {
.max_register = 0xFFFF,
};
-static int pm8008_init(struct pm8008_data *chip)
+static int pm8008_init(struct regmap *regmap)
{
int rc;
@@ -161,32 +160,32 @@ static int pm8008_init(struct pm8008_data *chip)
* This is required to enable the writing of TYPE registers in
* regmap_irq_sync_unlock().
*/
- rc = regmap_write(chip->regmap,
+ rc = regmap_write(regmap,
(PM8008_TEMP_ALARM_ADDR | INT_SET_TYPE_OFFSET),
BIT(0));
if (rc)
return rc;
/* Do the same for GPIO1 and GPIO2 peripherals */
- rc = regmap_write(chip->regmap,
+ rc = regmap_write(regmap,
(PM8008_GPIO1_ADDR | INT_SET_TYPE_OFFSET), BIT(0));
if (rc)
return rc;
- rc = regmap_write(chip->regmap,
+ rc = regmap_write(regmap,
(PM8008_GPIO2_ADDR | INT_SET_TYPE_OFFSET), BIT(0));
return rc;
}
static int pm8008_probe_irq_peripherals(struct pm8008_data *chip,
- int client_irq)
+ struct regmap *regmap, int client_irq)
{
int rc, i;
struct regmap_irq_type *type;
struct regmap_irq_chip_data *irq_data;
- rc = pm8008_init(chip);
+ rc = pm8008_init(regmap);
if (rc) {
dev_err(chip->dev, "Init failed: %d\n", rc);
return rc;
@@ -208,7 +207,7 @@ static int pm8008_probe_irq_peripherals(struct pm8008_data *chip,
IRQ_TYPE_LEVEL_HIGH | IRQ_TYPE_LEVEL_LOW);
}
- rc = devm_regmap_add_irq_chip(chip->dev, chip->regmap, client_irq,
+ rc = devm_regmap_add_irq_chip(chip->dev, regmap, client_irq,
IRQF_SHARED, 0, &pm8008_irq_chip, &irq_data);
if (rc) {
dev_err(chip->dev, "Failed to add IRQ chip: %d\n", rc);
@@ -223,14 +222,15 @@ static int pm8008_probe(struct i2c_client *client)
int rc;
struct pm8008_data *chip;
struct gpio_desc *reset_gpio;
+ struct regmap *regmap;
chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
if (!chip)
return -ENOMEM;
chip->dev = &client->dev;
- chip->regmap = devm_regmap_init_i2c(client, &qcom_mfd_regmap_cfg);
- if (!chip->regmap)
+ regmap = devm_regmap_init_i2c(client, &qcom_mfd_regmap_cfg);
+ if (!regmap)
return -ENODEV;
i2c_set_clientdata(client, chip);
@@ -240,7 +240,7 @@ static int pm8008_probe(struct i2c_client *client)
return PTR_ERR(reset_gpio);
if (of_property_read_bool(chip->dev->of_node, "interrupt-controller")) {
- rc = pm8008_probe_irq_peripherals(chip, client->irq);
+ rc = pm8008_probe_irq_peripherals(chip, regmap, client->irq);
if (rc)
dev_err(chip->dev, "Failed to probe irq periphs: %d\n", rc);
}
--
2.7.4
Use i2c_new_dummy_device() to register pm8008-regulator
client present at a different address space, instead of
defining a separate DT node. This avoids calling the probe
twice for the same chip, once for each client pm8008-infra
and pm8008-regulator.
As a part of this define pm8008_regmap_init() to do regmap
init for both the clients and define pm8008_get_regmap() to
pass the regmap to the regulator driver.
Signed-off-by: Satya Priya <[email protected]>
Reviewed-by: Stephen Boyd <[email protected]>
---
Changes in V13:
- None.
Changes in V12:
- Make chip as const in pm8008_get_regmap() definition.
- Use EXPORT_SYMBOL_GPL() for pm8008_get_regmap.
- Add linux/mfd/qcom_pm8008.h to avoid error.
Changes in V11:
- Remove the for loop and register dummy directly as there are
only 2 clients.
- Define pm8008_regmap_init() API to do the redundant init part.
drivers/mfd/qcom-pm8008.c | 34 ++++++++++++++++++++++++++++++++--
include/linux/mfd/qcom_pm8008.h | 8 ++++++++
2 files changed, 40 insertions(+), 2 deletions(-)
create mode 100644 include/linux/mfd/qcom_pm8008.h
diff --git a/drivers/mfd/qcom-pm8008.c b/drivers/mfd/qcom-pm8008.c
index 569ffd50..55e2a8e 100644
--- a/drivers/mfd/qcom-pm8008.c
+++ b/drivers/mfd/qcom-pm8008.c
@@ -9,6 +9,7 @@
#include <linux/interrupt.h>
#include <linux/irq.h>
#include <linux/irqdomain.h>
+#include <linux/mfd/qcom_pm8008.h>
#include <linux/module.h>
#include <linux/of_device.h>
#include <linux/of_platform.h>
@@ -57,6 +58,7 @@ enum {
struct pm8008_data {
struct device *dev;
+ struct regmap *regulators_regmap;
int irq;
struct regmap_irq_chip_data *irq_data;
};
@@ -150,6 +152,12 @@ static struct regmap_config qcom_mfd_regmap_cfg = {
.max_register = 0xFFFF,
};
+struct regmap *pm8008_get_regmap(const struct pm8008_data *chip)
+{
+ return chip->regulators_regmap;
+}
+EXPORT_SYMBOL_GPL(pm8008_get_regmap);
+
static int pm8008_init(struct regmap *regmap)
{
int rc;
@@ -217,11 +225,25 @@ static int pm8008_probe_irq_peripherals(struct pm8008_data *chip,
return 0;
}
+static struct regmap *pm8008_regmap_init(struct i2c_client *client,
+ struct pm8008_data *chip)
+{
+ struct regmap *regmap;
+
+ regmap = devm_regmap_init_i2c(client, &qcom_mfd_regmap_cfg);
+ if (!regmap)
+ return NULL;
+
+ i2c_set_clientdata(client, chip);
+ return regmap;
+}
+
static int pm8008_probe(struct i2c_client *client)
{
int rc;
struct pm8008_data *chip;
struct gpio_desc *reset_gpio;
+ struct i2c_client *regulators_client;
struct regmap *regmap;
chip = devm_kzalloc(&client->dev, sizeof(*chip), GFP_KERNEL);
@@ -229,11 +251,19 @@ static int pm8008_probe(struct i2c_client *client)
return -ENOMEM;
chip->dev = &client->dev;
- regmap = devm_regmap_init_i2c(client, &qcom_mfd_regmap_cfg);
+ regmap = pm8008_regmap_init(client, chip);
if (!regmap)
return -ENODEV;
- i2c_set_clientdata(client, chip);
+ regulators_client = i2c_new_dummy_device(client->adapter, client->addr + 1);
+ if (IS_ERR(regulators_client)) {
+ dev_err(&client->dev, "can't attach client\n");
+ return PTR_ERR(regulators_client);
+ }
+
+ chip->regulators_regmap = pm8008_regmap_init(regulators_client, chip);
+ if (!chip->regulators_regmap)
+ return -ENODEV;
reset_gpio = devm_gpiod_get(chip->dev, "reset", GPIOD_OUT_LOW);
if (IS_ERR(reset_gpio))
diff --git a/include/linux/mfd/qcom_pm8008.h b/include/linux/mfd/qcom_pm8008.h
new file mode 100644
index 0000000..d5db9a2
--- /dev/null
+++ b/include/linux/mfd/qcom_pm8008.h
@@ -0,0 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef __QCOM_PM8008_H__
+#define __QCOM_PM8008_H__
+
+struct pm8008_data;
+struct regmap *pm8008_get_regmap(const struct pm8008_data *chip);
+
+#endif
--
2.7.4
HTML mail? Please send plaintext next time.
Quoting Satya Priya Kakitapalli (Temp) (2022-05-27 01:24:19)
>
> On 5/21/2022 8:26 AM, Stephen Boyd wrote:
>
> Quoting Satya Priya (2022-05-20 03:49:35)
>
> diff --git a/drivers/regulator/qcom-pm8008-regulator.c b/drivers/regulator/qcom-pm8008-regulator.c
> new file mode 100644
> index 0000000..6e815c6
> --- /dev/null
> +++ b/drivers/regulator/qcom-pm8008-regulator.c
> @@ -0,0 +1,225 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +/* Copyright (c) 2022, The Linux Foundation. All rights reserved. */
> +
> +#include <linux/device.h>
> +#include <linux/kernel.h>
> +#include <linux/mfd/qcom_pm8008.h>
> +#include <linux/module.h>
> +#include <linux/of.h>
> +#include <linux/of_device.h>
>
> What in of_device.h is used?
>
>
> struct of_device_id
That struct is defined in mod_devicetable.h, not of_device.h
>
>
>
> +#include <linux/platform_device.h>
> +#include <linux/regmap.h>
> +#include <linux/regulator/driver.h>
> +
[...]
>
>
> +};
> +
> +static int pm8008_regulator_get_voltage(struct regulator_dev *rdev)
> +{
> + struct pm8008_regulator *pm8008_reg = rdev_get_drvdata(rdev);
> +
> + return pm8008_reg->voltage_selector;
>
> Can this read the hardware instead of caching the value from
> pm8008_regulator_set_voltage()?
>
>
> I can use the regmap_bulk_read like below (which was present in the earlier
> versions)
Please do
> + }
> +
> + pm8008_reg->dev = dev;
> +
> + rc = of_property_read_string(dev->of_node, "regulator-name", &name);
> + if (rc)
> + return rc;
> +
> + /* get the required regulator data */
> + for (i = 0; i < ARRAY_SIZE(reg_data); i++)
> + if (strstr(name, reg_data[i].name))
>
> Why not find this via reg/address instead? It would save storing the
> regulator name in the reg_data table.
>
>
> You mean match this using base address? then we should add base address in the
> reg_data table. We will need the name to be stored in reg_data table anyway for
> the pm8008_reg->rdesc.of_match
Why? Now that this driver binds to each node individually the usage of
of_match doesn't make any sense to me. Can you set 'struct
regulator_config::dev' instead and not set of_match?
On 5/28/2022 2:32 AM, Stephen Boyd wrote:
> HTML mail? Please send plaintext next time.
>
> Quoting Satya Priya Kakitapalli (Temp) (2022-05-27 01:24:19)
>> On 5/21/2022 8:26 AM, Stephen Boyd wrote:
>>
>> Quoting Satya Priya (2022-05-20 03:49:35)
>>
>> diff --git a/drivers/regulator/qcom-pm8008-regulator.c b/drivers/regulator/qcom-pm8008-regulator.c
>> new file mode 100644
>> index 0000000..6e815c6
>> --- /dev/null
>> +++ b/drivers/regulator/qcom-pm8008-regulator.c
>> @@ -0,0 +1,225 @@
>> +// SPDX-License-Identifier: GPL-2.0-only
>> +/* Copyright (c) 2022, The Linux Foundation. All rights reserved. */
>> +
>> +#include <linux/device.h>
>> +#include <linux/kernel.h>
>> +#include <linux/mfd/qcom_pm8008.h>
>> +#include <linux/module.h>
>> +#include <linux/of.h>
>> +#include <linux/of_device.h>
>>
>> What in of_device.h is used?
>>
>>
>> struct of_device_id
> That struct is defined in mod_devicetable.h, not of_device.h
>
>>
>>
>> +#include <linux/platform_device.h>
>> +#include <linux/regmap.h>
>> +#include <linux/regulator/driver.h>
>> +
> [...]
>>
>> +};
>> +
>> +static int pm8008_regulator_get_voltage(struct regulator_dev *rdev)
>> +{
>> + struct pm8008_regulator *pm8008_reg = rdev_get_drvdata(rdev);
>> +
>> + return pm8008_reg->voltage_selector;
>>
>> Can this read the hardware instead of caching the value from
>> pm8008_regulator_set_voltage()?
>>
>>
>> I can use the regmap_bulk_read like below (which was present in the earlier
>> versions)
> Please do
>
>> + }
>> +
>> + pm8008_reg->dev = dev;
>> +
>> + rc = of_property_read_string(dev->of_node, "regulator-name", &name);
>> + if (rc)
>> + return rc;
>> +
>> + /* get the required regulator data */
>> + for (i = 0; i < ARRAY_SIZE(reg_data); i++)
>> + if (strstr(name, reg_data[i].name))
>>
>> Why not find this via reg/address instead? It would save storing the
>> regulator name in the reg_data table.
>>
>>
>> You mean match this using base address? then we should add base address in the
>> reg_data table. We will need the name to be stored in reg_data table anyway for
>> the pm8008_reg->rdesc.of_match
> Why? Now that this driver binds to each node individually the usage of
> of_match doesn't make any sense to me. Can you set 'struct
> regulator_config::dev' instead and not set of_match?
Currently we are setting regulator_config::dev as dev->parent i.e.,
pm8008@8, because the parent supplies are present under pm8008@8, to get
the regulators mapped correctly to the parent supplies we are using
dev->parent.
If we do not set of_match in regulator descriptor,
regulator_of_get_init_node() would return NULL, causing init_data to be
NULL during regulator_register and regulators are not getting probed.
This can be resolved, if we get the init_data during pm8008_probe
itself. I'll do that in the next version.
Quoting Satya Priya Kakitapalli (Temp) (2022-05-30 03:33:47)
>
> On 5/28/2022 2:32 AM, Stephen Boyd wrote:
> > Quoting Satya Priya Kakitapalli (Temp) (2022-05-27 01:24:19)
> >> On 5/21/2022 8:26 AM, Stephen Boyd wrote:
> >> + }
> >> +
> >> + pm8008_reg->dev = dev;
> >> +
> >> + rc = of_property_read_string(dev->of_node, "regulator-name", &name);
> >> + if (rc)
> >> + return rc;
> >> +
> >> + /* get the required regulator data */
> >> + for (i = 0; i < ARRAY_SIZE(reg_data); i++)
> >> + if (strstr(name, reg_data[i].name))
> >>
> >> Why not find this via reg/address instead? It would save storing the
> >> regulator name in the reg_data table.
> >>
> >>
> >> You mean match this using base address? then we should add base address in the
> >> reg_data table. We will need the name to be stored in reg_data table anyway for
> >> the pm8008_reg->rdesc.of_match
> > Why? Now that this driver binds to each node individually the usage of
> > of_match doesn't make any sense to me. Can you set 'struct
> > regulator_config::dev' instead and not set of_match?
>
>
> Currently we are setting regulator_config::dev as dev->parent i.e.,
> pm8008@8, because the parent supplies are present under pm8008@8, to get
> the regulators mapped correctly to the parent supplies we are using
> dev->parent.
>
> If we do not set of_match in regulator descriptor,
> regulator_of_get_init_node() would return NULL, causing init_data to be
> NULL during regulator_register and regulators are not getting probed.
> This can be resolved, if we get the init_data during pm8008_probe
> itself. I'll do that in the next version.
>
Ok then it seems ok to leave it as is. I suspect getting init data
during probe is more code vs. having the node name and the address in
the table.
On 6/1/2022 7:36 AM, Stephen Boyd wrote:
> Quoting Satya Priya Kakitapalli (Temp) (2022-05-30 03:33:47)
>> On 5/28/2022 2:32 AM, Stephen Boyd wrote:
>>> Quoting Satya Priya Kakitapalli (Temp) (2022-05-27 01:24:19)
>>>> On 5/21/2022 8:26 AM, Stephen Boyd wrote:
>>>> + }
>>>> +
>>>> + pm8008_reg->dev = dev;
>>>> +
>>>> + rc = of_property_read_string(dev->of_node, "regulator-name", &name);
>>>> + if (rc)
>>>> + return rc;
>>>> +
>>>> + /* get the required regulator data */
>>>> + for (i = 0; i < ARRAY_SIZE(reg_data); i++)
>>>> + if (strstr(name, reg_data[i].name))
>>>>
>>>> Why not find this via reg/address instead? It would save storing the
>>>> regulator name in the reg_data table.
>>>>
>>>>
>>>> You mean match this using base address? then we should add base address in the
>>>> reg_data table. We will need the name to be stored in reg_data table anyway for
>>>> the pm8008_reg->rdesc.of_match
>>> Why? Now that this driver binds to each node individually the usage of
>>> of_match doesn't make any sense to me. Can you set 'struct
>>> regulator_config::dev' instead and not set of_match?
>>
>> Currently we are setting regulator_config::dev as dev->parent i.e.,
>> pm8008@8, because the parent supplies are present under pm8008@8, to get
>> the regulators mapped correctly to the parent supplies we are using
>> dev->parent.
>>
>> If we do not set of_match in regulator descriptor,
>> regulator_of_get_init_node() would return NULL, causing init_data to be
>> NULL during regulator_register and regulators are not getting probed.
>> This can be resolved, if we get the init_data during pm8008_probe
>> itself. I'll do that in the next version.
>>
> Ok then it seems ok to leave it as is. I suspect getting init data
> during probe is more code vs. having the node name and the address in
> the table.
Okay. If we are leaving it as is then, there is no need to add address
in the table.