linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH v5 0/6] LM36274 Introduction
@ 2019-06-04 17:43 Dan Murphy
  2019-06-04 17:43 ` [PATCH v5 1/6] regulator: lm363x: Make the gpio register enable flexible Dan Murphy
                   ` (5 more replies)
  0 siblings, 6 replies; 14+ messages in thread
From: Dan Murphy @ 2019-06-04 17:43 UTC (permalink / raw)
  To: jacek.anaszewski, pavel, broonie, lgirdwood
  Cc: lee.jones, linux-leds, linux-kernel, Dan Murphy

Hello

This is v5 of the patchset.  There is only one patch that has changed in the
series and that is the regulator: lm363x: Add support for LM36274 patch.  This
patch was updated to add flexibility in setting the bit to enable GPIO regulator
control.

This change was made on top of the branch

repo: https://git.kernel.org/pub/scm/linux/kernel/git/j.anaszewski/linux-leds.git
branch: ti-lmu-led-drivers

Dan

Dan Murphy (6):
  regulator: lm363x: Make the gpio register enable flexible
  dt-bindings: mfd: Add lm36274 bindings to ti-lmu
  mfd: ti-lmu: Add LM36274 support to the ti-lmu
  regulator: lm363x: Add support for LM36274
  dt-bindings: leds: Add LED bindings for the LM36274
  leds: lm36274: Introduce the TI LM36274 LED driver

 .../devicetree/bindings/leds/leds-lm36274.txt |  82 +++++++++
 .../devicetree/bindings/mfd/ti-lmu.txt        |  54 ++++++
 drivers/leds/Kconfig                          |   8 +
 drivers/leds/Makefile                         |   1 +
 drivers/leds/leds-lm36274.c                   | 174 ++++++++++++++++++
 drivers/mfd/Kconfig                           |   5 +-
 drivers/mfd/ti-lmu.c                          |  14 ++
 drivers/regulator/Kconfig                     |   2 +-
 drivers/regulator/lm363x-regulator.c          |  56 +++++-
 include/linux/mfd/ti-lmu-register.h           |  23 +++
 include/linux/mfd/ti-lmu.h                    |   4 +
 11 files changed, 417 insertions(+), 6 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/leds/leds-lm36274.txt
 create mode 100644 drivers/leds/leds-lm36274.c

-- 
2.21.0.5.gaeb582a983


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

* [PATCH v5 1/6] regulator: lm363x: Make the gpio register enable flexible
  2019-06-04 17:43 [PATCH v5 0/6] LM36274 Introduction Dan Murphy
@ 2019-06-04 17:43 ` Dan Murphy
  2019-06-05 10:01   ` Mark Brown
  2019-06-06  9:47   ` Pavel Machek
  2019-06-04 17:43 ` [PATCH v5 2/6] dt-bindings: mfd: Add lm36274 bindings to ti-lmu Dan Murphy
                   ` (4 subsequent siblings)
  5 siblings, 2 replies; 14+ messages in thread
From: Dan Murphy @ 2019-06-04 17:43 UTC (permalink / raw)
  To: jacek.anaszewski, pavel, broonie, lgirdwood
  Cc: lee.jones, linux-leds, linux-kernel, Dan Murphy

The use of and enablement of the GPIO can be used across devices.
Use the enable_reg in the regulator descriptor for the register to
write.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
---

v5 - No changes to the patch changes requested in this patch were done in
patch 4 of this series - https://lore.kernel.org/patchwork/patch/1077408/

 drivers/regulator/lm363x-regulator.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/regulator/lm363x-regulator.c b/drivers/regulator/lm363x-regulator.c
index e02fdd1dd092..1b5d7d2f26b8 100644
--- a/drivers/regulator/lm363x-regulator.c
+++ b/drivers/regulator/lm363x-regulator.c
@@ -263,8 +263,8 @@ static int lm363x_regulator_probe(struct platform_device *pdev)
 
 	if (gpiod) {
 		cfg.ena_gpiod = gpiod;
-
-		ret = regmap_update_bits(regmap, LM3632_REG_BIAS_CONFIG,
+		ret = regmap_update_bits(regmap,
+					 lm363x_regulator_desc[id].enable_reg,
 					 LM3632_EXT_EN_MASK,
 					 LM3632_EXT_EN_MASK);
 		if (ret) {
-- 
2.21.0.5.gaeb582a983


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

* [PATCH v5 2/6] dt-bindings: mfd: Add lm36274 bindings to ti-lmu
  2019-06-04 17:43 [PATCH v5 0/6] LM36274 Introduction Dan Murphy
  2019-06-04 17:43 ` [PATCH v5 1/6] regulator: lm363x: Make the gpio register enable flexible Dan Murphy
@ 2019-06-04 17:43 ` Dan Murphy
  2019-06-06  9:49   ` Pavel Machek
  2019-06-04 17:43 ` [PATCH v5 3/6] mfd: ti-lmu: Add LM36274 support to the ti-lmu Dan Murphy
                   ` (3 subsequent siblings)
  5 siblings, 1 reply; 14+ messages in thread
From: Dan Murphy @ 2019-06-04 17:43 UTC (permalink / raw)
  To: jacek.anaszewski, pavel, broonie, lgirdwood
  Cc: lee.jones, linux-leds, linux-kernel, Dan Murphy, Rob Herring

Add the LM36274 backlight driver with regulator support.
This is a multi-function device for backlight applications.

Backlight properties will be documented in it's a supplemental
bindings document.

Regulator support is documented in the regulator/lm363x-regulator.txt

http://www.ti.com/lit/ds/symlink/lm36274.pdf

Signed-off-by: Dan Murphy <dmurphy@ti.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
---

