linux-arm-msm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH 0/3] regulator: max77826: Add MAX77826 support
@ 2020-04-13 16:44 Iskren Chernev
  2020-04-13 16:44 ` [PATCH 1/3] regulator: max77826: Add max77826 regulator driver Iskren Chernev
                   ` (3 more replies)
  0 siblings, 4 replies; 11+ messages in thread
From: Iskren Chernev @ 2020-04-13 16:44 UTC (permalink / raw)
  To: linux-arm-msm
  Cc: Andy Gross, Bjorn Andersson, devicetree, Liam Girdwood,
	linux-kernel, Mark Brown, Rob Herring, ~postmarketos/upstreaming,
	Iskren Chernev

The MAX77826 is a PMIC found on the Samsung Galaxy S5 (klte) and possibly other
devices. It is produced by Maxim Integrated and contains 15 LDOs a buck and
a buck boost regulator.

Iskren Chernev (3):
  regulator: max77826: Add max77826 regulator driver
  dt-bindings: regulator: Add document bindings for max77826
  ARM: dts: qcom: msm8974-klte: Add max77826 pmic node

 .../bindings/regulator/maxim,max77826.yaml    |  70 ++++
 .../boot/dts/qcom-msm8974-samsung-klte.dts    | 110 +++++++
 arch/arm/boot/dts/qcom-msm8974.dtsi           |  11 +
 drivers/regulator/Kconfig                     |  10 +
 drivers/regulator/Makefile                    |   1 +
 drivers/regulator/max77826-regulator.c        | 301 ++++++++++++++++++
 6 files changed, 503 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/regulator/maxim,max77826.yaml
 create mode 100644 drivers/regulator/max77826-regulator.c


base-commit: 3b2804993d1e9f2b01f4264993009d3e48722e0d
--
2.26.0


^ permalink raw reply	[flat|nested] 11+ messages in thread

* [PATCH 1/3] regulator: max77826: Add max77826 regulator driver
  2020-04-13 16:44 [PATCH 0/3] regulator: max77826: Add MAX77826 support Iskren Chernev
