* [PATCH V3 0/4] Add Qualcomm Technologies, Inc. PM8008 regulator driver @ 2021-10-28 15:14 Satya Priya 2021-10-28 15:14 ` [PATCH V3 1/4] regulator: dt-bindings: Add pm8008 regulator bindings Satya Priya ` (3 more replies) 0 siblings, 4 replies; 12+ messages in thread From: Satya Priya @ 2021-10-28 15:14 UTC (permalink / raw) To: Bjorn Andersson, Rob Herring Cc: Liam Girdwood, Mark Brown, swboyd, collinsd, subbaram, Das Srinagesh, linux-arm-msm, Lee Jones, devicetree, linux-kernel, Satya Priya Satya Priya (2): regulator: dt-bindings: Add pm8008 regulator bindings dt-bindings: mfd: pm8008: Add pm8008 regulator node satya priya (2): regulator: Add a regulator driver for the PM8008 PMIC arm64: dts: qcom: sc7280: Add pm8008 regulators support for sc7280-idp .../devicetree/bindings/mfd/qcom,pm8008.yaml | 24 ++ .../bindings/regulator/qcom,pm8008-regulator.yaml | 74 ++++++ arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 103 ++++++++ drivers/regulator/Kconfig | 9 + drivers/regulator/Makefile | 1 + drivers/regulator/qcom-pm8008-regulator.c | 269 +++++++++++++++++++++ 6 files changed, 480 insertions(+) create mode 100644 Documentation/devicetree/bindings/regulator/qcom,pm8008-regulator.yaml create mode 100644 drivers/regulator/qcom-pm8008-regulator.c -- 2.7.4 ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH V3 1/4] regulator: dt-bindings: Add pm8008 regulator bindings 2021-10-28 15:14 [PATCH V3 0/4] Add Qualcomm Technologies, Inc. PM8008 regulator driver Satya Priya @ 2021-10-28 15:14 ` Satya Priya 2021-10-28 20:06 ` Stephen Boyd 2021-10-28 15:14 ` [PATCH V3 2/4] dt-bindings: mfd: pm8008: Add pm8008 regulator node Satya Priya ` (2 subsequent siblings) 3 siblings, 1 reply; 12+ messages in thread From: Satya Priya @ 2021-10-28 15:14 UTC (permalink / raw) To: Bjorn Andersson, Rob Herring Cc: Liam Girdwood, Mark Brown, swboyd, collinsd, subbaram, Das Srinagesh, linux-arm-msm, Lee Jones, devicetree, linux-kernel, Satya Priya Add bindings for pm8008 pmic regulators. Signed-off-by: Satya Priya <quic_c_skakit@quicinc.com> --- Changes in V2: - Moved this patch before "mfd: pm8008: Add pm8008 regulator node" to resolve dtschema errors. Removed regulator-min-microvolt and regulator-max-microvolt properties. Changes in V3: - As per Rob's comments added standard unit suffix for mindropout property, added blank lines where required and added description for reg property. - As per Stephen's comments, changed the qcom,min-dropout-voltage to standard property regulator-min-dropout-voltage-microvolt. .../bindings/regulator/qcom,pm8008-regulator.yaml | 74 ++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 Documentation/devicetree/bindings/regulator/qcom,pm8008-regulator.yaml diff --git a/Documentation/devicetree/bindings/regulator/qcom,pm8008-regulator.yaml b/Documentation/devicetree/bindings/regulator/qcom,pm8008-regulator.yaml new file mode 100644 index 0000000..cc624d1 --- /dev/null +++ b/Documentation/devicetree/bindings/regulator/qcom,pm8008-regulator.yaml @@ -0,0 +1,74 @@ +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/regulator/qcom,pm8008-regulator.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Qualcomm Technologies, Inc. PM8008 Regulator bindings + +maintainers: + - Satya Priya <skakit@codeaurora.org> + +description: + Qualcomm Technologies, Inc. PM8008 is an I2C controlled PMIC + containing 7 LDO regulators. + +properties: + compatible: + const: qcom,pm8008-regulator + + "#address-cells": + const: 1 + + "#size-cells": + const: 0 + + 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: + "^l[1-7]@[0-9a-f]+$": + type: object + + $ref: "regulator.yaml#" + + description: PM8008 regulator peripherals of PM8008 regulator device + + properties: + reg: + maxItems: 1 + description: Base address of the regulator. + + regulator-name: true + + regulator-min-dropout-voltage-microvolt: + description: + Specifies the minimum voltage in microvolts that the parent + supply regulator must output, above the output of this + regulator. + + required: + - reg + - regulator-name + + unevaluatedProperties: false + +required: + - compatible + - "#address-cells" + - "#size-cells" + +additionalProperties: false +... -- 2.7.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH V3 1/4] regulator: dt-bindings: Add pm8008 regulator bindings 2021-10-28 15:14 ` [PATCH V3 1/4] regulator: dt-bindings: Add pm8008 regulator bindings Satya Priya @ 2021-10-28 20:06 ` Stephen Boyd 2021-11-18 13:58 ` Satya Priya Kakitapalli (Temp) 0 siblings, 1 reply; 12+ messages in thread From: Stephen Boyd @ 2021-10-28 20:06 UTC (permalink / raw) To: Bjorn Andersson, Rob Herring, Satya Priya Cc: Liam Girdwood, Mark Brown, collinsd, subbaram, Das Srinagesh, linux-arm-msm, Lee Jones, devicetree, linux-kernel Quoting Satya Priya (2021-10-28 08:14:29) > diff --git a/Documentation/devicetree/bindings/regulator/qcom,pm8008-regulator.yaml b/Documentation/devicetree/bindings/regulator/qcom,pm8008-regulator.yaml > new file mode 100644 > index 0000000..cc624d1 > --- /dev/null > +++ b/Documentation/devicetree/bindings/regulator/qcom,pm8008-regulator.yaml > @@ -0,0 +1,74 @@ > +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/regulator/qcom,pm8008-regulator.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Qualcomm Technologies, Inc. PM8008 Regulator bindings > + > +maintainers: > + - Satya Priya <skakit@codeaurora.org> > + > +description: > + Qualcomm Technologies, Inc. PM8008 is an I2C controlled PMIC > + containing 7 LDO regulators. > + > +properties: > + compatible: > + const: qcom,pm8008-regulator Maybe qcom,pm8008-regulators because there's more than one? > + > + "#address-cells": > + const: 1 > + > + "#size-cells": > + const: 0 > + > + 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: > + "^l[1-7]@[0-9a-f]+$": > + type: object > + > + $ref: "regulator.yaml#" > + > + description: PM8008 regulator peripherals of PM8008 regulator device > + > + properties: > + reg: > + maxItems: 1 > + description: Base address of the regulator. > + > + regulator-name: true > + > + regulator-min-dropout-voltage-microvolt: This needs to move to regulator.yaml in a separate patch. > + description: > + Specifies the minimum voltage in microvolts that the parent > + supply regulator must output, above the output of this > + regulator. > + ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH V3 1/4] regulator: dt-bindings: Add pm8008 regulator bindings 2021-10-28 20:06 ` Stephen Boyd @ 2021-11-18 13:58 ` Satya Priya Kakitapalli (Temp) 0 siblings, 0 replies; 12+ messages in thread From: Satya Priya Kakitapalli (Temp) @ 2021-11-18 13:58 UTC (permalink / raw) To: Stephen Boyd, Bjorn Andersson, Rob Herring Cc: Liam Girdwood, Mark Brown, subbaram, Das Srinagesh, linux-arm-msm, Lee Jones, devicetree, linux-kernel On 10/29/2021 1:36 AM, Stephen Boyd wrote: > Quoting Satya Priya (2021-10-28 08:14:29) >> diff --git a/Documentation/devicetree/bindings/regulator/qcom,pm8008-regulator.yaml b/Documentation/devicetree/bindings/regulator/qcom,pm8008-regulator.yaml >> new file mode 100644 >> index 0000000..cc624d1 >> --- /dev/null >> +++ b/Documentation/devicetree/bindings/regulator/qcom,pm8008-regulator.yaml >> @@ -0,0 +1,74 @@ >> +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause >> +%YAML 1.2 >> +--- >> +$id: http://devicetree.org/schemas/regulator/qcom,pm8008-regulator.yaml# >> +$schema: http://devicetree.org/meta-schemas/core.yaml# >> + >> +title: Qualcomm Technologies, Inc. PM8008 Regulator bindings >> + >> +maintainers: >> + - Satya Priya <skakit@codeaurora.org> >> + >> +description: >> + Qualcomm Technologies, Inc. PM8008 is an I2C controlled PMIC >> + containing 7 LDO regulators. >> + >> +properties: >> + compatible: >> + const: qcom,pm8008-regulator > Maybe qcom,pm8008-regulators because there's more than one? Okay >> + >> + "#address-cells": >> + const: 1 >> + >> + "#size-cells": >> + const: 0 >> + >> + 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: >> + "^l[1-7]@[0-9a-f]+$": >> + type: object >> + >> + $ref: "regulator.yaml#" >> + >> + description: PM8008 regulator peripherals of PM8008 regulator device >> + >> + properties: >> + reg: >> + maxItems: 1 >> + description: Base address of the regulator. >> + >> + regulator-name: true >> + >> + regulator-min-dropout-voltage-microvolt: > This needs to move to regulator.yaml in a separate patch. Okay >> + description: >> + Specifies the minimum voltage in microvolts that the parent >> + supply regulator must output, above the output of this >> + regulator. >> + ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH V3 2/4] dt-bindings: mfd: pm8008: Add pm8008 regulator node 2021-10-28 15:14 [PATCH V3 0/4] Add Qualcomm Technologies, Inc. PM8008 regulator driver Satya Priya 2021-10-28 15:14 ` [PATCH V3 1/4] regulator: dt-bindings: Add pm8008 regulator bindings Satya Priya @ 2021-10-28 15:14 ` Satya Priya 2021-10-28 20:06 ` Stephen Boyd 2021-10-28 15:14 ` [PATCH V3 3/4] regulator: Add a regulator driver for the PM8008 PMIC Satya Priya 2021-10-28 15:14 ` [PATCH V3 4/4] arm64: dts: qcom: sc7280: Add pm8008 regulators support for sc7280-idp Satya Priya 3 siblings, 1 reply; 12+ messages in thread From: Satya Priya @ 2021-10-28 15:14 UTC (permalink / raw) To: Bjorn Andersson, Rob Herring Cc: Liam Girdwood, Mark Brown, swboyd, collinsd, subbaram, Das Srinagesh, linux-arm-msm, Lee Jones, devicetree, linux-kernel, Satya Priya Add pm8008-regulator node and example. Signed-off-by: Satya Priya <quic_c_skakit@quicinc.com> --- Changes in V2: - As per Rob's comments changed "pm8008[a-z]?-regulator" to "^pm8008[a-z]?-regulators". Changes in V3: - Fixed bot errors. - As per stephen's comments, changed "^pm8008[a-z]?-regulators$" to "regulators". .../devicetree/bindings/mfd/qcom,pm8008.yaml | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/Documentation/devicetree/bindings/mfd/qcom,pm8008.yaml b/Documentation/devicetree/bindings/mfd/qcom,pm8008.yaml index ec3138c..717e012 100644 --- a/Documentation/devicetree/bindings/mfd/qcom,pm8008.yaml +++ b/Documentation/devicetree/bindings/mfd/qcom,pm8008.yaml @@ -44,6 +44,10 @@ properties: "#size-cells": const: 0 + regulators: + type: object + $ref: "../regulator/qcom,pm8008-regulator.yaml#" + patternProperties: "^gpio@[0-9a-f]+$": type: object @@ -122,6 +126,26 @@ examples: interrupt-controller; #interrupt-cells = <2>; }; + + regulators { + compatible = "qcom,pm8008-regulator"; + #address-cells = <1>; + #size-cells = <0>; + + 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_l1: l1@4000 { + reg = <0x4000>; + regulator-name = "pm8008_l1"; + regulator-min-microvolt = <950000>; + regulator-max-microvolt = <1300000>; + regulator-min-dropout-voltage-microvolt = <96000>; + }; + }; }; }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH V3 2/4] dt-bindings: mfd: pm8008: Add pm8008 regulator node 2021-10-28 15:14 ` [PATCH V3 2/4] dt-bindings: mfd: pm8008: Add pm8008 regulator node Satya Priya @ 2021-10-28 20:06 ` Stephen Boyd 0 siblings, 0 replies; 12+ messages in thread From: Stephen Boyd @ 2021-10-28 20:06 UTC (permalink / raw) To: Bjorn Andersson, Rob Herring, Satya Priya Cc: Liam Girdwood, Mark Brown, collinsd, subbaram, Das Srinagesh, linux-arm-msm, Lee Jones, devicetree, linux-kernel Quoting Satya Priya (2021-10-28 08:14:30) > Add pm8008-regulator node and example. > > Signed-off-by: Satya Priya <quic_c_skakit@quicinc.com> > --- With s/regulator/regulators/ in the compatible string Reviewed-by: Stephen Boyd <swboyd@chromium.org> ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH V3 3/4] regulator: Add a regulator driver for the PM8008 PMIC 2021-10-28 15:14 [PATCH V3 0/4] Add Qualcomm Technologies, Inc. PM8008 regulator driver Satya Priya 2021-10-28 15:14 ` [PATCH V3 1/4] regulator: dt-bindings: Add pm8008 regulator bindings Satya Priya 2021-10-28 15:14 ` [PATCH V3 2/4] dt-bindings: mfd: pm8008: Add pm8008 regulator node Satya Priya @ 2021-10-28 15:14 ` Satya Priya 2021-10-28 20:19 ` Stephen Boyd 2021-10-28 15:14 ` [PATCH V3 4/4] arm64: dts: qcom: sc7280: Add pm8008 regulators support for sc7280-idp Satya Priya 3 siblings, 1 reply; 12+ messages in thread From: Satya Priya @ 2021-10-28 15:14 UTC (permalink / raw) To: Bjorn Andersson, Rob Herring Cc: Liam Girdwood, Mark Brown, swboyd, collinsd, subbaram, Das Srinagesh, linux-arm-msm, Lee Jones, devicetree, linux-kernel, Satya Priya 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 <quic_c_skakit@quicinc.com> --- Changes in V2: - As per Mark's comments - Using regmap helpers for regulator enable/disable and is_enabled APIs - Changed pr_err to dev_err wherever possible. - Removed init_voltage property as it is not used. - Removed if check for registering LDOs - Other minor changes. Changes in V3: - As per Stephen's comments, - Removed unused includes - Removed PM8008_MAX_LDO macro. - Removed pm8008_read/write APIs, using regmap_bulk_read/write APIs - Using le16_to_cpu/cpu_to_le16 APIs in pm8008_regulator_get/set_voltage - Consolidated all probe related functions into single probe function. - Added of_parse_cb call back and removed regulator-name matching loop. - Fixed other minor nits. drivers/regulator/Kconfig | 9 + drivers/regulator/Makefile | 1 + drivers/regulator/qcom-pm8008-regulator.c | 269 ++++++++++++++++++++++++++++++ 3 files changed, 279 insertions(+) create mode 100644 drivers/regulator/qcom-pm8008-regulator.c diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig index 6be9b1c..61e3e98 100644 --- a/drivers/regulator/Kconfig +++ b/drivers/regulator/Kconfig @@ -916,6 +916,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 b07d2a2..4fac16b6 100644 --- a/drivers/regulator/Makefile +++ b/drivers/regulator/Makefile @@ -100,6 +100,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..74ba682 --- /dev/null +++ b/drivers/regulator/qcom-pm8008-regulator.c @@ -0,0 +1,269 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* Copyright (c) 2021, The Linux Foundation. All rights reserved. */ + +#include <linux/device.h> +#include <linux/interrupt.h> +#include <linux/kernel.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> +#include <linux/regulator/machine.h> +#include <linux/regulator/of_regulator.h> + +#define STARTUP_DELAY_USEC 20 +#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_STATUS1_REG(base) (base + 0x08) +#define VREG_READY_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 regulator_data { + const char *name; + const char *supply_name; + int min_uv; + int max_uv; + int min_dropout_uv; +}; + +struct pm8008_regulator { + struct device *dev; + struct regmap *regmap; + struct regulator_desc rdesc; + struct regulator_dev *rdev; + struct device_node *of_node; + u16 base; + int step_rate; +}; + +static const struct regulator_data reg_data[] = { + /* name parent min_uv max_uv headroom_uv */ + { "l1", "vdd_l1_l2", 528000, 1504000, 225000 }, + { "l2", "vdd_l1_l2", 528000, 1504000, 225000 }, + { "l3", "vdd_l3_l4", 1504000, 3400000, 200000 }, + { "l4", "vdd_l3_l4", 1504000, 3400000, 200000 }, + { "l5", "vdd_l5", 1504000, 3400000, 300000 }, + { "l6", "vdd_l6", 1504000, 3400000, 300000 }, + { "l7", "vdd_l7", 1504000, 3400000, 300000 }, + { } +}; + +static int pm8008_regulator_get_voltage(struct regulator_dev *rdev) +{ + struct pm8008_regulator *pm8008_reg = rdev_get_drvdata(rdev); + __le16 mV; + int rc; + + rc = regmap_bulk_read(pm8008_reg->regmap, + LDO_VSET_LB_REG(pm8008_reg->base), (void *)&mV, 2); + if (rc < 0) { + dev_err(pm8008_reg->dev, + "failed to read regulator voltage rc=%d\n", rc); + return rc; + } + + return le16_to_cpu(mV) * 1000; +} + +static inline int pm8008_write_voltage(struct pm8008_regulator *pm8008_reg, + int min_uv, int max_uv) +{ + int rc, mv; + u16 vset_raw; + + mv = DIV_ROUND_UP(min_uv, 1000); + + /* + * Each LSB of regulator is 1mV and the voltage setpoint + * should be multiple of 8mV(step). + */ + mv = DIV_ROUND_UP(mv, VSET_STEP_MV) * VSET_STEP_MV; + if (mv * 1000 > max_uv) { + dev_err(pm8008_reg->dev, + "requested voltage (%d uV) above maximum limit (%d uV)\n", + mv*1000, max_uv); + return -EINVAL; + } + + vset_raw = cpu_to_le16(mv); + + rc = regmap_bulk_write(pm8008_reg->regmap, + LDO_VSET_LB_REG(pm8008_reg->base), + (const void *)&vset_raw, sizeof(vset_raw)); + if (rc < 0) { + dev_err(pm8008_reg->dev, "failed to write voltage rc=%d\n", rc); + return rc; + } + + return 0; +} + +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, + int min_uv, int max_uv, unsigned int *selector) +{ + struct pm8008_regulator *pm8008_reg = rdev_get_drvdata(rdev); + int rc; + + rc = pm8008_write_voltage(pm8008_reg, min_uv, max_uv); + if (rc < 0) + return rc; + + *selector = DIV_ROUND_UP(min_uv - pm8008_reg->rdesc.min_uV, + VSET_STEP_UV); + + dev_dbg(pm8008_reg->dev, "voltage set to %d\n", min_uv); + 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 = pm8008_regulator_set_voltage, + .get_voltage = pm8008_regulator_get_voltage, + .list_voltage = regulator_list_voltage_linear, + .set_voltage_time = pm8008_regulator_set_voltage_time, +}; + +static int pm8008_regulator_of_parse(struct device_node *node, + const struct regulator_desc *desc, + struct regulator_config *config) +{ + struct pm8008_regulator *pm8008_reg = config->driver_data; + struct device *dev = config->dev; + int rc; + u8 reg; + + rc = of_property_read_u32(node, "regulator-min-dropout-voltage-microvolt", + &pm8008_reg->rdesc.min_dropout_uV); + if (rc) { + dev_err(dev, "failed to read min-dropout voltage rc=%d\n", rc); + return rc; + } + + /* get slew rate */ + rc = regmap_bulk_read(pm8008_reg->regmap, + LDO_STEPPER_CTL_REG(pm8008_reg->base), (void *)®, 1); + if (rc < 0) { + dev_err(dev, "%s: failed to read step rate configuration rc=%d\n", + pm8008_reg->rdesc.name, rc); + return rc; + } + pm8008_reg->step_rate + = DEFAULT_VOLTAGE_STEPPER_RATE >> (reg & STEP_RATE_MASK); + + return 0; +} + +static int pm8008_regulator_probe(struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + struct device_node *node = pdev->dev.of_node; + struct pm8008_regulator *pm8008_reg; + struct regmap *regmap; + struct regulator_config reg_config = {}; + const struct regulator_data *reg; + struct regulator_init_data *init_data; + int rc; + u32 base; + + regmap = dev_get_regmap(dev->parent, NULL); + if (!regmap) { + dev_err(dev, "parent regmap is missing\n"); + return -EINVAL; + } + + for (reg = ®_data[0]; reg->name; reg++) { + pm8008_reg = devm_kzalloc(dev, sizeof(*pm8008_reg), GFP_KERNEL); + + pm8008_reg->regmap = regmap; + + pm8008_reg->of_node = of_get_child_by_name(node, reg->name); + if (!pm8008_reg->of_node) { + dev_err(dev, "child node %s not found\n", reg->name); + return -ENODEV; + } + + pm8008_reg->dev = dev; + + rc = of_property_read_u32(pm8008_reg->of_node, "reg", &base); + if (rc < 0) { + dev_err(dev, "%s: failed to get regulator base rc=%d\n", + reg->name, rc); + return rc; + } + pm8008_reg->base = base; + + init_data = of_get_regulator_init_data(dev, pm8008_reg->of_node, + &pm8008_reg->rdesc); + if (!init_data) { + dev_err(dev, "%s: failed to get regulator data\n", reg->name); + return -ENODATA; + } + + pm8008_reg->rdesc.type = REGULATOR_VOLTAGE; + pm8008_reg->rdesc.ops = &pm8008_regulator_ops; + pm8008_reg->rdesc.name = init_data->constraints.name; + pm8008_reg->rdesc.supply_name = reg->supply_name; + pm8008_reg->rdesc.of_match = reg->name; + pm8008_reg->rdesc.of_parse_cb = pm8008_regulator_of_parse; + pm8008_reg->rdesc.uV_step = VSET_STEP_UV; + pm8008_reg->rdesc.min_uV = reg->min_uv; + pm8008_reg->rdesc.n_voltages + = ((reg->max_uv - reg->min_uv) + / pm8008_reg->rdesc.uV_step) + 1; + + pm8008_reg->rdesc.enable_reg = LDO_ENABLE_REG(base); + pm8008_reg->rdesc.enable_mask = ENABLE_BIT; + pm8008_reg->rdesc.min_dropout_uV = reg->min_dropout_uv; + + init_data->constraints.input_uV = init_data->constraints.max_uV; + reg_config.dev = dev; + reg_config.init_data = init_data; + reg_config.driver_data = pm8008_reg; + reg_config.of_node = pm8008_reg->of_node; + + return PTR_ERR_OR_ZERO(devm_regulator_register(dev, &pm8008_reg->rdesc, + ®_config)); + } + + 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 v2"); -- 2.7.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH V3 3/4] regulator: Add a regulator driver for the PM8008 PMIC 2021-10-28 15:14 ` [PATCH V3 3/4] regulator: Add a regulator driver for the PM8008 PMIC Satya Priya @ 2021-10-28 20:19 ` Stephen Boyd 2021-11-18 13:57 ` Satya Priya Kakitapalli (Temp) 0 siblings, 1 reply; 12+ messages in thread From: Stephen Boyd @ 2021-10-28 20:19 UTC (permalink / raw) To: Bjorn Andersson, Rob Herring, Satya Priya Cc: Liam Girdwood, Mark Brown, collinsd, subbaram, Das Srinagesh, linux-arm-msm, Lee Jones, devicetree, linux-kernel Quoting Satya Priya (2021-10-28 08:14:31) > diff --git a/drivers/regulator/qcom-pm8008-regulator.c b/drivers/regulator/qcom-pm8008-regulator.c > new file mode 100644 > index 0000000..74ba682 > --- /dev/null > +++ b/drivers/regulator/qcom-pm8008-regulator.c > @@ -0,0 +1,269 @@ > +// SPDX-License-Identifier: GPL-2.0-only > +/* Copyright (c) 2021, The Linux Foundation. All rights reserved. */ > + > +#include <linux/device.h> > +#include <linux/interrupt.h> > +#include <linux/kernel.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> > +#include <linux/regulator/machine.h> > +#include <linux/regulator/of_regulator.h> > + > +#define STARTUP_DELAY_USEC 20 > +#define VSET_STEP_MV 8 > +#define VSET_STEP_UV (VSET_STEP_MV * 1000) > + > +#define LDO_ENABLE_REG(base) (base + 0x46) Add parenthesis around base as well ((base) + 0x46) > +#define ENABLE_BIT BIT(7) > + > +#define LDO_STATUS1_REG(base) (base + 0x08) > +#define VREG_READY_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 regulator_data { > + const char *name; > + const char *supply_name; > + int min_uv; > + int max_uv; > + int min_dropout_uv; > +}; > + > +struct pm8008_regulator { > + struct device *dev; > + struct regmap *regmap; > + struct regulator_desc rdesc; > + struct regulator_dev *rdev; > + struct device_node *of_node; This isn't used outside of probe so please drop it. Same goes for any other struct member that we don't need to keep around beyond probe. Drop them. rdev? > + u16 base; > + int step_rate; > +}; > + > +static const struct regulator_data reg_data[] = { > + /* name parent min_uv max_uv headroom_uv */ > + { "l1", "vdd_l1_l2", 528000, 1504000, 225000 }, > + { "l2", "vdd_l1_l2", 528000, 1504000, 225000 }, > + { "l3", "vdd_l3_l4", 1504000, 3400000, 200000 }, > + { "l4", "vdd_l3_l4", 1504000, 3400000, 200000 }, > + { "l5", "vdd_l5", 1504000, 3400000, 300000 }, > + { "l6", "vdd_l6", 1504000, 3400000, 300000 }, > + { "l7", "vdd_l7", 1504000, 3400000, 300000 }, > + { } > +}; > + > +static int pm8008_regulator_get_voltage(struct regulator_dev *rdev) > +{ > + struct pm8008_regulator *pm8008_reg = rdev_get_drvdata(rdev); > + __le16 mV; > + int rc; > + > + rc = regmap_bulk_read(pm8008_reg->regmap, > + LDO_VSET_LB_REG(pm8008_reg->base), (void *)&mV, 2); > + if (rc < 0) { > + dev_err(pm8008_reg->dev, > + "failed to read regulator voltage rc=%d\n", rc); Put it all on one line? > + return rc; > + } > + > + return le16_to_cpu(mV) * 1000; > +} > + > +static inline int pm8008_write_voltage(struct pm8008_regulator *pm8008_reg, > + int min_uv, int max_uv) > +{ > + int rc, mv; > + u16 vset_raw; > + > + mv = DIV_ROUND_UP(min_uv, 1000); > + > + /* > + * Each LSB of regulator is 1mV and the voltage setpoint > + * should be multiple of 8mV(step). > + */ > + mv = DIV_ROUND_UP(mv, VSET_STEP_MV) * VSET_STEP_MV; > + if (mv * 1000 > max_uv) { > + dev_err(pm8008_reg->dev, > + "requested voltage (%d uV) above maximum limit (%d uV)\n", > + mv*1000, max_uv); > + return -EINVAL; > + } > + > + vset_raw = cpu_to_le16(mv); > + > + rc = regmap_bulk_write(pm8008_reg->regmap, > + LDO_VSET_LB_REG(pm8008_reg->base), > + (const void *)&vset_raw, sizeof(vset_raw)); > + if (rc < 0) { > + dev_err(pm8008_reg->dev, "failed to write voltage rc=%d\n", rc); If this uses the regulator_dev::dev then we'll know which regulator is failing, instead of just that some regulator failed inside the PMIC. > + return rc; > + } > + > + return 0; > +} > + > +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, > + int min_uv, int max_uv, unsigned int *selector) > +{ > + struct pm8008_regulator *pm8008_reg = rdev_get_drvdata(rdev); > + int rc; > + > + rc = pm8008_write_voltage(pm8008_reg, min_uv, max_uv); > + if (rc < 0) > + return rc; > + > + *selector = DIV_ROUND_UP(min_uv - pm8008_reg->rdesc.min_uV, > + VSET_STEP_UV); > + > + dev_dbg(pm8008_reg->dev, "voltage set to %d\n", min_uv); > + 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 = pm8008_regulator_set_voltage, Can we use set_voltage_sel instead? > + .get_voltage = pm8008_regulator_get_voltage, > + .list_voltage = regulator_list_voltage_linear, > + .set_voltage_time = pm8008_regulator_set_voltage_time, > +}; > + > +static int pm8008_regulator_of_parse(struct device_node *node, > + const struct regulator_desc *desc, > + struct regulator_config *config) > +{ > + struct pm8008_regulator *pm8008_reg = config->driver_data; > + struct device *dev = config->dev; > + int rc; > + u8 reg; > + > + rc = of_property_read_u32(node, "regulator-min-dropout-voltage-microvolt", > + &pm8008_reg->rdesc.min_dropout_uV); > + if (rc) { > + dev_err(dev, "failed to read min-dropout voltage rc=%d\n", rc); > + return rc; > + } > + > + /* get slew rate */ > + rc = regmap_bulk_read(pm8008_reg->regmap, > + LDO_STEPPER_CTL_REG(pm8008_reg->base), (void *)®, 1); Just make reg unsigned int to avoid the cast. > + if (rc < 0) { > + dev_err(dev, "%s: failed to read step rate configuration rc=%d\n", > + pm8008_reg->rdesc.name, rc); > + return rc; > + } reg &= STEP_RATE_MASK; pm8008_reg->step_rate = DEFAULT_VOLTAGE_STEPPER_RATE >> reg; > + pm8008_reg->step_rate > + = DEFAULT_VOLTAGE_STEPPER_RATE >> (reg & STEP_RATE_MASK); > + > + return 0; > +} > + > +static int pm8008_regulator_probe(struct platform_device *pdev) > +{ > + struct device *dev = &pdev->dev; > + struct device_node *node = pdev->dev.of_node; > + struct pm8008_regulator *pm8008_reg; > + struct regmap *regmap; > + struct regulator_config reg_config = {}; > + const struct regulator_data *reg; > + struct regulator_init_data *init_data; > + int rc; > + u32 base; > + > + regmap = dev_get_regmap(dev->parent, NULL); > + if (!regmap) { > + dev_err(dev, "parent regmap is missing\n"); > + return -EINVAL; > + } > + > + for (reg = ®_data[0]; reg->name; reg++) { > + pm8008_reg = devm_kzalloc(dev, sizeof(*pm8008_reg), GFP_KERNEL); > + > + pm8008_reg->regmap = regmap; > + > + pm8008_reg->of_node = of_get_child_by_name(node, reg->name); This of_node reference needs to be put somewhere. > + if (!pm8008_reg->of_node) { > + dev_err(dev, "child node %s not found\n", reg->name); > + return -ENODEV; > + } > + > + pm8008_reg->dev = dev; > + > + rc = of_property_read_u32(pm8008_reg->of_node, "reg", &base); > + if (rc < 0) { > + dev_err(dev, "%s: failed to get regulator base rc=%d\n", > + reg->name, rc); > + return rc; > + } > + pm8008_reg->base = base; > + > + init_data = of_get_regulator_init_data(dev, pm8008_reg->of_node, > + &pm8008_reg->rdesc); Is this necessary? > + if (!init_data) { > + dev_err(dev, "%s: failed to get regulator data\n", reg->name); > + return -ENODATA; > + } > + > + pm8008_reg->rdesc.type = REGULATOR_VOLTAGE; > + pm8008_reg->rdesc.ops = &pm8008_regulator_ops; > + pm8008_reg->rdesc.name = init_data->constraints.name; > + pm8008_reg->rdesc.supply_name = reg->supply_name; > + pm8008_reg->rdesc.of_match = reg->name; > + pm8008_reg->rdesc.of_parse_cb = pm8008_regulator_of_parse; > + pm8008_reg->rdesc.uV_step = VSET_STEP_UV; > + pm8008_reg->rdesc.min_uV = reg->min_uv; > + pm8008_reg->rdesc.n_voltages > + = ((reg->max_uv - reg->min_uv) > + / pm8008_reg->rdesc.uV_step) + 1; > + > + pm8008_reg->rdesc.enable_reg = LDO_ENABLE_REG(base); > + pm8008_reg->rdesc.enable_mask = ENABLE_BIT; > + pm8008_reg->rdesc.min_dropout_uV = reg->min_dropout_uv; > + > + init_data->constraints.input_uV = init_data->constraints.max_uV; > + reg_config.dev = dev; > + reg_config.init_data = init_data; > + reg_config.driver_data = pm8008_reg; > + reg_config.of_node = pm8008_reg->of_node; I think we don't need to do this? > + > + return PTR_ERR_OR_ZERO(devm_regulator_register(dev, &pm8008_reg->rdesc, > + ®_config)); Why are we returning here? Shouldn't we check return value and only return on failure and otherwise continue with registering the rest of the regulators? > + } > + > + return 0; > +} > + ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH V3 3/4] regulator: Add a regulator driver for the PM8008 PMIC 2021-10-28 20:19 ` Stephen Boyd @ 2021-11-18 13:57 ` Satya Priya Kakitapalli (Temp) 0 siblings, 0 replies; 12+ messages in thread From: Satya Priya Kakitapalli (Temp) @ 2021-11-18 13:57 UTC (permalink / raw) To: Stephen Boyd, Bjorn Andersson, Rob Herring Cc: Liam Girdwood, Mark Brown, subbaram, Das Srinagesh, linux-arm-msm, Lee Jones, devicetree, linux-kernel On 10/29/2021 1:49 AM, Stephen Boyd wrote: > Quoting Satya Priya (2021-10-28 08:14:31) >> diff --git a/drivers/regulator/qcom-pm8008-regulator.c b/drivers/regulator/qcom-pm8008-regulator.c >> new file mode 100644 >> index 0000000..74ba682 >> --- /dev/null >> +++ b/drivers/regulator/qcom-pm8008-regulator.c >> @@ -0,0 +1,269 @@ >> +// SPDX-License-Identifier: GPL-2.0-only >> +/* Copyright (c) 2021, The Linux Foundation. All rights reserved. */ >> + >> +#include <linux/device.h> >> +#include <linux/interrupt.h> >> +#include <linux/kernel.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> >> +#include <linux/regulator/machine.h> >> +#include <linux/regulator/of_regulator.h> >> + >> +#define STARTUP_DELAY_USEC 20 >> +#define VSET_STEP_MV 8 >> +#define VSET_STEP_UV (VSET_STEP_MV * 1000) >> + >> +#define LDO_ENABLE_REG(base) (base + 0x46) > Add parenthesis around base as well ((base) + 0x46) Okay >> +#define ENABLE_BIT BIT(7) >> + >> +#define LDO_STATUS1_REG(base) (base + 0x08) >> +#define VREG_READY_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 regulator_data { >> + const char *name; >> + const char *supply_name; >> + int min_uv; >> + int max_uv; >> + int min_dropout_uv; >> +}; >> + >> +struct pm8008_regulator { >> + struct device *dev; >> + struct regmap *regmap; >> + struct regulator_desc rdesc; >> + struct regulator_dev *rdev; >> + struct device_node *of_node; > This isn't used outside of probe so please drop it. Same goes for any > other struct member that we don't need to keep around beyond probe. Drop > them. rdev? Okay, I'll remove. >> + u16 base; >> + int step_rate; >> +}; >> + >> +static const struct regulator_data reg_data[] = { >> + /* name parent min_uv max_uv headroom_uv */ >> + { "l1", "vdd_l1_l2", 528000, 1504000, 225000 }, >> + { "l2", "vdd_l1_l2", 528000, 1504000, 225000 }, >> + { "l3", "vdd_l3_l4", 1504000, 3400000, 200000 }, >> + { "l4", "vdd_l3_l4", 1504000, 3400000, 200000 }, >> + { "l5", "vdd_l5", 1504000, 3400000, 300000 }, >> + { "l6", "vdd_l6", 1504000, 3400000, 300000 }, >> + { "l7", "vdd_l7", 1504000, 3400000, 300000 }, >> + { } >> +}; >> + >> +static int pm8008_regulator_get_voltage(struct regulator_dev *rdev) >> +{ >> + struct pm8008_regulator *pm8008_reg = rdev_get_drvdata(rdev); >> + __le16 mV; >> + int rc; >> + >> + rc = regmap_bulk_read(pm8008_reg->regmap, >> + LDO_VSET_LB_REG(pm8008_reg->base), (void *)&mV, 2); >> + if (rc < 0) { >> + dev_err(pm8008_reg->dev, >> + "failed to read regulator voltage rc=%d\n", rc); > Put it all on one line? Okay. >> + return rc; >> + } >> + >> + return le16_to_cpu(mV) * 1000; >> +} >> + >> +static inline int pm8008_write_voltage(struct pm8008_regulator *pm8008_reg, >> + int min_uv, int max_uv) >> +{ >> + int rc, mv; >> + u16 vset_raw; >> + >> + mv = DIV_ROUND_UP(min_uv, 1000); >> + >> + /* >> + * Each LSB of regulator is 1mV and the voltage setpoint >> + * should be multiple of 8mV(step). >> + */ >> + mv = DIV_ROUND_UP(mv, VSET_STEP_MV) * VSET_STEP_MV; >> + if (mv * 1000 > max_uv) { >> + dev_err(pm8008_reg->dev, >> + "requested voltage (%d uV) above maximum limit (%d uV)\n", >> + mv*1000, max_uv); >> + return -EINVAL; >> + } >> + >> + vset_raw = cpu_to_le16(mv); >> + >> + rc = regmap_bulk_write(pm8008_reg->regmap, >> + LDO_VSET_LB_REG(pm8008_reg->base), >> + (const void *)&vset_raw, sizeof(vset_raw)); >> + if (rc < 0) { >> + dev_err(pm8008_reg->dev, "failed to write voltage rc=%d\n", rc); > If this uses the regulator_dev::dev then we'll know which regulator is > failing, instead of just that some regulator failed inside the PMIC. OK, but in this API we do not have the rdev, in other APIs wherever possible I'll use rdev->dev. >> + return rc; >> + } >> + >> + return 0; >> +} >> + >> +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, >> + int min_uv, int max_uv, unsigned int *selector) >> +{ >> + struct pm8008_regulator *pm8008_reg = rdev_get_drvdata(rdev); >> + int rc; >> + >> + rc = pm8008_write_voltage(pm8008_reg, min_uv, max_uv); >> + if (rc < 0) >> + return rc; >> + >> + *selector = DIV_ROUND_UP(min_uv - pm8008_reg->rdesc.min_uV, >> + VSET_STEP_UV); >> + >> + dev_dbg(pm8008_reg->dev, "voltage set to %d\n", min_uv); >> + 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 = pm8008_regulator_set_voltage, > Can we use set_voltage_sel instead? Yes >> + .get_voltage = pm8008_regulator_get_voltage, >> + .list_voltage = regulator_list_voltage_linear, >> + .set_voltage_time = pm8008_regulator_set_voltage_time, >> +}; >> + >> +static int pm8008_regulator_of_parse(struct device_node *node, >> + const struct regulator_desc *desc, >> + struct regulator_config *config) >> +{ >> + struct pm8008_regulator *pm8008_reg = config->driver_data; >> + struct device *dev = config->dev; >> + int rc; >> + u8 reg; >> + >> + rc = of_property_read_u32(node, "regulator-min-dropout-voltage-microvolt", >> + &pm8008_reg->rdesc.min_dropout_uV); >> + if (rc) { >> + dev_err(dev, "failed to read min-dropout voltage rc=%d\n", rc); >> + return rc; >> + } >> + >> + /* get slew rate */ >> + rc = regmap_bulk_read(pm8008_reg->regmap, >> + LDO_STEPPER_CTL_REG(pm8008_reg->base), (void *)®, 1); > Just make reg unsigned int to avoid the cast. Ok >> + if (rc < 0) { >> + dev_err(dev, "%s: failed to read step rate configuration rc=%d\n", >> + pm8008_reg->rdesc.name, rc); >> + return rc; >> + } > reg &= STEP_RATE_MASK; > pm8008_reg->step_rate = DEFAULT_VOLTAGE_STEPPER_RATE >> reg; Ok >> + pm8008_reg->step_rate >> + = DEFAULT_VOLTAGE_STEPPER_RATE >> (reg & STEP_RATE_MASK); >> + >> + return 0; >> +} >> + >> +static int pm8008_regulator_probe(struct platform_device *pdev) >> +{ >> + struct device *dev = &pdev->dev; >> + struct device_node *node = pdev->dev.of_node; >> + struct pm8008_regulator *pm8008_reg; >> + struct regmap *regmap; >> + struct regulator_config reg_config = {}; >> + const struct regulator_data *reg; >> + struct regulator_init_data *init_data; >> + int rc; >> + u32 base; >> + >> + regmap = dev_get_regmap(dev->parent, NULL); >> + if (!regmap) { >> + dev_err(dev, "parent regmap is missing\n"); >> + return -EINVAL; >> + } >> + >> + for (reg = ®_data[0]; reg->name; reg++) { >> + pm8008_reg = devm_kzalloc(dev, sizeof(*pm8008_reg), GFP_KERNEL); >> + >> + pm8008_reg->regmap = regmap; >> + >> + pm8008_reg->of_node = of_get_child_by_name(node, reg->name); > This of_node reference needs to be put somewhere. > >> + if (!pm8008_reg->of_node) { >> + dev_err(dev, "child node %s not found\n", reg->name); >> + return -ENODEV; >> + } >> + >> + pm8008_reg->dev = dev; >> + >> + rc = of_property_read_u32(pm8008_reg->of_node, "reg", &base); >> + if (rc < 0) { >> + dev_err(dev, "%s: failed to get regulator base rc=%d\n", >> + reg->name, rc); >> + return rc; >> + } >> + pm8008_reg->base = base; >> + >> + init_data = of_get_regulator_init_data(dev, pm8008_reg->of_node, >> + &pm8008_reg->rdesc); > Is this necessary? I guess its not necessary, I'll remove and validate once. >> + if (!init_data) { >> + dev_err(dev, "%s: failed to get regulator data\n", reg->name); >> + return -ENODATA; >> + } >> + >> + pm8008_reg->rdesc.type = REGULATOR_VOLTAGE; >> + pm8008_reg->rdesc.ops = &pm8008_regulator_ops; >> + pm8008_reg->rdesc.name = init_data->constraints.name; >> + pm8008_reg->rdesc.supply_name = reg->supply_name; >> + pm8008_reg->rdesc.of_match = reg->name; >> + pm8008_reg->rdesc.of_parse_cb = pm8008_regulator_of_parse; >> + pm8008_reg->rdesc.uV_step = VSET_STEP_UV; >> + pm8008_reg->rdesc.min_uV = reg->min_uv; >> + pm8008_reg->rdesc.n_voltages >> + = ((reg->max_uv - reg->min_uv) >> + / pm8008_reg->rdesc.uV_step) + 1; >> + >> + pm8008_reg->rdesc.enable_reg = LDO_ENABLE_REG(base); >> + pm8008_reg->rdesc.enable_mask = ENABLE_BIT; >> + pm8008_reg->rdesc.min_dropout_uV = reg->min_dropout_uv; >> + >> + init_data->constraints.input_uV = init_data->constraints.max_uV; >> + reg_config.dev = dev; >> + reg_config.init_data = init_data; >> + reg_config.driver_data = pm8008_reg; >> + reg_config.of_node = pm8008_reg->of_node; > I think we don't need to do this? Right, I'll remove. >> + >> + return PTR_ERR_OR_ZERO(devm_regulator_register(dev, &pm8008_reg->rdesc, >> + ®_config)); > Why are we returning here? Shouldn't we check return value and only > return on failure and otherwise continue with registering the rest of > the regulators? My bad, I'll correct this. >> + } >> + >> + return 0; >> +} >> + ^ permalink raw reply [flat|nested] 12+ messages in thread
* [PATCH V3 4/4] arm64: dts: qcom: sc7280: Add pm8008 regulators support for sc7280-idp 2021-10-28 15:14 [PATCH V3 0/4] Add Qualcomm Technologies, Inc. PM8008 regulator driver Satya Priya ` (2 preceding siblings ...) 2021-10-28 15:14 ` [PATCH V3 3/4] regulator: Add a regulator driver for the PM8008 PMIC Satya Priya @ 2021-10-28 15:14 ` Satya Priya 2021-10-28 20:40 ` Stephen Boyd 3 siblings, 1 reply; 12+ messages in thread From: Satya Priya @ 2021-10-28 15:14 UTC (permalink / raw) To: Bjorn Andersson, Rob Herring Cc: Liam Girdwood, Mark Brown, swboyd, collinsd, subbaram, Das Srinagesh, linux-arm-msm, Lee Jones, devicetree, linux-kernel, Satya Priya Add pm8008 regulators support for sc7280 idp. Signed-off-by: Satya Priya <quic_c_skakit@quicinc.com> --- Changes in V2: - As per Stephen's comments, replaced '_' with '-' for node names. Changes in V3: - Changed the regulator node names as l1, l2 etc - Changed "pm8008-regulators" to "regulators" - Changed "qcom,min-dropout-voltage" to "regulator-min-dropout-voltage-microvolt" arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 103 +++++++++++++++++++++++++++++++ 1 file changed, 103 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi index d623d71..493575b 100644 --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi @@ -309,6 +309,97 @@ }; }; +&i2c1 { + #address-cells = <1>; + #size-cells = <0>; + status = "okay"; + + pm8008_chip: pm8008@8 { + compatible = "qcom,pm8008"; + reg = <0x8>; + #address-cells = <1>; + #size-cells = <0>; + + pinctrl-names = "default"; + pinctrl-0 = <&pm8008_active>; + }; + + pm8008_ldo: pm8008@9 { + compatible = "qcom,pm8008"; + reg = <0x9>; + #address-cells = <1>; + #size-cells = <0>; + + regulators { + compatible = "qcom,pm8008-regulator"; + #address-cells = <1>; + #size-cells = <0>; + + 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_l1: l1@4000 { + reg = <0x4000>; + regulator-name = "pm8008_l1"; + regulator-min-microvolt = <950000>; + regulator-max-microvolt = <1300000>; + regulator-min-dropout-voltage-microvolt = <96000>; + }; + + pm8008_l2: l2@4100 { + reg = <0x4100>; + regulator-name = "pm8008_l2"; + regulator-min-microvolt = <950000>; + regulator-max-microvolt = <1250000>; + regulator-min-dropout-voltage-microvolt = <24000>; + }; + + pm8008_l3: l3@4200 { + reg = <0x4200>; + regulator-name = "pm8008_l3"; + regulator-min-microvolt = <1650000>; + regulator-max-microvolt = <3000000>; + regulator-min-dropout-voltage-microvolt = <224000>; + }; + + pm8008_l4: l4@4300 { + reg = <0x4300>; + regulator-name = "pm8008_l4"; + regulator-min-microvolt = <1504000>; + regulator-max-microvolt = <1600000>; + regulator-min-dropout-voltage-microvolt = <0>; + }; + + pm8008_l5: l5@4400 { + reg = <0x4400>; + regulator-name = "pm8008_l5"; + regulator-min-microvolt = <2600000>; + regulator-max-microvolt = <3000000>; + regulator-min-dropout-voltage-microvolt = <104000>; + }; + + pm8008_l6: l6@4500 { + reg = <0x4500>; + regulator-name = "pm8008_l6"; + regulator-min-microvolt = <2600000>; + regulator-max-microvolt = <3000000>; + regulator-min-dropout-voltage-microvolt = <112000>; + }; + + pm8008_l7: l7@4600 { + reg = <0x4600>; + regulator-name = "pm8008_l7"; + regulator-min-microvolt = <3000000>; + regulator-max-microvolt = <3544000>; + regulator-min-dropout-voltage-microvolt = <96000>; + }; + }; + }; +}; + &qfprom { vcc-supply = <&vreg_l1c_1p8>; }; @@ -437,6 +528,18 @@ }; }; +&pm8350c_gpios { + pm8008-reset { + pm8008_active: pm8008-active { + pins = "gpio4"; + function = "normal"; + bias-disable; + output-high; + power-source = <0>; + }; + }; +}; + &qspi_cs0 { bias-disable; }; -- 2.7.4 ^ permalink raw reply related [flat|nested] 12+ messages in thread
* Re: [PATCH V3 4/4] arm64: dts: qcom: sc7280: Add pm8008 regulators support for sc7280-idp 2021-10-28 15:14 ` [PATCH V3 4/4] arm64: dts: qcom: sc7280: Add pm8008 regulators support for sc7280-idp Satya Priya @ 2021-10-28 20:40 ` Stephen Boyd 2021-11-18 13:50 ` Satya Priya Kakitapalli (Temp) 0 siblings, 1 reply; 12+ messages in thread From: Stephen Boyd @ 2021-10-28 20:40 UTC (permalink / raw) To: Bjorn Andersson, Rob Herring, Satya Priya Cc: Liam Girdwood, Mark Brown, collinsd, subbaram, Das Srinagesh, linux-arm-msm, Lee Jones, devicetree, linux-kernel Quoting Satya Priya (2021-10-28 08:14:32) > Add pm8008 regulators support for sc7280 idp. > > Signed-off-by: Satya Priya <quic_c_skakit@quicinc.com> > --- > Changes in V2: > - As per Stephen's comments, replaced '_' with '-' for node names. > > Changes in V3: > - Changed the regulator node names as l1, l2 etc > - Changed "pm8008-regulators" to "regulators" > - Changed "qcom,min-dropout-voltage" to "regulator-min-dropout-voltage-microvolt" > > arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 103 +++++++++++++++++++++++++++++++ > 1 file changed, 103 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi > index d623d71..493575b 100644 > --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi > @@ -309,6 +309,97 @@ > }; > }; > > +&i2c1 { > + #address-cells = <1>; > + #size-cells = <0>; > + status = "okay"; > + > + pm8008_chip: pm8008@8 { If this is going to be copy/pasted wherever devices that use pm8008 live then it's probably better to make a new file like we do for other pmics. Maybe something like &pm8008_i2c { <All the generic stuff in here like reg properties and address/size cells and compatible> }; and then have each board set the min/max voltages and min dropout properties. Then we can include the pm8008.dtsi file after defining which i2c bus it lives on. pm8008_i2c: i2c5 { }; #include "pm8008.dtsi" ... &pm8008_l1 { regulator-min-microvolt = <...>; ... }; > + compatible = "qcom,pm8008"; > + reg = <0x8>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + pinctrl-names = "default"; > + pinctrl-0 = <&pm8008_active>; > + }; > + > + pm8008_ldo: pm8008@9 { > + compatible = "qcom,pm8008"; > + reg = <0x9>; > + #address-cells = <1>; > + #size-cells = <0>; > + > + regulators { > + compatible = "qcom,pm8008-regulator"; > + #address-cells = <1>; > + #size-cells = <0>; > + > + 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_l1: l1@4000 { > + reg = <0x4000>; > + regulator-name = "pm8008_l1"; > + regulator-min-microvolt = <950000>; > + regulator-max-microvolt = <1300000>; > + regulator-min-dropout-voltage-microvolt = <96000>; > + }; > + > + pm8008_l2: l2@4100 { > + reg = <0x4100>; > + regulator-name = "pm8008_l2"; > + regulator-min-microvolt = <950000>; > + regulator-max-microvolt = <1250000>; > + regulator-min-dropout-voltage-microvolt = <24000>; > + }; > + > + pm8008_l3: l3@4200 { > + reg = <0x4200>; > + regulator-name = "pm8008_l3"; > + regulator-min-microvolt = <1650000>; > + regulator-max-microvolt = <3000000>; > + regulator-min-dropout-voltage-microvolt = <224000>; > + }; > + > + pm8008_l4: l4@4300 { > + reg = <0x4300>; > + regulator-name = "pm8008_l4"; > + regulator-min-microvolt = <1504000>; > + regulator-max-microvolt = <1600000>; > + regulator-min-dropout-voltage-microvolt = <0>; > + }; > + > + pm8008_l5: l5@4400 { > + reg = <0x4400>; > + regulator-name = "pm8008_l5"; > + regulator-min-microvolt = <2600000>; > + regulator-max-microvolt = <3000000>; > + regulator-min-dropout-voltage-microvolt = <104000>; > + }; > + > + pm8008_l6: l6@4500 { > + reg = <0x4500>; > + regulator-name = "pm8008_l6"; > + regulator-min-microvolt = <2600000>; > + regulator-max-microvolt = <3000000>; > + regulator-min-dropout-voltage-microvolt = <112000>; > + }; > + > + pm8008_l7: l7@4600 { > + reg = <0x4600>; > + regulator-name = "pm8008_l7"; > + regulator-min-microvolt = <3000000>; > + regulator-max-microvolt = <3544000>; > + regulator-min-dropout-voltage-microvolt = <96000>; > + }; > + }; > + }; > +}; > + > &qfprom { > vcc-supply = <&vreg_l1c_1p8>; > }; > @@ -437,6 +528,18 @@ > }; > }; > > +&pm8350c_gpios { > + pm8008-reset { Why is it a subnode of a subnode? Shouldn't it be pm8008-active directly underneath pm8350c_gpios? > + pm8008_active: pm8008-active { > + pins = "gpio4"; > + function = "normal"; > + bias-disable; > + output-high; > + power-source = <0>; > + }; > + }; > +}; > + > &qspi_cs0 { > bias-disable; > }; ^ permalink raw reply [flat|nested] 12+ messages in thread
* Re: [PATCH V3 4/4] arm64: dts: qcom: sc7280: Add pm8008 regulators support for sc7280-idp 2021-10-28 20:40 ` Stephen Boyd @ 2021-11-18 13:50 ` Satya Priya Kakitapalli (Temp) 0 siblings, 0 replies; 12+ messages in thread From: Satya Priya Kakitapalli (Temp) @ 2021-11-18 13:50 UTC (permalink / raw) To: Stephen Boyd, Bjorn Andersson, Rob Herring Cc: Liam Girdwood, Mark Brown, collinsd, subbaram, Das Srinagesh, linux-arm-msm, Lee Jones, devicetree, linux-kernel On 10/29/2021 2:10 AM, Stephen Boyd wrote: > Quoting Satya Priya (2021-10-28 08:14:32) >> Add pm8008 regulators support for sc7280 idp. >> >> Signed-off-by: Satya Priya <quic_c_skakit@quicinc.com> >> --- >> Changes in V2: >> - As per Stephen's comments, replaced '_' with '-' for node names. >> >> Changes in V3: >> - Changed the regulator node names as l1, l2 etc >> - Changed "pm8008-regulators" to "regulators" >> - Changed "qcom,min-dropout-voltage" to "regulator-min-dropout-voltage-microvolt" >> >> arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 103 +++++++++++++++++++++++++++++++ >> 1 file changed, 103 insertions(+) >> >> diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi >> index d623d71..493575b 100644 >> --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi >> +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi >> @@ -309,6 +309,97 @@ >> }; >> }; >> >> +&i2c1 { >> + #address-cells = <1>; >> + #size-cells = <0>; >> + status = "okay"; >> + >> + pm8008_chip: pm8008@8 { > If this is going to be copy/pasted wherever devices that use pm8008 live > then it's probably better to make a new file like we do for other pmics. Sounds good, I'll do that. > Maybe something like > > &pm8008_i2c { > <All the generic stuff in here like reg properties and > address/size cells and compatible> > }; > > and then have each board set the min/max voltages and min dropout > properties. Then we can include the pm8008.dtsi file after defining > which i2c bus it lives on. > > pm8008_i2c: i2c5 { }; > #include "pm8008.dtsi" > > ... > > > &pm8008_l1 { > regulator-min-microvolt = <...>; > ... > }; > >> + compatible = "qcom,pm8008"; >> + reg = <0x8>; >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pm8008_active>; >> + }; >> + >> + pm8008_ldo: pm8008@9 { >> + compatible = "qcom,pm8008"; >> + reg = <0x9>; >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + regulators { >> + compatible = "qcom,pm8008-regulator"; >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + 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_l1: l1@4000 { >> + reg = <0x4000>; >> + regulator-name = "pm8008_l1"; >> + regulator-min-microvolt = <950000>; >> + regulator-max-microvolt = <1300000>; >> + regulator-min-dropout-voltage-microvolt = <96000>; >> + }; >> + >> + pm8008_l2: l2@4100 { >> + reg = <0x4100>; >> + regulator-name = "pm8008_l2"; >> + regulator-min-microvolt = <950000>; >> + regulator-max-microvolt = <1250000>; >> + regulator-min-dropout-voltage-microvolt = <24000>; >> + }; >> + >> + pm8008_l3: l3@4200 { >> + reg = <0x4200>; >> + regulator-name = "pm8008_l3"; >> + regulator-min-microvolt = <1650000>; >> + regulator-max-microvolt = <3000000>; >> + regulator-min-dropout-voltage-microvolt = <224000>; >> + }; >> + >> + pm8008_l4: l4@4300 { >> + reg = <0x4300>; >> + regulator-name = "pm8008_l4"; >> + regulator-min-microvolt = <1504000>; >> + regulator-max-microvolt = <1600000>; >> + regulator-min-dropout-voltage-microvolt = <0>; >> + }; >> + >> + pm8008_l5: l5@4400 { >> + reg = <0x4400>; >> + regulator-name = "pm8008_l5"; >> + regulator-min-microvolt = <2600000>; >> + regulator-max-microvolt = <3000000>; >> + regulator-min-dropout-voltage-microvolt = <104000>; >> + }; >> + >> + pm8008_l6: l6@4500 { >> + reg = <0x4500>; >> + regulator-name = "pm8008_l6"; >> + regulator-min-microvolt = <2600000>; >> + regulator-max-microvolt = <3000000>; >> + regulator-min-dropout-voltage-microvolt = <112000>; >> + }; >> + >> + pm8008_l7: l7@4600 { >> + reg = <0x4600>; >> + regulator-name = "pm8008_l7"; >> + regulator-min-microvolt = <3000000>; >> + regulator-max-microvolt = <3544000>; >> + regulator-min-dropout-voltage-microvolt = <96000>; >> + }; >> + }; >> + }; >> +}; >> + >> &qfprom { >> vcc-supply = <&vreg_l1c_1p8>; >> }; >> @@ -437,6 +528,18 @@ >> }; >> }; >> >> +&pm8350c_gpios { >> + pm8008-reset { > Why is it a subnode of a subnode? Shouldn't it be pm8008-active > directly underneath pm8350c_gpios? Right, I'll remove the subnode pm8008-reset. >> + pm8008_active: pm8008-active { >> + pins = "gpio4"; >> + function = "normal"; >> + bias-disable; >> + output-high; >> + power-source = <0>; >> + }; >> + }; >> +}; >> + >> &qspi_cs0 { >> bias-disable; >> }; ^ permalink raw reply [flat|nested] 12+ messages in thread
end of thread, other threads:[~2021-11-18 13:59 UTC | newest] Thread overview: 12+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-10-28 15:14 [PATCH V3 0/4] Add Qualcomm Technologies, Inc. PM8008 regulator driver Satya Priya 2021-10-28 15:14 ` [PATCH V3 1/4] regulator: dt-bindings: Add pm8008 regulator bindings Satya Priya 2021-10-28 20:06 ` Stephen Boyd 2021-11-18 13:58 ` Satya Priya Kakitapalli (Temp) 2021-10-28 15:14 ` [PATCH V3 2/4] dt-bindings: mfd: pm8008: Add pm8008 regulator node Satya Priya 2021-10-28 20:06 ` Stephen Boyd 2021-10-28 15:14 ` [PATCH V3 3/4] regulator: Add a regulator driver for the PM8008 PMIC Satya Priya 2021-10-28 20:19 ` Stephen Boyd 2021-11-18 13:57 ` Satya Priya Kakitapalli (Temp) 2021-10-28 15:14 ` [PATCH V3 4/4] arm64: dts: qcom: sc7280: Add pm8008 regulators support for sc7280-idp Satya Priya 2021-10-28 20:40 ` Stephen Boyd 2021-11-18 13:50 ` Satya Priya Kakitapalli (Temp)
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).