v5 - No changes

 .../devicetree/bindings/mfd/ti-lmu.txt        | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/Documentation/devicetree/bindings/mfd/ti-lmu.txt b/Documentation/devicetree/bindings/mfd/ti-lmu.txt
index 782d3c9812ed..2296b8f24de4 100644
--- a/Documentation/devicetree/bindings/mfd/ti-lmu.txt
+++ b/Documentation/devicetree/bindings/mfd/ti-lmu.txt
@@ -8,6 +8,7 @@ TI LMU driver supports lighting devices below.
   LM3632       Backlight and regulator
   LM3633       Backlight, LED and fault monitor
   LM3695       Backlight
+  LM36274      Backlight and regulator
 
 Required properties:
   - compatible: Should be one of:
@@ -15,11 +16,13 @@ Required properties:
                 "ti,lm3632"
                 "ti,lm3633"
                 "ti,lm3695"
+		"ti,lm36274"
   - reg: I2C slave address.
          0x11 for LM3632
          0x29 for LM3631
          0x36 for LM3633
          0x63 for LM3695
+         0x11 for LM36274
 
 Optional properties:
   - enable-gpios: A GPIO specifier for hardware enable pin.
@@ -50,12 +53,14 @@ Optional nodes:
       - compatible: Should be one of:
                     "ti,lm3633-fault-monitor"
   - leds: LED properties for LM3633. Please refer to [2].
+	  LED properties for LM36274. Please refer to [4].
   - regulators: Regulator properties for LM3631 and LM3632.
                 Please refer to [3].
 
 [1] ../leds/backlight/ti-lmu-backlight.txt
 [2] ../leds/leds-lm3633.txt
 [3] ../regulator/lm363x-regulator.txt
+[4] ../leds/leds-lm36274.txt
 
 lm3631@29 {
 	compatible = "ti,lm3631";
@@ -213,3 +218,52 @@ lm3695@63 {
 		};
 	};
 };
+
+lm36274@11 {
+	compatible = "ti,lm36274";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	reg = <0x11>;
+
+	enable-gpios = <&pioC 2 GPIO_ACTIVE_HIGH>;
+	regulators {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "ti,lm363x-regulator";
+
+		enable-gpios = <&pioC 0 GPIO_ACTIVE_HIGH>,
+			       <&pioC 1 GPIO_ACTIVE_HIGH>;
+
+		vboost {
+			regulator-name = "lcd_boost";
+			regulator-min-microvolt = <4000000>;
+			regulator-max-microvolt = <7150000>;
+			regulator-always-on;
+		};
+
+		vpos {
+			regulator-name = "lcd_vpos";
+			regulator-min-microvolt = <4000000>;
+			regulator-max-microvolt = <6500000>;
+		};
+
+		vneg {
+			regulator-name = "lcd_vneg";
+			regulator-min-microvolt = <4000000>;
+			regulator-max-microvolt = <6500000>;
+		};
+	};
+
+	backlight {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "ti,lm36274-backlight";
+
+		led@0 {
+			reg = <0>;
+			led-sources = <0 2>;
+			label = "white:backlight_cluster";
+			linux,default-trigger = "backlight";
+		};
+	};
+};
-- 
2.21.0.5.gaeb582a983


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

* [PATCH v5 3/6] mfd: ti-lmu: Add LM36274 support to the ti-lmu
  2019-06-04 17:43 [PATCH v5 0/6] LM36274 Introduction Dan Murphy
  2019-06-04 17:43 ` [PATCH v5 1/6] regulator: lm363x: Make the gpio register enable flexible Dan Murphy
  2019-06-04 17:43 ` [PATCH v5 2/6] dt-bindings: mfd: Add lm36274 bindings to ti-lmu Dan Murphy