@ 2020-04-13 16:44 ` Iskren Chernev
  2020-04-14 10:56   ` Mark Brown
  2020-04-13 16:44 ` [PATCH 2/3] dt-bindings: regulator: Add document bindings for max77826 Iskren Chernev
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 11+ messages in thread
From: Iskren Chernev @ 2020-04-13 16:44 UTC (permalink / raw)
  To: linux-arm-msm
  Cc: Andy Gross, Bjorn Andersson, devicetree, Liam Girdwood,
	linux-kernel, Mark Brown, Rob Herring, ~postmarketos/upstreaming,
	Iskren Chernev

Adding regulator driver for the Maxim max77826 device.
The max77826 PMIC contains a high-efficiency BUCK regulator, a BUCK
BOOST regulator and 15 LDOs. It is designed for smartphone and tablet
applications and is accessed over I2C.

Signed-off-by: Iskren Chernev <iskren.chernev@gmail.com>
---
 drivers/regulator/Kconfig              |  10 +
 drivers/regulator/Makefile             |   1 +
 drivers/regulator/max77826-regulator.c | 301 +++++++++++++++++++++++++
 3 files changed, 312 insertions(+)
 create mode 100644 drivers/regulator/max77826-regulator.c

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index f4b72cb098ef..e8f7a0965ae9 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -585,6 +585,16 @@ config REGULATOR_MAX77802
 	  Exynos5420/Exynos5800 SoCs to control various voltages.
 	  It includes support for control of voltage and ramp speed.
 
+config REGULATOR_MAX77826
+	tristate "Maxim 77826 regulator"
+	depends on I2C
+	select REGMAP_I2C
+	help
+	  This driver controls a Maxim 77826 regulator via I2C bus.
+	  The regulator include 15 LDOs, BUCK and BUCK BOOST regulator.
+	  It includes support for control of output voltage. This
+	  regulator is found on the Samsung Galaxy S5 (klte) smartphone.
+
 config REGULATOR_MC13XXX_CORE
 	tristate
 
diff --git a/drivers/regulator/Makefile b/drivers/regulator/Makefile
index 6610ee001d9a..e8f163371071 100644
--- a/drivers/regulator/Makefile
+++ b/drivers/regulator/Makefile
@@ -74,6 +74,7 @@ obj-$(CONFIG_REGULATOR_MAX8998) += max8998.o
 obj-$(CONFIG_REGULATOR_MAX77686) += max77686-regulator.o
 obj-$(CONFIG_REGULATOR_MAX77693) += max77693-regulator.o
 obj-$(CONFIG_REGULATOR_MAX77802) += max77802-regulator.o
+obj-$(CONFIG_REGULATOR_MAX77826) += max77826-regulator.o
 obj-$(CONFIG_REGULATOR_MC13783) += mc13783-regulator.o
 obj-$(CONFIG_REGULATOR_MC13892) += mc13892-regulator.o
 obj-$(CONFIG_REGULATOR_MC13XXX_CORE) +=  mc13xxx-regulator-core.o
diff --git a/drivers/regulator/max77826-regulator.c b/drivers/regulator/max77826-regulator.c
new file mode 100644
index 000000000000..070fbc2e1e43
--- /dev/null
+++ b/drivers/regulator/max77826-regulator.c
@@ -0,0 +1,301 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
+//
+// max77826-regulator.c  - regulator driver for Maxim MAX77826
+//
+// Author: Iskren Chernev <iskren.chernev@gmail.com>
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/err.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/driver.h>
+#include <linux/regulator/of_regulator.h>
+#include <linux/i2c.h>
+#include <linux/regmap.h>
+
+enum max77826_registers {
+	MAX77826_REG_INT_SRC = 0x00,
+	MAX77826_REG_SYS_INT,
+	MAX77826_REG_INT1,
+	MAX77826_REG_INT2,
+	MAX77826_REG_BB_INT,
+	MAX77826_REG_INT_SRC_M,
+	MAX77826_REG_TOPSYS_INT_M,
+	MAX77826_REG_INT1_M,
+	MAX77826_REG_INT2_M,
+	MAX77826_REG_BB_INT_M,
+	MAX77826_REG_TOPSYS_STAT,
+	MAX77826_REG_STAT1,
+	MAX77826_REG_STAT2,
+	MAX77826_REG_BB_STAT,
+	/* 0x0E - 0x0F: Reserved */
+	MAX77826_REG_LDO_OPMD1 = 0x10,
+	MAX77826_REG_LDO_OPMD2,
+	MAX77826_REG_LDO_OPMD3,
+	MAX77826_REG_LDO_OPMD4,
+	MAX77826_REG_B_BB_OPMD,
+	/* 0x15 - 0x1F: Reserved */
+	MAX77826_REG_LDO1_CFG = 0x20,
+	MAX77826_REG_LDO2_CFG,
+	MAX77826_REG_LDO3_CFG,
+	MAX77826_REG_LDO4_CFG,
+	MAX77826_REG_LDO5_CFG,
+	MAX77826_REG_LDO6_CFG,
+	MAX77826_REG_LDO7_CFG,
+	MAX77826_REG_LDO8_CFG,
+	MAX77826_REG_LDO9_CFG,
+	MAX77826_REG_LDO10_CFG,
+	MAX77826_REG_LDO11_CFG,
+	MAX77826_REG_LDO12_CFG,
+	MAX77826_REG_LDO13_CFG,
+	MAX77826_REG_LDO14_CFG,
+	MAX77826_REG_LDO15_CFG,
+	/* 0x2F: Reserved */
+	MAX77826_REG_BUCK_CFG = 0x30,
+	MAX77826_REG_BUCK_VOUT,
+	MAX77826_REG_BB_CFG,
+	MAX77826_REG_BB_VOUT,
+	/* 0x34 - 0x3F: Reserved */
+	MAX77826_REG_BUCK_SS_FREQ = 0x40,
+	MAX77826_REG_UVLO_FALL,
+	/* 0x42 - 0xCE: Reserved */
+	MAX77826_REG_DEVICE_ID = 0xCF,
+};
+
+enum max77826_regulators {
+	MAX77826_LDO1 = 0,
+	MAX77826_LDO2,
+	MAX77826_LDO3,
+	MAX77826_LDO4,
+	MAX77826_LDO5,
+	MAX77826_LDO6,
+	MAX77826_LDO7,
+	MAX77826_LDO8,
+	MAX77826_LDO9,
+	MAX77826_LDO10,
+	MAX77826_LDO11,
+	MAX77826_LDO12,
+	MAX77826_LDO13,
+	MAX77826_LDO14,
+	MAX77826_LDO15,
+	MAX77826_BUCK,
+	MAX77826_BUCKBOOST,
+	MAX77826_MAX_REGULATORS,
+};
+
+#define MAX77826_MASK_LDO		0x7f
+#define MAX77826_MASK_BUCK		0xff
+#define MAX77826_MASK_BUCKBOOST		0x7f
+#define MAX77826_BUCK_RAMP_DELAY	12500
+
+/* values in mV */
+/* for LDO1-3 */
+#define MAX77826_NMOS_LDO_VOLT_MIN	600000
+#define MAX77826_NMOS_LDO_VOLT_MAX	2187500
+#define MAX77826_NMOS_LDO_VOLT_STEP	12500
+
+/* for LDO4-15 */
+#define MAX77826_PMOS_LDO_VOLT_MIN	800000
+#define MAX77826_PMOS_LDO_VOLT_MAX	3975000
+#define MAX77826_PMOS_LDO_VOLT_STEP	25000
+
+/* for BUCK */
+#define MAX77826_BUCK_VOLT_MIN		500000
+#define MAX77826_BUCK_VOLT_MAX		1800000
+#define MAX77826_BUCK_VOLT_STEP		6250
+
+/* for BUCKBOOST */
+#define MAX77826_BUCKBOOST_VOLT_MIN	2600000
+#define MAX77826_BUCKBOOST_VOLT_MAX	4187500
+#define MAX77826_BUCKBOOST_VOLT_STEP	12500
+#define MAX77826_VOLT_RANGE(_type)					\
+	((MAX77826_ ## _type ## _VOLT_MAX -				\
+	  MAX77826_ ## _type ## _VOLT_MIN) /				\
+	 MAX77826_ ## _type ## _VOLT_STEP + 1)
+
+#define MAX77826_LDO(_id, _type)					\
+	[MAX77826_LDO ## _id] = {					\
+		.id = MAX77826_LDO ## _id,				\
+		.name = "LDO"#_id,					\
+		.of_match = of_match_ptr("LDO"#_id),			\
+		.regulators_node = "regulators",			\
+		.ops = &max77826_most_ops,				\
+		.min_uV = MAX77826_ ## _type ## _LDO_VOLT_MIN,		\
+		.uV_step = MAX77826_ ## _type ## _LDO_VOLT_STEP,	\
+		.n_voltages = MAX77826_VOLT_RANGE(_type ## _LDO),	\
+		.enable_reg = MAX77826_REG_LDO_OPMD1 + (_id - 1) / 4,	\
+		.enable_mask = BIT(((_id - 1) % 4) * 2 + 1),		\
+		.vsel_reg = MAX77826_REG_LDO1_CFG + (_id - 1),		\
+		.vsel_mask = MAX77826_MASK_LDO,				\
+		.owner = THIS_MODULE,					\
+	}
+
+#define MAX77826_BUCK(_idx, _id, _ops)					\
+	[MAX77826_ ## _id] = {						\
+		.id = MAX77826_ ## _id,					\
+		.name = #_id,						\
+		.of_match = of_match_ptr(#_id),				\
+		.regulators_node = "regulators",			\
+		.ops = &_ops,						\
+		.min_uV =  MAX77826_ ## _id ## _VOLT_MIN,		\
+		.uV_step = MAX77826_ ## _id ## _VOLT_STEP,		\
+		.n_voltages = MAX77826_VOLT_RANGE(_id),			\
+		.enable_reg = MAX77826_REG_B_BB_OPMD,			\
+		.enable_mask = BIT(_idx * 2 + 1),			\
+		.vsel_reg = MAX77826_REG_BUCK_VOUT + _idx * 2,		\
+		.vsel_mask = MAX77826_MASK_ ## _id,			\
+		.owner = THIS_MODULE,					\
+	}
+
+
+
+struct max77826_regulator_info {
+	struct regmap *regmap;
+	struct regulator_desc *rdesc;
+};
+
+static const struct regmap_config max77826_regmap_config = {
+	.reg_bits = 8,
+	.val_bits = 8,
+	.max_register = MAX77826_REG_DEVICE_ID,
+};
+
+static int max77826_set_voltage_time_sel(struct regulator_dev *,
+				unsigned int old_selector,
+				unsigned int new_selector);
+
+static const struct regulator_ops max77826_most_ops = {
+	.enable			= regulator_enable_regmap,
+	.disable		= regulator_disable_regmap,
+	.is_enabled		= regulator_is_enabled_regmap,
+	.list_voltage		= regulator_list_voltage_linear,
+	.map_voltage		= regulator_map_voltage_linear,
+	.get_voltage_sel	= regulator_get_voltage_sel_regmap,
+	.set_voltage_sel	= regulator_set_voltage_sel_regmap,
+};
+
+static const struct regulator_ops max77826_buck_ops = {
+	.enable			= regulator_enable_regmap,
+	.disable		= regulator_disable_regmap,
+	.is_enabled		= regulator_is_enabled_regmap,
+	.list_voltage		= regulator_list_voltage_linear,
+	.map_voltage		= regulator_map_voltage_linear,
+	.get_voltage_sel	= regulator_get_voltage_sel_regmap,
+	.set_voltage_sel	= regulator_set_voltage_sel_regmap,
+	.set_voltage_time_sel	= max77826_set_voltage_time_sel,
+};
+
+static struct regulator_desc max77826_regulators_desc[] = {
+	MAX77826_LDO(1, NMOS),
+	MAX77826_LDO(2, NMOS),
+	MAX77826_LDO(3, NMOS),
+	MAX77826_LDO(4, PMOS),
+	MAX77826_LDO(5, PMOS),
+	MAX77826_LDO(6, PMOS),
+	MAX77826_LDO(7, PMOS),
+	MAX77826_LDO(8, PMOS),
+	MAX77826_LDO(9, PMOS),
+	MAX77826_LDO(10, PMOS),
+	MAX77826_LDO(11, PMOS),
+	MAX77826_LDO(12, PMOS),
+	MAX77826_LDO(13, PMOS),
+	MAX77826_LDO(14, PMOS),
+	MAX77826_LDO(15, PMOS),
+	MAX77826_BUCK(0, BUCK, max77826_buck_ops),
+	MAX77826_BUCK(1, BUCKBOOST, max77826_most_ops),
+};
+
+static int max77826_set_voltage_time_sel(struct regulator_dev *rdev,
+				unsigned int old_selector,
+				unsigned int new_selector)
+{
+	if (new_selector > old_selector) {
+		return DIV_ROUND_UP(MAX77826_BUCK_VOLT_STEP *
+				(new_selector - old_selector),
+				MAX77826_BUCK_RAMP_DELAY);
+	}
+
+	return 0;
+}
+
+static int max77826_read_device_id(struct regmap *regmap, struct device *dev)
+{
+	unsigned int device_id;
+	int res;
+
+	res = regmap_read(regmap, MAX77826_REG_DEVICE_ID, &device_id);
+	if (!res)
+		dev_dbg(dev, "DEVICE_ID: 0x%x\n", device_id);
+
+	return res;
+}
+
+static int max77826_i2c_probe(struct i2c_client *client)
+{
+	struct device *dev = &client->dev;
+	struct max77826_regulator_info *info;
+	struct regulator_config config = {};
+	struct regulator_dev *rdev;
+	struct regmap *regmap;
+	int i;
+
+	info = devm_kzalloc(dev, sizeof(struct max77826_regulator_info),
+				GFP_KERNEL);
+	if (!info)
+		return -ENOMEM;
+
+	info->rdesc = max77826_regulators_desc;
+	regmap = devm_regmap_init_i2c(client, &max77826_regmap_config);
+	if (IS_ERR(regmap)) {
+		dev_err(dev, "Failed to allocate regmap!\n");
+		return PTR_ERR(regmap);
+	}
+
+	info->regmap = regmap;
+	i2c_set_clientdata(client, info);
+
+	config.dev = dev;
+	config.regmap = regmap;
+	config.driver_data = info;
+
+	for (i = 0; i < MAX77826_MAX_REGULATORS; i++) {
+		rdev = devm_regulator_register(dev,
+					       &max77826_regulators_desc[i],
+					       &config);
+		if (IS_ERR(rdev)) {
+			dev_err(dev, "Failed to register regulator!\n");
+			return PTR_ERR(rdev);
+		}
+	}
+
+	return max77826_read_device_id(regmap, dev);
+}
+
+static const struct of_device_id max77826_of_match[] = {
+	{ .compatible = "maxim,max77826-regulator" },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(of, max77826_of_match);
+
+static const struct i2c_device_id max77826_id[] = {
+	{ "max77826-regulator" },
+	{ /* sentinel */ }
+};
+MODULE_DEVICE_TABLE(i2c, max77826_id);
+
+static struct i2c_driver max77826_regulator_driver = {
+	.driver = {
+		.name = "max77826",
+		.of_match_table = of_match_ptr(max77826_of_match),
+	},
+	.probe_new = max77826_i2c_probe,
+	.id_table = max77826_id,
+};
+module_i2c_driver(max77826_regulator_driver);
+
+MODULE_AUTHOR("Iskren Chernev <iskren.chernev@gmail.com>");
+MODULE_DESCRIPTION("MAX77826 PMIC regulator driver");
+MODULE_LICENSE("GPL");
-- 
2.26.0


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 2/3] dt-bindings: regulator: Add document bindings for max77826
  2020-04-13 16:44 [PATCH 0/3] regulator: max77826: Add MAX77826 support Iskren Chernev
  2020-04-13 16:44 ` [PATCH 1/3] regulator: max77826: Add max77826 regulator driver Iskren Chernev
