[PATCH v3 0/5] mfd: sec: add S2MPS15 PMIC support

[PATCH v3 0/5] mfd: sec: add S2MPS15 PMIC support

[Alim Akhtar]

Samsung's S2MPS15 PMIC is targetted to be used with Samsung's Exynos7 SoC.
The S2MPS15 PMIC is similar in functionality to S2MPS11/14 PMIC. It contains
27 LDO and 10 Buck regulators, RTC, three 32.768 KHz clock outputs and allows
programming these blocks via a I2C interface. This patch series adds initial
support for LDO/Buck regulators of S2MPS15 PMIC.

Changes since v2:
* Addressed Lee Jones review comments.

Changes since v1:
* Added suggestion from Krzysztof [1].
* Added s2mps15's 32.768 clocks support.
* Added s2mps15's rtc support.

V1 of these patches (with a lesser features) were posted a year back,
since then there is not much progress on this, this is my attempt to
move things forward.

[1]-> https://lkml.org/lkml/2014/10/14/67

This series is based on linux-next-20151022.
This is tested on exynos7-espresso board.

Alim Akhtar (2):
  clk: s2mps15: Add support for S2MPS15 clocks
  drivers/rtc/rtc-s5m.c: add support for S2MPS15 RTC

Thomas Abraham (3):
  dt-bindings: mfd: s2mps11: add documentation for s2mps15 PMIC
  mfd: sec: Add support for S2MPS15 PMIC
  regulator: s2mps11: add support for S2MPS15 regulators

 Documentation/devicetree/bindings/mfd/s2mps11.txt |   23 +--
 drivers/clk/Kconfig                               |    5 +-
 drivers/clk/clk-s2mps11.c                         |   24 ++++
 drivers/mfd/sec-core.c                            |   31 ++++
 drivers/mfd/sec-irq.c                             |    8 ++
 drivers/regulator/Kconfig                         |    4 +-
 drivers/regulator/s2mps11.c                       |  135 +++++++++++++++++-
 drivers/rtc/rtc-s5m.c                             |   14 +-
 include/linux/mfd/samsung/core.h                  |    1 +
 include/linux/mfd/samsung/s2mps15.h               |  158 +++++++++++++++++++++
 10 files changed, 389 insertions(+), 14 deletions(-)
 create mode 100644 include/linux/mfd/samsung/s2mps15.h

-- 
1.7.10.4

[PATCH v3 1/5] dt-bindings: mfd: s2mps11: add documentation for s2mps15 PMIC

[Alim Akhtar]

From: Thomas Abraham <thomas.ab@samsung.com>

Add dt-binding documentation for s2mps15 PMIC device. The s2mps15 device
is similar to s2mps11/14 PMIC device and has 27 LDO and 10 buck regulators.

Cc: devicetree@vger.kernel.org
Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
---
 Documentation/devicetree/bindings/mfd/s2mps11.txt |   23 ++++++++++++++-------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/Documentation/devicetree/bindings/mfd/s2mps11.txt b/Documentation/devicetree/bindings/mfd/s2mps11.txt
index 890f0b0e1643..c0427c9d0886 100644
--- a/Documentation/devicetree/bindings/mfd/s2mps11.txt
+++ b/Documentation/devicetree/bindings/mfd/s2mps11.txt
@@ -1,5 +1,5 @@
 
-* Samsung S2MPS11, S2MPS13, S2MPS14 and S2MPU02 Voltage and Current Regulator
+* Samsung S2MPS11/13/14/15 and S2MPU02 Voltage and Current Regulator
 
 The Samsung S2MPS11 is a multi-function device which includes voltage and
 current regulators, RTC, charger controller and other sub-blocks. It is
@@ -7,8 +7,12 @@ interfaced to the host controller using an I2C interface. Each sub-block is
 addressed by the host system using different I2C slave addresses.
 
 Required properties:
-- compatible: Should be "samsung,s2mps11-pmic" or "samsung,s2mps13-pmic"
-	      or "samsung,s2mps14-pmic" or "samsung,s2mpu02-pmic".
+- compatible: Should be one of the following
+	- "samsung,s2mps11-pmic"
+	- "samsung,s2mps13-pmic"
+	- "samsung,s2mps14-pmic"
+	- "samsung,s2mps15-pmic"
+	- "samsung,s2mpu02-pmic".
 - reg: Specifies the I2C slave address of the pmic block. It should be 0x66.
 
 Optional properties:
@@ -24,7 +28,7 @@ Optional properties:
   unwanted buck warm reset (setting buck voltages to default values).
 
 Optional nodes:
-- clocks: s2mps11, s2mps13 and s5m8767 provide three(AP/CP/BT) buffered 32.768
+- clocks: s2mps11, s2mps13, s2mps15 and s5m8767 provide three(AP/CP/BT) buffered 32.768
   KHz outputs, so to register these as clocks with common clock framework
   instantiate a sub-node named "clocks". It uses the common clock binding
   documented in :
@@ -37,12 +41,13 @@ Optional nodes:
     the clock which they consume.
     Clock               ID           Devices
     ----------------------------------------------------------
-    32KhzAP		0            S2MPS11, S2MPS13, S2MPS14, S5M8767
-    32KhzCP		1            S2MPS11, S2MPS13, S5M8767
-    32KhzBT		2            S2MPS11, S2MPS13, S2MPS14, S5M8767
+    32KhzAP		0            S2MPS11, S2MPS13, S2MPS14, S2MPS15, S5M8767
+    32KhzCP		1            S2MPS11, S2MPS13, S2MPS15, S5M8767
+    32KhzBT		2            S2MPS11, S2MPS13, S2MPS14, S2MPS15, S5M8767
 
   - compatible: Should be one of: "samsung,s2mps11-clk", "samsung,s2mps13-clk",
-		"samsung,s2mps14-clk", "samsung,s5m8767-clk"
+		"samsung,s2mps14-clk", "samsung,s2mps15-clk",
+		"samsung,s5m8767-clk"
 
 - regulators: The regulators of s2mps11 that have to be instantiated should be
 included in a sub-node named 'regulators'. Regulator nodes included in this
@@ -90,6 +95,7 @@ as per the datasheet of s2mps11.
 			- S2MPS11: 1 to 38
 			- S2MPS13: 1 to 40
 			- S2MPS14: 1 to 25
+			- S2MPS15: 1 to 27
 			- S2MPU02: 1 to 28
 		  - Example: LDO1, LDO2, LDO28
 	- BUCKn
@@ -97,6 +103,7 @@ as per the datasheet of s2mps11.
 			- S2MPS11: 1 to 10
 			- S2MPS13: 1 to 10
 			- S2MPS14: 1 to 5
+			- S2MPS15: 1 to 10
 			- S2MPU02: 1 to 7
 		  - Example: BUCK1, BUCK2, BUCK9
 
-- 
1.7.10.4

[PATCH v3 2/5] mfd: sec: Add support for S2MPS15 PMIC

[Alim Akhtar]

From: Thomas Abraham <thomas.ab@samsung.com>

Add support for S2MPS15 PMIC which is similar to S2MPS11 PMIC. The S2MPS15
PMIC supports 27 LDO regulators, 10 buck regulators, RTC, three 32.768KHz
clock outputs and battery charger. This patch adds initial support for
LDO and buck regulators of S2MPS15 device.

Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
[Alim: Added s2mps15_devs like rtc and clk and related changes]
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
---
 drivers/mfd/sec-core.c              |   31 +++++++
 drivers/mfd/sec-irq.c               |    8 ++
 include/linux/mfd/samsung/core.h    |    1 +
 include/linux/mfd/samsung/s2mps15.h |  158 +++++++++++++++++++++++++++++++++++
 4 files changed, 198 insertions(+)
 create mode 100644 include/linux/mfd/samsung/s2mps15.h

diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
index 2626fc0b5b8c..db3d4d4ff805 100644
--- a/drivers/mfd/sec-core.c
+++ b/drivers/mfd/sec-core.c
@@ -29,6 +29,7 @@
 #include <linux/mfd/samsung/s2mps11.h>
 #include <linux/mfd/samsung/s2mps13.h>
 #include <linux/mfd/samsung/s2mps14.h>
+#include <linux/mfd/samsung/s2mps15.h>
 #include <linux/mfd/samsung/s2mpu02.h>
 #include <linux/mfd/samsung/s5m8763.h>
 #include <linux/mfd/samsung/s5m8767.h>
@@ -96,6 +97,17 @@ static const struct mfd_cell s2mps14_devs[] = {
 	}
 };
 