@ 2019-06-04 17:43 ` Dan Murphy
  2019-06-04 17:43 ` [PATCH v5 4/6] regulator: lm363x: Add support for LM36274 Dan Murphy
                   ` (2 subsequent siblings)
  5 siblings, 0 replies; 14+ messages in thread
From: Dan Murphy @ 2019-06-04 17:43 UTC (permalink / raw)
  To: jacek.anaszewski, pavel, broonie, lgirdwood
  Cc: lee.jones, linux-leds, linux-kernel, Dan Murphy

Add the LM36274 register support to the ti-lmu MFD driver.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
---

v5 - No changes

 drivers/mfd/Kconfig                 |  5 ++---
 drivers/mfd/ti-lmu.c                | 14 ++++++++++++++
 include/linux/mfd/ti-lmu-register.h | 23 +++++++++++++++++++++++
 include/linux/mfd/ti-lmu.h          |  4 ++++
 4 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 8933485b28e7..a69aca3c2dab 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -1335,9 +1335,8 @@ config MFD_TI_LMU
 	select REGMAP_I2C
 	help
 	  Say yes here to enable support for TI LMU chips.
-
-	  TI LMU MFD supports LM3532, LM3631, LM3632, LM3633, and LM3695.
-	  It consists of backlight, LED and regulator driver.
+	  TI LMU MFD supports LM3532, LM3631, LM3632, LM3633, LM3695 and
+	  LM36274.  It consists of backlight, LED and regulator driver.
 	  It provides consistent device controls for lighting functions.
 
 config MFD_OMAP_USB_HOST
diff --git a/drivers/mfd/ti-lmu.c b/drivers/mfd/ti-lmu.c
index 89b1c5b584af..691ab9dd6236 100644
--- a/drivers/mfd/ti-lmu.c
+++ b/drivers/mfd/ti-lmu.c
@@ -111,6 +111,17 @@ static const struct mfd_cell lm3695_devices[] = {
 	},
 };
 
+static const struct mfd_cell lm36274_devices[] = {
+	LM363X_REGULATOR(LM36274_BOOST),
+	LM363X_REGULATOR(LM36274_LDO_POS),
+	LM363X_REGULATOR(LM36274_LDO_NEG),
+	{
+		.name          = "lm36274-leds",
+		.id            = LM36274,
+		.of_compatible = "ti,lm36274-backlight",
+	},
+};
+
 #define TI_LMU_DATA(chip, max_reg)		\
 static const struct ti_lmu_data chip##_data =	\
 {						\
@@ -123,6 +134,7 @@ TI_LMU_DATA(lm3631, LM3631_MAX_REG);
 TI_LMU_DATA(lm3632, LM3632_MAX_REG);
 TI_LMU_DATA(lm3633, LM3633_MAX_REG);
 TI_LMU_DATA(lm3695, LM3695_MAX_REG);
+TI_LMU_DATA(lm36274, LM36274_MAX_REG);
 
 static int ti_lmu_probe(struct i2c_client *cl, const struct i2c_device_id *id)
 {
@@ -191,6 +203,7 @@ static const struct of_device_id ti_lmu_of_match[] = {
 	{ .compatible = "ti,lm3632", .data = &lm3632_data },
 	{ .compatible = "ti,lm3633", .data = &lm3633_data },
 	{ .compatible = "ti,lm3695", .data = &lm3695_data },
+	{ .compatible = "ti,lm36274", .data = &lm36274_data },
 	{ }
 };
 MODULE_DEVICE_TABLE(of, ti_lmu_of_match);
@@ -200,6 +213,7 @@ static const struct i2c_device_id ti_lmu_ids[] = {
 	{ "lm3632", LM3632 },
 	{ "lm3633", LM3633 },
 	{ "lm3695", LM3695 },
+	{ "lm36274", LM36274 },
 	{ }
 };
 MODULE_DEVICE_TABLE(i2c, ti_lmu_ids);
diff --git a/include/linux/mfd/ti-lmu-register.h b/include/linux/mfd/ti-lmu-register.h
index 76998b01764b..076d8dea38fd 100644
--- a/include/linux/mfd/ti-lmu-register.h
+++ b/include/linux/mfd/ti-lmu-register.h
@@ -189,4 +189,27 @@
 #define LM3695_REG_BRT_MSB			0x14
 
 #define LM3695_MAX_REG				0x14
+
+/* LM36274 */
+#define LM36274_REG_REV				0x01
+#define LM36274_REG_BL_CFG_1			0x02
+#define LM36274_REG_BL_CFG_2			0x03
+#define LM36274_REG_BRT_LSB			0x04
+#define LM36274_REG_BRT_MSB			0x05
+#define LM36274_REG_BL_EN			0x08
+
+#define LM36274_REG_BIAS_CONFIG_1		0x09
+#define LM36274_EXT_EN_MASK			BIT(0)
+#define LM36274_EN_VNEG_MASK			BIT(1)
+#define LM36274_EN_VPOS_MASK			BIT(2)
+
+#define LM36274_REG_BIAS_CONFIG_2		0x0a
+#define LM36274_REG_BIAS_CONFIG_3		0x0b
+#define LM36274_REG_VOUT_BOOST			0x0c
+#define LM36274_REG_VOUT_POS			0x0d
+#define LM36274_REG_VOUT_NEG			0x0e
+#define LM36274_VOUT_MASK			0x3F
+
+#define LM36274_MAX_REG				0x13
+
 #endif
diff --git a/include/linux/mfd/ti-lmu.h b/include/linux/mfd/ti-lmu.h
index 54e9d272e81c..0957598c7d41 100644
--- a/include/linux/mfd/ti-lmu.h
+++ b/include/linux/mfd/ti-lmu.h
@@ -26,6 +26,7 @@ enum ti_lmu_id {
 	LM3632,
 	LM3633,
 	LM3695,
+	LM36274,
 	LMU_MAX_ID,
 };
 
@@ -67,6 +68,9 @@ enum lm363x_regulator_id {
 	LM3632_BOOST,		/* Boost output */
 	LM3632_LDO_POS,		/* Positive display bias output */
 	LM3632_LDO_NEG,		/* Negative display bias output */
+	LM36274_BOOST,		/* Boost output */
+	LM36274_LDO_POS,	/* Positive display bias output */
+	LM36274_LDO_NEG,	/* Negative display bias output */
 };
 
 /**
-- 
2.21.0.5.gaeb582a983


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

* [PATCH v5 4/6] regulator: lm363x: Add support for LM36274
  2019-06-04 17:43 [PATCH v5 0/6] LM36274 Introduction Dan Murphy
                   ` (2 preceding siblings ...)
  2019-06-04 17:43 ` [PATCH v5 3/6] mfd: ti-lmu: Add LM36274 support to the ti-lmu Dan Murphy
@ 2019-06-04 17:43 ` Dan Murphy
  2019-06-04 17:43 ` [PATCH v5 5/6] dt-bindings: leds: Add LED bindings for the LM36274 Dan Murphy
  2019-06-04 17:43 ` [PATCH v5 6/6] leds: lm36274: Introduce the TI LM36274 LED driver Dan Murphy
  5 siblings, 0 replies; 14+ messages in thread
From: Dan Murphy @ 2019-06-04 17:43 UTC (permalink / raw)
  To: jacek.anaszewski, pavel, broonie, lgirdwood
  Cc: lee.jones, linux-leds, linux-kernel, Dan Murphy

Adding regulator support for the LM36274 backlight driver.
This device can leverage this existing code as the functionality
and registers are common enough between the LM36274 and the LM363x
series of devices.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
---

v5 - Add flexibility when setting the EXT_EN GPIO bit for the LM3633 and LM36274
Based on comments made in patch 1 - https://lore.kernel.org/patchwork/patch/1077408/

 drivers/regulator/Kconfig            |  2 +-
 drivers/regulator/lm363x-regulator.c | 52 ++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/drivers/regulator/Kconfig b/drivers/regulator/Kconfig