@ 2020-04-13 16:44 ` Iskren Chernev
  2020-04-20 20:55   ` Rob Herring
  2020-04-13 16:44 ` [PATCH 3/3] ARM: dts: qcom: msm8974-klte: Add max77826 pmic node Iskren Chernev
  2020-04-14 10:57 ` [PATCH 0/3] regulator: max77826: Add MAX77826 support Mark Brown
  3 siblings, 1 reply; 11+ messages in thread
From: Iskren Chernev @ 2020-04-13 16:44 UTC (permalink / raw)
  To: linux-arm-msm
  Cc: Andy Gross, Bjorn Andersson, devicetree, Liam Girdwood,
	linux-kernel, Mark Brown, Rob Herring, ~postmarketos/upstreaming,
	Iskren Chernev

Add device tree binding information for max77826 regulator driver.
Example bindings for max77826 are added.

Signed-off-by: Iskren Chernev <iskren.chernev@gmail.com>
---
 .../bindings/regulator/maxim,max77826.yaml    | 70 +++++++++++++++++++
 1 file changed, 70 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/regulator/maxim,max77826.yaml

diff --git a/Documentation/devicetree/bindings/regulator/maxim,max77826.yaml b/Documentation/devicetree/bindings/regulator/maxim,max77826.yaml
new file mode 100644
index 000000000000..3cd449a746b0
--- /dev/null
+++ b/Documentation/devicetree/bindings/regulator/maxim,max77826.yaml
@@ -0,0 +1,70 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/regulator/maxim,max77826.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Maxim Integrated MAX77826 PMIC
+
+maintainers:
+  - Iskren Chernev <iskren.chernev@gmail.com>
+
+properties:
+  $nodename:
+    pattern: "pmic@[0-9a-f]{1,2}"
+  compatible:
+    enum:
+      - maxim,max77826-regulator
+
+  reg:
+    maxItems: 1
+
+  regulators:
+    type: object
+    allOf:
+      - $ref: regulator.yaml#
+    description: |
+      list of regulators provided by this controller, must be named
+      after their hardware counterparts LDO[1-15], BUCK and BUCKBOOST
+
+    patternProperties:
+      "^LDO([1-9]|1[0-5])$":
+        type: object
+        allOf:
+          - $ref: regulator.yaml#
+
+      "^BUCK|BUCKBOOST$":
+        type: object
+        allOf:
+          - $ref: regulator.yaml#
+
+      additionalProperties: false
+    additionalProperties: false
+
+required:
+  - compatible
+  - reg
+  - regulators
+
+additionalProperties: false
+
+examples:
+  - |
+    i2c {
+        #address-cells = <1>;
+        #size-cells = <0>;
+
+        pmic@69 {
+            compatible = "maxim,max77826-regulator";
+            reg = <0x69>;
+
+            regulators {
+                LDO2 {
+                    regulator-name = "ldo2";
+                    regulator-min-microvolt = <650000>;
+                    regulator-max-microvolt = <3587500>;
+                };
+            };
+       };
+     };
+...
-- 
2.26.0


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [PATCH 3/3] ARM: dts: qcom: msm8974-klte: Add max77826 pmic node
  2020-04-13 16:44 [PATCH 0/3] regulator: max77826: Add MAX77826 support Iskren Chernev
  2020-04-13 16:44 ` [PATCH 1/3] regulator: max77826: Add max77826 regulator driver Iskren Chernev
  2020-04-13 16:44 ` [PATCH 2/3] dt-bindings: regulator: Add document bindings for max77826 Iskren Chernev