+static const struct mfd_cell s2mps15_devs[] = {
+	{
+		.name = "s2mps15-pmic",
+	}, {
+		.name = "s2mps15-rtc",
+	}, {
+		.name = "s2mps15-clk",
+		.of_compatible = "samsung,s2mps15-clk",
+	},
+};
+
 static const struct mfd_cell s2mpa01_devs[] = {
 	{
 		.name = "s2mpa01-pmic",
@@ -125,6 +137,9 @@ static const struct of_device_id sec_dt_match[] = {
 		.compatible = "samsung,s2mps14-pmic",
 		.data = (void *)S2MPS14X,
 	}, {
+		.compatible = "samsung,s2mps15-pmic",
+		.data = (void *)S2MPS15X,
+	}, {
 		.compatible = "samsung,s2mpa01-pmic",
 		.data = (void *)S2MPA01,
 	}, {
@@ -226,6 +241,15 @@ static const struct regmap_config s2mps14_regmap_config = {
 	.cache_type = REGCACHE_FLAT,
 };
 
+static const struct regmap_config s2mps15_regmap_config = {
+	.reg_bits = 8,
+	.val_bits = 8,
+
+	.max_register = S2MPS15_REG_LDODSCH4,
+	.volatile_reg = s2mps11_volatile,
+	.cache_type = REGCACHE_FLAT,
+};
+
 static const struct regmap_config s2mpu02_regmap_config = {
 	.reg_bits = 8,
 	.val_bits = 8,
@@ -387,6 +411,9 @@ static int sec_pmic_probe(struct i2c_client *i2c,
 	case S2MPS14X:
 		regmap = &s2mps14_regmap_config;
 		break;
+	case S2MPS15X:
+		regmap = &s2mps15_regmap_config;
+		break;
 	case S5M8763X:
 		regmap = &s5m8763_regmap_config;
 		break;
@@ -445,6 +472,10 @@ static int sec_pmic_probe(struct i2c_client *i2c,
 		sec_devs = s2mps14_devs;
 		num_sec_devs = ARRAY_SIZE(s2mps14_devs);
 		break;
+	case S2MPS15X:
+		sec_devs = s2mps15_devs;
+		num_sec_devs = ARRAY_SIZE(s2mps15_devs);
+		break;
 	case S2MPU02:
 		sec_devs = s2mpu02_devs;
 		num_sec_devs = ARRAY_SIZE(s2mpu02_devs);
diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c
index 806fa8dbb22d..d77de431cc50 100644
--- a/drivers/mfd/sec-irq.c
+++ b/drivers/mfd/sec-irq.c
@@ -407,6 +407,11 @@ static const struct regmap_irq_chip s2mps14_irq_chip = {
 	S2MPS1X_IRQ_CHIP_COMMON_DATA,
 };
 
+static const struct regmap_irq_chip s2mps15_irq_chip = {
+	.name = "s2mps15",
+	S2MPS1X_IRQ_CHIP_COMMON_DATA,
+};
+
 static const struct regmap_irq_chip s2mpu02_irq_chip = {
 	.name = "s2mpu02",
 	.irqs = s2mpu02_irqs,
@@ -466,6 +471,9 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic)
 	case S2MPS14X:
 		sec_irq_chip = &s2mps14_irq_chip;
 		break;
+	case S2MPS15X:
+		sec_irq_chip = &s2mps15_irq_chip;
+		break;
 	case S2MPU02:
 		sec_irq_chip = &s2mpu02_irq_chip;
 		break;
diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
index a06098639399..6bc4bcd488ac 100644
--- a/include/linux/mfd/samsung/core.h
+++ b/include/linux/mfd/samsung/core.h
@@ -44,6 +44,7 @@ enum sec_device_type {
 	S2MPS11X,
 	S2MPS13X,
 	S2MPS14X,
+	S2MPS15X,
 	S2MPU02,
 };
 
diff --git a/include/linux/mfd/samsung/s2mps15.h b/include/linux/mfd/samsung/s2mps15.h
new file mode 100644
index 000000000000..36d35287c3c0
--- /dev/null
+++ b/include/linux/mfd/samsung/s2mps15.h
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd
+ *              http://www.samsung.com
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef __LINUX_MFD_S2MPS15_H
+#define __LINUX_MFD_S2MPS15_H
+
+/* S2MPS15 registers */
+enum s2mps15_reg {
+	S2MPS15_REG_ID,
+	S2MPS15_REG_INT1,
+	S2MPS15_REG_INT2,
+	S2MPS15_REG_INT3,
+	S2MPS15_REG_INT1M,
+	S2MPS15_REG_INT2M,
+	S2MPS15_REG_INT3M,
+	S2MPS15_REG_ST1,
+	S2MPS15_REG_ST2,
+	S2MPS15_REG_PWRONSRC,
+	S2MPS15_REG_OFFSRC,
+	S2MPS15_REG_BU_CHG,
+	S2MPS15_REG_RTC_BUF,
+	S2MPS15_REG_CTRL1,
+	S2MPS15_REG_CTRL2,
+	S2MPS15_REG_RSVD1,
+	S2MPS15_REG_RSVD2,
+	S2MPS15_REG_RSVD3,
+	S2MPS15_REG_RSVD4,
+	S2MPS15_REG_RSVD5,
+	S2MPS15_REG_RSVD6,
+	S2MPS15_REG_CTRL3,
+	S2MPS15_REG_RSVD7,
+	S2MPS15_REG_RSVD8,
+	S2MPS15_REG_RSVD9,
+	S2MPS15_REG_B1CTRL1,
+	S2MPS15_REG_B1CTRL2,
+	S2MPS15_REG_B2CTRL1,
+	S2MPS15_REG_B2CTRL2,
+	S2MPS15_REG_B3CTRL1,
+	S2MPS15_REG_B3CTRL2,
+	S2MPS15_REG_B4CTRL1,
+	S2MPS15_REG_B4CTRL2,
+	S2MPS15_REG_B5CTRL1,
+	S2MPS15_REG_B5CTRL2,
+	S2MPS15_REG_B6CTRL1,
+	S2MPS15_REG_B6CTRL2,
+	S2MPS15_REG_B7CTRL1,
+	S2MPS15_REG_B7CTRL2,
+	S2MPS15_REG_B8CTRL1,
+	S2MPS15_REG_B8CTRL2,
+	S2MPS15_REG_B9CTRL1,
+	S2MPS15_REG_B9CTRL2,
+	S2MPS15_REG_B10CTRL1,
+	S2MPS15_REG_B10CTRL2,
+	S2MPS15_REG_BBCTRL1,
+	S2MPS15_REG_BBCTRL2,
+	S2MPS15_REG_BRAMP,
+	S2MPS15_REG_LDODVS1,
+	S2MPS15_REG_LDODVS2,
+	S2MPS15_REG_LDODVS3,
+	S2MPS15_REG_LDODVS4,
+	S2MPS15_REG_L1CTRL,
+	S2MPS15_REG_L2CTRL,
+	S2MPS15_REG_L3CTRL,
+	S2MPS15_REG_L4CTRL,
+	S2MPS15_REG_L5CTRL,
+	S2MPS15_REG_L6CTRL,
+	S2MPS15_REG_L7CTRL,
+	S2MPS15_REG_L8CTRL,
+	S2MPS15_REG_L9CTRL,
+	S2MPS15_REG_L10CTRL,
+	S2MPS15_REG_L11CTRL,
+	S2MPS15_REG_L12CTRL,
+	S2MPS15_REG_L13CTRL,
+	S2MPS15_REG_L14CTRL,
+	S2MPS15_REG_L15CTRL,
+	S2MPS15_REG_L16CTRL,
+	S2MPS15_REG_L17CTRL,
+	S2MPS15_REG_L18CTRL,
+	S2MPS15_REG_L19CTRL,
+	S2MPS15_REG_L20CTRL,
+	S2MPS15_REG_L21CTRL,
+	S2MPS15_REG_L22CTRL,
+	S2MPS15_REG_L23CTRL,
+	S2MPS15_REG_L24CTRL,
+	S2MPS15_REG_L25CTRL,
+	S2MPS15_REG_L26CTRL,
+	S2MPS15_REG_L27CTRL,
+	S2MPS15_REG_LDODSCH1,
+	S2MPS15_REG_LDODSCH2,
+	S2MPS15_REG_LDODSCH3,
+	S2MPS15_REG_LDODSCH4,
+};
+
+/* S2MPS15 regulator ids */
+enum s2mps15_regulators {
+	S2MPS15_LDO1,
+	S2MPS15_LDO2,
+	S2MPS15_LDO3,
+	S2MPS15_LDO4,
+	S2MPS15_LDO5,
+	S2MPS15_LDO6,
+	S2MPS15_LDO7,
+	S2MPS15_LDO8,
+	S2MPS15_LDO9,
+	S2MPS15_LDO10,
+	S2MPS15_LDO11,
+	S2MPS15_LDO12,
+	S2MPS15_LDO13,
+	S2MPS15_LDO14,
+	S2MPS15_LDO15,
+	S2MPS15_LDO16,
+	S2MPS15_LDO17,
+	S2MPS15_LDO18,
+	S2MPS15_LDO19,
+	S2MPS15_LDO20,
+	S2MPS15_LDO21,
+	S2MPS15_LDO22,
+	S2MPS15_LDO23,
+	S2MPS15_LDO24,
+	S2MPS15_LDO25,
+	S2MPS15_LDO26,
+	S2MPS15_LDO27,
+	S2MPS15_BUCK1,
+	S2MPS15_BUCK2,
+	S2MPS15_BUCK3,
+	S2MPS15_BUCK4,
+	S2MPS15_BUCK5,
+	S2MPS15_BUCK6,
+	S2MPS15_BUCK7,
+	S2MPS15_BUCK8,
+	S2MPS15_BUCK9,
+	S2MPS15_BUCK10,
+	S2MPS15_BUCK11,
+	S2MPS15_REGULATOR_MAX,
+};
+
+#define S2MPS15_LDO_VSEL_MASK		(0x3F)
+#define S2MPS15_BUCK_VSEL_MASK		(0xFF)
+
+#define S2MPS15_ENABLE_SHIFT		(0x06)
+#define S2MPS15_ENABLE_MASK		(0x03 << S2MPS15_ENABLE_SHIFT)
+
+#define S2MPS15_LDO_N_VOLTAGES		(S2MPS15_LDO_VSEL_MASK + 1)
+#define S2MPS15_BUCK_N_VOLTAGES	(S2MPS15_BUCK_VSEL_MASK + 1)
+
+#endif /* __LINUX_MFD_S2MPS15_H */
-- 
1.7.10.4

Re: [PATCH v3 2/5] mfd: sec: Add support for S2MPS15 PMIC

[Lee Jones]

On Mon, 26 Oct 2015, Alim Akhtar wrote:

> From: Thomas Abraham <thomas.ab@samsung.com>
> 
> Add support for S2MPS15 PMIC which is similar to S2MPS11 PMIC. The S2MPS15
> PMIC supports 27 LDO regulators, 10 buck regulators, RTC, three 32.768KHz
> clock outputs and battery charger. This patch adds initial support for
> LDO and buck regulators of S2MPS15 device.
> 
> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
> [Alim: Added s2mps15_devs like rtc and clk and related changes]
> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> ---
>  drivers/mfd/sec-core.c              |   31 +++++++
>  drivers/mfd/sec-irq.c               |    8 ++
>  include/linux/mfd/samsung/core.h    |    1 +
>  include/linux/mfd/samsung/s2mps15.h |  158 +++++++++++++++++++++++++++++++++++
>  4 files changed, 198 insertions(+)
>  create mode 100644 include/linux/mfd/samsung/s2mps15.h

I replied to the previous set and won't be reviewing this one until
all of the open points are solved.

> diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
> index 2626fc0b5b8c..db3d4d4ff805 100644
> --- a/drivers/mfd/sec-core.c
> +++ b/drivers/mfd/sec-core.c
> @@ -29,6 +29,7 @@
>  #include <linux/mfd/samsung/s2mps11.h>
>  #include <linux/mfd/samsung/s2mps13.h>
>  #include <linux/mfd/samsung/s2mps14.h>
> +#include <linux/mfd/samsung/s2mps15.h>
>  #include <linux/mfd/samsung/s2mpu02.h>
>  #include <linux/mfd/samsung/s5m8763.h>
>  #include <linux/mfd/samsung/s5m8767.h>
> @@ -96,6 +97,17 @@ static const struct mfd_cell s2mps14_devs[] = {
>  	}
>  };
>  
> +static const struct mfd_cell s2mps15_devs[] = {
> +	{
> +		.name = "s2mps15-pmic",
> +	}, {
> +		.name = "s2mps15-rtc",
> +	}, {
> +		.name = "s2mps15-clk",
> +		.of_compatible = "samsung,s2mps15-clk",
> +	},
> +};
> +
>  static const struct mfd_cell s2mpa01_devs[] = {
>  	{
>  		.name = "s2mpa01-pmic",
> @@ -125,6 +137,9 @@ static const struct of_device_id sec_dt_match[] = {
>  		.compatible = "samsung,s2mps14-pmic",
>  		.data = (void *)S2MPS14X,
>  	}, {
> +		.compatible = "samsung,s2mps15-pmic",
> +		.data = (void *)S2MPS15X,
> +	}, {
>  		.compatible = "samsung,s2mpa01-pmic",
>  		.data = (void *)S2MPA01,
>  	}, {
> @@ -226,6 +241,15 @@ static const struct regmap_config s2mps14_regmap_config = {
>  	.cache_type = REGCACHE_FLAT,
>  };
>  
> +static const struct regmap_config s2mps15_regmap_config = {
> +	.reg_bits = 8,
> +	.val_bits = 8,
> +
> +	.max_register = S2MPS15_REG_LDODSCH4,
> +	.volatile_reg = s2mps11_volatile,
> +	.cache_type = REGCACHE_FLAT,
> +};
> +
>  static const struct regmap_config s2mpu02_regmap_config = {
>  	.reg_bits = 8,
>  	.val_bits = 8,
> @@ -387,6 +411,9 @@ static int sec_pmic_probe(struct i2c_client *i2c,
>  	case S2MPS14X:
>  		regmap = &s2mps14_regmap_config;
>  		break;
> +	case S2MPS15X:
> +		regmap = &s2mps15_regmap_config;
> +		break;
>  	case S5M8763X:
>  		regmap = &s5m8763_regmap_config;
>  		break;
> @@ -445,6 +472,10 @@ static int sec_pmic_probe(struct i2c_client *i2c,
>  		sec_devs = s2mps14_devs;
>  		num_sec_devs = ARRAY_SIZE(s2mps14_devs);
>  		break;
> +	case S2MPS15X:
> +		sec_devs = s2mps15_devs;
> +		num_sec_devs = ARRAY_SIZE(s2mps15_devs);
> +		break;
>  	case S2MPU02:
>  		sec_devs = s2mpu02_devs;
>  		num_sec_devs = ARRAY_SIZE(s2mpu02_devs);
> diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c
> index 806fa8dbb22d..d77de431cc50 100644
> --- a/drivers/mfd/sec-irq.c
> +++ b/drivers/mfd/sec-irq.c
> @@ -407,6 +407,11 @@ static const struct regmap_irq_chip s2mps14_irq_chip = {
>  	S2MPS1X_IRQ_CHIP_COMMON_DATA,
>  };
>  
> +static const struct regmap_irq_chip s2mps15_irq_chip = {
> +	.name = "s2mps15",
> +	S2MPS1X_IRQ_CHIP_COMMON_DATA,
> +};
> +
>  static const struct regmap_irq_chip s2mpu02_irq_chip = {
>  	.name = "s2mpu02",
>  	.irqs = s2mpu02_irqs,
> @@ -466,6 +471,9 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic)
>  	case S2MPS14X:
>  		sec_irq_chip = &s2mps14_irq_chip;
>  		break;
> +	case S2MPS15X:
> +		sec_irq_chip = &s2mps15_irq_chip;
> +		break;
>  	case S2MPU02:
>  		sec_irq_chip = &s2mpu02_irq_chip;
>  		break;
> diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
> index a06098639399..6bc4bcd488ac 100644
> --- a/include/linux/mfd/samsung/core.h
> +++ b/include/linux/mfd/samsung/core.h
> @@ -44,6 +44,7 @@ enum sec_device_type {
>  	S2MPS11X,
>  	S2MPS13X,
>  	S2MPS14X,
> +	S2MPS15X,
>  	S2MPU02,
>  };
>  
> diff --git a/include/linux/mfd/samsung/s2mps15.h b/include/linux/mfd/samsung/s2mps15.h
> new file mode 100644
> index 000000000000..36d35287c3c0
> --- /dev/null
> +++ b/include/linux/mfd/samsung/s2mps15.h
> @@ -0,0 +1,158 @@
> +/*
> + * Copyright (c) 2015 Samsung Electronics Co., Ltd
> + *              http://www.samsung.com
> + *
> + * This program is free software; you can redistribute  it and/or modify it
> + * under  the terms of  the GNU General  Public License as published by the
> + * Free Software Foundation;  either version 2 of the  License, or (at your
> + * option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful,
> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> + * GNU General Public License for more details.
> + */
> +
> +#ifndef __LINUX_MFD_S2MPS15_H
> +#define __LINUX_MFD_S2MPS15_H
> +
> +/* S2MPS15 registers */
> +enum s2mps15_reg {
> +	S2MPS15_REG_ID,
> +	S2MPS15_REG_INT1,
> +	S2MPS15_REG_INT2,
> +	S2MPS15_REG_INT3,
> +	S2MPS15_REG_INT1M,
> +	S2MPS15_REG_INT2M,
> +	S2MPS15_REG_INT3M,
> +	S2MPS15_REG_ST1,
> +	S2MPS15_REG_ST2,
> +	S2MPS15_REG_PWRONSRC,
> +	S2MPS15_REG_OFFSRC,
> +	S2MPS15_REG_BU_CHG,
> +	S2MPS15_REG_RTC_BUF,
> +	S2MPS15_REG_CTRL1,
> +	S2MPS15_REG_CTRL2,
> +	S2MPS15_REG_RSVD1,
> +	S2MPS15_REG_RSVD2,
> +	S2MPS15_REG_RSVD3,
> +	S2MPS15_REG_RSVD4,
> +	S2MPS15_REG_RSVD5,
> +	S2MPS15_REG_RSVD6,
> +	S2MPS15_REG_CTRL3,
> +	S2MPS15_REG_RSVD7,
> +	S2MPS15_REG_RSVD8,
> +	S2MPS15_REG_RSVD9,
> +	S2MPS15_REG_B1CTRL1,
> +	S2MPS15_REG_B1CTRL2,
> +	S2MPS15_REG_B2CTRL1,
> +	S2MPS15_REG_B2CTRL2,
> +	S2MPS15_REG_B3CTRL1,
> +	S2MPS15_REG_B3CTRL2,
> +	S2MPS15_REG_B4CTRL1,
> +	S2MPS15_REG_B4CTRL2,
> +	S2MPS15_REG_B5CTRL1,
> +	S2MPS15_REG_B5CTRL2,
> +	S2MPS15_REG_B6CTRL1,
> +	S2MPS15_REG_B6CTRL2,
> +	S2MPS15_REG_B7CTRL1,
> +	S2MPS15_REG_B7CTRL2,
> +	S2MPS15_REG_B8CTRL1,
> +	S2MPS15_REG_B8CTRL2,
> +	S2MPS15_REG_B9CTRL1,
> +	S2MPS15_REG_B9CTRL2,
> +	S2MPS15_REG_B10CTRL1,
> +	S2MPS15_REG_B10CTRL2,
> +	S2MPS15_REG_BBCTRL1,
> +	S2MPS15_REG_BBCTRL2,
> +	S2MPS15_REG_BRAMP,
> +	S2MPS15_REG_LDODVS1,
> +	S2MPS15_REG_LDODVS2,
> +	S2MPS15_REG_LDODVS3,
> +	S2MPS15_REG_LDODVS4,
> +	S2MPS15_REG_L1CTRL,
> +	S2MPS15_REG_L2CTRL,
> +	S2MPS15_REG_L3CTRL,
> +	S2MPS15_REG_L4CTRL,
> +	S2MPS15_REG_L5CTRL,
> +	S2MPS15_REG_L6CTRL,
> +	S2MPS15_REG_L7CTRL,
> +	S2MPS15_REG_L8CTRL,
> +	S2MPS15_REG_L9CTRL,
> +	S2MPS15_REG_L10CTRL,
> +	S2MPS15_REG_L11CTRL,
> +	S2MPS15_REG_L12CTRL,
> +	S2MPS15_REG_L13CTRL,
> +	S2MPS15_REG_L14CTRL,
> +	S2MPS15_REG_L15CTRL,
> +	S2MPS15_REG_L16CTRL,
> +	S2MPS15_REG_L17CTRL,
> +	S2MPS15_REG_L18CTRL,
> +	S2MPS15_REG_L19CTRL,
> +	S2MPS15_REG_L20CTRL,
> +	S2MPS15_REG_L21CTRL,
> +	S2MPS15_REG_L22CTRL,
> +	S2MPS15_REG_L23CTRL,
> +	S2MPS15_REG_L24CTRL,
> +	S2MPS15_REG_L25CTRL,
> +	S2MPS15_REG_L26CTRL,
> +	S2MPS15_REG_L27CTRL,
> +	S2MPS15_REG_LDODSCH1,
> +	S2MPS15_REG_LDODSCH2,
> +	S2MPS15_REG_LDODSCH3,
> +	S2MPS15_REG_LDODSCH4,
> +};
> +
> +/* S2MPS15 regulator ids */
> +enum s2mps15_regulators {
> +	S2MPS15_LDO1,
> +	S2MPS15_LDO2,
> +	S2MPS15_LDO3,
> +	S2MPS15_LDO4,
> +	S2MPS15_LDO5,
> +	S2MPS15_LDO6,
> +	S2MPS15_LDO7,
> +	S2MPS15_LDO8,
> +	S2MPS15_LDO9,
> +	S2MPS15_LDO10,
> +	S2MPS15_LDO11,
> +	S2MPS15_LDO12,
> +	S2MPS15_LDO13,
> +	S2MPS15_LDO14,
> +	S2MPS15_LDO15,
> +	S2MPS15_LDO16,
> +	S2MPS15_LDO17,
> +	S2MPS15_LDO18,
> +	S2MPS15_LDO19,
> +	S2MPS15_LDO20,
> +	S2MPS15_LDO21,
> +	S2MPS15_LDO22,
> +	S2MPS15_LDO23,
> +	S2MPS15_LDO24,
> +	S2MPS15_LDO25,
> +	S2MPS15_LDO26,
> +	S2MPS15_LDO27,
> +	S2MPS15_BUCK1,
> +	S2MPS15_BUCK2,
> +	S2MPS15_BUCK3,
> +	S2MPS15_BUCK4,
> +	S2MPS15_BUCK5,
> +	S2MPS15_BUCK6,
> +	S2MPS15_BUCK7,
> +	S2MPS15_BUCK8,
> +	S2MPS15_BUCK9,
> +	S2MPS15_BUCK10,
> +	S2MPS15_BUCK11,
> +	S2MPS15_REGULATOR_MAX,
> +};
> +
> +#define S2MPS15_LDO_VSEL_MASK		(0x3F)
> +#define S2MPS15_BUCK_VSEL_MASK		(0xFF)
> +
> +#define S2MPS15_ENABLE_SHIFT		(0x06)
> +#define S2MPS15_ENABLE_MASK		(0x03 << S2MPS15_ENABLE_SHIFT)
> +
> +#define S2MPS15_LDO_N_VOLTAGES		(S2MPS15_LDO_VSEL_MASK + 1)
> +#define S2MPS15_BUCK_N_VOLTAGES	(S2MPS15_BUCK_VSEL_MASK + 1)
> +
> +#endif /* __LINUX_MFD_S2MPS15_H */

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v3 2/5] mfd: sec: Add support for S2MPS15 PMIC

[Krzysztof Kozlowski]

On 26.10.2015 23:34, Lee Jones wrote:
> On Mon, 26 Oct 2015, Alim Akhtar wrote:
> 
>> From: Thomas Abraham <thomas.ab@samsung.com>
>>
>> Add support for S2MPS15 PMIC which is similar to S2MPS11 PMIC. The S2MPS15
>> PMIC supports 27 LDO regulators, 10 buck regulators, RTC, three 32.768KHz
>> clock outputs and battery charger. This patch adds initial support for
>> LDO and buck regulators of S2MPS15 device.
>>
>> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
>> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
>> [Alim: Added s2mps15_devs like rtc and clk and related changes]
>> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
>> ---
>>  drivers/mfd/sec-core.c              |   31 +++++++
>>  drivers/mfd/sec-irq.c               |    8 ++
>>  include/linux/mfd/samsung/core.h    |    1 +
>>  include/linux/mfd/samsung/s2mps15.h |  158 +++++++++++++++++++++++++++++++++++
>>  4 files changed, 198 insertions(+)
>>  create mode 100644 include/linux/mfd/samsung/s2mps15.h
> 
> I replied to the previous set and won't be reviewing this one until
> all of the open points are solved.

The naming and compatibles used by the driver are confusing but how it
was at beginning. Beside the confusion, the names are correct:

1. Main mfd driver:
 - compatible: samsung,s2mps1*-pmic
 - driver name: sec_pmic

2. Regulator driver:
 - no compatible (because it always searches for "regulators" subnode of
its parent... that is the convention/legacy behaviour)
 - driver name: s2mps1*-pmic

I hope that explains your concerns.

Best regards,
Krzysztof


> 
>> diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
>> index 2626fc0b5b8c..db3d4d4ff805 100644
>> --- a/drivers/mfd/sec-core.c
>> +++ b/drivers/mfd/sec-core.c
>> @@ -29,6 +29,7 @@
>>  #include <linux/mfd/samsung/s2mps11.h>
>>  #include <linux/mfd/samsung/s2mps13.h>
>>  #include <linux/mfd/samsung/s2mps14.h>
>> +#include <linux/mfd/samsung/s2mps15.h>
>>  #include <linux/mfd/samsung/s2mpu02.h>
>>  #include <linux/mfd/samsung/s5m8763.h>
>>  #include <linux/mfd/samsung/s5m8767.h>
>> @@ -96,6 +97,17 @@ static const struct mfd_cell s2mps14_devs[] = {
>>  	}
>>  };
>>  
>> +static const struct mfd_cell s2mps15_devs[] = {
>> +	{
>> +		.name = "s2mps15-pmic",
>> +	}, {
>> +		.name = "s2mps15-rtc",
>> +	}, {
>> +		.name = "s2mps15-clk",
>> +		.of_compatible = "samsung,s2mps15-clk",
>> +	},
>> +};
>> +
>>  static const struct mfd_cell s2mpa01_devs[] = {
>>  	{
>>  		.name = "s2mpa01-pmic",
>> @@ -125,6 +137,9 @@ static const struct of_device_id sec_dt_match[] = {
>>  		.compatible = "samsung,s2mps14-pmic",
>>  		.data = (void *)S2MPS14X,
>>  	}, {
>> +		.compatible = "samsung,s2mps15-pmic",
>> +		.data = (void *)S2MPS15X,
>> +	}, {
>>  		.compatible = "samsung,s2mpa01-pmic",
>>  		.data = (void *)S2MPA01,
>>  	}, {
>> @@ -226,6 +241,15 @@ static const struct regmap_config s2mps14_regmap_config = {
>>  	.cache_type = REGCACHE_FLAT,
>>  };
>>  
>> +static const struct regmap_config s2mps15_regmap_config = {
>> +	.reg_bits = 8,
>> +	.val_bits = 8,
>> +
>> +	.max_register = S2MPS15_REG_LDODSCH4,
>> +	.volatile_reg = s2mps11_volatile,
>> +	.cache_type = REGCACHE_FLAT,
>> +};
>> +
>>  static const struct regmap_config s2mpu02_regmap_config = {
>>  	.reg_bits = 8,
>>  	.val_bits = 8,
>> @@ -387,6 +411,9 @@ static int sec_pmic_probe(struct i2c_client *i2c,
>>  	case S2MPS14X:
>>  		regmap = &s2mps14_regmap_config;
>>  		break;
>> +	case S2MPS15X:
>> +		regmap = &s2mps15_regmap_config;
>> +		break;
>>  	case S5M8763X:
>>  		regmap = &s5m8763_regmap_config;
>>  		break;
>> @@ -445,6 +472,10 @@ static int sec_pmic_probe(struct i2c_client *i2c,
>>  		sec_devs = s2mps14_devs;
>>  		num_sec_devs = ARRAY_SIZE(s2mps14_devs);
>>  		break;
>> +	case S2MPS15X:
>> +		sec_devs = s2mps15_devs;
>> +		num_sec_devs = ARRAY_SIZE(s2mps15_devs);
>> +		break;
>>  	case S2MPU02:
>>  		sec_devs = s2mpu02_devs;
>>  		num_sec_devs = ARRAY_SIZE(s2mpu02_devs);
>> diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c
>> index 806fa8dbb22d..d77de431cc50 100644
>> --- a/drivers/mfd/sec-irq.c
>> +++ b/drivers/mfd/sec-irq.c
>> @@ -407,6 +407,11 @@ static const struct regmap_irq_chip s2mps14_irq_chip = {
>>  	S2MPS1X_IRQ_CHIP_COMMON_DATA,
>>  };
>>  
>> +static const struct regmap_irq_chip s2mps15_irq_chip = {
>> +	.name = "s2mps15",
>> +	S2MPS1X_IRQ_CHIP_COMMON_DATA,
>> +};
>> +
>>  static const struct regmap_irq_chip s2mpu02_irq_chip = {
>>  	.name = "s2mpu02",
>>  	.irqs = s2mpu02_irqs,
>> @@ -466,6 +471,9 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic)
>>  	case S2MPS14X:
>>  		sec_irq_chip = &s2mps14_irq_chip;
>>  		break;
>> +	case S2MPS15X:
>> +		sec_irq_chip = &s2mps15_irq_chip;
>> +		break;
>>  	case S2MPU02:
>>  		sec_irq_chip = &s2mpu02_irq_chip;
>>  		break;
>> diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
>> index a06098639399..6bc4bcd488ac 100644
>> --- a/include/linux/mfd/samsung/core.h
>> +++ b/include/linux/mfd/samsung/core.h
>> @@ -44,6 +44,7 @@ enum sec_device_type {
>>  	S2MPS11X,
>>  	S2MPS13X,
>>  	S2MPS14X,
>> +	S2MPS15X,
>>  	S2MPU02,
>>  };
>>  
>> diff --git a/include/linux/mfd/samsung/s2mps15.h b/include/linux/mfd/samsung/s2mps15.h
>> new file mode 100644
>> index 000000000000..36d35287c3c0
>> --- /dev/null
>> +++ b/include/linux/mfd/samsung/s2mps15.h
>> @@ -0,0 +1,158 @@
>> +/*
>> + * Copyright (c) 2015 Samsung Electronics Co., Ltd
>> + *              http://www.samsung.com
>> + *
>> + * This program is free software; you can redistribute  it and/or modify it
>> + * under  the terms of  the GNU General  Public License as published by the
>> + * Free Software Foundation;  either version 2 of the  License, or (at your
>> + * option) any later version.
>> + *
>> + * This program is distributed in the hope that it will be useful,
>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>> + * GNU General Public License for more details.
>> + */
>> +
>> +#ifndef __LINUX_MFD_S2MPS15_H
>> +#define __LINUX_MFD_S2MPS15_H
>> +
>> +/* S2MPS15 registers */
>> +enum s2mps15_reg {
>> +	S2MPS15_REG_ID,
>> +	S2MPS15_REG_INT1,
>> +	S2MPS15_REG_INT2,
>> +	S2MPS15_REG_INT3,
>> +	S2MPS15_REG_INT1M,
>> +	S2MPS15_REG_INT2M,
>> +	S2MPS15_REG_INT3M,
>> +	S2MPS15_REG_ST1,
>> +	S2MPS15_REG_ST2,
>> +	S2MPS15_REG_PWRONSRC,
>> +	S2MPS15_REG_OFFSRC,
>> +	S2MPS15_REG_BU_CHG,
>> +	S2MPS15_REG_RTC_BUF,
>> +	S2MPS15_REG_CTRL1,
>> +	S2MPS15_REG_CTRL2,
>> +	S2MPS15_REG_RSVD1,
>> +	S2MPS15_REG_RSVD2,
>> +	S2MPS15_REG_RSVD3,
>> +	S2MPS15_REG_RSVD4,
>> +	S2MPS15_REG_RSVD5,
>> +	S2MPS15_REG_RSVD6,
>> +	S2MPS15_REG_CTRL3,
>> +	S2MPS15_REG_RSVD7,
>> +	S2MPS15_REG_RSVD8,
>> +	S2MPS15_REG_RSVD9,
>> +	S2MPS15_REG_B1CTRL1,
>> +	S2MPS15_REG_B1CTRL2,
>> +	S2MPS15_REG_B2CTRL1,
>> +	S2MPS15_REG_B2CTRL2,
>> +	S2MPS15_REG_B3CTRL1,
>> +	S2MPS15_REG_B3CTRL2,
>> +	S2MPS15_REG_B4CTRL1,
>> +	S2MPS15_REG_B4CTRL2,
>> +	S2MPS15_REG_B5CTRL1,
>> +	S2MPS15_REG_B5CTRL2,
>> +	S2MPS15_REG_B6CTRL1,
>> +	S2MPS15_REG_B6CTRL2,
>> +	S2MPS15_REG_B7CTRL1,
>> +	S2MPS15_REG_B7CTRL2,
>> +	S2MPS15_REG_B8CTRL1,
>> +	S2MPS15_REG_B8CTRL2,
>> +	S2MPS15_REG_B9CTRL1,
>> +	S2MPS15_REG_B9CTRL2,
>> +	S2MPS15_REG_B10CTRL1,
>> +	S2MPS15_REG_B10CTRL2,
>> +	S2MPS15_REG_BBCTRL1,
>> +	S2MPS15_REG_BBCTRL2,
>> +	S2MPS15_REG_BRAMP,
>> +	S2MPS15_REG_LDODVS1,
>> +	S2MPS15_REG_LDODVS2,
>> +	S2MPS15_REG_LDODVS3,
>> +	S2MPS15_REG_LDODVS4,
>> +	S2MPS15_REG_L1CTRL,
>> +	S2MPS15_REG_L2CTRL,
>> +	S2MPS15_REG_L3CTRL,
>> +	S2MPS15_REG_L4CTRL,
>> +	S2MPS15_REG_L5CTRL,
>> +	S2MPS15_REG_L6CTRL,
>> +	S2MPS15_REG_L7CTRL,
>> +	S2MPS15_REG_L8CTRL,
>> +	S2MPS15_REG_L9CTRL,
>> +	S2MPS15_REG_L10CTRL,
>> +	S2MPS15_REG_L11CTRL,
>> +	S2MPS15_REG_L12CTRL,
>> +	S2MPS15_REG_L13CTRL,
>> +	S2MPS15_REG_L14CTRL,
>> +	S2MPS15_REG_L15CTRL,
>> +	S2MPS15_REG_L16CTRL,
>> +	S2MPS15_REG_L17CTRL,
>> +	S2MPS15_REG_L18CTRL,
>> +	S2MPS15_REG_L19CTRL,
>> +	S2MPS15_REG_L20CTRL,
>> +	S2MPS15_REG_L21CTRL,
>> +	S2MPS15_REG_L22CTRL,
>> +	S2MPS15_REG_L23CTRL,
>> +	S2MPS15_REG_L24CTRL,
>> +	S2MPS15_REG_L25CTRL,
>> +	S2MPS15_REG_L26CTRL,
>> +	S2MPS15_REG_L27CTRL,
>> +	S2MPS15_REG_LDODSCH1,
>> +	S2MPS15_REG_LDODSCH2,
>> +	S2MPS15_REG_LDODSCH3,
>> +	S2MPS15_REG_LDODSCH4,
>> +};
>> +
>> +/* S2MPS15 regulator ids */
>> +enum s2mps15_regulators {
>> +	S2MPS15_LDO1,
>> +	S2MPS15_LDO2,
>> +	S2MPS15_LDO3,
>> +	S2MPS15_LDO4,
>> +	S2MPS15_LDO5,
>> +	S2MPS15_LDO6,
>> +	S2MPS15_LDO7,
>> +	S2MPS15_LDO8,
>> +	S2MPS15_LDO9,
>> +	S2MPS15_LDO10,
>> +	S2MPS15_LDO11,
>> +	S2MPS15_LDO12,
>> +	S2MPS15_LDO13,
>> +	S2MPS15_LDO14,
>> +	S2MPS15_LDO15,
>> +	S2MPS15_LDO16,
>> +	S2MPS15_LDO17,
>> +	S2MPS15_LDO18,
>> +	S2MPS15_LDO19,
>> +	S2MPS15_LDO20,
>> +	S2MPS15_LDO21,
>> +	S2MPS15_LDO22,
>> +	S2MPS15_LDO23,
>> +	S2MPS15_LDO24,
>> +	S2MPS15_LDO25,
>> +	S2MPS15_LDO26,
>> +	S2MPS15_LDO27,
>> +	S2MPS15_BUCK1,
>> +	S2MPS15_BUCK2,
>> +	S2MPS15_BUCK3,
>> +	S2MPS15_BUCK4,
>> +	S2MPS15_BUCK5,
>> +	S2MPS15_BUCK6,
>> +	S2MPS15_BUCK7,
>> +	S2MPS15_BUCK8,
>> +	S2MPS15_BUCK9,
>> +	S2MPS15_BUCK10,
>> +	S2MPS15_BUCK11,
>> +	S2MPS15_REGULATOR_MAX,
>> +};
>> +
>> +#define S2MPS15_LDO_VSEL_MASK		(0x3F)
>> +#define S2MPS15_BUCK_VSEL_MASK		(0xFF)
>> +
>> +#define S2MPS15_ENABLE_SHIFT		(0x06)
>> +#define S2MPS15_ENABLE_MASK		(0x03 << S2MPS15_ENABLE_SHIFT)
>> +
>> +#define S2MPS15_LDO_N_VOLTAGES		(S2MPS15_LDO_VSEL_MASK + 1)
>> +#define S2MPS15_BUCK_N_VOLTAGES	(S2MPS15_BUCK_VSEL_MASK + 1)
>> +
>> +#endif /* __LINUX_MFD_S2MPS15_H */
> 

Re: [PATCH v3 2/5] mfd: sec: Add support for S2MPS15 PMIC

[Lee Jones]

On Wed, 28 Oct 2015, Krzysztof Kozlowski wrote:

> On 26.10.2015 23:34, Lee Jones wrote:
> > On Mon, 26 Oct 2015, Alim Akhtar wrote:
> > 
> >> From: Thomas Abraham <thomas.ab@samsung.com>
> >>
> >> Add support for S2MPS15 PMIC which is similar to S2MPS11 PMIC. The S2MPS15
> >> PMIC supports 27 LDO regulators, 10 buck regulators, RTC, three 32.768KHz
> >> clock outputs and battery charger. This patch adds initial support for
> >> LDO and buck regulators of S2MPS15 device.
> >>
> >> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
> >> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
> >> [Alim: Added s2mps15_devs like rtc and clk and related changes]
> >> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> >> ---
> >>  drivers/mfd/sec-core.c              |   31 +++++++
> >>  drivers/mfd/sec-irq.c               |    8 ++
> >>  include/linux/mfd/samsung/core.h    |    1 +
> >>  include/linux/mfd/samsung/s2mps15.h |  158 +++++++++++++++++++++++++++++++++++
> >>  4 files changed, 198 insertions(+)
> >>  create mode 100644 include/linux/mfd/samsung/s2mps15.h
> > 
> > I replied to the previous set and won't be reviewing this one until
> > all of the open points are solved.
> 
> The naming and compatibles used by the driver are confusing but how it
> was at beginning. Beside the confusion, the names are correct:
> 
> 1. Main mfd driver:
>  - compatible: samsung,s2mps1*-pmic
>  - driver name: sec_pmic
> 
> 2. Regulator driver:
>  - no compatible (because it always searches for "regulators" subnode of
> its parent... that is the convention/legacy behaviour)
>  - driver name: s2mps1*-pmic
> 
> I hope that explains your concerns.

It explains *why*, but doesn't ease my concerns in any way.

Unfortunately I've only just realised the disparity we have between
MFD and the Regulator subsystem, which is annoying because it's now
almost impossible to rectify.  

We should have taken one of two views.  Either a) The MFD is the PMIC
device which encompasses regulator control.  In which case the MFD
and it's corresponding compatible string would be named *-pmic and the
regulator driver would be called *-regulator. Or b) The MFD could be
considered a normal MFD and be named after the model number, then the
regulator 'could' be named *-pmic.

However, with reference to b), how much other Power Management does
the regulator driver do besides control regulators?  I suspect not
much.  Therefore my preference would be for a).  My second choice
would be a mixuture of the two where nothing gets named *-pmic.  The
last option on my list would be the current situation where we seem to
be calling both the MFD (PMIC) itself and the Regulator driver
*-pmic, which is not good.

> >> diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
> >> index 2626fc0b5b8c..db3d4d4ff805 100644
> >> --- a/drivers/mfd/sec-core.c
> >> +++ b/drivers/mfd/sec-core.c
> >> @@ -29,6 +29,7 @@
> >>  #include <linux/mfd/samsung/s2mps11.h>
> >>  #include <linux/mfd/samsung/s2mps13.h>
> >>  #include <linux/mfd/samsung/s2mps14.h>
> >> +#include <linux/mfd/samsung/s2mps15.h>
> >>  #include <linux/mfd/samsung/s2mpu02.h>
> >>  #include <linux/mfd/samsung/s5m8763.h>
> >>  #include <linux/mfd/samsung/s5m8767.h>
> >> @@ -96,6 +97,17 @@ static const struct mfd_cell s2mps14_devs[] = {
> >>  	}
> >>  };
> >>  
> >> +static const struct mfd_cell s2mps15_devs[] = {
> >> +	{
> >> +		.name = "s2mps15-pmic",
> >> +	}, {
> >> +		.name = "s2mps15-rtc",
> >> +	}, {
> >> +		.name = "s2mps15-clk",
> >> +		.of_compatible = "samsung,s2mps15-clk",
> >> +	},
> >> +};
> >> +
> >>  static const struct mfd_cell s2mpa01_devs[] = {
> >>  	{
> >>  		.name = "s2mpa01-pmic",
> >> @@ -125,6 +137,9 @@ static const struct of_device_id sec_dt_match[] = {
> >>  		.compatible = "samsung,s2mps14-pmic",
> >>  		.data = (void *)S2MPS14X,
> >>  	}, {
> >> +		.compatible = "samsung,s2mps15-pmic",
> >> +		.data = (void *)S2MPS15X,
> >> +	}, {
> >>  		.compatible = "samsung,s2mpa01-pmic",
> >>  		.data = (void *)S2MPA01,
> >>  	}, {
> >> @@ -226,6 +241,15 @@ static const struct regmap_config s2mps14_regmap_config = {
> >>  	.cache_type = REGCACHE_FLAT,
> >>  };
> >>  
> >> +static const struct regmap_config s2mps15_regmap_config = {
> >> +	.reg_bits = 8,
> >> +	.val_bits = 8,
> >> +
> >> +	.max_register = S2MPS15_REG_LDODSCH4,
> >> +	.volatile_reg = s2mps11_volatile,
> >> +	.cache_type = REGCACHE_FLAT,
> >> +};
> >> +
> >>  static const struct regmap_config s2mpu02_regmap_config = {
> >>  	.reg_bits = 8,
> >>  	.val_bits = 8,
> >> @@ -387,6 +411,9 @@ static int sec_pmic_probe(struct i2c_client *i2c,
> >>  	case S2MPS14X:
> >>  		regmap = &s2mps14_regmap_config;
> >>  		break;
> >> +	case S2MPS15X:
> >> +		regmap = &s2mps15_regmap_config;
> >> +		break;
> >>  	case S5M8763X:
> >>  		regmap = &s5m8763_regmap_config;
> >>  		break;
> >> @@ -445,6 +472,10 @@ static int sec_pmic_probe(struct i2c_client *i2c,
> >>  		sec_devs = s2mps14_devs;
> >>  		num_sec_devs = ARRAY_SIZE(s2mps14_devs);
> >>  		break;
> >> +	case S2MPS15X:
> >> +		sec_devs = s2mps15_devs;
> >> +		num_sec_devs = ARRAY_SIZE(s2mps15_devs);
> >> +		break;
> >>  	case S2MPU02:
> >>  		sec_devs = s2mpu02_devs;
> >>  		num_sec_devs = ARRAY_SIZE(s2mpu02_devs);
> >> diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c
> >> index 806fa8dbb22d..d77de431cc50 100644
> >> --- a/drivers/mfd/sec-irq.c
> >> +++ b/drivers/mfd/sec-irq.c
> >> @@ -407,6 +407,11 @@ static const struct regmap_irq_chip s2mps14_irq_chip = {
> >>  	S2MPS1X_IRQ_CHIP_COMMON_DATA,
> >>  };
> >>  
> >> +static const struct regmap_irq_chip s2mps15_irq_chip = {
> >> +	.name = "s2mps15",
> >> +	S2MPS1X_IRQ_CHIP_COMMON_DATA,
> >> +};
> >> +
> >>  static const struct regmap_irq_chip s2mpu02_irq_chip = {
> >>  	.name = "s2mpu02",
> >>  	.irqs = s2mpu02_irqs,
> >> @@ -466,6 +471,9 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic)
> >>  	case S2MPS14X:
> >>  		sec_irq_chip = &s2mps14_irq_chip;
> >>  		break;
> >> +	case S2MPS15X:
> >> +		sec_irq_chip = &s2mps15_irq_chip;
> >> +		break;
> >>  	case S2MPU02:
> >>  		sec_irq_chip = &s2mpu02_irq_chip;
> >>  		break;
> >> diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
> >> index a06098639399..6bc4bcd488ac 100644
> >> --- a/include/linux/mfd/samsung/core.h
> >> +++ b/include/linux/mfd/samsung/core.h
> >> @@ -44,6 +44,7 @@ enum sec_device_type {
> >>  	S2MPS11X,
> >>  	S2MPS13X,
> >>  	S2MPS14X,
> >> +	S2MPS15X,
> >>  	S2MPU02,
> >>  };
> >>  
> >> diff --git a/include/linux/mfd/samsung/s2mps15.h b/include/linux/mfd/samsung/s2mps15.h
> >> new file mode 100644
> >> index 000000000000..36d35287c3c0
> >> --- /dev/null
> >> +++ b/include/linux/mfd/samsung/s2mps15.h
> >> @@ -0,0 +1,158 @@
> >> +/*
> >> + * Copyright (c) 2015 Samsung Electronics Co., Ltd
> >> + *              http://www.samsung.com
> >> + *
> >> + * This program is free software; you can redistribute  it and/or modify it
> >> + * under  the terms of  the GNU General  Public License as published by the
> >> + * Free Software Foundation;  either version 2 of the  License, or (at your
> >> + * option) any later version.
> >> + *
> >> + * This program is distributed in the hope that it will be useful,
> >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
> >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
> >> + * GNU General Public License for more details.
> >> + */
> >> +
> >> +#ifndef __LINUX_MFD_S2MPS15_H
> >> +#define __LINUX_MFD_S2MPS15_H
> >> +
> >> +/* S2MPS15 registers */
> >> +enum s2mps15_reg {
> >> +	S2MPS15_REG_ID,
> >> +	S2MPS15_REG_INT1,
> >> +	S2MPS15_REG_INT2,
> >> +	S2MPS15_REG_INT3,
> >> +	S2MPS15_REG_INT1M,
> >> +	S2MPS15_REG_INT2M,
> >> +	S2MPS15_REG_INT3M,
> >> +	S2MPS15_REG_ST1,
> >> +	S2MPS15_REG_ST2,
> >> +	S2MPS15_REG_PWRONSRC,
> >> +	S2MPS15_REG_OFFSRC,
> >> +	S2MPS15_REG_BU_CHG,
> >> +	S2MPS15_REG_RTC_BUF,
> >> +	S2MPS15_REG_CTRL1,
> >> +	S2MPS15_REG_CTRL2,
> >> +	S2MPS15_REG_RSVD1,
> >> +	S2MPS15_REG_RSVD2,
> >> +	S2MPS15_REG_RSVD3,
> >> +	S2MPS15_REG_RSVD4,
> >> +	S2MPS15_REG_RSVD5,
> >> +	S2MPS15_REG_RSVD6,
> >> +	S2MPS15_REG_CTRL3,
> >> +	S2MPS15_REG_RSVD7,
> >> +	S2MPS15_REG_RSVD8,
> >> +	S2MPS15_REG_RSVD9,
> >> +	S2MPS15_REG_B1CTRL1,
> >> +	S2MPS15_REG_B1CTRL2,
> >> +	S2MPS15_REG_B2CTRL1,
> >> +	S2MPS15_REG_B2CTRL2,
> >> +	S2MPS15_REG_B3CTRL1,
> >> +	S2MPS15_REG_B3CTRL2,
> >> +	S2MPS15_REG_B4CTRL1,
> >> +	S2MPS15_REG_B4CTRL2,
> >> +	S2MPS15_REG_B5CTRL1,
> >> +	S2MPS15_REG_B5CTRL2,
> >> +	S2MPS15_REG_B6CTRL1,
> >> +	S2MPS15_REG_B6CTRL2,
> >> +	S2MPS15_REG_B7CTRL1,
> >> +	S2MPS15_REG_B7CTRL2,
> >> +	S2MPS15_REG_B8CTRL1,
> >> +	S2MPS15_REG_B8CTRL2,
> >> +	S2MPS15_REG_B9CTRL1,
> >> +	S2MPS15_REG_B9CTRL2,
> >> +	S2MPS15_REG_B10CTRL1,
> >> +	S2MPS15_REG_B10CTRL2,
> >> +	S2MPS15_REG_BBCTRL1,
> >> +	S2MPS15_REG_BBCTRL2,
> >> +	S2MPS15_REG_BRAMP,
> >> +	S2MPS15_REG_LDODVS1,
> >> +	S2MPS15_REG_LDODVS2,
> >> +	S2MPS15_REG_LDODVS3,
> >> +	S2MPS15_REG_LDODVS4,
> >> +	S2MPS15_REG_L1CTRL,
> >> +	S2MPS15_REG_L2CTRL,
> >> +	S2MPS15_REG_L3CTRL,
> >> +	S2MPS15_REG_L4CTRL,
> >> +	S2MPS15_REG_L5CTRL,
> >> +	S2MPS15_REG_L6CTRL,
> >> +	S2MPS15_REG_L7CTRL,
> >> +	S2MPS15_REG_L8CTRL,
> >> +	S2MPS15_REG_L9CTRL,
> >> +	S2MPS15_REG_L10CTRL,
> >> +	S2MPS15_REG_L11CTRL,
> >> +	S2MPS15_REG_L12CTRL,
> >> +	S2MPS15_REG_L13CTRL,
> >> +	S2MPS15_REG_L14CTRL,
> >> +	S2MPS15_REG_L15CTRL,
> >> +	S2MPS15_REG_L16CTRL,
> >> +	S2MPS15_REG_L17CTRL,
> >> +	S2MPS15_REG_L18CTRL,
> >> +	S2MPS15_REG_L19CTRL,
> >> +	S2MPS15_REG_L20CTRL,
> >> +	S2MPS15_REG_L21CTRL,
> >> +	S2MPS15_REG_L22CTRL,
> >> +	S2MPS15_REG_L23CTRL,
> >> +	S2MPS15_REG_L24CTRL,
> >> +	S2MPS15_REG_L25CTRL,
> >> +	S2MPS15_REG_L26CTRL,
> >> +	S2MPS15_REG_L27CTRL,
> >> +	S2MPS15_REG_LDODSCH1,
> >> +	S2MPS15_REG_LDODSCH2,
> >> +	S2MPS15_REG_LDODSCH3,
> >> +	S2MPS15_REG_LDODSCH4,
> >> +};
> >> +
> >> +/* S2MPS15 regulator ids */
> >> +enum s2mps15_regulators {
> >> +	S2MPS15_LDO1,
> >> +	S2MPS15_LDO2,
> >> +	S2MPS15_LDO3,
> >> +	S2MPS15_LDO4,
> >> +	S2MPS15_LDO5,
> >> +	S2MPS15_LDO6,
> >> +	S2MPS15_LDO7,
> >> +	S2MPS15_LDO8,
> >> +	S2MPS15_LDO9,
> >> +	S2MPS15_LDO10,
> >> +	S2MPS15_LDO11,
> >> +	S2MPS15_LDO12,
> >> +	S2MPS15_LDO13,
> >> +	S2MPS15_LDO14,
> >> +	S2MPS15_LDO15,
> >> +	S2MPS15_LDO16,
> >> +	S2MPS15_LDO17,
> >> +	S2MPS15_LDO18,
> >> +	S2MPS15_LDO19,
> >> +	S2MPS15_LDO20,
> >> +	S2MPS15_LDO21,
> >> +	S2MPS15_LDO22,
> >> +	S2MPS15_LDO23,
> >> +	S2MPS15_LDO24,
> >> +	S2MPS15_LDO25,
> >> +	S2MPS15_LDO26,
> >> +	S2MPS15_LDO27,
> >> +	S2MPS15_BUCK1,
> >> +	S2MPS15_BUCK2,
> >> +	S2MPS15_BUCK3,
> >> +	S2MPS15_BUCK4,
> >> +	S2MPS15_BUCK5,
> >> +	S2MPS15_BUCK6,
> >> +	S2MPS15_BUCK7,
> >> +	S2MPS15_BUCK8,
> >> +	S2MPS15_BUCK9,
> >> +	S2MPS15_BUCK10,
> >> +	S2MPS15_BUCK11,
> >> +	S2MPS15_REGULATOR_MAX,
> >> +};
> >> +
> >> +#define S2MPS15_LDO_VSEL_MASK		(0x3F)
> >> +#define S2MPS15_BUCK_VSEL_MASK		(0xFF)
> >> +
> >> +#define S2MPS15_ENABLE_SHIFT		(0x06)
> >> +#define S2MPS15_ENABLE_MASK		(0x03 << S2MPS15_ENABLE_SHIFT)
> >> +
> >> +#define S2MPS15_LDO_N_VOLTAGES		(S2MPS15_LDO_VSEL_MASK + 1)
> >> +#define S2MPS15_BUCK_N_VOLTAGES	(S2MPS15_BUCK_VSEL_MASK + 1)
> >> +
> >> +#endif /* __LINUX_MFD_S2MPS15_H */
> > 
> 

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v3 2/5] mfd: sec: Add support for S2MPS15 PMIC

[Alim Akhtar]

Hello,

On 10/28/2015 02:16 PM, Lee Jones wrote:
> On Wed, 28 Oct 2015, Krzysztof Kozlowski wrote:
>
>> On 26.10.2015 23:34, Lee Jones wrote:
>>> On Mon, 26 Oct 2015, Alim Akhtar wrote:
>>>
>>>> From: Thomas Abraham <thomas.ab@samsung.com>
>>>>
>>>> Add support for S2MPS15 PMIC which is similar to S2MPS11 PMIC. The S2MPS15
>>>> PMIC supports 27 LDO regulators, 10 buck regulators, RTC, three 32.768KHz
>>>> clock outputs and battery charger. This patch adds initial support for
>>>> LDO and buck regulators of S2MPS15 device.
>>>>
>>>> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
>>>> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
>>>> [Alim: Added s2mps15_devs like rtc and clk and related changes]
>>>> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
>>>> ---
>>>>   drivers/mfd/sec-core.c              |   31 +++++++
>>>>   drivers/mfd/sec-irq.c               |    8 ++
>>>>   include/linux/mfd/samsung/core.h    |    1 +
>>>>   include/linux/mfd/samsung/s2mps15.h |  158 +++++++++++++++++++++++++++++++++++
>>>>   4 files changed, 198 insertions(+)
>>>>   create mode 100644 include/linux/mfd/samsung/s2mps15.h
>>>
>>> I replied to the previous set and won't be reviewing this one until
>>> all of the open points are solved.
>>
>> The naming and compatibles used by the driver are confusing but how it
>> was at beginning. Beside the confusion, the names are correct:
>>
>> 1. Main mfd driver:
>>   - compatible: samsung,s2mps1*-pmic
>>   - driver name: sec_pmic
>>
>> 2. Regulator driver:
>>   - no compatible (because it always searches for "regulators" subnode of
>> its parent... that is the convention/legacy behaviour)
>>   - driver name: s2mps1*-pmic
>>
>> I hope that explains your concerns.
>
> It explains *why*, but doesn't ease my concerns in any way.
>
> Unfortunately I've only just realised the disparity we have between
> MFD and the Regulator subsystem, which is annoying because it's now
> almost impossible to rectify.
>
> We should have taken one of two views.  Either a) The MFD is the PMIC
> device which encompasses regulator control.  In which case the MFD
> and it's corresponding compatible string would be named *-pmic and the
> regulator driver would be called *-regulator. Or b) The MFD could be
> considered a normal MFD and be named after the model number, then the
> regulator 'could' be named *-pmic.
>
> However, with reference to b), how much other Power Management does
> the regulator driver do besides control regulators?  I suspect not
> much.  Therefore my preference would be for a).  My second choice
> would be a mixuture of the two where nothing gets named *-pmic.  The
> last option on my list would be the current situation where we seem to
> be calling both the MFD (PMIC) itself and the Regulator driver
> *-pmic, which is not good.
>
Well, I would have also preferred option a), but keeping existing DT 
bindings, looks like we need to go with the current situation.
Krzysztof any thought on this?

>>>> diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
>>>> index 2626fc0b5b8c..db3d4d4ff805 100644
>>>> --- a/drivers/mfd/sec-core.c
>>>> +++ b/drivers/mfd/sec-core.c
>>>> @@ -29,6 +29,7 @@
>>>>   #include <linux/mfd/samsung/s2mps11.h>
>>>>   #include <linux/mfd/samsung/s2mps13.h>
>>>>   #include <linux/mfd/samsung/s2mps14.h>
>>>> +#include <linux/mfd/samsung/s2mps15.h>
>>>>   #include <linux/mfd/samsung/s2mpu02.h>
>>>>   #include <linux/mfd/samsung/s5m8763.h>
>>>>   #include <linux/mfd/samsung/s5m8767.h>
>>>> @@ -96,6 +97,17 @@ static const struct mfd_cell s2mps14_devs[] = {
>>>>   	}
>>>>   };
>>>>
>>>> +static const struct mfd_cell s2mps15_devs[] = {
>>>> +	{
>>>> +		.name = "s2mps15-pmic",
>>>> +	}, {
>>>> +		.name = "s2mps15-rtc",
>>>> +	}, {
>>>> +		.name = "s2mps15-clk",
>>>> +		.of_compatible = "samsung,s2mps15-clk",
>>>> +	},
>>>> +};
>>>> +
>>>>   static const struct mfd_cell s2mpa01_devs[] = {
>>>>   	{
>>>>   		.name = "s2mpa01-pmic",
>>>> @@ -125,6 +137,9 @@ static const struct of_device_id sec_dt_match[] = {
>>>>   		.compatible = "samsung,s2mps14-pmic",
>>>>   		.data = (void *)S2MPS14X,
>>>>   	}, {
>>>> +		.compatible = "samsung,s2mps15-pmic",
>>>> +		.data = (void *)S2MPS15X,
>>>> +	}, {
>>>>   		.compatible = "samsung,s2mpa01-pmic",
>>>>   		.data = (void *)S2MPA01,
>>>>   	}, {
>>>> @@ -226,6 +241,15 @@ static const struct regmap_config s2mps14_regmap_config = {
>>>>   	.cache_type = REGCACHE_FLAT,
>>>>   };
>>>>
>>>> +static const struct regmap_config s2mps15_regmap_config = {
>>>> +	.reg_bits = 8,
>>>> +	.val_bits = 8,
>>>> +
>>>> +	.max_register = S2MPS15_REG_LDODSCH4,
>>>> +	.volatile_reg = s2mps11_volatile,
>>>> +	.cache_type = REGCACHE_FLAT,
>>>> +};
>>>> +
>>>>   static const struct regmap_config s2mpu02_regmap_config = {
>>>>   	.reg_bits = 8,
>>>>   	.val_bits = 8,
>>>> @@ -387,6 +411,9 @@ static int sec_pmic_probe(struct i2c_client *i2c,
>>>>   	case S2MPS14X:
>>>>   		regmap = &s2mps14_regmap_config;
>>>>   		break;
>>>> +	case S2MPS15X:
>>>> +		regmap = &s2mps15_regmap_config;
>>>> +		break;
>>>>   	case S5M8763X:
>>>>   		regmap = &s5m8763_regmap_config;
>>>>   		break;
>>>> @@ -445,6 +472,10 @@ static int sec_pmic_probe(struct i2c_client *i2c,
>>>>   		sec_devs = s2mps14_devs;
>>>>   		num_sec_devs = ARRAY_SIZE(s2mps14_devs);
>>>>   		break;
>>>> +	case S2MPS15X:
>>>> +		sec_devs = s2mps15_devs;
>>>> +		num_sec_devs = ARRAY_SIZE(s2mps15_devs);
>>>> +		break;
>>>>   	case S2MPU02:
>>>>   		sec_devs = s2mpu02_devs;
>>>>   		num_sec_devs = ARRAY_SIZE(s2mpu02_devs);
>>>> diff --git a/drivers/mfd/sec-irq.c b/drivers/mfd/sec-irq.c
>>>> index 806fa8dbb22d..d77de431cc50 100644
>>>> --- a/drivers/mfd/sec-irq.c
>>>> +++ b/drivers/mfd/sec-irq.c
>>>> @@ -407,6 +407,11 @@ static const struct regmap_irq_chip s2mps14_irq_chip = {
>>>>   	S2MPS1X_IRQ_CHIP_COMMON_DATA,
>>>>   };
>>>>
>>>> +static const struct regmap_irq_chip s2mps15_irq_chip = {
>>>> +	.name = "s2mps15",
>>>> +	S2MPS1X_IRQ_CHIP_COMMON_DATA,
>>>> +};
>>>> +
>>>>   static const struct regmap_irq_chip s2mpu02_irq_chip = {
>>>>   	.name = "s2mpu02",
>>>>   	.irqs = s2mpu02_irqs,
>>>> @@ -466,6 +471,9 @@ int sec_irq_init(struct sec_pmic_dev *sec_pmic)
>>>>   	case S2MPS14X:
>>>>   		sec_irq_chip = &s2mps14_irq_chip;
>>>>   		break;
>>>> +	case S2MPS15X:
>>>> +		sec_irq_chip = &s2mps15_irq_chip;
>>>> +		break;
>>>>   	case S2MPU02:
>>>>   		sec_irq_chip = &s2mpu02_irq_chip;
>>>>   		break;
>>>> diff --git a/include/linux/mfd/samsung/core.h b/include/linux/mfd/samsung/core.h
>>>> index a06098639399..6bc4bcd488ac 100644
>>>> --- a/include/linux/mfd/samsung/core.h
>>>> +++ b/include/linux/mfd/samsung/core.h
>>>> @@ -44,6 +44,7 @@ enum sec_device_type {
>>>>   	S2MPS11X,
>>>>   	S2MPS13X,
>>>>   	S2MPS14X,
>>>> +	S2MPS15X,
>>>>   	S2MPU02,
>>>>   };
>>>>
>>>> diff --git a/include/linux/mfd/samsung/s2mps15.h b/include/linux/mfd/samsung/s2mps15.h
>>>> new file mode 100644
>>>> index 000000000000..36d35287c3c0
>>>> --- /dev/null
>>>> +++ b/include/linux/mfd/samsung/s2mps15.h
>>>> @@ -0,0 +1,158 @@
>>>> +/*
>>>> + * Copyright (c) 2015 Samsung Electronics Co., Ltd
>>>> + *              http://www.samsung.com
>>>> + *
>>>> + * This program is free software; you can redistribute  it and/or modify it
>>>> + * under  the terms of  the GNU General  Public License as published by the
>>>> + * Free Software Foundation;  either version 2 of the  License, or (at your
>>>> + * option) any later version.
>>>> + *
>>>> + * This program is distributed in the hope that it will be useful,
>>>> + * but WITHOUT ANY WARRANTY; without even the implied warranty of
>>>> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
>>>> + * GNU General Public License for more details.
>>>> + */
>>>> +
>>>> +#ifndef __LINUX_MFD_S2MPS15_H
>>>> +#define __LINUX_MFD_S2MPS15_H
>>>> +
>>>> +/* S2MPS15 registers */
>>>> +enum s2mps15_reg {
>>>> +	S2MPS15_REG_ID,
>>>> +	S2MPS15_REG_INT1,
>>>> +	S2MPS15_REG_INT2,
>>>> +	S2MPS15_REG_INT3,
>>>> +	S2MPS15_REG_INT1M,
>>>> +	S2MPS15_REG_INT2M,
>>>> +	S2MPS15_REG_INT3M,
>>>> +	S2MPS15_REG_ST1,
>>>> +	S2MPS15_REG_ST2,
>>>> +	S2MPS15_REG_PWRONSRC,
>>>> +	S2MPS15_REG_OFFSRC,
>>>> +	S2MPS15_REG_BU_CHG,
>>>> +	S2MPS15_REG_RTC_BUF,
>>>> +	S2MPS15_REG_CTRL1,
>>>> +	S2MPS15_REG_CTRL2,
>>>> +	S2MPS15_REG_RSVD1,
>>>> +	S2MPS15_REG_RSVD2,
>>>> +	S2MPS15_REG_RSVD3,
>>>> +	S2MPS15_REG_RSVD4,
>>>> +	S2MPS15_REG_RSVD5,
>>>> +	S2MPS15_REG_RSVD6,
>>>> +	S2MPS15_REG_CTRL3,
>>>> +	S2MPS15_REG_RSVD7,
>>>> +	S2MPS15_REG_RSVD8,
>>>> +	S2MPS15_REG_RSVD9,
>>>> +	S2MPS15_REG_B1CTRL1,
>>>> +	S2MPS15_REG_B1CTRL2,
>>>> +	S2MPS15_REG_B2CTRL1,
>>>> +	S2MPS15_REG_B2CTRL2,
>>>> +	S2MPS15_REG_B3CTRL1,
>>>> +	S2MPS15_REG_B3CTRL2,
>>>> +	S2MPS15_REG_B4CTRL1,
>>>> +	S2MPS15_REG_B4CTRL2,
>>>> +	S2MPS15_REG_B5CTRL1,
>>>> +	S2MPS15_REG_B5CTRL2,
>>>> +	S2MPS15_REG_B6CTRL1,
>>>> +	S2MPS15_REG_B6CTRL2,
>>>> +	S2MPS15_REG_B7CTRL1,
>>>> +	S2MPS15_REG_B7CTRL2,
>>>> +	S2MPS15_REG_B8CTRL1,
>>>> +	S2MPS15_REG_B8CTRL2,
>>>> +	S2MPS15_REG_B9CTRL1,
>>>> +	S2MPS15_REG_B9CTRL2,
>>>> +	S2MPS15_REG_B10CTRL1,
>>>> +	S2MPS15_REG_B10CTRL2,
>>>> +	S2MPS15_REG_BBCTRL1,
>>>> +	S2MPS15_REG_BBCTRL2,
>>>> +	S2MPS15_REG_BRAMP,
>>>> +	S2MPS15_REG_LDODVS1,
>>>> +	S2MPS15_REG_LDODVS2,
>>>> +	S2MPS15_REG_LDODVS3,
>>>> +	S2MPS15_REG_LDODVS4,
>>>> +	S2MPS15_REG_L1CTRL,
>>>> +	S2MPS15_REG_L2CTRL,
>>>> +	S2MPS15_REG_L3CTRL,
>>>> +	S2MPS15_REG_L4CTRL,
>>>> +	S2MPS15_REG_L5CTRL,
>>>> +	S2MPS15_REG_L6CTRL,
>>>> +	S2MPS15_REG_L7CTRL,
>>>> +	S2MPS15_REG_L8CTRL,
>>>> +	S2MPS15_REG_L9CTRL,
>>>> +	S2MPS15_REG_L10CTRL,
>>>> +	S2MPS15_REG_L11CTRL,
>>>> +	S2MPS15_REG_L12CTRL,
>>>> +	S2MPS15_REG_L13CTRL,
>>>> +	S2MPS15_REG_L14CTRL,
>>>> +	S2MPS15_REG_L15CTRL,
>>>> +	S2MPS15_REG_L16CTRL,
>>>> +	S2MPS15_REG_L17CTRL,
>>>> +	S2MPS15_REG_L18CTRL,
>>>> +	S2MPS15_REG_L19CTRL,
>>>> +	S2MPS15_REG_L20CTRL,
>>>> +	S2MPS15_REG_L21CTRL,
>>>> +	S2MPS15_REG_L22CTRL,
>>>> +	S2MPS15_REG_L23CTRL,
>>>> +	S2MPS15_REG_L24CTRL,
>>>> +	S2MPS15_REG_L25CTRL,
>>>> +	S2MPS15_REG_L26CTRL,
>>>> +	S2MPS15_REG_L27CTRL,
>>>> +	S2MPS15_REG_LDODSCH1,
>>>> +	S2MPS15_REG_LDODSCH2,
>>>> +	S2MPS15_REG_LDODSCH3,
>>>> +	S2MPS15_REG_LDODSCH4,
>>>> +};
>>>> +
>>>> +/* S2MPS15 regulator ids */
>>>> +enum s2mps15_regulators {
>>>> +	S2MPS15_LDO1,
>>>> +	S2MPS15_LDO2,
>>>> +	S2MPS15_LDO3,
>>>> +	S2MPS15_LDO4,
>>>> +	S2MPS15_LDO5,
>>>> +	S2MPS15_LDO6,
>>>> +	S2MPS15_LDO7,
>>>> +	S2MPS15_LDO8,
>>>> +	S2MPS15_LDO9,
>>>> +	S2MPS15_LDO10,
>>>> +	S2MPS15_LDO11,
>>>> +	S2MPS15_LDO12,
>>>> +	S2MPS15_LDO13,
>>>> +	S2MPS15_LDO14,
>>>> +	S2MPS15_LDO15,
>>>> +	S2MPS15_LDO16,
>>>> +	S2MPS15_LDO17,
>>>> +	S2MPS15_LDO18,
>>>> +	S2MPS15_LDO19,
>>>> +	S2MPS15_LDO20,
>>>> +	S2MPS15_LDO21,
>>>> +	S2MPS15_LDO22,
>>>> +	S2MPS15_LDO23,
>>>> +	S2MPS15_LDO24,
>>>> +	S2MPS15_LDO25,
>>>> +	S2MPS15_LDO26,
>>>> +	S2MPS15_LDO27,
>>>> +	S2MPS15_BUCK1,
>>>> +	S2MPS15_BUCK2,
>>>> +	S2MPS15_BUCK3,
>>>> +	S2MPS15_BUCK4,
>>>> +	S2MPS15_BUCK5,
>>>> +	S2MPS15_BUCK6,
>>>> +	S2MPS15_BUCK7,
>>>> +	S2MPS15_BUCK8,
>>>> +	S2MPS15_BUCK9,
>>>> +	S2MPS15_BUCK10,
>>>> +	S2MPS15_BUCK11,
>>>> +	S2MPS15_REGULATOR_MAX,
>>>> +};
>>>> +
>>>> +#define S2MPS15_LDO_VSEL_MASK		(0x3F)
>>>> +#define S2MPS15_BUCK_VSEL_MASK		(0xFF)
>>>> +
>>>> +#define S2MPS15_ENABLE_SHIFT		(0x06)
>>>> +#define S2MPS15_ENABLE_MASK		(0x03 << S2MPS15_ENABLE_SHIFT)
>>>> +
>>>> +#define S2MPS15_LDO_N_VOLTAGES		(S2MPS15_LDO_VSEL_MASK + 1)
>>>> +#define S2MPS15_BUCK_N_VOLTAGES	(S2MPS15_BUCK_VSEL_MASK + 1)
>>>> +
>>>> +#endif /* __LINUX_MFD_S2MPS15_H */
>>>
>>
>

Re: [PATCH v3 2/5] mfd: sec: Add support for S2MPS15 PMIC

[Krzysztof Kozlowski]

W dniu 28.10.2015 o 20:21, Alim Akhtar pisze:
> Hello,
> 
> On 10/28/2015 02:16 PM, Lee Jones wrote:
>> On Wed, 28 Oct 2015, Krzysztof Kozlowski wrote:
>>
>>> On 26.10.2015 23:34, Lee Jones wrote:
>>>> On Mon, 26 Oct 2015, Alim Akhtar wrote:
>>>>
>>>>> From: Thomas Abraham <thomas.ab@samsung.com>
>>>>>
>>>>> Add support for S2MPS15 PMIC which is similar to S2MPS11 PMIC. The
>>>>> S2MPS15
>>>>> PMIC supports 27 LDO regulators, 10 buck regulators, RTC, three
>>>>> 32.768KHz
>>>>> clock outputs and battery charger. This patch adds initial support for
>>>>> LDO and buck regulators of S2MPS15 device.
>>>>>
>>>>> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
>>>>> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
>>>>> [Alim: Added s2mps15_devs like rtc and clk and related changes]
>>>>> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
>>>>> ---
>>>>>   drivers/mfd/sec-core.c              |   31 +++++++
>>>>>   drivers/mfd/sec-irq.c               |    8 ++
>>>>>   include/linux/mfd/samsung/core.h    |    1 +
>>>>>   include/linux/mfd/samsung/s2mps15.h |  158
>>>>> +++++++++++++++++++++++++++++++++++
>>>>>   4 files changed, 198 insertions(+)
>>>>>   create mode 100644 include/linux/mfd/samsung/s2mps15.h
>>>>
>>>> I replied to the previous set and won't be reviewing this one until
>>>> all of the open points are solved.
>>>
>>> The naming and compatibles used by the driver are confusing but how it
>>> was at beginning. Beside the confusion, the names are correct:
>>>
>>> 1. Main mfd driver:
>>>   - compatible: samsung,s2mps1*-pmic
>>>   - driver name: sec_pmic
>>>
>>> 2. Regulator driver:
>>>   - no compatible (because it always searches for "regulators"
>>> subnode of
>>> its parent... that is the convention/legacy behaviour)
>>>   - driver name: s2mps1*-pmic
>>>
>>> I hope that explains your concerns.
>>
>> It explains *why*, but doesn't ease my concerns in any way.
>>
>> Unfortunately I've only just realised the disparity we have between
>> MFD and the Regulator subsystem, which is annoying because it's now
>> almost impossible to rectify.
>>
>> We should have taken one of two views.  Either a) The MFD is the PMIC
>> device which encompasses regulator control.  In which case the MFD
>> and it's corresponding compatible string would be named *-pmic and the
>> regulator driver would be called *-regulator. Or b) The MFD could be
>> considered a normal MFD and be named after the model number, then the
>> regulator 'could' be named *-pmic.
>>
>> However, with reference to b), how much other Power Management does
>> the regulator driver do besides control regulators?  I suspect not
>> much.  Therefore my preference would be for a).  My second choice
>> would be a mixuture of the two where nothing gets named *-pmic.  The
>> last option on my list would be the current situation where we seem to
>> be calling both the MFD (PMIC) itself and the Regulator driver
>> *-pmic, which is not good.
>>
> Well, I would have also preferred option a), but keeping existing DT
> bindings, looks like we need to go with the current situation.
> Krzysztof any thought on this?
> 

Looks good to me. Please, go ahead.

Best regards,
Krzysztof

Re: [PATCH v3 2/5] mfd: sec: Add support for S2MPS15 PMIC

[Krzysztof Kozlowski]

W dniu 28.10.2015 o 17:46, Lee Jones pisze:
> On Wed, 28 Oct 2015, Krzysztof Kozlowski wrote:
> 
>> On 26.10.2015 23:34, Lee Jones wrote:
>>> On Mon, 26 Oct 2015, Alim Akhtar wrote:
>>>
>>>> From: Thomas Abraham <thomas.ab@samsung.com>
>>>>
>>>> Add support for S2MPS15 PMIC which is similar to S2MPS11 PMIC. The S2MPS15
>>>> PMIC supports 27 LDO regulators, 10 buck regulators, RTC, three 32.768KHz
>>>> clock outputs and battery charger. This patch adds initial support for
>>>> LDO and buck regulators of S2MPS15 device.
>>>>
>>>> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
>>>> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
>>>> [Alim: Added s2mps15_devs like rtc and clk and related changes]
>>>> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
>>>> ---
>>>>  drivers/mfd/sec-core.c              |   31 +++++++
>>>>  drivers/mfd/sec-irq.c               |    8 ++
>>>>  include/linux/mfd/samsung/core.h    |    1 +
>>>>  include/linux/mfd/samsung/s2mps15.h |  158 +++++++++++++++++++++++++++++++++++
>>>>  4 files changed, 198 insertions(+)
>>>>  create mode 100644 include/linux/mfd/samsung/s2mps15.h
>>>
>>> I replied to the previous set and won't be reviewing this one until
>>> all of the open points are solved.
>>
>> The naming and compatibles used by the driver are confusing but how it
>> was at beginning. Beside the confusion, the names are correct:
>>
>> 1. Main mfd driver:
>>  - compatible: samsung,s2mps1*-pmic
>>  - driver name: sec_pmic
>>
>> 2. Regulator driver:
>>  - no compatible (because it always searches for "regulators" subnode of
>> its parent... that is the convention/legacy behaviour)
>>  - driver name: s2mps1*-pmic
>>
>> I hope that explains your concerns.
> 
> It explains *why*, but doesn't ease my concerns in any way.
> 
> Unfortunately I've only just realised the disparity we have between
> MFD and the Regulator subsystem, which is annoying because it's now
> almost impossible to rectify.  
> 
> We should have taken one of two views.  Either a) The MFD is the PMIC
> device which encompasses regulator control.  In which case the MFD
> and it's corresponding compatible string would be named *-pmic and the
> regulator driver would be called *-regulator. Or b) The MFD could be
> considered a normal MFD and be named after the model number, then the
> regulator 'could' be named *-pmic.
> 
> However, with reference to b), how much other Power Management does
> the regulator driver do besides control regulators?  I suspect not
> much.  Therefore my preference would be for a).  My second choice
> would be a mixuture of the two where nothing gets named *-pmic.  The
> last option on my list would be the current situation where we seem to
> be calling both the MFD (PMIC) itself and the Regulator driver
> *-pmic, which is not good.

Starting from the description of device-family. This is called "Power
Management IC" but it is rather a "Power Deliver/Distribute IC". There
isn't any logic inside except enable/disable/configure/set low power
mode for regulators.

However in the same time the IC comes (always) with:
 - 32kHz clocks,
 - RTC,
 - backup battery charger (no driver for it),
 - reset for SoC,
 - shutdown on thermal alert (also no driver for this control).

The solution a) seems fine to me. Make sense and it looks entirely
backward compatible - only driver names will be modified.

Best regards,
Krzysztof

Re: [PATCH v3 2/5] mfd: sec: Add support for S2MPS15 PMIC

[Lee Jones]

On Wed, 28 Oct 2015, Krzysztof Kozlowski wrote:

> W dniu 28.10.2015 o 17:46, Lee Jones pisze:
> > On Wed, 28 Oct 2015, Krzysztof Kozlowski wrote:
> > 
> >> On 26.10.2015 23:34, Lee Jones wrote:
> >>> On Mon, 26 Oct 2015, Alim Akhtar wrote:
> >>>
> >>>> From: Thomas Abraham <thomas.ab@samsung.com>
> >>>>
> >>>> Add support for S2MPS15 PMIC which is similar to S2MPS11 PMIC. The S2MPS15
> >>>> PMIC supports 27 LDO regulators, 10 buck regulators, RTC, three 32.768KHz
> >>>> clock outputs and battery charger. This patch adds initial support for
> >>>> LDO and buck regulators of S2MPS15 device.
> >>>>
> >>>> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
> >>>> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
> >>>> [Alim: Added s2mps15_devs like rtc and clk and related changes]
> >>>> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> >>>> ---
> >>>>  drivers/mfd/sec-core.c              |   31 +++++++
> >>>>  drivers/mfd/sec-irq.c               |    8 ++
> >>>>  include/linux/mfd/samsung/core.h    |    1 +
> >>>>  include/linux/mfd/samsung/s2mps15.h |  158 +++++++++++++++++++++++++++++++++++
> >>>>  4 files changed, 198 insertions(+)
> >>>>  create mode 100644 include/linux/mfd/samsung/s2mps15.h
> >>>
> >>> I replied to the previous set and won't be reviewing this one until
> >>> all of the open points are solved.
> >>
> >> The naming and compatibles used by the driver are confusing but how it
> >> was at beginning. Beside the confusion, the names are correct:
> >>
> >> 1. Main mfd driver:
> >>  - compatible: samsung,s2mps1*-pmic
> >>  - driver name: sec_pmic
> >>
> >> 2. Regulator driver:
> >>  - no compatible (because it always searches for "regulators" subnode of
> >> its parent... that is the convention/legacy behaviour)
> >>  - driver name: s2mps1*-pmic
> >>
> >> I hope that explains your concerns.
> > 
> > It explains *why*, but doesn't ease my concerns in any way.
> > 
> > Unfortunately I've only just realised the disparity we have between
> > MFD and the Regulator subsystem, which is annoying because it's now
> > almost impossible to rectify.  
> > 
> > We should have taken one of two views.  Either a) The MFD is the PMIC
> > device which encompasses regulator control.  In which case the MFD
> > and it's corresponding compatible string would be named *-pmic and the
> > regulator driver would be called *-regulator. Or b) The MFD could be
> > considered a normal MFD and be named after the model number, then the
> > regulator 'could' be named *-pmic.
> > 
> > However, with reference to b), how much other Power Management does
> > the regulator driver do besides control regulators?  I suspect not
> > much.  Therefore my preference would be for a).  My second choice
> > would be a mixuture of the two where nothing gets named *-pmic.  The
> > last option on my list would be the current situation where we seem to
> > be calling both the MFD (PMIC) itself and the Regulator driver
> > *-pmic, which is not good.
> 
> Starting from the description of device-family. This is called "Power
> Management IC" but it is rather a "Power Deliver/Distribute IC". There
> isn't any logic inside except enable/disable/configure/set low power
> mode for regulators.
> 
> However in the same time the IC comes (always) with:
>  - 32kHz clocks,
>  - RTC,
>  - backup battery charger (no driver for it),
>  - reset for SoC,
>  - shutdown on thermal alert (also no driver for this control).
> 
> The solution a) seems fine to me. Make sense and it looks entirely
> backward compatible - only driver names will be modified.

Perfect solution from my PoV.

Thanks Krzysztof.

-- 
Lee Jones
Linaro STMicroelectronics Landing Team Lead
Linaro.org │ Open source software for ARM SoCs
Follow Linaro: Facebook | Twitter | Blog

Re: [PATCH v3 2/5] mfd: sec: Add support for S2MPS15 PMIC

[Alim Akhtar]

On 10/28/2015 07:21 PM, Lee Jones wrote:
> On Wed, 28 Oct 2015, Krzysztof Kozlowski wrote:
>
>> W dniu 28.10.2015 o 17:46, Lee Jones pisze:
>>> On Wed, 28 Oct 2015, Krzysztof Kozlowski wrote:
>>>
>>>> On 26.10.2015 23:34, Lee Jones wrote:
>>>>> On Mon, 26 Oct 2015, Alim Akhtar wrote:
>>>>>
>>>>>> From: Thomas Abraham <thomas.ab@samsung.com>
>>>>>>
>>>>>> Add support for S2MPS15 PMIC which is similar to S2MPS11 PMIC. The S2MPS15
>>>>>> PMIC supports 27 LDO regulators, 10 buck regulators, RTC, three 32.768KHz
>>>>>> clock outputs and battery charger. This patch adds initial support for
>>>>>> LDO and buck regulators of S2MPS15 device.
>>>>>>
>>>>>> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
>>>>>> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
>>>>>> [Alim: Added s2mps15_devs like rtc and clk and related changes]
>>>>>> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
>>>>>> ---
>>>>>>   drivers/mfd/sec-core.c              |   31 +++++++
>>>>>>   drivers/mfd/sec-irq.c               |    8 ++
>>>>>>   include/linux/mfd/samsung/core.h    |    1 +
>>>>>>   include/linux/mfd/samsung/s2mps15.h |  158 +++++++++++++++++++++++++++++++++++
>>>>>>   4 files changed, 198 insertions(+)
>>>>>>   create mode 100644 include/linux/mfd/samsung/s2mps15.h
>>>>>
>>>>> I replied to the previous set and won't be reviewing this one until
>>>>> all of the open points are solved.
>>>>
>>>> The naming and compatibles used by the driver are confusing but how it
>>>> was at beginning. Beside the confusion, the names are correct:
>>>>
>>>> 1. Main mfd driver:
>>>>   - compatible: samsung,s2mps1*-pmic
>>>>   - driver name: sec_pmic
>>>>
>>>> 2. Regulator driver:
>>>>   - no compatible (because it always searches for "regulators" subnode of
>>>> its parent... that is the convention/legacy behaviour)
>>>>   - driver name: s2mps1*-pmic
>>>>
>>>> I hope that explains your concerns.
>>>
>>> It explains *why*, but doesn't ease my concerns in any way.
>>>
>>> Unfortunately I've only just realised the disparity we have between
>>> MFD and the Regulator subsystem, which is annoying because it's now
>>> almost impossible to rectify.
>>>
>>> We should have taken one of two views.  Either a) The MFD is the PMIC
>>> device which encompasses regulator control.  In which case the MFD
>>> and it's corresponding compatible string would be named *-pmic and the
>>> regulator driver would be called *-regulator. Or b) The MFD could be
>>> considered a normal MFD and be named after the model number, then the
>>> regulator 'could' be named *-pmic.
>>>
>>> However, with reference to b), how much other Power Management does
>>> the regulator driver do besides control regulators?  I suspect not
>>> much.  Therefore my preference would be for a).  My second choice
>>> would be a mixuture of the two where nothing gets named *-pmic.  The
>>> last option on my list would be the current situation where we seem to
>>> be calling both the MFD (PMIC) itself and the Regulator driver
>>> *-pmic, which is not good.
>>
>> Starting from the description of device-family. This is called "Power
>> Management IC" but it is rather a "Power Deliver/Distribute IC". There
>> isn't any logic inside except enable/disable/configure/set low power
>> mode for regulators.
>>
>> However in the same time the IC comes (always) with:
>>   - 32kHz clocks,
>>   - RTC,
>>   - backup battery charger (no driver for it),
>>   - reset for SoC,
>>   - shutdown on thermal alert (also no driver for this control).
>>
>> The solution a) seems fine to me. Make sense and it looks entirely
>> backward compatible - only driver names will be modified.
>
> Perfect solution from my PoV.
>
> Thanks Krzysztof.
>
Thanks Jones/Krzysztof as always.
Will update the patches.

