Unverified Commit 90fd840e authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "regulator: mcp16502: make lpm pin optional" from Claudiu Beznea... 

Merge series "regulator: mcp16502: make lpm pin optional" from Claudiu Beznea <claudiu.beznea@microchip.com>:

Hi,

This patch makes the LPM pin as optional as this may be controlled
in the last phase of suspend procedure to decrease the power consumption
while suspended. Along w/ this update the MAINTAINERS entry for this
driver.

Thank you,
Claudiu Beznea

Claudiu Beznea (3):
  dt-bindings: regulator: mcp16502: document lpm as optional
  regulator: mcp16502: lpm pin can be optional on some platforms
  MAINTAINERS: add myself as maintainer for mcp16502

 Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt | 3 ++-
 MAINTAINERS                                                        | 4 ++--
 drivers/regulator/mcp16502.c                                       | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

--
2.7.4

_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
parents 907dfdc9 eea0b4e2

Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt

+2 −1
Original line number Diff line number Diff line
@@ -4,7 +4,8 @@ Required properties: 
- compatible: "microchip,mcp16502"

- reg: I2C slave address

- lpm-gpios: GPIO for LPM pin. Note that this GPIO *must* remain high during

	     suspend-to-ram, keeping the PMIC into HIBERNATE mode.

	     suspend-to-ram, keeping the PMIC into HIBERNATE mode; this

	     property is optional;

- regulators: A node that houses a sub-node for each regulator within

              the device. Each sub-node is identified using the node's

              name. The content of each sub-node is defined by the

MAINTAINERS

+2 −2
Original line number Diff line number Diff line
@@ -11690,9 +11690,9 @@ F: drivers/video/fbdev/atmel_lcdfb.c 
F:	include/video/atmel_lcdc.h









MICROCHIP MCP16502 PMIC DRIVER









M:	Andrei Stefanescu <andrei.stefanescu@microchip.com>









M:	Claudiu Beznea <claudiu.beznea@microchip.com>









L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)









S:	Maintained









S:	Supported









F:	Documentation/devicetree/bindings/regulator/mcp16502-regulator.txt









F:	drivers/regulator/mcp16502.c








































drivers/regulator/mcp16502.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -550,7 +550,7 @@ static int mcp16502_probe(struct i2c_client *client,







	config.regmap = rmap;









	config.driver_data = mcp;



















	mcp->lpm = devm_gpiod_get(dev, "lpm", GPIOD_OUT_LOW);









	mcp->lpm = devm_gpiod_get_optional(dev, "lpm", GPIOD_OUT_LOW);









	if (IS_ERR(mcp->lpm)) {









		dev_err(dev, "failed to get lpm pin: %ld\n", PTR_ERR(mcp->lpm));









		return PTR_ERR(mcp->lpm);