index 6c37f0df9323..34e03691dd00 100644
--- a/drivers/regulator/Kconfig
+++ b/drivers/regulator/Kconfig
@@ -363,7 +363,7 @@ config REGULATOR_LM363X
 	tristate "TI LM363X voltage regulators"
 	depends on MFD_TI_LMU
 	help
-	  This driver supports LM3631 and LM3632 voltage regulators for
+	  This driver supports LM3631, LM3632 and LM36274 voltage regulators for
 	  the LCD bias.
 	  One boost output voltage is configurable and always on.
 	  Other LDOs are used for the display module.
diff --git a/drivers/regulator/lm363x-regulator.c b/drivers/regulator/lm363x-regulator.c
index 1b5d7d2f26b8..b053e2254684 100644
--- a/drivers/regulator/lm363x-regulator.c
+++ b/drivers/regulator/lm363x-regulator.c
@@ -37,6 +37,11 @@
 #define LM3632_VBOOST_MIN		4500000
 #define LM3632_VLDO_MIN			4000000
 
+/* LM36274 */
+#define LM36274_BOOST_VSEL_MAX		0x3f
+#define LM36274_LDO_VSEL_MAX		0x34
+#define LM36274_VOLTAGE_MIN		4000000
+
 /* Common */
 #define LM363X_STEP_50mV		50000
 #define LM363X_STEP_500mV		500000
@@ -217,6 +222,51 @@ static const struct regulator_desc lm363x_regulator_desc[] = {
 		.enable_reg     = LM3632_REG_BIAS_CONFIG,
 		.enable_mask    = LM3632_EN_VNEG_MASK,
 	},
+
+	/* LM36274 */
+	{
+		.name           = "vboost",
+		.of_match	= "vboost",
+		.id             = LM36274_BOOST,
+		.ops            = &lm363x_boost_voltage_table_ops,
+		.n_voltages     = LM36274_BOOST_VSEL_MAX,
+		.min_uV         = LM36274_VOLTAGE_MIN,
+		.uV_step        = LM363X_STEP_50mV,
+		.type           = REGULATOR_VOLTAGE,
+		.owner          = THIS_MODULE,
+		.vsel_reg       = LM36274_REG_VOUT_BOOST,
+		.vsel_mask      = LM36274_VOUT_MASK,
+	},
+	{
+		.name           = "ldo_vpos",
+		.of_match	= "vpos",
+		.id             = LM36274_LDO_POS,
+		.ops            = &lm363x_regulator_voltage_table_ops,
+		.n_voltages     = LM36274_LDO_VSEL_MAX,
+		.min_uV         = LM36274_VOLTAGE_MIN,
+		.uV_step        = LM363X_STEP_50mV,
+		.type           = REGULATOR_VOLTAGE,
+		.owner          = THIS_MODULE,
+		.vsel_reg       = LM36274_REG_VOUT_POS,
+		.vsel_mask      = LM36274_VOUT_MASK,
+		.enable_reg     = LM36274_REG_BIAS_CONFIG_1,
+		.enable_mask    = LM36274_EN_VPOS_MASK,
+	},
+	{
+		.name           = "ldo_vneg",
+		.of_match	= "vneg",
+		.id             = LM36274_LDO_NEG,
+		.ops            = &lm363x_regulator_voltage_table_ops,
+		.n_voltages     = LM36274_LDO_VSEL_MAX,
+		.min_uV         = LM36274_VOLTAGE_MIN,
+		.uV_step        = LM363X_STEP_50mV,
+		.type           = REGULATOR_VOLTAGE,
+		.owner          = THIS_MODULE,
+		.vsel_reg       = LM36274_REG_VOUT_NEG,
+		.vsel_mask      = LM36274_VOUT_MASK,
+		.enable_reg     = LM36274_REG_BIAS_CONFIG_1,
+		.enable_mask    = LM36274_EN_VNEG_MASK,
+	},
 };
 
 static struct gpio_desc *lm363x_regulator_of_get_enable_gpio(struct device *dev, int id)