Re: [PATCH v3 2/5] mfd: sec: Add support for S2MPS15 PMIC

[Krzysztof Kozlowski]

On 26.10.2015 21:51, Alim Akhtar wrote:
> From: Thomas Abraham <thomas.ab@samsung.com>
> 
> Add support for S2MPS15 PMIC which is similar to S2MPS11 PMIC. The S2MPS15
> PMIC supports 27 LDO regulators, 10 buck regulators, RTC, three 32.768KHz
> clock outputs and battery charger. This patch adds initial support for
> LDO and buck regulators of S2MPS15 device.
> 
> Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
> [Alim: Added s2mps15_devs like rtc and clk and related changes]
> Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
> ---
>  drivers/mfd/sec-core.c              |   31 +++++++
>  drivers/mfd/sec-irq.c               |    8 ++
>  include/linux/mfd/samsung/core.h    |    1 +
>  include/linux/mfd/samsung/s2mps15.h |  158 +++++++++++++++++++++++++++++++++++
>  4 files changed, 198 insertions(+)
>  create mode 100644 include/linux/mfd/samsung/s2mps15.h
> 
> diff --git a/drivers/mfd/sec-core.c b/drivers/mfd/sec-core.c
> index 2626fc0b5b8c..db3d4d4ff805 100644
> --- a/drivers/mfd/sec-core.c
> +++ b/drivers/mfd/sec-core.c
> @@ -29,6 +29,7 @@
>  #include <linux/mfd/samsung/s2mps11.h>
>  #include <linux/mfd/samsung/s2mps13.h>
>  #include <linux/mfd/samsung/s2mps14.h>
> +#include <linux/mfd/samsung/s2mps15.h>
>  #include <linux/mfd/samsung/s2mpu02.h>
>  #include <linux/mfd/samsung/s5m8763.h>
>  #include <linux/mfd/samsung/s5m8767.h>
> @@ -96,6 +97,17 @@ static const struct mfd_cell s2mps14_devs[] = {
>  	}
>  };
>  
> +static const struct mfd_cell s2mps15_devs[] = {
> +	{
> +		.name = "s2mps15-pmic",
> +	}, {
> +		.name = "s2mps15-rtc",
> +	}, {
> +		.name = "s2mps15-clk",
> +		.of_compatible = "samsung,s2mps15-clk",
> +	},

I have different questions here. RTC and CLK module look the same as
S2MPS14. Then you should existing compatibles and names.

I'll ask in details about this in separate emails for patch 4 and 5.
Until questions are resolved, these looks wrong.

Best regards,
Krzysztof

[PATCH v3 3/5] regulator: s2mps11: add support for S2MPS15 regulators

[Alim Akhtar]

From: Thomas Abraham <thomas.ab@samsung.com>

The S2MPS15 PMIC is similar in functionality to S2MPS11/14 PMIC. It contains
27 LDO and 10 Buck regulators and allows programming these regulators via a
I2C interface. This patch adds initial support for LDO/Buck regulators of
S2MPS15 PMIC.

Signed-off-by: Thomas Abraham <thomas.ab@samsung.com>
Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
Reviewed-by: Krzysztof Kozlowski <k.kozlowski@samsung.com>
---
 drivers/regulator/Kconfig   |    4 +-
 drivers/regulator/s2mps11.c |  135 ++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 136 insertions(+), 3 deletions(-)

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 64bccff557be..3e3ee5b88b3f 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -588,10 +588,10 @@ config REGULATOR_S2MPA01
 	 via I2C bus. S2MPA01 has 10 Bucks and 26 LDO outputs.
 
 config REGULATOR_S2MPS11
-	tristate "Samsung S2MPS11/S2MPS13/S2MPS14/S2MPU02 voltage regulator"
+	tristate "Samsung S2MPS11/13/14/15/S2MPU02 voltage regulator"
 	depends on MFD_SEC_CORE
 	help
-	 This driver supports a Samsung S2MPS11/S2MPS13/S2MPS14/S2MPU02 voltage
+	 This driver supports a Samsung S2MPS11/13/14/15/S2MPU02 voltage
 	 output regulator via I2C bus. The chip is comprised of high efficient
 	 Buck converters including Dual-Phase Buck converter, Buck-Boost
 	 converter, various LDOs.
diff --git a/drivers/regulator/s2mps11.c b/drivers/regulator/s2mps11.c
index 72fc3c32db49..12c59158552c 100644
--- a/drivers/regulator/s2mps11.c
+++ b/drivers/regulator/s2mps11.c
@@ -32,6 +32,7 @@
 #include <linux/mfd/samsung/s2mps11.h>
 #include <linux/mfd/samsung/s2mps13.h>
 #include <linux/mfd/samsung/s2mps14.h>
+#include <linux/mfd/samsung/s2mps15.h>
 #include <linux/mfd/samsung/s2mpu02.h>
 
 /* The highest number of possible regulators for supported devices. */
@@ -661,6 +662,133 @@ static const struct regulator_desc s2mps14_regulators[] = {
 				    S2MPS14_BUCK1235_START_SEL),
 };
 
