Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed6d362d authored by Stefan Agner's avatar Stefan Agner Committed by Lee Jones
Browse files

regulator: rn5t618: Add RN5T567 PMIC support 



Extend the driver to support Ricoh RN5T567. Support the additional
DCDC and slightly different voltage range of LDORTC1.

Signed-off-by: default avatarStefan Agner <stefan@agner.ch>
Reviewed-by: default avatarMarcel Ziswiler <marcel.ziswiler@toradex.com>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
parent a99ab50d

drivers/regulator/Kconfig

+3 −2
Original line number Original line Diff line number Diff line
@@ -636,10 +636,11 @@ config REGULATOR_RK808 
	  outputs which can be controlled by i2c communication.

	  outputs which can be controlled by i2c communication.





config REGULATOR_RN5T618

config REGULATOR_RN5T618

	tristate "Ricoh RN5T618 voltage regulators"

	tristate "Ricoh RN5T567/618 voltage regulators"

	depends on MFD_RN5T618

	depends on MFD_RN5T618

	help

	help

	  Say y here to support the regulators found on Ricoh RN5T618 PMIC.

	  Say y here to support the regulators found on Ricoh RN5T567 or

	  RN5T618 PMIC.





config REGULATOR_RT5033

config REGULATOR_RT5033

	tristate "Richtek RT5033 Regulators"

	tristate "Richtek RT5033 Regulators"

drivers/regulator/rn5t618-regulator.c

+36 −4
Original line number Original line Diff line number Diff line
@@ -46,6 +46,23 @@ static struct regulator_ops rn5t618_reg_ops = { 
		.vsel_mask	= (vmask),				\

		.vsel_mask	= (vmask),				\

	}

	}





static struct regulator_desc rn5t567_regulators[] = {

	/* DCDC */

	REG(DCDC1, DC1CTL, BIT(0), DC1DAC, 0xff, 600000, 3500000, 12500),

	REG(DCDC2, DC2CTL, BIT(0), DC2DAC, 0xff, 600000, 3500000, 12500),

	REG(DCDC3, DC3CTL, BIT(0), DC3DAC, 0xff, 600000, 3500000, 12500),

	REG(DCDC4, DC4CTL, BIT(0), DC4DAC, 0xff, 600000, 3500000, 12500),

	/* LDO */

	REG(LDO1, LDOEN1, BIT(0), LDO1DAC, 0x7f, 900000, 3500000, 25000),

	REG(LDO2, LDOEN1, BIT(1), LDO2DAC, 0x7f, 900000, 3500000, 25000),

	REG(LDO3, LDOEN1, BIT(2), LDO3DAC, 0x7f, 600000, 3500000, 25000),

	REG(LDO4, LDOEN1, BIT(3), LDO4DAC, 0x7f, 900000, 3500000, 25000),

	REG(LDO5, LDOEN1, BIT(4), LDO5DAC, 0x7f, 900000, 3500000, 25000),

	/* LDO RTC */

	REG(LDORTC1, LDOEN2, BIT(4), LDORTCDAC, 0x7f, 1200000, 3500000, 25000),

	REG(LDORTC2, LDOEN2, BIT(5), LDORTC2DAC, 0x7f, 900000, 3500000, 25000),

};



static struct regulator_desc rn5t618_regulators[] = {

static struct regulator_desc rn5t618_regulators[] = {

	/* DCDC */

	/* DCDC */

	REG(DCDC1, DC1CTL, BIT(0), DC1DAC, 0xff, 600000, 3500000, 12500),

	REG(DCDC1, DC1CTL, BIT(0), DC1DAC, 0xff, 600000, 3500000, 12500),
@@ -67,18 +84,33 @@ static int rn5t618_regulator_probe(struct platform_device *pdev) 
	struct rn5t618 *rn5t618 = dev_get_drvdata(pdev->dev.parent);

	struct rn5t618 *rn5t618 = dev_get_drvdata(pdev->dev.parent);

	struct regulator_config config = { };

	struct regulator_config config = { };

	struct regulator_dev *rdev;

	struct regulator_dev *rdev;

	struct regulator_desc *regulators;

	int i;

	int i;





	for (i = 0; i < RN5T618_REG_NUM; i++) {

	switch (rn5t618->variant) {

	case RN5T567:

		regulators = rn5t567_regulators;

		break;

	case RN5T618:

		regulators = rn5t618_regulators;

		break;

	default:

		return -EINVAL;

	}



	config.dev = pdev->dev.parent;

	config.dev = pdev->dev.parent;

	config.regmap = rn5t618->regmap;

	config.regmap = rn5t618->regmap;





	for (i = 0; i < RN5T618_REG_NUM; i++) {

		if (!regulators[i].name)

			continue;



		rdev = devm_regulator_register(&pdev->dev,

		rdev = devm_regulator_register(&pdev->dev,

					       &rn5t618_regulators[i],

					       &regulators[i],

					       &config);

					       &config);

		if (IS_ERR(rdev)) {

		if (IS_ERR(rdev)) {

			dev_err(&pdev->dev, "failed to register %s regulator\n",

			dev_err(&pdev->dev, "failed to register %s regulator\n",

				rn5t618_regulators[i].name);

				regulators[i].name);

			return PTR_ERR(rdev);

			return PTR_ERR(rdev);

		}

		}

	}

	}

include/linux/mfd/rn5t618.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -217,6 +217,7 @@ enum { 
	RN5T618_DCDC1,

	RN5T618_DCDC1,

	RN5T618_DCDC2,

	RN5T618_DCDC2,

	RN5T618_DCDC3,

	RN5T618_DCDC3,

	RN5T618_DCDC4,

	RN5T618_LDO1,

	RN5T618_LDO1,

	RN5T618_LDO2,

	RN5T618_LDO2,

	RN5T618_LDO3,

	RN5T618_LDO3,