@@ -229,9 +279,11 @@ static struct gpio_desc *lm363x_regulator_of_get_enable_gpio(struct device *dev,
 	 */
 	switch (id) {
 	case LM3632_LDO_POS:
+	case LM36274_LDO_POS:
 		return gpiod_get_index_optional(dev, "enable", 0,
 				GPIOD_OUT_LOW | GPIOD_FLAGS_BIT_NONEXCLUSIVE);
 	case LM3632_LDO_NEG:
+	case LM36274_LDO_NEG:
 		return gpiod_get_index_optional(dev, "enable", 1,
 				GPIOD_OUT_LOW | GPIOD_FLAGS_BIT_NONEXCLUSIVE);
 	default:
-- 
2.21.0.5.gaeb582a983


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

* [PATCH v5 5/6] dt-bindings: leds: Add LED bindings for the LM36274
  2019-06-04 17:43 [PATCH v5 0/6] LM36274 Introduction Dan Murphy
                   ` (3 preceding siblings ...)
  2019-06-04 17:43 ` [PATCH v5 4/6] regulator: lm363x: Add support for LM36274 Dan Murphy
@ 2019-06-04 17:43 ` Dan Murphy
  2019-06-04 17:43 ` [PATCH v5 6/6] leds: lm36274: Introduce the TI LM36274 LED driver Dan Murphy
  5 siblings, 0 replies; 14+ messages in thread
From: Dan Murphy @ 2019-06-04 17:43 UTC (permalink / raw)
  To: jacek.anaszewski, pavel, broonie, lgirdwood
  Cc: lee.jones, linux-leds, linux-kernel, Dan Murphy, Rob Herring

Add the LM36274 LED specific bindings.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
---

v5 - No changes

 .../devicetree/bindings/leds/leds-lm36274.txt | 82 +++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/leds/leds-lm36274.txt

diff --git a/Documentation/devicetree/bindings/leds/leds-lm36274.txt b/Documentation/devicetree/bindings/leds/leds-lm36274.txt
new file mode 100644
index 000000000000..329393700191
--- /dev/null
+++ b/Documentation/devicetree/bindings/leds/leds-lm36274.txt
@@ -0,0 +1,82 @@
+* Texas Instruments LM36274 4-Channel LCD Backlight Driver w/Integrated Bias
+
+The LM36274 is an integrated four-channel WLED driver and LCD bias supply.
+The backlight boost provides the power to bias four parallel LED strings with
+up to 29V total output voltage. The 11-bit LED current is programmable via
+the I2C bus and/or controlled via a logic level PWM input from 60 μA to 30 mA.
+
+Parent device properties are documented in ../mfd/ti_lmu.txt
+Regulator properties are documented in ../regulator/lm363x-regulator.txt
+
+Required backlight properties:
+	- compatible:
+		"ti,lm36274-backlight"
+	- reg : 0
+	- #address-cells : 1
+	- #size-cells : 0
+	- led-sources : Indicates which LED strings will be enabled.
+			Values from 0-3, sources is 0 based so strings will be
+			source value + 1.
+
+Optional backlight properties:
+	- label : see Documentation/devicetree/bindings/leds/common.txt
+	- linux,default-trigger :
+	   see Documentation/devicetree/bindings/leds/common.txt
+
+Example:
+
+HVLED string 1 and 3 are controlled by control bank A and HVLED 2 string is
+controlled by control bank B.
+
+lm36274@11 {
+	compatible = "ti,lm36274";
+	#address-cells = <1>;
+	#size-cells = <0>;
+	reg = <0x11>;
+
+	enable-gpios = <&gpio1 28 GPIO_ACTIVE_HIGH>;
+
+	regulators {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "ti,lm363x-regulator";
+
+		enable-gpios = <&pioC 0 GPIO_ACTIVE_HIGH>,
+			       <&pioC 1 GPIO_ACTIVE_HIGH>;
+
+		vboost {
+			regulator-name = "lcd_boost";
+			regulator-min-microvolt = <4000000>;
+			regulator-max-microvolt = <7150000>;
+			regulator-always-on;
+		};
+
+		vpos {
+			regulator-name = "lcd_vpos";
+			regulator-min-microvolt = <4000000>;
+			regulator-max-microvolt = <6500000>;
+		};
+
+		vneg {
+			regulator-name = "lcd_vneg";
+			regulator-min-microvolt = <4000000>;
+			regulator-max-microvolt = <6500000>;
+		};
+	};
+
+	backlight {
+		#address-cells = <1>;
+		#size-cells = <0>;
+		compatible = "ti,lm36274-backlight";
+
+		led@0 {
+			reg = <0>;
+			led-sources = <0 2>;
+			label = "white:backlight_cluster";
+			linux,default-trigger = "backlight";
+		};
+	};
+};
+
+For more product information please see the link below:
+http://www.ti.com/lit/ds/symlink/lm36274.pdf
-- 
2.21.0.5.gaeb582a983


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

* [PATCH v5 6/6] leds: lm36274: Introduce the TI LM36274 LED driver
  2019-06-04 17:43 [PATCH v5 0/6] LM36274 Introduction Dan Murphy
                   ` (4 preceding siblings ...)
  2019-06-04 17:43 ` [PATCH v5 5/6] dt-bindings: leds: Add LED bindings for the LM36274 Dan Murphy
@ 2019-06-04 17:43 ` Dan Murphy
  5 siblings, 0 replies; 14+ messages in thread
From: Dan Murphy @ 2019-06-04 17:43 UTC (permalink / raw)
  To: jacek.anaszewski, pavel, broonie, lgirdwood
  Cc: lee.jones, linux-leds, linux-kernel, Dan Murphy

Introduce the LM36274 LED driver.  This driver uses the ti-lmu
MFD driver to probe this LED driver.  The driver configures only the
LED registers and enables the outputs according to the config file.

The driver utilizes the TI LMU (Lighting Management Unit) LED common
framework to set the brightness bits.

Signed-off-by: Dan Murphy <dmurphy@ti.com>
Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
---

v5 - No changes

 drivers/leds/Kconfig        |   8 ++
 drivers/leds/Makefile       |   1 +
 drivers/leds/leds-lm36274.c | 174 ++++++++++++++++++++++++++++++++++++
 3 files changed, 183 insertions(+)
 create mode 100644 drivers/leds/leds-lm36274.c

diff --git a/drivers/leds/Kconfig b/drivers/leds/Kconfig
index 91cb047059a0..61c585049b2d 100644
--- a/drivers/leds/Kconfig
+++ b/drivers/leds/Kconfig
@@ -798,6 +798,14 @@ config LEDS_LM3697
 	  Say Y to enable the LM3697 LED driver for TI LMU devices.
 	  This supports the LED device LM3697.
 
+config LEDS_LM36274
+	tristate "LED driver for LM36274"
+	depends on LEDS_TI_LMU_COMMON
+	depends on MFD_TI_LMU
+	help
+	  Say Y to enable the LM36274 LED driver for TI LMU devices.
+	  This supports the LED device LM36274.
+
 comment "LED Triggers"
 source "drivers/leds/trigger/Kconfig"
 
diff --git a/drivers/leds/Makefile b/drivers/leds/Makefile
index 6c3350404ede..c52934732c1a 100644
--- a/drivers/leds/Makefile
+++ b/drivers/leds/Makefile
@@ -83,6 +83,7 @@ obj-$(CONFIG_LEDS_SC27XX_BLTC)		+= leds-sc27xx-bltc.o
 obj-$(CONFIG_LEDS_LM3601X)		+= leds-lm3601x.o
 obj-$(CONFIG_LEDS_TI_LMU_COMMON)	+= leds-ti-lmu-common.o
 obj-$(CONFIG_LEDS_LM3697)		+= leds-lm3697.o
+obj-$(CONFIG_LEDS_LM36274)		+= leds-lm36274.o
 
 # LED SPI Drivers
 obj-$(CONFIG_LEDS_CR0014114)		+= leds-cr0014114.o
diff --git a/drivers/leds/leds-lm36274.c b/drivers/leds/leds-lm36274.c
new file mode 100644
index 000000000000..b47786d36d21
--- /dev/null
+++ b/drivers/leds/leds-lm36274.c
@@ -0,0 +1,174 @@
+// SPDX-License-Identifier: GPL-2.0
+// TI LM36274 LED chip family driver
+// Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/
+
+#include <linux/bitops.h>
+#include <linux/device.h>
+#include <linux/err.h>
+#include <linux/leds.h>
+#include <linux/leds-ti-lmu-common.h>
+#include <linux/module.h>
+#include <linux/of_device.h>
+#include <linux/platform_device.h>
+
+#include <linux/mfd/ti-lmu.h>
+#include <linux/mfd/ti-lmu-register.h>
+
+#include <uapi/linux/uleds.h>
+
+#define LM36274_MAX_STRINGS	4
+#define LM36274_BL_EN		BIT(4)
+
+/**
+ * struct lm36274
+ * @pdev: platform device
+ * @led_dev: led class device
+ * @lmu_data: Register and setting values for common code
+ * @regmap: Devices register map
+ * @dev: Pointer to the devices device struct
+ * @led_sources - The LED strings supported in this array
+ * @num_leds - Number of LED strings are supported in this array
+ */
+struct lm36274 {
+	struct platform_device *pdev;
+	struct led_classdev led_dev;
+	struct ti_lmu_bank lmu_data;
+	struct regmap *regmap;
+	struct device *dev;
+
+	u32 led_sources[LM36274_MAX_STRINGS];
+	int num_leds;
+};
+
+static int lm36274_brightness_set(struct led_classdev *led_cdev,
+				enum led_brightness brt_val)
+{
+	struct lm36274 *led = container_of(led_cdev, struct lm36274, led_dev);
+
+	return ti_lmu_common_set_brightness(&led->lmu_data, brt_val);
+}
+
+static int lm36274_init(struct lm36274 *lm36274_data)
+{
+	int enable_val = 0;
+	int i;
+
+	for (i = 0; i < lm36274_data->num_leds; i++)
+		enable_val |= (1 << lm36274_data->led_sources[i]);
+
+	if (!enable_val) {
+		dev_err(lm36274_data->dev, "No LEDs were enabled\n");
+		return -EINVAL;
+	}
+
+	enable_val |= LM36274_BL_EN;
+
+	return regmap_write(lm36274_data->regmap, LM36274_REG_BL_EN,
+			    enable_val);
+}
+
+static int lm36274_parse_dt(struct lm36274 *lm36274_data)
+{
+	struct fwnode_handle *child = NULL;
+	char label[LED_MAX_NAME_SIZE];
+	struct device *dev = &lm36274_data->pdev->dev;
+	const char *name;
+	int child_cnt;
+	int ret = -EINVAL;
+
+	/* There should only be 1 node */
+	child_cnt = device_get_child_node_count(dev);
+	if (child_cnt != 1)
+		return ret;
+
+	device_for_each_child_node(dev, child) {
+		ret = fwnode_property_read_string(child, "label", &name);
+		if (ret)
+			snprintf(label, sizeof(label),
+				"%s::", lm36274_data->pdev->name);
+		else
+			snprintf(label, sizeof(label),
+				 "%s:%s", lm36274_data->pdev->name, name);
+
+		lm36274_data->num_leds = fwnode_property_read_u32_array(child,
+							  "led-sources",
+							  NULL, 0);
+		if (lm36274_data->num_leds <= 0)
+			return -ENODEV;
+
+		ret = fwnode_property_read_u32_array(child, "led-sources",
+						     lm36274_data->led_sources,
+						     lm36274_data->num_leds);
+		if (ret) {
+			dev_err(dev, "led-sources property missing\n");
+			return -EINVAL;
+		}
+
+		fwnode_property_read_string(child, "linux,default-trigger",
+					&lm36274_data->led_dev.default_trigger);
+
+	}
+
+	lm36274_data->lmu_data.regmap = lm36274_data->regmap;
+	lm36274_data->lmu_data.max_brightness = MAX_BRIGHTNESS_11BIT;
+	lm36274_data->lmu_data.msb_brightness_reg = LM36274_REG_BRT_MSB;
+	lm36274_data->lmu_data.lsb_brightness_reg = LM36274_REG_BRT_LSB;
+
+	lm36274_data->led_dev.name = label;
+	lm36274_data->led_dev.max_brightness = MAX_BRIGHTNESS_11BIT;
+	lm36274_data->led_dev.brightness_set_blocking = lm36274_brightness_set;
+
+	return ret;
+}
+
+static int lm36274_probe(struct platform_device *pdev)
+{
+	struct ti_lmu *lmu = dev_get_drvdata(pdev->dev.parent);
+	struct lm36274 *lm36274_data;
+	int ret;
+
+	lm36274_data = devm_kzalloc(&pdev->dev, sizeof(*lm36274_data),
+				    GFP_KERNEL);
+	if (!lm36274_data) {
+		ret = -ENOMEM;
+		return ret;
+	}
+
+	lm36274_data->pdev = pdev;
+	lm36274_data->dev = lmu->dev;
+	lm36274_data->regmap = lmu->regmap;
+	dev_set_drvdata(&pdev->dev, lm36274_data);
+
+	ret = lm36274_parse_dt(lm36274_data);
+	if (ret) {
+		dev_err(lm36274_data->dev, "Failed to parse DT node\n");
+		return ret;
+	}
+
+	ret = lm36274_init(lm36274_data);
+	if (ret) {
+		dev_err(lm36274_data->dev, "Failed to init the device\n");
+		return ret;
+	}
+
+	return devm_led_classdev_register(lm36274_data->dev,
+					 &lm36274_data->led_dev);
+}
+
+static const struct of_device_id of_lm36274_leds_match[] = {
+	{ .compatible = "ti,lm36274-backlight", },
+	{},
+};
+MODULE_DEVICE_TABLE(of, of_lm36274_leds_match);
+
+static struct platform_driver lm36274_driver = {
+	.probe  = lm36274_probe,
+	.driver = {
+		.name = "lm36274-leds",
+	},
+};
+module_platform_driver(lm36274_driver)
+
+MODULE_DESCRIPTION("Texas Instruments LM36274 LED driver");
+MODULE_AUTHOR("Dan Murphy <dmurphy@ti.com>");
+MODULE_LICENSE("GPL v2");
-- 
2.21.0.5.gaeb582a983


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

* Re: [PATCH v5 1/6] regulator: lm363x: Make the gpio register enable flexible
  2019-06-04 17:43 ` [PATCH v5 1/6] regulator: lm363x: Make the gpio register enable flexible Dan Murphy
@ 2019-06-05 10:01   ` Mark Brown
  2019-06-05 12:02     ` Dan Murphy
  2019-06-06  9:47   ` Pavel Machek
  1 sibling, 1 reply; 14+ messages in thread
From: Mark Brown @ 2019-06-05 10:01 UTC (permalink / raw)
  To: Dan Murphy
  Cc: jacek.anaszewski, pavel, lgirdwood, lee.jones, linux-leds, linux-kernel

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

On Tue, Jun 04, 2019 at 12:43:40PM -0500, Dan Murphy wrote:
> The use of and enablement of the GPIO can be used across devices.
> Use the enable_reg in the regulator descriptor for the register to
> write.
> 
> Signed-off-by: Dan Murphy <dmurphy@ti.com>
> Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
> ---
> 
> v5 - No changes to the patch changes requested in this patch were done in
> patch 4 of this series - https://lore.kernel.org/patchwork/patch/1077408/

I was expecting this patch to just be completely dropped?  It looks like
the end result is very similar, we're still using enable_reg to get the
register and I don't see new validation added in patch 4.

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

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

* Re: [PATCH v5 1/6] regulator: lm363x: Make the gpio register enable flexible
  2019-06-05 10:01   ` Mark Brown
@ 2019-06-05 12:02     ` Dan Murphy
  2019-06-05 12:47       ` Dan Murphy
  0 siblings, 1 reply; 14+ messages in thread
From: Dan Murphy @ 2019-06-05 12:02 UTC (permalink / raw)
  To: Mark Brown
  Cc: jacek.anaszewski, pavel, lgirdwood, lee.jones, linux-leds, linux-kernel

Mark

On 6/5/19 5:01 AM, Mark Brown wrote:
> On Tue, Jun 04, 2019 at 12:43:40PM -0500, Dan Murphy wrote:
>> The use of and enablement of the GPIO can be used across devices.
>> Use the enable_reg in the regulator descriptor for the register to
>> write.
>>
>> Signed-off-by: Dan Murphy <dmurphy@ti.com>
>> Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
>> ---
>>
>> v5 - No changes to the patch changes requested in this patch were done in
>> patch 4 of this series - https://lore.kernel.org/patchwork/patch/1077408/
> I was expecting this patch to just be completely dropped?  It looks like
> the end result is very similar, we're still using enable_reg to get the
> register and I don't see new validation added in patch 4.

I can squash patch 1 into 4.

Also not sure what you mean by new validation.

Please comment on patch 4 to what you are looking for

Dan


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

* Re: [PATCH v5 1/6] regulator: lm363x: Make the gpio register enable flexible
  2019-06-05 12:02     ` Dan Murphy
@ 2019-06-05 12:47       ` Dan Murphy
  2019-06-05 16:31         ` Mark Brown
  0 siblings, 1 reply; 14+ messages in thread
From: Dan Murphy @ 2019-06-05 12:47 UTC (permalink / raw)
  To: Mark Brown
  Cc: jacek.anaszewski, pavel, lgirdwood, lee.jones, linux-leds, linux-kernel

Mark

On 6/5/19 7:02 AM, Dan Murphy wrote:
> Mark
>
> On 6/5/19 5:01 AM, Mark Brown wrote:
>> On Tue, Jun 04, 2019 at 12:43:40PM -0500, Dan Murphy wrote:
>>> The use of and enablement of the GPIO can be used across devices.
>>> Use the enable_reg in the regulator descriptor for the register to
>>> write.
>>>
>>> Signed-off-by: Dan Murphy <dmurphy@ti.com>
>>> Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>
>>> ---
>>>
>>> v5 - No changes to the patch changes requested in this patch were 
>>> done in
>>> patch 4 of this series - 
>>> https://lore.kernel.org/patchwork/patch/1077408/
>> I was expecting this patch to just be completely dropped?  It looks like
>> the end result is very similar, we're still using enable_reg to get the
>> register and I don't see new validation added in patch 4.
>
> I can squash patch 1 into 4.
>
> Also not sure what you mean by new validation.
>
Disregard I understand.  The patch is missing the validation code.


> Please comment on patch 4 to what you are looking for
>
> Dan
>

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

* Re: [PATCH v5 1/6] regulator: lm363x: Make the gpio register enable flexible
  2019-06-05 12:47       ` Dan Murphy
@ 2019-06-05 16:31         ` Mark Brown
  2019-06-05 16:32           ` Dan Murphy
  0 siblings, 1 reply; 14+ messages in thread
From: Mark Brown @ 2019-06-05 16:31 UTC (permalink / raw)
  To: Dan Murphy
  Cc: jacek.anaszewski, pavel, lgirdwood, lee.jones, linux-leds, linux-kernel

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

On Wed, Jun 05, 2019 at 07:47:50AM -0500, Dan Murphy wrote:
> On 6/5/19 7:02 AM, Dan Murphy wrote:

> > I can squash patch 1 into 4.

> > Also not sure what you mean by new validation.

> Disregard I understand.  The patch is missing the validation code.

Ah, some git add issues I guess :)  Squashing would help but it's not
essential I think.

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

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

* Re: [PATCH v5 1/6] regulator: lm363x: Make the gpio register enable flexible
  2019-06-05 16:31         ` Mark Brown
@ 2019-06-05 16:32           ` Dan Murphy
  0 siblings, 0 replies; 14+ messages in thread
From: Dan Murphy @ 2019-06-05 16:32 UTC (permalink / raw)
  To: Mark Brown
  Cc: jacek.anaszewski, pavel, lgirdwood, lee.jones, linux-leds, linux-kernel

Mark

On 6/5/19 11:31 AM, Mark Brown wrote:
> On Wed, Jun 05, 2019 at 07:47:50AM -0500, Dan Murphy wrote:
>> On 6/5/19 7:02 AM, Dan Murphy wrote:
>>> I can squash patch 1 into 4.
>>> Also not sure what you mean by new validation.
>> Disregard I understand.  The patch is missing the validation code.
> Ah, some git add issues I guess :)  Squashing would help but it's not
> essential I think.