+static struct regulator_ops s2mps15_reg_ldo_ops = {
+	.list_voltage		= regulator_list_voltage_linear_range,
+	.map_voltage		= regulator_map_voltage_linear_range,
+	.is_enabled		= regulator_is_enabled_regmap,
+	.enable			= regulator_enable_regmap,
+	.disable		= regulator_disable_regmap,
+	.get_voltage_sel	= regulator_get_voltage_sel_regmap,
+	.set_voltage_sel	= regulator_set_voltage_sel_regmap,
+};
+
+static struct regulator_ops s2mps15_reg_buck_ops = {
+	.list_voltage		= regulator_list_voltage_linear_range,
+	.map_voltage		= regulator_map_voltage_linear_range,
+	.is_enabled		= regulator_is_enabled_regmap,
+	.enable			= regulator_enable_regmap,
+	.disable		= regulator_disable_regmap,
+	.get_voltage_sel	= regulator_get_voltage_sel_regmap,
+	.set_voltage_sel	= regulator_set_voltage_sel_regmap,
+	.set_voltage_time_sel	= regulator_set_voltage_time_sel,
+};
+
+#define regulator_desc_s2mps15_ldo(num, range) {	\
+	.name		= "LDO"#num,			\
+	.id		= S2MPS15_LDO##num,		\
+	.ops		= &s2mps15_reg_ldo_ops,		\
+	.type		= REGULATOR_VOLTAGE,		\
+	.owner		= THIS_MODULE,			\
+	.linear_ranges	= range,			\
+	.n_linear_ranges = ARRAY_SIZE(range),		\
+	.n_voltages	= S2MPS15_LDO_N_VOLTAGES,	\
+	.vsel_reg	= S2MPS15_REG_L1CTRL + num - 1,	\
+	.vsel_mask	= S2MPS15_LDO_VSEL_MASK,	\
+	.enable_reg	= S2MPS15_REG_L1CTRL + num - 1,	\
+	.enable_mask	= S2MPS15_ENABLE_MASK		\
+}
+
+#define regulator_desc_s2mps15_buck(num, range) {			\
+	.name		= "BUCK"#num,					\
+	.id		= S2MPS15_BUCK##num,				\
+	.ops		= &s2mps15_reg_buck_ops,			\
+	.type		= REGULATOR_VOLTAGE,				\
+	.owner		= THIS_MODULE,					\
+	.linear_ranges	= range,					\
+	.n_linear_ranges = ARRAY_SIZE(range),				\
+	.ramp_delay	= 12500,					\
+	.n_voltages	= S2MPS15_BUCK_N_VOLTAGES,			\
+	.vsel_reg	= S2MPS15_REG_B1CTRL2 + ((num - 1) * 2),	\
+	.vsel_mask	= S2MPS15_BUCK_VSEL_MASK,			\
+	.enable_reg	= S2MPS15_REG_B1CTRL1 + ((num - 1) * 2),	\
+	.enable_mask	= S2MPS15_ENABLE_MASK				\
+}
+
+/* voltage range for s2mps15 LDO 3, 5, 15, 16, 18, 20, 23 and 27 */
+static const struct regulator_linear_range s2mps15_ldo_voltage_ranges1[] = {
+	REGULATOR_LINEAR_RANGE(1000000, 0xc, 0x38, 25000),
+};
+
+/* voltage range for s2mps15 LDO 2, 6, 14, 17, 19, 21, 24 and 25 */
+static const struct regulator_linear_range s2mps15_ldo_voltage_ranges2[] = {
+	REGULATOR_LINEAR_RANGE(1800000, 0x0, 0x3f, 25000),
+};
+
+/* voltage range for s2mps15 LDO 4, 11, 12, 13, 22 and 26 */
+static const struct regulator_linear_range s2mps15_ldo_voltage_ranges3[] = {
+	REGULATOR_LINEAR_RANGE(700000, 0x0, 0x34, 12500),
+};
+
+/* voltage range for s2mps15 LDO 7, 8, 9 and 10 */
+static const struct regulator_linear_range s2mps15_ldo_voltage_ranges4[] = {
+	REGULATOR_LINEAR_RANGE(700000, 0xc, 0x18, 25000),
+};
+
+/* voltage range for s2mps15 LDO 1 */
+static const struct regulator_linear_range s2mps15_ldo_voltage_ranges5[] = {
+	REGULATOR_LINEAR_RANGE(500000, 0x0, 0x20, 12500),
+};
+
+/* voltage range for s2mps15 BUCK 1, 2, 3, 4, 5, 6 and 7 */
+static const struct regulator_linear_range s2mps15_buck_voltage_ranges1[] = {
+	REGULATOR_LINEAR_RANGE(500000, 0x20, 0xb0, 6250),
+};
+
+/* voltage range for s2mps15 BUCK 8, 9 and 10 */
+static const struct regulator_linear_range s2mps15_buck_voltage_ranges2[] = {
+	REGULATOR_LINEAR_RANGE(1000000, 0x20, 0xc0, 12500),
+};
+
+static const struct regulator_desc s2mps15_regulators[] = {
+	regulator_desc_s2mps15_ldo(1, s2mps15_ldo_voltage_ranges5),
+	regulator_desc_s2mps15_ldo(2, s2mps15_ldo_voltage_ranges2),
+	regulator_desc_s2mps15_ldo(3, s2mps15_ldo_voltage_ranges1),
+	regulator_desc_s2mps15_ldo(4, s2mps15_ldo_voltage_ranges3),
+	regulator_desc_s2mps15_ldo(5, s2mps15_ldo_voltage_ranges1),
+	regulator_desc_s2mps15_ldo(6, s2mps15_ldo_voltage_ranges2),
+	regulator_desc_s2mps15_ldo(7, s2mps15_ldo_voltage_ranges4),
+	regulator_desc_s2mps15_ldo(8, s2mps15_ldo_voltage_ranges4),
+	regulator_desc_s2mps15_ldo(9, s2mps15_ldo_voltage_ranges4),
+	regulator_desc_s2mps15_ldo(10, s2mps15_ldo_voltage_ranges4),
+	regulator_desc_s2mps15_ldo(11, s2mps15_ldo_voltage_ranges3),
+	regulator_desc_s2mps15_ldo(12, s2mps15_ldo_voltage_ranges3),
+	regulator_desc_s2mps15_ldo(13, s2mps15_ldo_voltage_ranges3),
+	regulator_desc_s2mps15_ldo(14, s2mps15_ldo_voltage_ranges2),
+	regulator_desc_s2mps15_ldo(15, s2mps15_ldo_voltage_ranges1),
+	regulator_desc_s2mps15_ldo(16, s2mps15_ldo_voltage_ranges1),
+	regulator_desc_s2mps15_ldo(17, s2mps15_ldo_voltage_ranges2),
+	regulator_desc_s2mps15_ldo(18, s2mps15_ldo_voltage_ranges1),
+	regulator_desc_s2mps15_ldo(19, s2mps15_ldo_voltage_ranges2),
+	regulator_desc_s2mps15_ldo(20, s2mps15_ldo_voltage_ranges1),
+	regulator_desc_s2mps15_ldo(21, s2mps15_ldo_voltage_ranges2),
+	regulator_desc_s2mps15_ldo(22, s2mps15_ldo_voltage_ranges3),
+	regulator_desc_s2mps15_ldo(23, s2mps15_ldo_voltage_ranges1),
+	regulator_desc_s2mps15_ldo(24, s2mps15_ldo_voltage_ranges2),
+	regulator_desc_s2mps15_ldo(25, s2mps15_ldo_voltage_ranges2),
+	regulator_desc_s2mps15_ldo(26, s2mps15_ldo_voltage_ranges3),
+	regulator_desc_s2mps15_ldo(27, s2mps15_ldo_voltage_ranges1),
+	regulator_desc_s2mps15_buck(1, s2mps15_buck_voltage_ranges1),
+	regulator_desc_s2mps15_buck(2, s2mps15_buck_voltage_ranges1),
+	regulator_desc_s2mps15_buck(3, s2mps15_buck_voltage_ranges1),
+	regulator_desc_s2mps15_buck(4, s2mps15_buck_voltage_ranges1),
+	regulator_desc_s2mps15_buck(5, s2mps15_buck_voltage_ranges1),
+	regulator_desc_s2mps15_buck(6, s2mps15_buck_voltage_ranges1),
+	regulator_desc_s2mps15_buck(7, s2mps15_buck_voltage_ranges1),
+	regulator_desc_s2mps15_buck(8, s2mps15_buck_voltage_ranges2),
+	regulator_desc_s2mps15_buck(9, s2mps15_buck_voltage_ranges2),
+	regulator_desc_s2mps15_buck(10, s2mps15_buck_voltage_ranges2),
+};
+
 static int s2mps14_pmic_enable_ext_control(struct s2mps11_info *s2mps11,
 		struct regulator_dev *rdev)
 {
@@ -974,6 +1102,10 @@ static int s2mps11_pmic_probe(struct platform_device *pdev)
 		regulators = s2mps14_regulators;
 		BUILD_BUG_ON(S2MPS_REGULATOR_MAX < s2mps11->rdev_num);
 		break;
+	case S2MPS15X:
+		s2mps11->rdev_num = ARRAY_SIZE(s2mps15_regulators);
+		regulators = s2mps15_regulators;
+		break;
 	case S2MPU02:
 		s2mps11->rdev_num = ARRAY_SIZE(s2mpu02_regulators);
 		regulators = s2mpu02_regulators;
@@ -1070,6 +1202,7 @@ static const struct platform_device_id s2mps11_pmic_id[] = {
 	{ "s2mps11-pmic", S2MPS11X},
 	{ "s2mps13-pmic", S2MPS13X},
 	{ "s2mps14-pmic", S2MPS14X},
+	{ "s2mps15-pmic", S2MPS15X},
 	{ "s2mpu02-pmic", S2MPU02},
 	{ },
 };
@@ -1097,5 +1230,5 @@ module_exit(s2mps11_pmic_exit);
 
 /* Module information */
 MODULE_AUTHOR("Sangbeom Kim <sbkim73@samsung.com>");
-MODULE_DESCRIPTION("SAMSUNG S2MPS11/S2MPS14/S2MPU02 Regulator Driver");
+MODULE_DESCRIPTION("SAMSUNG S2MPS11/S2MPS14/S2MPS15/S2MPU02 Regulator Driver");
 MODULE_LICENSE("GPL");
-- 
1.7.10.4

[PATCH v3 4/5] clk: s2mps15: Add support for S2MPS15 clocks

[Alim Akhtar]

S2MPS15 PMIC has three 32k buffered clocks outputs. This patch
adds supports for the same to the s2mps11 clock driver.

Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
---
 drivers/clk/Kconfig       |    5 +++--
 drivers/clk/clk-s2mps11.c |   24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
index a1fa61159179..037a314b5d76 100644
--- a/drivers/clk/Kconfig
+++ b/drivers/clk/Kconfig
@@ -120,9 +120,10 @@ config COMMON_CLK_S2MPS11
 	tristate "Clock driver for S2MPS1X/S5M8767 MFD"
 	depends on MFD_SEC_CORE
 	---help---
-	  This driver supports S2MPS11/S2MPS14/S5M8767 crystal oscillator
+	  This driver supports S2MPS1X/S5M8767 crystal oscillator
 	  clock. These multi-function devices have two (S2MPS14) or three
-	  (S2MPS11, S5M8767) fixed-rate oscillators, clocked at 32KHz each.
+	  (S2MPS11/S2MPS13/S2MPS15/S5M8767) fixed-rate oscillators,
+	  clocked at 32KHz each.
 
 config CLK_TWL6040
 	tristate "External McPDM functional clock from twl6040"
diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c
index d266299dfdb1..455500dca653 100644
--- a/drivers/clk/clk-s2mps11.c
+++ b/drivers/clk/clk-s2mps11.c
@@ -25,6 +25,7 @@
 #include <linux/mfd/samsung/s2mps11.h>
 #include <linux/mfd/samsung/s2mps13.h>
 #include <linux/mfd/samsung/s2mps14.h>
+#include <linux/mfd/samsung/s2mps15.h>
 #include <linux/mfd/samsung/s5m8767.h>
 #include <linux/mfd/samsung/core.h>
 
@@ -148,6 +149,24 @@ static struct clk_init_data s2mps14_clks_init[S2MPS11_CLKS_NUM] = {
 	},
 };
 