@ 2020-04-13 16:44 ` Iskren Chernev
  2020-04-14 10:57 ` [PATCH 0/3] regulator: max77826: Add MAX77826 support Mark Brown
  3 siblings, 0 replies; 11+ messages in thread
From: Iskren Chernev @ 2020-04-13 16:44 UTC (permalink / raw)
  To: linux-arm-msm
  Cc: Andy Gross, Bjorn Andersson, devicetree, Liam Girdwood,
	linux-kernel, Mark Brown, Rob Herring, ~postmarketos/upstreaming,
	Iskren Chernev

This introduces the MAX77826 PMIC that powers some pheripherals on the
klte, like the touchpad, touchkeys and camera.

Signed-off-by: Iskren Chernev <iskren.chernev@gmail.com>
---
 .../boot/dts/qcom-msm8974-samsung-klte.dts    | 110 ++++++++++++++++++
 arch/arm/boot/dts/qcom-msm8974.dtsi           |  11 ++
 2 files changed, 121 insertions(+)

diff --git a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts
index eaa1001d0a46..f6d3a9dcf0de 100644
--- a/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts
+++ b/arch/arm/boot/dts/qcom-msm8974-samsung-klte.dts
@@ -21,4 +21,114 @@ serial@f991e000 {
 		status = "ok";
 	};
 