More like PEBKAC on this one


Dan


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

* Re: [PATCH v5 1/6] regulator: lm363x: Make the gpio register enable flexible
  2019-06-04 17:43 ` [PATCH v5 1/6] regulator: lm363x: Make the gpio register enable flexible Dan Murphy
  2019-06-05 10:01   ` Mark Brown
@ 2019-06-06  9:47   ` Pavel Machek
  1 sibling, 0 replies; 14+ messages in thread
From: Pavel Machek @ 2019-06-06  9:47 UTC (permalink / raw)
  To: Dan Murphy
  Cc: jacek.anaszewski, broonie, lgirdwood, lee.jones, linux-leds,
	linux-kernel

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

On Tue 2019-06-04 12:43:40, Dan Murphy wrote:
> The use of and enablement of the GPIO can be used across devices.
> Use the enable_reg in the regulator descriptor for the register to
> write.
> 
> Signed-off-by: Dan Murphy <dmurphy@ti.com>
> Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>

Acked-by: Pavel Machek <pavel@ucw.cz>

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

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

* Re: [PATCH v5 2/6] dt-bindings: mfd: Add lm36274 bindings to ti-lmu
  2019-06-04 17:43 ` [PATCH v5 2/6] dt-bindings: mfd: Add lm36274 bindings to ti-lmu Dan Murphy