+static struct clk_init_data s2mps15_clks_init[S2MPS11_CLKS_NUM] = {
+	[S2MPS11_CLK_AP] = {
+		.name = "s2mps15_ap",
+		.ops = &s2mps11_clk_ops,
+		.flags = CLK_IS_ROOT,
+	},
+	[S2MPS11_CLK_CP] = {
+		.name = "s2mps15_cp",
+		.ops = &s2mps11_clk_ops,
+		.flags = CLK_IS_ROOT,
+	},
+	[S2MPS11_CLK_BT] = {
+		.name = "s2mps15_bt",
+		.ops = &s2mps11_clk_ops,
+		.flags = CLK_IS_ROOT,
+	},
+};
+
 static struct device_node *s2mps11_clk_parse_dt(struct platform_device *pdev,
 		struct clk_init_data *clks_init)
 {
@@ -207,6 +226,10 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
 		s2mps11_reg = S2MPS14_REG_RTCCTRL;
 		clks_init = s2mps14_clks_init;
 		break;
+	case S2MPS15X:
+		s2mps11_reg = S2MPS15_REG_RTC_BUF;
+		clks_init = s2mps15_clks_init;
+		break;
 	case S5M8767X:
 		s2mps11_reg = S5M8767_REG_CTRL1;
 		clks_init = s2mps11_clks_init;
@@ -292,6 +315,7 @@ static const struct platform_device_id s2mps11_clk_id[] = {
 	{ "s2mps11-clk", S2MPS11X},
 	{ "s2mps13-clk", S2MPS13X},
 	{ "s2mps14-clk", S2MPS14X},
+	{ "s2mps15-clk", S2MPS15X},
 	{ "s5m8767-clk", S5M8767X},
 	{ },
 };
-- 
1.7.10.4

Re: [PATCH v3 4/5] clk: s2mps15: Add support for S2MPS15 clocks

[Krzysztof Kozlowski]

On 26.10.2015 21:51, Alim Akhtar wrote:
> S2MPS15 PMIC has three 32k buffered clocks outputs. This patch
> adds supports for the same to the s2mps11 clock driver.
> 
> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
> ---
>  drivers/clk/Kconfig       |    5 +++--
>  drivers/clk/clk-s2mps11.c |   24 ++++++++++++++++++++++++
>  2 files changed, 27 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
> index a1fa61159179..037a314b5d76 100644
> --- a/drivers/clk/Kconfig
> +++ b/drivers/clk/Kconfig
> @@ -120,9 +120,10 @@ config COMMON_CLK_S2MPS11
>  	tristate "Clock driver for S2MPS1X/S5M8767 MFD"
>  	depends on MFD_SEC_CORE
>  	---help---
> -	  This driver supports S2MPS11/S2MPS14/S5M8767 crystal oscillator
> +	  This driver supports S2MPS1X/S5M8767 crystal oscillator
>  	  clock. These multi-function devices have two (S2MPS14) or three
> -	  (S2MPS11, S5M8767) fixed-rate oscillators, clocked at 32KHz each.
> +	  (S2MPS11/S2MPS13/S2MPS15/S5M8767) fixed-rate oscillators,
> +	  clocked at 32KHz each.
>  
>  config CLK_TWL6040
>  	tristate "External McPDM functional clock from twl6040"
> diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c
> index d266299dfdb1..455500dca653 100644
> --- a/drivers/clk/clk-s2mps11.c
> +++ b/drivers/clk/clk-s2mps11.c
> @@ -25,6 +25,7 @@
>  #include <linux/mfd/samsung/s2mps11.h>
>  #include <linux/mfd/samsung/s2mps13.h>
>  #include <linux/mfd/samsung/s2mps14.h>
> +#include <linux/mfd/samsung/s2mps15.h>
>  #include <linux/mfd/samsung/s5m8767.h>
>  #include <linux/mfd/samsung/core.h>
>  
> @@ -148,6 +149,24 @@ static struct clk_init_data s2mps14_clks_init[S2MPS11_CLKS_NUM] = {
>  	},
>  };
>  
> +static struct clk_init_data s2mps15_clks_init[S2MPS11_CLKS_NUM] = {
> +	[S2MPS11_CLK_AP] = {
> +		.name = "s2mps15_ap",
> +		.ops = &s2mps11_clk_ops,
> +		.flags = CLK_IS_ROOT,
> +	},
> +	[S2MPS11_CLK_CP] = {
> +		.name = "s2mps15_cp",
> +		.ops = &s2mps11_clk_ops,
> +		.flags = CLK_IS_ROOT,
> +	},
> +	[S2MPS11_CLK_BT] = {
> +		.name = "s2mps15_bt",
> +		.ops = &s2mps11_clk_ops,
> +		.flags = CLK_IS_ROOT,
> +	},
> +};