+	pinctrl@fd510000 {
+		i2c6_pins: i2c6 {
+			mux {
+				pins = "gpio29", "gpio30";
+				function = "blsp_i2c6";
+
+				drive-strength = <2>;
+				bias-disable;
+			};
+		};
+	};
+
+	i2c@f9928000 {
+		status = "okay";
+
+		pinctrl-names = "default";
+		pinctrl-0 = <&i2c6_pins>;
+
+		pmic@60 {
+			reg = <0x60>;
+			compatible = "maxim,max77826-regulator";
+
+			regulators {
+				max77826_ldo1: LDO1 {
+					regulator-min-microvolt = <1200000>;
+					regulator-max-microvolt = <1200000>;
+				};
+
+				max77826_ldo2: LDO2 {
+					regulator-min-microvolt = <1000000>;
+					regulator-max-microvolt = <1000000>;
+				};
+
+				max77826_ldo3: LDO3 {
+					regulator-min-microvolt = <1200000>;
+					regulator-max-microvolt = <1200000>;
+				};
+
+				max77826_ldo4: LDO4 {
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <1800000>;
+				};
+
+				max77826_ldo5: LDO5 {
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <1800000>;
+				};
+
+				max77826_ldo6: LDO6 {
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <3300000>;
+				};
+
+				max77826_ldo7: LDO7 {
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <1800000>;
+				};
+
+				max77826_ldo8: LDO8 {
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <3300000>;
+				};
+
+				max77826_ldo9: LDO9 {
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <1800000>;
+				};
+
+				max77826_ldo10: LDO10 {
+					regulator-min-microvolt = <2800000>;
+					regulator-max-microvolt = <2950000>;
+				};
+
+				max77826_ldo11: LDO11 {
+					regulator-min-microvolt = <2700000>;
+					regulator-max-microvolt = <2950000>;
+				};
+
+				max77826_ldo12: LDO12 {
+					regulator-min-microvolt = <2500000>;
+					regulator-max-microvolt = <3300000>;
+				};
+
+				max77826_ldo13: LDO13 {
+					regulator-min-microvolt = <3300000>;
+					regulator-max-microvolt = <3300000>;
+				};
+
+				max77826_ldo14: LDO14 {
+					regulator-min-microvolt = <3300000>;
+					regulator-max-microvolt = <3300000>;
+				};
+
+				max77826_ldo15: LDO15 {
+					regulator-min-microvolt = <1800000>;
+					regulator-max-microvolt = <1800000>;
+				};
+
+				max77826_buck: BUCK {
+					regulator-min-microvolt = <1225000>;
+					regulator-max-microvolt = <1225000>;
+				};
+
+				max77826_buckboost: BUCKBOOST {
+					regulator-min-microvolt = <3400000>;
+					regulator-max-microvolt = <3400000>;
+				};
+			};
+		};
+	};
 };