@ 2019-06-06  9:49   ` Pavel Machek
  0 siblings, 0 replies; 14+ messages in thread
From: Pavel Machek @ 2019-06-06  9:49 UTC (permalink / raw)
  To: Dan Murphy
  Cc: jacek.anaszewski, broonie, lgirdwood, lee.jones, linux-leds,
	linux-kernel, Rob Herring

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

On Tue 2019-06-04 12:43:41, Dan Murphy wrote:
> Add the LM36274 backlight driver with regulator support.
> This is a multi-function device for backlight applications.
> 
> Backlight properties will be documented in it's a supplemental
> bindings document.
> 
> Regulator support is documented in the regulator/lm363x-regulator.txt
> 
> http://www.ti.com/lit/ds/symlink/lm36274.pdf
> 
> Signed-off-by: Dan Murphy <dmurphy@ti.com>
> Reviewed-by: Rob Herring <robh@kernel.org>
> Acked-by: Lee Jones <lee.jones@linaro.org>
> Signed-off-by: Jacek Anaszewski <jacek.anaszewski@gmail.com>

Acked-by: Pavel Machek <pavel@ucw.cz>

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

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

end of thread, other threads:[~2019-06-06  9:49 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-04 17:43 [PATCH v5 0/6] LM36274 Introduction Dan Murphy
2019-06-04 17:43 ` [PATCH v5 1/6] regulator: lm363x: Make the gpio register enable flexible Dan Murphy
2019-06-05 10:01   ` Mark Brown
2019-06-05 12:02     ` Dan Murphy
2019-06-05 12:47       ` Dan Murphy
2019-06-05 16:31         ` Mark Brown
2019-06-05 16:32           ` Dan Murphy
2019-06-06  9:47   ` Pavel Machek
2019-06-04 17:43 ` [PATCH v5 2/6] dt-bindings: mfd: Add lm36274 bindings to ti-lmu Dan Murphy
2019-06-06  9:49   ` Pavel Machek
2019-06-04 17:43 ` [PATCH v5 3/6] mfd: ti-lmu: Add LM36274 support to the ti-lmu Dan Murphy
2019-06-04 17:43 ` [PATCH v5 4/6] regulator: lm363x: Add support for LM36274 Dan Murphy
2019-06-04 17:43 ` [PATCH v5 5/6] dt-bindings: leds: Add LED bindings for the LM36274 Dan Murphy
2019-06-04 17:43 ` [PATCH v5 6/6] leds: lm36274: Introduce the TI LM36274 LED driver Dan Murphy

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).