I see that for S2MPS13 we already added similar array which duplicates
the S2MPS11. This actually looks wrong. Just re-use existing
s2mps11_clks_init.

Best regards,
Krzysztof

Re: [PATCH v3 4/5] clk: s2mps15: Add support for S2MPS15 clocks

[Alim Akhtar]

Hello

On 10/28/2015 06:52 AM, Krzysztof Kozlowski wrote:
> On 26.10.2015 21:51, Alim Akhtar wrote:
>> S2MPS15 PMIC has three 32k buffered clocks outputs. This patch
>> adds supports for the same to the s2mps11 clock driver.
>>
>> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
>> ---
>>   drivers/clk/Kconfig       |    5 +++--
>>   drivers/clk/clk-s2mps11.c |   24 ++++++++++++++++++++++++
>>   2 files changed, 27 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
>> index a1fa61159179..037a314b5d76 100644
>> --- a/drivers/clk/Kconfig
>> +++ b/drivers/clk/Kconfig
>> @@ -120,9 +120,10 @@ config COMMON_CLK_S2MPS11
>>   	tristate "Clock driver for S2MPS1X/S5M8767 MFD"
>>   	depends on MFD_SEC_CORE
>>   	---help---
>> -	  This driver supports S2MPS11/S2MPS14/S5M8767 crystal oscillator
>> +	  This driver supports S2MPS1X/S5M8767 crystal oscillator
>>   	  clock. These multi-function devices have two (S2MPS14) or three
>> -	  (S2MPS11, S5M8767) fixed-rate oscillators, clocked at 32KHz each.
>> +	  (S2MPS11/S2MPS13/S2MPS15/S5M8767) fixed-rate oscillators,
>> +	  clocked at 32KHz each.
>>
>>   config CLK_TWL6040
>>   	tristate "External McPDM functional clock from twl6040"
>> diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c
>> index d266299dfdb1..455500dca653 100644
>> --- a/drivers/clk/clk-s2mps11.c
>> +++ b/drivers/clk/clk-s2mps11.c
>> @@ -25,6 +25,7 @@
>>   #include <linux/mfd/samsung/s2mps11.h>
>>   #include <linux/mfd/samsung/s2mps13.h>
>>   #include <linux/mfd/samsung/s2mps14.h>
>> +#include <linux/mfd/samsung/s2mps15.h>
>>   #include <linux/mfd/samsung/s5m8767.h>
>>   #include <linux/mfd/samsung/core.h>
>>
>> @@ -148,6 +149,24 @@ static struct clk_init_data s2mps14_clks_init[S2MPS11_CLKS_NUM] = {
>>   	},
>>   };
>>
>> +static struct clk_init_data s2mps15_clks_init[S2MPS11_CLKS_NUM] = {
>> +	[S2MPS11_CLK_AP] = {
>> +		.name = "s2mps15_ap",
>> +		.ops = &s2mps11_clk_ops,
>> +		.flags = CLK_IS_ROOT,
>> +	},
>> +	[S2MPS11_CLK_CP] = {
>> +		.name = "s2mps15_cp",
>> +		.ops = &s2mps11_clk_ops,
>> +		.flags = CLK_IS_ROOT,
>> +	},
>> +	[S2MPS11_CLK_BT] = {
>> +		.name = "s2mps15_bt",
>> +		.ops = &s2mps11_clk_ops,
>> +		.flags = CLK_IS_ROOT,
>> +	},
>> +};
>
> I see that for S2MPS13 we already added similar array which duplicates
> the S2MPS11. This actually looks wrong. Just re-use existing
> s2mps11_clks_init.
>
hmm..ok will do.
> Best regards,
> Krzysztof
>
>

Re: [PATCH v3 4/5] clk: s2mps15: Add support for S2MPS15 clocks

[Krzysztof Kozlowski]