diff --git a/arch/arm/boot/dts/qcom-msm8974.dtsi b/arch/arm/boot/dts/qcom-msm8974.dtsi
index 2ea2308d91b3..51f5f904f9eb 100644
--- a/arch/arm/boot/dts/qcom-msm8974.dtsi
+++ b/arch/arm/boot/dts/qcom-msm8974.dtsi
@@ -974,6 +974,17 @@ blsp_i2c3: i2c@f9925000 {
 			#size-cells = <0>;
 		};
 
+		blsp_i2c6: i2c@f9928000 {
+			status = "disabled";
+			compatible = "qcom,i2c-qup-v2.1.1";
+			reg = <0xf9928000 0x1000>;
+			interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&gcc GCC_BLSP1_QUP6_I2C_APPS_CLK>, <&gcc GCC_BLSP1_AHB_CLK>;
+			clock-names = "core", "iface";
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
 		blsp_i2c8: i2c@f9964000 {
 			status = "disabled";
 			compatible = "qcom,i2c-qup-v2.1.1";
-- 
2.26.0


^ permalink raw reply related	[flat|nested] 11+ messages in thread

* Re: [PATCH 1/3] regulator: max77826: Add max77826 regulator driver
  2020-04-13 16:44 ` [PATCH 1/3] regulator: max77826: Add max77826 regulator driver Iskren Chernev
@ 2020-04-14 10:56   ` Mark Brown
  0 siblings, 0 replies; 11+ messages in thread
From: Mark Brown @ 2020-04-14 10:56 UTC (permalink / raw)
  To: Iskren Chernev
  Cc: linux-arm-msm, Andy Gross, Bjorn Andersson, devicetree,
	Liam Girdwood, linux-kernel, Rob Herring,
	~postmarketos/upstreaming

[-- Attachment #1: Type: text/plain, Size: 294 bytes --]

On Mon, Apr 13, 2020 at 07:44:38PM +0300, Iskren Chernev wrote:

> +static const struct of_device_id max77826_of_match[] = {
> +	{ .compatible = "maxim,max77826-regulator" },

This should just be maxim,max77826 - there's no need to disambiguate or
describe the device in the compatible string.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 0/3] regulator: max77826: Add MAX77826 support
  2020-04-13 16:44 [PATCH 0/3] regulator: max77826: Add MAX77826 support Iskren Chernev
                   ` (2 preceding siblings ...)
  2020-04-13 16:44 ` [PATCH 3/3] ARM: dts: qcom: msm8974-klte: Add max77826 pmic node Iskren Chernev
@ 2020-04-14 10:57 ` Mark Brown
  2020-04-14 13:14   ` Iskren Chernev
  3 siblings, 1 reply; 11+ messages in thread
From: Mark Brown @ 2020-04-14 10:57 UTC (permalink / raw)
  To: Iskren Chernev
  Cc: linux-arm-msm, Andy Gross, Bjorn Andersson, devicetree,
	Liam Girdwood, linux-kernel, Rob Herring,
	~postmarketos/upstreaming

[-- Attachment #1: Type: text/plain, Size: 508 bytes --]

On Mon, Apr 13, 2020 at 07:44:37PM +0300, Iskren Chernev wrote:
> The MAX77826 is a PMIC found on the Samsung Galaxy S5 (klte) and possibly other
> devices. It is produced by Maxim Integrated and contains 15 LDOs a buck and
> a buck boost regulator.
> 
> Iskren Chernev (3):
>   regulator: max77826: Add max77826 regulator driver
>   dt-bindings: regulator: Add document bindings for max77826

Aside from the compatible string and the subject prefix on the DT
binding patch this looks good to me.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 0/3] regulator: max77826: Add MAX77826 support
  2020-04-14 10:57 ` [PATCH 0/3] regulator: max77826: Add MAX77826 support Mark Brown
@ 2020-04-14 13:14   ` Iskren Chernev
  2020-04-14 14:53     ` Mark Brown
  0 siblings, 1 reply; 11+ messages in thread
From: Iskren Chernev @ 2020-04-14 13:14 UTC (permalink / raw)
  To: Mark Brown
  Cc: linux-arm-msm, Andy Gross, Bjorn Andersson, devicetree,
	Liam Girdwood, linux-kernel, Rob Herring,
	~postmarketos/upstreaming


On 4/14/20 1:57 PM, Mark Brown wrote:
> On Mon, Apr 13, 2020 at 07:44:37PM +0300, Iskren Chernev wrote:
>> The MAX77826 is a PMIC found on the Samsung Galaxy S5 (klte) and possibly other
>> devices. It is produced by Maxim Integrated and contains 15 LDOs a buck and
>> a buck boost regulator.
>>
>> Iskren Chernev (3):
>>   regulator: max77826: Add max77826 regulator driver
>>   dt-bindings: regulator: Add document bindings for max77826
>
> Aside from the compatible string and the subject prefix on the DT
> binding patch this looks good to me.

About the subject -- I guess you mean the suffix is wrong, it should be:

  dt-bindings: regulator: Document bindings for max77826

I'll also change the compatible string.


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 0/3] regulator: max77826: Add MAX77826 support
  2020-04-14 13:14   ` Iskren Chernev
@ 2020-04-14 14:53     ` Mark Brown
  0 siblings, 0 replies; 11+ messages in thread
From: Mark Brown @ 2020-04-14 14:53 UTC (permalink / raw)
  To: Iskren Chernev
  Cc: linux-arm-msm, Andy Gross, Bjorn Andersson, devicetree,
	Liam Girdwood, linux-kernel, Rob Herring,
	~postmarketos/upstreaming

[-- Attachment #1: Type: text/plain, Size: 357 bytes --]

On Tue, Apr 14, 2020 at 04:14:01PM +0300, Iskren Chernev wrote:

> > Aside from the compatible string and the subject prefix on the DT
> > binding patch this looks good to me.

> About the subject -- I guess you mean the suffix is wrong, it should be:

>   dt-bindings: regulator: Document bindings for max77826

No, it should just be regulator:.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 2/3] dt-bindings: regulator: Add document bindings for max77826
  2020-04-13 16:44 ` [PATCH 2/3] dt-bindings: regulator: Add document bindings for max77826 Iskren Chernev
@ 2020-04-20 20:55   ` Rob Herring
  2020-04-23 12:59     ` Iskren Chernev
  0 siblings, 1 reply; 11+ messages in thread
From: Rob Herring @ 2020-04-20 20:55 UTC (permalink / raw)
  To: Iskren Chernev
  Cc: linux-arm-msm, Andy Gross, Bjorn Andersson, devicetree,
	Liam Girdwood, linux-kernel, Mark Brown,
	~postmarketos/upstreaming

On Mon, Apr 13, 2020 at 07:44:39PM +0300, Iskren Chernev wrote:
> Add device tree binding information for max77826 regulator driver.
> Example bindings for max77826 are added.
> 
> Signed-off-by: Iskren Chernev <iskren.chernev@gmail.com>
> ---
>  .../bindings/regulator/maxim,max77826.yaml    | 70 +++++++++++++++++++
>  1 file changed, 70 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/regulator/maxim,max77826.yaml
> 
> diff --git a/Documentation/devicetree/bindings/regulator/maxim,max77826.yaml b/Documentation/devicetree/bindings/regulator/maxim,max77826.yaml
> new file mode 100644
> index 000000000000..3cd449a746b0
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/regulator/maxim,max77826.yaml
> @@ -0,0 +1,70 @@
> +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/regulator/maxim,max77826.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Maxim Integrated MAX77826 PMIC
> +
> +maintainers:
> +  - Iskren Chernev <iskren.chernev@gmail.com>
> +
> +properties:
> +  $nodename:
> +    pattern: "pmic@[0-9a-f]{1,2}"
> +  compatible:
> +    enum:
> +      - maxim,max77826-regulator
> +
> +  reg:
> +    maxItems: 1
> +
> +  regulators:
> +    type: object
> +    allOf:
> +      - $ref: regulator.yaml#
> +    description: |
> +      list of regulators provided by this controller, must be named
> +      after their hardware counterparts LDO[1-15], BUCK and BUCKBOOST
> +
> +    patternProperties:
> +      "^LDO([1-9]|1[0-5])$":
> +        type: object
> +        allOf:
> +          - $ref: regulator.yaml#
> +
> +      "^BUCK|BUCKBOOST$":
> +        type: object
> +        allOf:
> +          - $ref: regulator.yaml#
> +
> +      additionalProperties: false

You are defining a property called 'additionalProperties'. This one 
should be dropped because additionalProperties doesn't work with a $ref.

> +    additionalProperties: false
> +
> +required:
> +  - compatible
> +  - reg
> +  - regulators
> +
> +additionalProperties: false
> +
> +examples:
> +  - |
> +    i2c {
> +        #address-cells = <1>;
> +        #size-cells = <0>;
> +
> +        pmic@69 {
> +            compatible = "maxim,max77826-regulator";
> +            reg = <0x69>;
> +
> +            regulators {
> +                LDO2 {
> +                    regulator-name = "ldo2";
> +                    regulator-min-microvolt = <650000>;
> +                    regulator-max-microvolt = <3587500>;
> +                };
> +            };
> +       };
> +     };
> +...
> -- 
> 2.26.0
> 

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 2/3] dt-bindings: regulator: Add document bindings for max77826
  2020-04-20 20:55   ` Rob Herring
@ 2020-04-23 12:59     ` Iskren Chernev
  2020-04-24 14:28       ` Rob Herring
  0 siblings, 1 reply; 11+ messages in thread
From: Iskren Chernev @ 2020-04-23 12:59 UTC (permalink / raw)
  To: Rob Herring
  Cc: linux-arm-msm, Andy Gross, Bjorn Andersson, devicetree,
	Liam Girdwood, linux-kernel, Mark Brown,
	~postmarketos/upstreaming


On 4/20/20 11:55 PM, Rob Herring wrote:
> On Mon, Apr 13, 2020 at 07:44:39PM +0300, Iskren Chernev wrote:
>> +    patternProperties:
>> +      "^LDO([1-9]|1[0-5])$":
>> +        type: object
>> +        allOf:
>> +          - $ref: regulator.yaml#
>> +
>> +      "^BUCK|BUCKBOOST$":
>> +        type: object
>> +        allOf:
>> +          - $ref: regulator.yaml#
>> +
>> +      additionalProperties: false
>
> You are defining a property called 'additionalProperties'. This one
> should be dropped because additionalProperties doesn't work with a $ref.
>

I got the idea from mps,mpq7920.yaml. It has additionalProperties in the
exact same places that I do. Also bd718(28|37|47).yaml seem to use
additionalProperties inside patternProperties. Shall I modify it as well?

I couldn't find the core schema for this yaml:
http://devicetree.org/meta-schemas/core.yaml (gives 404).  Is there a way
to verify the validity of the yaml?

Also, this patch is already merged in linux-next. I guess I shall submit
a new patch with the fixes standalone?


^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [PATCH 2/3] dt-bindings: regulator: Add document bindings for max77826
  2020-04-23 12:59     ` Iskren Chernev
@ 2020-04-24 14:28       ` Rob Herring
  0 siblings, 0 replies; 11+ messages in thread
From: Rob Herring @ 2020-04-24 14:28 UTC (permalink / raw)
  To: Iskren Chernev
  Cc: linux-arm-msm, Andy Gross, Bjorn Andersson, devicetree,
	Liam Girdwood, linux-kernel, Mark Brown,
	~postmarketos/upstreaming

On Thu, Apr 23, 2020 at 7:59 AM Iskren Chernev <iskren.chernev@gmail.com> wrote:
>
>
> On 4/20/20 11:55 PM, Rob Herring wrote:
> > On Mon, Apr 13, 2020 at 07:44:39PM +0300, Iskren Chernev wrote:
> >> +    patternProperties:
> >> +      "^LDO([1-9]|1[0-5])$":
> >> +        type: object
> >> +        allOf:
> >> +          - $ref: regulator.yaml#
> >> +
> >> +      "^BUCK|BUCKBOOST$":
> >> +        type: object
> >> +        allOf:
> >> +          - $ref: regulator.yaml#
> >> +
> >> +      additionalProperties: false
> >
> > You are defining a property called 'additionalProperties'. This one
> > should be dropped because additionalProperties doesn't work with a $ref.
> >
>
> I got the idea from mps,mpq7920.yaml. It has additionalProperties in the
> exact same places that I do. Also bd718(28|37|47).yaml seem to use
> additionalProperties inside patternProperties. Shall I modify it as well?

Indeed. mps,mp5416.yaml too. I'll fix all of these and few
non-regulator ones so I can get them into rc3.

> I couldn't find the core schema for this yaml:
> http://devicetree.org/meta-schemas/core.yaml (gives 404).  Is there a way
> to verify the validity of the yaml?

Running 'make dt_binding_check'. The url is just convention and while
files could be there they aren't. They are all contained in the
dtschema module[1].

However, in this case the meta-schema fails to check for this. It is
technically valid as it is saying you can't have a DT property called
'additionalProperties'. I've written a check now which should disallow
listing any DT property names which are json-schema vocabulary. Once
the failures get fixed I'll add it to the meta-schema.

> Also, this patch is already merged in linux-next. I guess I shall submit
> a new patch with the fixes standalone?

Yes, should be on top of this one.

Thanks,
Rob

[1] https://github.com/devicetree-org/dt-schema

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2020-04-24 14:28 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-04-13 16:44 [PATCH 0/3] regulator: max77826: Add MAX77826 support Iskren Chernev
2020-04-13 16:44 ` [PATCH 1/3] regulator: max77826: Add max77826 regulator driver Iskren Chernev
2020-04-14 10:56   ` Mark Brown
2020-04-13 16:44 ` [PATCH 2/3] dt-bindings: regulator: Add document bindings for max77826 Iskren Chernev
2020-04-20 20:55   ` Rob Herring
2020-04-23 12:59     ` Iskren Chernev
2020-04-24 14:28       ` Rob Herring
2020-04-13 16:44 ` [PATCH 3/3] ARM: dts: qcom: msm8974-klte: Add max77826 pmic node Iskren Chernev
2020-04-14 10:57 ` [PATCH 0/3] regulator: max77826: Add MAX77826 support Mark Brown
2020-04-14 13:14   ` Iskren Chernev
2020-04-14 14:53     ` Mark Brown

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).