On 26.10.2015 21:51, Alim Akhtar wrote:
> S2MPS15 PMIC has three 32k buffered clocks outputs. This patch
> adds supports for the same to the s2mps11 clock driver.
> 
> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
> ---
>  drivers/clk/Kconfig       |    5 +++--
>  drivers/clk/clk-s2mps11.c |   24 ++++++++++++++++++++++++
>  2 files changed, 27 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
> index a1fa61159179..037a314b5d76 100644
> --- a/drivers/clk/Kconfig
> +++ b/drivers/clk/Kconfig
> @@ -120,9 +120,10 @@ config COMMON_CLK_S2MPS11
>  	tristate "Clock driver for S2MPS1X/S5M8767 MFD"
>  	depends on MFD_SEC_CORE
>  	---help---
> -	  This driver supports S2MPS11/S2MPS14/S5M8767 crystal oscillator
> +	  This driver supports S2MPS1X/S5M8767 crystal oscillator
>  	  clock. These multi-function devices have two (S2MPS14) or three
> -	  (S2MPS11, S5M8767) fixed-rate oscillators, clocked at 32KHz each.
> +	  (S2MPS11/S2MPS13/S2MPS15/S5M8767) fixed-rate oscillators,
> +	  clocked at 32KHz each.
>  
>  config CLK_TWL6040
>  	tristate "External McPDM functional clock from twl6040"
> diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c
> index d266299dfdb1..455500dca653 100644
> --- a/drivers/clk/clk-s2mps11.c
> +++ b/drivers/clk/clk-s2mps11.c
> @@ -25,6 +25,7 @@
>  #include <linux/mfd/samsung/s2mps11.h>
>  #include <linux/mfd/samsung/s2mps13.h>
>  #include <linux/mfd/samsung/s2mps14.h>
> +#include <linux/mfd/samsung/s2mps15.h>
>  #include <linux/mfd/samsung/s5m8767.h>
>  #include <linux/mfd/samsung/core.h>
>  
> @@ -148,6 +149,24 @@ static struct clk_init_data s2mps14_clks_init[S2MPS11_CLKS_NUM] = {
>  	},
>  };
>  
> +static struct clk_init_data s2mps15_clks_init[S2MPS11_CLKS_NUM] = {
> +	[S2MPS11_CLK_AP] = {
> +		.name = "s2mps15_ap",
> +		.ops = &s2mps11_clk_ops,
> +		.flags = CLK_IS_ROOT,
> +	},
> +	[S2MPS11_CLK_CP] = {
> +		.name = "s2mps15_cp",
> +		.ops = &s2mps11_clk_ops,
> +		.flags = CLK_IS_ROOT,
> +	},
> +	[S2MPS11_CLK_BT] = {
> +		.name = "s2mps15_bt",
> +		.ops = &s2mps11_clk_ops,
> +		.flags = CLK_IS_ROOT,
> +	},
> +};
> +
>  static struct device_node *s2mps11_clk_parse_dt(struct platform_device *pdev,
>  		struct clk_init_data *clks_init)
>  {
> @@ -207,6 +226,10 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
>  		s2mps11_reg = S2MPS14_REG_RTCCTRL;
>  		clks_init = s2mps14_clks_init;
>  		break;
> +	case S2MPS15X:
> +		s2mps11_reg = S2MPS15_REG_RTC_BUF;
> +		clks_init = s2mps15_clks_init;

Another question (after looking at RTC driver):
Is this the same register address as S2MPS14?

Best regards,
Krzysztof

Re: [PATCH v3 4/5] clk: s2mps15: Add support for S2MPS15 clocks

[Krzysztof Kozlowski]

On 28.10.2015 10:26, Krzysztof Kozlowski wrote:
> On 26.10.2015 21:51, Alim Akhtar wrote:
>> S2MPS15 PMIC has three 32k buffered clocks outputs. This patch
>> adds supports for the same to the s2mps11 clock driver.
>>
>> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
>> ---
>>  drivers/clk/Kconfig       |    5 +++--
>>  drivers/clk/clk-s2mps11.c |   24 ++++++++++++++++++++++++
>>  2 files changed, 27 insertions(+), 2 deletions(-)
>>
>> diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
>> index a1fa61159179..037a314b5d76 100644
>> --- a/drivers/clk/Kconfig
>> +++ b/drivers/clk/Kconfig
>> @@ -120,9 +120,10 @@ config COMMON_CLK_S2MPS11
>>  	tristate "Clock driver for S2MPS1X/S5M8767 MFD"
>>  	depends on MFD_SEC_CORE
>>  	---help---
>> -	  This driver supports S2MPS11/S2MPS14/S5M8767 crystal oscillator
>> +	  This driver supports S2MPS1X/S5M8767 crystal oscillator
>>  	  clock. These multi-function devices have two (S2MPS14) or three
>> -	  (S2MPS11, S5M8767) fixed-rate oscillators, clocked at 32KHz each.
>> +	  (S2MPS11/S2MPS13/S2MPS15/S5M8767) fixed-rate oscillators,
>> +	  clocked at 32KHz each.
>>  
>>  config CLK_TWL6040
>>  	tristate "External McPDM functional clock from twl6040"
>> diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c
>> index d266299dfdb1..455500dca653 100644
>> --- a/drivers/clk/clk-s2mps11.c
>> +++ b/drivers/clk/clk-s2mps11.c
>> @@ -25,6 +25,7 @@
>>  #include <linux/mfd/samsung/s2mps11.h>
>>  #include <linux/mfd/samsung/s2mps13.h>
>>  #include <linux/mfd/samsung/s2mps14.h>
>> +#include <linux/mfd/samsung/s2mps15.h>
>>  #include <linux/mfd/samsung/s5m8767.h>
>>  #include <linux/mfd/samsung/core.h>
>>  
>> @@ -148,6 +149,24 @@ static struct clk_init_data s2mps14_clks_init[S2MPS11_CLKS_NUM] = {
>>  	},
>>  };
>>  
>> +static struct clk_init_data s2mps15_clks_init[S2MPS11_CLKS_NUM] = {
>> +	[S2MPS11_CLK_AP] = {
>> +		.name = "s2mps15_ap",
>> +		.ops = &s2mps11_clk_ops,
>> +		.flags = CLK_IS_ROOT,
>> +	},
>> +	[S2MPS11_CLK_CP] = {
>> +		.name = "s2mps15_cp",
>> +		.ops = &s2mps11_clk_ops,
>> +		.flags = CLK_IS_ROOT,
>> +	},
>> +	[S2MPS11_CLK_BT] = {
>> +		.name = "s2mps15_bt",
>> +		.ops = &s2mps11_clk_ops,
>> +		.flags = CLK_IS_ROOT,
>> +	},
>> +};
>> +
>>  static struct device_node *s2mps11_clk_parse_dt(struct platform_device *pdev,
>>  		struct clk_init_data *clks_init)
>>  {
>> @@ -207,6 +226,10 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
>>  		s2mps11_reg = S2MPS14_REG_RTCCTRL;
>>  		clks_init = s2mps14_clks_init;
>>  		break;
>> +	case S2MPS15X:
>> +		s2mps11_reg = S2MPS15_REG_RTC_BUF;
>> +		clks_init = s2mps15_clks_init;
> 
> Another question (after looking at RTC driver):
> Is this the same register address as S2MPS14?

I found the answer - this is the same address as in S2MPS13 and S2MPS14:
0xc. The S2MPS14 has only two clocks though but S2MPS13 has three.
Again, as in RTC, you should re-use existing support.

It looks there is no need for this patch at all.

Best regards,
Krzysztof

Re: [PATCH v3 4/5] clk: s2mps15: Add support for S2MPS15 clocks

[Alim Akhtar]

On 10/28/2015 10:04 AM, Krzysztof Kozlowski wrote:
> On 28.10.2015 10:26, Krzysztof Kozlowski wrote:
>> On 26.10.2015 21:51, Alim Akhtar wrote:
>>> S2MPS15 PMIC has three 32k buffered clocks outputs. This patch
>>> adds supports for the same to the s2mps11 clock driver.
>>>
>>> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
>>> ---
>>>   drivers/clk/Kconfig       |    5 +++--
>>>   drivers/clk/clk-s2mps11.c |   24 ++++++++++++++++++++++++
>>>   2 files changed, 27 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
>>> index a1fa61159179..037a314b5d76 100644
>>> --- a/drivers/clk/Kconfig
>>> +++ b/drivers/clk/Kconfig
>>> @@ -120,9 +120,10 @@ config COMMON_CLK_S2MPS11
>>>   	tristate "Clock driver for S2MPS1X/S5M8767 MFD"
>>>   	depends on MFD_SEC_CORE
>>>   	---help---
>>> -	  This driver supports S2MPS11/S2MPS14/S5M8767 crystal oscillator
>>> +	  This driver supports S2MPS1X/S5M8767 crystal oscillator
>>>   	  clock. These multi-function devices have two (S2MPS14) or three
>>> -	  (S2MPS11, S5M8767) fixed-rate oscillators, clocked at 32KHz each.
>>> +	  (S2MPS11/S2MPS13/S2MPS15/S5M8767) fixed-rate oscillators,
>>> +	  clocked at 32KHz each.
>>>
>>>   config CLK_TWL6040
>>>   	tristate "External McPDM functional clock from twl6040"
>>> diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c
>>> index d266299dfdb1..455500dca653 100644
>>> --- a/drivers/clk/clk-s2mps11.c
>>> +++ b/drivers/clk/clk-s2mps11.c
>>> @@ -25,6 +25,7 @@
>>>   #include <linux/mfd/samsung/s2mps11.h>
>>>   #include <linux/mfd/samsung/s2mps13.h>
>>>   #include <linux/mfd/samsung/s2mps14.h>
>>> +#include <linux/mfd/samsung/s2mps15.h>
>>>   #include <linux/mfd/samsung/s5m8767.h>
>>>   #include <linux/mfd/samsung/core.h>
>>>
>>> @@ -148,6 +149,24 @@ static struct clk_init_data s2mps14_clks_init[S2MPS11_CLKS_NUM] = {
>>>   	},
>>>   };
>>>
>>> +static struct clk_init_data s2mps15_clks_init[S2MPS11_CLKS_NUM] = {
>>> +	[S2MPS11_CLK_AP] = {
>>> +		.name = "s2mps15_ap",
>>> +		.ops = &s2mps11_clk_ops,
>>> +		.flags = CLK_IS_ROOT,
>>> +	},
>>> +	[S2MPS11_CLK_CP] = {
>>> +		.name = "s2mps15_cp",
>>> +		.ops = &s2mps11_clk_ops,
>>> +		.flags = CLK_IS_ROOT,
>>> +	},
>>> +	[S2MPS11_CLK_BT] = {
>>> +		.name = "s2mps15_bt",
>>> +		.ops = &s2mps11_clk_ops,
>>> +		.flags = CLK_IS_ROOT,
>>> +	},
>>> +};
>>> +
>>>   static struct device_node *s2mps11_clk_parse_dt(struct platform_device *pdev,
>>>   		struct clk_init_data *clks_init)
>>>   {
>>> @@ -207,6 +226,10 @@ static int s2mps11_clk_probe(struct platform_device *pdev)
>>>   		s2mps11_reg = S2MPS14_REG_RTCCTRL;
>>>   		clks_init = s2mps14_clks_init;
>>>   		break;
>>> +	case S2MPS15X:
>>> +		s2mps11_reg = S2MPS15_REG_RTC_BUF;
>>> +		clks_init = s2mps15_clks_init;
>>
>> Another question (after looking at RTC driver):
>> Is this the same register address as S2MPS14?
>
> I found the answer - this is the same address as in S2MPS13 and S2MPS14:
> 0xc. The S2MPS14 has only two clocks though but S2MPS13 has three.
> Again, as in RTC, you should re-use existing support.
>
> It looks there is no need for this patch at all.
>
Yes, checked that, rtc looks same to s2mps14 and clk looks same as 
s2mps13{ not s2mps11}, because of the RTC_BUF address changes.
Will drop patch 4 and 5 and use the existing names where applicable.
I think I don't have to change the binding or Kconfig changes?


> Best regards,
> Krzysztof
>

Re: [PATCH v3 4/5] clk: s2mps15: Add support for S2MPS15 clocks

[Krzysztof Kozlowski]

On 28.10.2015 13:55, Alim Akhtar wrote:
> 
> 
> On 10/28/2015 10:04 AM, Krzysztof Kozlowski wrote:
>> On 28.10.2015 10:26, Krzysztof Kozlowski wrote:
>>> On 26.10.2015 21:51, Alim Akhtar wrote:
>>>> S2MPS15 PMIC has three 32k buffered clocks outputs. This patch
>>>> adds supports for the same to the s2mps11 clock driver.
>>>>
>>>> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
>>>> ---
>>>>   drivers/clk/Kconfig       |    5 +++--
>>>>   drivers/clk/clk-s2mps11.c |   24 ++++++++++++++++++++++++
>>>>   2 files changed, 27 insertions(+), 2 deletions(-)
>>>>
>>>> diff --git a/drivers/clk/Kconfig b/drivers/clk/Kconfig
>>>> index a1fa61159179..037a314b5d76 100644
>>>> --- a/drivers/clk/Kconfig
>>>> +++ b/drivers/clk/Kconfig
>>>> @@ -120,9 +120,10 @@ config COMMON_CLK_S2MPS11
>>>>       tristate "Clock driver for S2MPS1X/S5M8767 MFD"
>>>>       depends on MFD_SEC_CORE
>>>>       ---help---
>>>> -      This driver supports S2MPS11/S2MPS14/S5M8767 crystal oscillator
>>>> +      This driver supports S2MPS1X/S5M8767 crystal oscillator
>>>>         clock. These multi-function devices have two (S2MPS14) or three
>>>> -      (S2MPS11, S5M8767) fixed-rate oscillators, clocked at 32KHz
>>>> each.
>>>> +      (S2MPS11/S2MPS13/S2MPS15/S5M8767) fixed-rate oscillators,
>>>> +      clocked at 32KHz each.
>>>>
>>>>   config CLK_TWL6040
>>>>       tristate "External McPDM functional clock from twl6040"
>>>> diff --git a/drivers/clk/clk-s2mps11.c b/drivers/clk/clk-s2mps11.c
>>>> index d266299dfdb1..455500dca653 100644
>>>> --- a/drivers/clk/clk-s2mps11.c
>>>> +++ b/drivers/clk/clk-s2mps11.c
>>>> @@ -25,6 +25,7 @@
>>>>   #include <linux/mfd/samsung/s2mps11.h>
>>>>   #include <linux/mfd/samsung/s2mps13.h>
>>>>   #include <linux/mfd/samsung/s2mps14.h>
>>>> +#include <linux/mfd/samsung/s2mps15.h>
>>>>   #include <linux/mfd/samsung/s5m8767.h>
>>>>   #include <linux/mfd/samsung/core.h>
>>>>
>>>> @@ -148,6 +149,24 @@ static struct clk_init_data
>>>> s2mps14_clks_init[S2MPS11_CLKS_NUM] = {
>>>>       },
>>>>   };
>>>>
>>>> +static struct clk_init_data s2mps15_clks_init[S2MPS11_CLKS_NUM] = {
>>>> +    [S2MPS11_CLK_AP] = {
>>>> +        .name = "s2mps15_ap",
>>>> +        .ops = &s2mps11_clk_ops,
>>>> +        .flags = CLK_IS_ROOT,
>>>> +    },
>>>> +    [S2MPS11_CLK_CP] = {
>>>> +        .name = "s2mps15_cp",
>>>> +        .ops = &s2mps11_clk_ops,
>>>> +        .flags = CLK_IS_ROOT,
>>>> +    },
>>>> +    [S2MPS11_CLK_BT] = {
>>>> +        .name = "s2mps15_bt",
>>>> +        .ops = &s2mps11_clk_ops,
>>>> +        .flags = CLK_IS_ROOT,
>>>> +    },
>>>> +};
>>>> +
>>>>   static struct device_node *s2mps11_clk_parse_dt(struct
>>>> platform_device *pdev,
>>>>           struct clk_init_data *clks_init)
>>>>   {
>>>> @@ -207,6 +226,10 @@ static int s2mps11_clk_probe(struct
>>>> platform_device *pdev)
>>>>           s2mps11_reg = S2MPS14_REG_RTCCTRL;
>>>>           clks_init = s2mps14_clks_init;
>>>>           break;
>>>> +    case S2MPS15X:
>>>> +        s2mps11_reg = S2MPS15_REG_RTC_BUF;
>>>> +        clks_init = s2mps15_clks_init;
>>>
>>> Another question (after looking at RTC driver):
>>> Is this the same register address as S2MPS14?
>>
>> I found the answer - this is the same address as in S2MPS13 and S2MPS14:
>> 0xc. The S2MPS14 has only two clocks though but S2MPS13 has three.
>> Again, as in RTC, you should re-use existing support.
>>
>> It looks there is no need for this patch at all.
>>
> Yes, checked that, rtc looks same to s2mps14 and clk looks same as
> s2mps13{ not s2mps11}, because of the RTC_BUF address changes.
> Will drop patch 4 and 5 and use the existing names where applicable.

Thanks!

> I think I don't have to change the binding or Kconfig changes?

I think you don't have to. Only the main MFD driver will be updated with
respective child driver names and compatible.

Best regards,
Krzysztof

[PATCH v3 5/5] drivers/rtc/rtc-s5m.c: add support for S2MPS15 RTC

[Alim Akhtar]

RTC found in s2mps15 is almost same as one found in s2mps14.
This patch add required changes to enable s2mps15 rtc timer.

Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
---
 drivers/rtc/rtc-s5m.c |   14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/drivers/rtc/rtc-s5m.c b/drivers/rtc/rtc-s5m.c
index f2504b4eef34..ac3286a267ba 100644
--- a/drivers/rtc/rtc-s5m.c
+++ b/drivers/rtc/rtc-s5m.c
@@ -188,6 +188,7 @@ static inline int s5m_check_peding_alarm_interrupt(struct s5m_rtc_info *info,
 		ret = regmap_read(info->regmap, S5M_RTC_STATUS, &val);
 		val &= S5M_ALARM0_STATUS;
 		break;
+	case S2MPS15X:
 	case S2MPS14X:
 	case S2MPS13X:
 		ret = regmap_read(info->s5m87xx->regmap_pmic, S2MPS14_REG_ST2,
@@ -253,6 +254,7 @@ static inline int s5m8767_rtc_set_alarm_reg(struct s5m_rtc_info *info)
 		data &= ~S5M_RTC_TIME_EN_MASK;
 		break;
 	case S2MPS14X:
+	case S2MPS15X:
 		data |= S2MPS_RTC_RUDR_MASK;
 		break;
 	case S2MPS13X:
@@ -317,7 +319,8 @@ static int s5m_rtc_read_time(struct device *dev, struct rtc_time *tm)
 	u8 data[info->regs->regs_count];
 	int ret;
 
-	if (info->device_type == S2MPS14X || info->device_type == S2MPS13X) {
+	if (info->device_type == S2MPS14X || info->device_type == S2MPS15X ||
+						info->device_type == S2MPS13X) {
 		ret = regmap_update_bits(info->regmap,
 				info->regs->rtc_udr_update,
 				S2MPS_RTC_RUDR_MASK, S2MPS_RTC_RUDR_MASK);
@@ -339,6 +342,7 @@ static int s5m_rtc_read_time(struct device *dev, struct rtc_time *tm)
 		break;
 
 	case S5M8767X:
+	case S2MPS15X:
 	case S2MPS14X:
 	case S2MPS13X:
 		s5m8767_data_to_tm(data, tm, info->rtc_24hr_mode);
@@ -366,6 +370,7 @@ static int s5m_rtc_set_time(struct device *dev, struct rtc_time *tm)
 		s5m8763_tm_to_data(tm, data);
 		break;
 	case S5M8767X:
+	case S2MPS15X:
 	case S2MPS14X:
 	case S2MPS13X:
 		ret = s5m8767_tm_to_data(tm, data);
@@ -414,6 +419,7 @@ static int s5m_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 		break;
 
 	case S5M8767X:
+	case S2MPS15X:
 	case S2MPS14X:
 	case S2MPS13X:
 		s5m8767_data_to_tm(data, &alrm->time, info->rtc_24hr_mode);
@@ -463,6 +469,7 @@ static int s5m_rtc_stop_alarm(struct s5m_rtc_info *info)
 		break;
 
 	case S5M8767X:
+	case S2MPS15X:
 	case S2MPS14X:
 	case S2MPS13X:
 		for (i = 0; i < info->regs->regs_count; i++)
@@ -508,6 +515,7 @@ static int s5m_rtc_start_alarm(struct s5m_rtc_info *info)
 		break;
 
 	case S5M8767X:
+	case S2MPS15X:
 	case S2MPS14X:
 	case S2MPS13X:
 		data[RTC_SEC] |= ALARM_ENABLE_MASK;
@@ -548,6 +556,7 @@ static int s5m_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
 		break;
 
 	case S5M8767X:
+	case S2MPS15X:
 	case S2MPS14X:
 	case S2MPS13X:
 		s5m8767_tm_to_data(&alrm->time, data);
@@ -631,6 +640,7 @@ static int s5m8767_rtc_init_reg(struct s5m_rtc_info *info)
 		ret = regmap_raw_write(info->regmap, S5M_ALARM0_CONF, data, 2);
 		break;
 
+	case S2MPS15X:
 	case S2MPS14X:
 	case S2MPS13X:
 		data[0] = (0 << BCD_EN_SHIFT) | (1 << MODEL24_SHIFT);
@@ -679,6 +689,7 @@ static int s5m_rtc_probe(struct platform_device *pdev)
 		return -ENOMEM;
 
 	switch (platform_get_device_id(pdev)->driver_data) {
+	case S2MPS15X:
 	case S2MPS14X:
 	case S2MPS13X:
 		regmap_cfg = &s2mps14_rtc_regmap_config;
@@ -805,6 +816,7 @@ static const struct platform_device_id s5m_rtc_id[] = {
 	{ "s5m-rtc",		S5M8767X },
 	{ "s2mps13-rtc",	S2MPS13X },
 	{ "s2mps14-rtc",	S2MPS14X },
+	{ "s2mps15-rtc",	S2MPS15X },
 	{ },
 };
 MODULE_DEVICE_TABLE(platform, s5m_rtc_id);
-- 
1.7.10.4

Re: [rtc-linux] [PATCH v3 5/5] drivers/rtc/rtc-s5m.c: add support for S2MPS15 RTC

[Alexandre Belloni]

On 26/10/2015 at 18:21:22 +0530, Alim Akhtar wrote :
> RTC found in s2mps15 is almost same as one found in s2mps14.
> This patch add required changes to enable s2mps15 rtc timer.
> 
> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>

One really small nitpick below else you can add my
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

> ---
>  drivers/rtc/rtc-s5m.c |   14 +++++++++++++-
>  1 file changed, 13 insertions(+), 1 deletion(-)
> 
> @@ -317,7 +319,8 @@ static int s5m_rtc_read_time(struct device *dev, struct rtc_time *tm)
>  	u8 data[info->regs->regs_count];
>  	int ret;
>  
> -	if (info->device_type == S2MPS14X || info->device_type == S2MPS13X) {
> +	if (info->device_type == S2MPS14X || info->device_type == S2MPS15X ||
> +						info->device_type == S2MPS13X) {

This line is not properly aligned.

>  		ret = regmap_update_bits(info->regmap,
>  				info->regs->rtc_udr_update,
>  				S2MPS_RTC_RUDR_MASK, S2MPS_RTC_RUDR_MASK);

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: [PATCH v3 5/5] drivers/rtc/rtc-s5m.c: add support for S2MPS15 RTC

[Krzysztof Kozlowski]

On 26.10.2015 21:51, Alim Akhtar wrote:
> RTC found in s2mps15 is almost same as one found in s2mps14.
> This patch add required changes to enable s2mps15 rtc timer.
> 
> Signed-off-by: Alim Akhtar <alim.akhtar@samsung.com>
> ---
>  drivers/rtc/rtc-s5m.c |   14 +++++++++++++-
>  1 file changed, 13 insertions(+), 1 deletion(-)

NACK.

I don't have S2MPS15 datasheet but looking at the code right now this
looks *exactly the same* device as S2MPS14.

If that's true, then don't add new compatibles, new names etc. Re-use.
No new code needed, no changes needed. Keep it simple.

Best regards,
Krzysztof

> 
> diff --git a/drivers/rtc/rtc-s5m.c b/drivers/rtc/rtc-s5m.c
> index f2504b4eef34..ac3286a267ba 100644
> --- a/drivers/rtc/rtc-s5m.c
> +++ b/drivers/rtc/rtc-s5m.c
> @@ -188,6 +188,7 @@ static inline int s5m_check_peding_alarm_interrupt(struct s5m_rtc_info *info,
>  		ret = regmap_read(info->regmap, S5M_RTC_STATUS, &val);
>  		val &= S5M_ALARM0_STATUS;
>  		break;
> +	case S2MPS15X:
>  	case S2MPS14X:
>  	case S2MPS13X:
>  		ret = regmap_read(info->s5m87xx->regmap_pmic, S2MPS14_REG_ST2,
> @@ -253,6 +254,7 @@ static inline int s5m8767_rtc_set_alarm_reg(struct s5m_rtc_info *info)
>  		data &= ~S5M_RTC_TIME_EN_MASK;
>  		break;
>  	case S2MPS14X:
> +	case S2MPS15X:
>  		data |= S2MPS_RTC_RUDR_MASK;
>  		break;
>  	case S2MPS13X:
> @@ -317,7 +319,8 @@ static int s5m_rtc_read_time(struct device *dev, struct rtc_time *tm)
>  	u8 data[info->regs->regs_count];
>  	int ret;
>  
> -	if (info->device_type == S2MPS14X || info->device_type == S2MPS13X) {
> +	if (info->device_type == S2MPS14X || info->device_type == S2MPS15X ||
> +						info->device_type == S2MPS13X) {
>  		ret = regmap_update_bits(info->regmap,
>  				info->regs->rtc_udr_update,
>  				S2MPS_RTC_RUDR_MASK, S2MPS_RTC_RUDR_MASK);
> @@ -339,6 +342,7 @@ static int s5m_rtc_read_time(struct device *dev, struct rtc_time *tm)
>  		break;
>  
>  	case S5M8767X:
> +	case S2MPS15X:
>  	case S2MPS14X:
>  	case S2MPS13X:
>  		s5m8767_data_to_tm(data, tm, info->rtc_24hr_mode);
> @@ -366,6 +370,7 @@ static int s5m_rtc_set_time(struct device *dev, struct rtc_time *tm)
>  		s5m8763_tm_to_data(tm, data);
>  		break;
>  	case S5M8767X:
> +	case S2MPS15X:
>  	case S2MPS14X:
>  	case S2MPS13X:
>  		ret = s5m8767_tm_to_data(tm, data);
> @@ -414,6 +419,7 @@ static int s5m_rtc_read_alarm(struct device *dev, struct rtc_wkalrm *alrm)
>  		break;
>  
>  	case S5M8767X:
> +	case S2MPS15X:
>  	case S2MPS14X:
>  	case S2MPS13X:
>  		s5m8767_data_to_tm(data, &alrm->time, info->rtc_24hr_mode);
> @@ -463,6 +469,7 @@ static int s5m_rtc_stop_alarm(struct s5m_rtc_info *info)
>  		break;
>  
>  	case S5M8767X:
> +	case S2MPS15X:
>  	case S2MPS14X:
>  	case S2MPS13X:
>  		for (i = 0; i < info->regs->regs_count; i++)
> @@ -508,6 +515,7 @@ static int s5m_rtc_start_alarm(struct s5m_rtc_info *info)
>  		break;
>  
>  	case S5M8767X:
> +	case S2MPS15X:
>  	case S2MPS14X:
>  	case S2MPS13X:
>  		data[RTC_SEC] |= ALARM_ENABLE_MASK;
> @@ -548,6 +556,7 @@ static int s5m_rtc_set_alarm(struct device *dev, struct rtc_wkalrm *alrm)
>  		break;
>  
>  	case S5M8767X:
> +	case S2MPS15X:
>  	case S2MPS14X:
>  	case S2MPS13X:
>  		s5m8767_tm_to_data(&alrm->time, data);
> @@ -631,6 +640,7 @@ static int s5m8767_rtc_init_reg(struct s5m_rtc_info *info)
>  		ret = regmap_raw_write(info->regmap, S5M_ALARM0_CONF, data, 2);
>  		break;
>  
> +	case S2MPS15X:
>  	case S2MPS14X:
>  	case S2MPS13X:
>  		data[0] = (0 << BCD_EN_SHIFT) | (1 << MODEL24_SHIFT);
> @@ -679,6 +689,7 @@ static int s5m_rtc_probe(struct platform_device *pdev)
>  		return -ENOMEM;
>  
>  	switch (platform_get_device_id(pdev)->driver_data) {
> +	case S2MPS15X:
>  	case S2MPS14X:
>  	case S2MPS13X:
>  		regmap_cfg = &s2mps14_rtc_regmap_config;
> @@ -805,6 +816,7 @@ static const struct platform_device_id s5m_rtc_id[] = {
>  	{ "s5m-rtc",		S5M8767X },
>  	{ "s2mps13-rtc",	S2MPS13X },
>  	{ "s2mps14-rtc",	S2MPS14X },
> +	{ "s2mps15-rtc",	S2MPS15X },
>  	{ },
>  };
>  MODULE_DEVICE_TABLE(platform, s5m_rtc_id);
> 

Re: [PATCH v3 5/5] drivers/rtc/rtc-s5m.c: add support for S2MPS15 RTC

[Mark Brown]

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

On Wed, Oct 28, 2015 at 10:29:56AM +0900, Krzysztof Kozlowski wrote:

> If that's true, then don't add new compatibles, new names etc. Re-use.
> No new code needed, no changes needed. Keep it simple.

Well, it depends - it can be useful to get the information about it
being a different part into DT so that if in future we realise that
there is some difference (perhaps a bug workaround even if the IP is
intended to be the same).  Though in the case of a MFD that information
can be obtained from the MFD for the device.

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

Re: [PATCH v3 5/5] drivers/rtc/rtc-s5m.c: add support for S2MPS15 RTC

[Krzysztof Kozlowski]

On 28.10.2015 10:53, Mark Brown wrote:
> On Wed, Oct 28, 2015 at 10:29:56AM +0900, Krzysztof Kozlowski wrote:
> 
>> If that's true, then don't add new compatibles, new names etc. Re-use.
>> No new code needed, no changes needed. Keep it simple.
> 
> Well, it depends - it can be useful to get the information about it
> being a different part into DT so that if in future we realise that
> there is some difference (perhaps a bug workaround even if the IP is
> intended to be the same).  Though in the case of a MFD that information
> can be obtained from the MFD for the device.

We can always differentiate later and introduce new compatible.
Declaring a compatible right now would be useful only if we really cared
about using the workaround on older DTBs.

Since I cannot judge the difference (I don't have the datasheet of
S2MPS15) then I don't see the need of adding new compatible/name for the
"same device".

Of course maybe there is such need? Alim?

Best regards,
Krzysztof

Re: [PATCH v3 5/5] drivers/rtc/rtc-s5m.c: add support for S2MPS15 RTC

[Alim Akhtar]

Hello,

On 10/28/2015 07:47 AM, Krzysztof Kozlowski wrote:
> On 28.10.2015 10:53, Mark Brown wrote:
>> On Wed, Oct 28, 2015 at 10:29:56AM +0900, Krzysztof Kozlowski wrote:
>>
>>> If that's true, then don't add new compatibles, new names etc. Re-use.
>>> No new code needed, no changes needed. Keep it simple.
>>
>> Well, it depends - it can be useful to get the information about it
>> being a different part into DT so that if in future we realise that
>> there is some difference (perhaps a bug workaround even if the IP is
>> intended to be the same).  Though in the case of a MFD that information
>> can be obtained from the MFD for the device.
>
> We can always differentiate later and introduce new compatible.
> Declaring a compatible right now would be useful only if we really cared
> about using the workaround on older DTBs.
>
> Since I cannot judge the difference (I don't have the datasheet of
> S2MPS15) then I don't see the need of adding new compatible/name for the
> "same device".
>
> Of course maybe there is such need? Alim?
>
Well I did think of keeping the changes as minimal as possible, like 
just have "{ "s2mps15-rtc",        S2MPS14X }", since I don't have 
access to s2mps14 UM, I could not confirm that s2mps14 and s2mps15 are 
exactly the same w.r.t rtc block. So I proposed the current changes.

Well I do agree with Mark here, a name/compatible matching with the pmic 
is good to at least avoid confusion while looking at the sysfs.

> Best regards,
> Krzysztof
>

Re: [PATCH v3 5/5] drivers/rtc/rtc-s5m.c: add support for S2MPS15 RTC

[Krzysztof Kozlowski]

On 28.10.2015 12:14, Alim Akhtar wrote:
> Hello,
> 
> On 10/28/2015 07:47 AM, Krzysztof Kozlowski wrote:
>> On 28.10.2015 10:53, Mark Brown wrote:
>>> On Wed, Oct 28, 2015 at 10:29:56AM +0900, Krzysztof Kozlowski wrote:
>>>
>>>> If that's true, then don't add new compatibles, new names etc. Re-use.
>>>> No new code needed, no changes needed. Keep it simple.
>>>
>>> Well, it depends - it can be useful to get the information about it
>>> being a different part into DT so that if in future we realise that
>>> there is some difference (perhaps a bug workaround even if the IP is
>>> intended to be the same).  Though in the case of a MFD that information
>>> can be obtained from the MFD for the device.
>>
>> We can always differentiate later and introduce new compatible.
>> Declaring a compatible right now would be useful only if we really cared
>> about using the workaround on older DTBs.
>>
>> Since I cannot judge the difference (I don't have the datasheet of
>> S2MPS15) then I don't see the need of adding new compatible/name for the
>> "same device".
>>
>> Of course maybe there is such need? Alim?
>>
> Well I did think of keeping the changes as minimal as possible, like
> just have "{ "s2mps15-rtc",        S2MPS14X }", since I don't have
> access to s2mps14 UM, I could not confirm that s2mps14 and s2mps15 are
> exactly the same w.r.t rtc block. So I proposed the current changes.
> 
> Well I do agree with Mark here, a name/compatible matching with the pmic
> is good to at least avoid confusion while looking at the sysfs.

What kind of confusion in sysfs? I don't see any... and already the
s2mps14-rtc name is used for S2MPS11 and S2MPS14.

The s2mps13 clock driver added new name and compatible... which was
probably totally unneeded (I missed that during review). We don't have
to make this as a rule...

Since we do not have any data about future workarounds and the
differences then just follow Ockham's razor - use the same name and
compatible.

Best regards,
Krzysztof

Re: [PATCH v3 5/5] drivers/rtc/rtc-s5m.c: add support for S2MPS15 RTC

[Alim Akhtar]

On 10/28/2015 09:01 AM, Krzysztof Kozlowski wrote:
> On 28.10.2015 12:14, Alim Akhtar wrote:
>> Hello,
>>
>> On 10/28/2015 07:47 AM, Krzysztof Kozlowski wrote:
>>> On 28.10.2015 10:53, Mark Brown wrote:
>>>> On Wed, Oct 28, 2015 at 10:29:56AM +0900, Krzysztof Kozlowski wrote:
>>>>
>>>>> If that's true, then don't add new compatibles, new names etc. Re-use.
>>>>> No new code needed, no changes needed. Keep it simple.
>>>>
>>>> Well, it depends - it can be useful to get the information about it
>>>> being a different part into DT so that if in future we realise that
>>>> there is some difference (perhaps a bug workaround even if the IP is
>>>> intended to be the same).  Though in the case of a MFD that information
>>>> can be obtained from the MFD for the device.
>>>
>>> We can always differentiate later and introduce new compatible.
>>> Declaring a compatible right now would be useful only if we really cared
>>> about using the workaround on older DTBs.
>>>
>>> Since I cannot judge the difference (I don't have the datasheet of
>>> S2MPS15) then I don't see the need of adding new compatible/name for the
>>> "same device".
>>>
>>> Of course maybe there is such need? Alim?
>>>
>> Well I did think of keeping the changes as minimal as possible, like
>> just have "{ "s2mps15-rtc",        S2MPS14X }", since I don't have
>> access to s2mps14 UM, I could not confirm that s2mps14 and s2mps15 are
>> exactly the same w.r.t rtc block. So I proposed the current changes.
>>
>> Well I do agree with Mark here, a name/compatible matching with the pmic
>> is good to at least avoid confusion while looking at the sysfs.
>
> What kind of confusion in sysfs? I don't see any... and already the
> s2mps14-rtc name is used for S2MPS11 and S2MPS14.
>
> The s2mps13 clock driver added new name and compatible... which was
> probably totally unneeded (I missed that during review). We don't have
> to make this as a rule...
>
> Since we do not have any data about future workarounds and the
> differences then just follow Ockham's razor - use the same name and
> compatible.
>
ok, have request s2smp14 UM, will cross check and update accordingly.
Thanks.
> Best regards,
> Krzysztof
>

Re: [rtc-linux] Re: [PATCH v3 5/5] drivers/rtc/rtc-s5m.c: add support for S2MPS15 RTC

[Alexandre Belloni]

On 28/10/2015 at 12:31:43 +0900, Krzysztof Kozlowski wrote :
> The s2mps13 clock driver added new name and compatible... which was
> probably totally unneeded (I missed that during review). We don't have
> to make this as a rule...
> 
> Since we do not have any data about future workarounds and the
> differences then just follow Ockham's razor - use the same name and
> compatible.
> 

So you don't care about DT backward compatibility because when a
workaround will be needed for one of the IPs, then you will have to
update the old dtb to use it.

Unless you are sure that the IP is the same, doing

{ "s2mps15-rtc",	S2MPS14X },

is probably the best way to handle that. Note that I personally don't
care about the DT ABI, I'm just pointing out what may happen ;)

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

Re: [rtc-linux] Re: [PATCH v3 5/5] drivers/rtc/rtc-s5m.c: add support for S2MPS15 RTC

[Alim Akhtar]

Hi Alexandre,

On 10/28/2015 03:18 PM, Alexandre Belloni wrote:
> On 28/10/2015 at 12:31:43 +0900, Krzysztof Kozlowski wrote :
>> The s2mps13 clock driver added new name and compatible... which was
>> probably totally unneeded (I missed that during review). We don't have
>> to make this as a rule...
>>
>> Since we do not have any data about future workarounds and the
>> differences then just follow Ockham's razor - use the same name and
>> compatible.
>>
>
> So you don't care about DT backward compatibility because when a
> workaround will be needed for one of the IPs, then you will have to
> update the old dtb to use it.
>
> Unless you are sure that the IP is the same, doing
>
> { "s2mps15-rtc",	S2MPS14X },
>
> is probably the best way to handle that. Note that I personally don't
> care about the DT ABI, I'm just pointing out what may happen ;)
>
Thats what my point is, anyway I am still looking into the fine prints 
of the s2mps15 and s2mps14 user manual, now I have found at least one 
difference in their one of the register bit, which might be a good 
reason to keep s2mps15-rtc device.
Will update the same in v4.
Thanks,

Re: [rtc-linux] Re: [PATCH v3 5/5] drivers/rtc/rtc-s5m.c: add support for S2MPS15 RTC

[Krzysztof Kozlowski]

W dniu 28.10.2015 o 19:30, Alim Akhtar pisze:
> Hi Alexandre,
> 
> On 10/28/2015 03:18 PM, Alexandre Belloni wrote:
>> On 28/10/2015 at 12:31:43 +0900, Krzysztof Kozlowski wrote :
>>> The s2mps13 clock driver added new name and compatible... which was
>>> probably totally unneeded (I missed that during review). We don't have
>>> to make this as a rule...
>>>
>>> Since we do not have any data about future workarounds and the
>>> differences then just follow Ockham's razor - use the same name and
>>> compatible.
>>>
>>
>> So you don't care about DT backward compatibility because when a
>> workaround will be needed for one of the IPs, then you will have to
>> update the old dtb to use it.
>>
>> Unless you are sure that the IP is the same, doing
>>
>> { "s2mps15-rtc",    S2MPS14X },
>>
>> is probably the best way to handle that. Note that I personally don't
>> care about the DT ABI, I'm just pointing out what may happen ;)
>>
> Thats what my point is, anyway I am still looking into the fine prints
> of the s2mps15 and s2mps14 user manual, now I have found at least one
> difference in their one of the register bit, which might be a good
> reason to keep s2mps15-rtc device.

No, this is not a good reason. Devices may be different but from
driver's perspective they behave the same. This means for example that
they use the same compatible. They can use the same driver name.

We have for example AHCI driver for entire range of different devices.
Some of them are different enough that require special code. So they
have different name and compatible. All of other use the same ahci
driver. But devices are different...

Best regards,
Krzysztof

Re: [rtc-linux] Re: [PATCH v3 5/5] drivers/rtc/rtc-s5m.c: add support for S2MPS15 RTC

[Krzysztof Kozlowski]

W dniu 28.10.2015 o 18:48, Alexandre Belloni pisze:
> On 28/10/2015 at 12:31:43 +0900, Krzysztof Kozlowski wrote :
>> The s2mps13 clock driver added new name and compatible... which was
>> probably totally unneeded (I missed that during review). We don't have
>> to make this as a rule...
>>
>> Since we do not have any data about future workarounds and the
>> differences then just follow Ockham's razor - use the same name and
>> compatible.
>>
> 
> So you don't care about DT backward compatibility because when a
> workaround will be needed for one of the IPs, then you will have to
> update the old dtb to use it.

Nope, DTB does not contain the name for RTC driver (s2mps15-rtc). It
will be exactly the same.

> 
> Unless you are sure that the IP is the same, doing
> 
> { "s2mps15-rtc",	S2MPS14X },
> 
> is probably the best way to handle that. Note that I personally don't
> care about the DT ABI, I'm just pointing out what may happen ;)

In case of RTC driver there is no chance of DT ABI issues here.

The clock driver is different because it contain a compatible.

Best regards,
Krzysztof

Re: [rtc-linux] Re: [PATCH v3 5/5] drivers/rtc/rtc-s5m.c: add support for S2MPS15 RTC

[Alexandre Belloni]

On 28/10/2015 at 22:31:48 +0900, Krzysztof Kozlowski wrote :
> > So you don't care about DT backward compatibility because when a
> > workaround will be needed for one of the IPs, then you will have to
> > update the old dtb to use it.
> 
> Nope, DTB does not contain the name for RTC driver (s2mps15-rtc). It
> will be exactly the same.
> 

Sure, I see it now. So no change is needed in the rtc driver until you
need to use that particular bit that is different.

-- 
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com