* [PATCH 0/2] Add input supplies to rk808 regulator
@ 2014-09-02 16:14 Doug Anderson
2014-09-02 16:14 ` [PATCH 1/2] regulator: RK808: Add proper input supplies for rk808 Doug Anderson
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Doug Anderson @ 2014-09-02 16:14 UTC (permalink / raw)
To: Mark Brown, Chris Zhong
Cc: Sonny Rao, Heiko Stuebner, linux-arm-kernel, linux-rockchip,
Doug Anderson, mark.rutland, devicetree, pawel.moll,
ijc+devicetree, zhangqing, lgirdwood, robh+dt, linux-kernel,
galak
We want to specify the input supplies to the rk808 regulator. This
patch series adds them to the driver. Note that the bindings are
based atop Chris's most recent version at
<https://patchwork.kernel.org/patch/4817931/>. If the regulator patch
is applied before Chris sends out his next version then I think Chris
could squash my bindings change (patch 2) into his next version.
Doug Anderson (2):
regulator: RK808: Add proper input supplies for rk808
dt-bindings: Add input supplies to rk808 bindings
Documentation/devicetree/bindings/mfd/rk808.txt | 11 +++++++++++
drivers/regulator/rk808-regulator.c | 15 ++++++++++++++-
2 files changed, 25 insertions(+), 1 deletion(-)
--
2.1.0.rc2.206.gedb03e5
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 1/2] regulator: RK808: Add proper input supplies for rk808 2014-09-02 16:14 [PATCH 0/2] Add input supplies to rk808 regulator Doug Anderson @ 2014-09-02 16:14 ` Doug Anderson 2014-09-02 16:14 ` [PATCH 2/2] dt-bindings: Add input supplies to rk808 bindings Doug Anderson 2014-09-02 19:48 ` [PATCH 0/2] Add input supplies to rk808 regulator Heiko Stübner 2 siblings, 0 replies; 7+ messages in thread From: Doug Anderson @ 2014-09-02 16:14 UTC (permalink / raw) To: Mark Brown, Chris Zhong Cc: Sonny Rao, Heiko Stuebner, linux-arm-kernel, linux-rockchip, Doug Anderson, lgirdwood, linux-kernel The original RK808 regulator driver didn't setup input supplies properly. Add them. Signed-off-by: Doug Anderson <dianders@chromium.org> --- drivers/regulator/rk808-regulator.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/regulator/rk808-regulator.c b/drivers/regulator/rk808-regulator.c index 0d11df1..44f5a8d 100644 --- a/drivers/regulator/rk808-regulator.c +++ b/drivers/regulator/rk808-regulator.c @@ -108,6 +108,7 @@ static struct regulator_ops rk808_switch_ops = { static const struct regulator_desc rk808_reg[] = { { .name = "DCDC_REG1", + .supply_name = "vcc1", .id = RK808_ID_DCDC1, .ops = &rk808_reg_ops, .type = REGULATOR_VOLTAGE, @@ -121,6 +122,7 @@ static const struct regulator_desc rk808_reg[] = { .owner = THIS_MODULE, }, { .name = "DCDC_REG2", + .supply_name = "vcc2", .id = RK808_ID_DCDC2, .ops = &rk808_reg_ops, .type = REGULATOR_VOLTAGE, @@ -134,6 +136,7 @@ static const struct regulator_desc rk808_reg[] = { .owner = THIS_MODULE, }, { .name = "DCDC_REG3", + .supply_name = "vcc3", .id = RK808_ID_DCDC3, .ops = &rk808_switch_ops, .type = REGULATOR_VOLTAGE, @@ -143,6 +146,7 @@ static const struct regulator_desc rk808_reg[] = { .owner = THIS_MODULE, }, { .name = "DCDC_REG4", + .supply_name = "vcc4", .id = RK808_ID_DCDC4, .ops = &rk808_reg_ops, .type = REGULATOR_VOLTAGE, @@ -156,6 +160,7 @@ static const struct regulator_desc rk808_reg[] = { .owner = THIS_MODULE, }, { .name = "LDO_REG1", + .supply_name = "vcc6", .id = RK808_ID_LDO1, .ops = &rk808_reg_ops, .type = REGULATOR_VOLTAGE, @@ -169,6 +174,7 @@ static const struct regulator_desc rk808_reg[] = { .owner = THIS_MODULE, }, { .name = "LDO_REG2", + .supply_name = "vcc6", .id = RK808_ID_LDO2, .ops = &rk808_reg_ops, .type = REGULATOR_VOLTAGE, @@ -182,6 +188,7 @@ static const struct regulator_desc rk808_reg[] = { .owner = THIS_MODULE, }, { .name = "LDO_REG3", + .supply_name = "vcc7", .id = RK808_ID_LDO3, .ops = &rk808_reg_ops, .type = REGULATOR_VOLTAGE, @@ -195,6 +202,7 @@ static const struct regulator_desc rk808_reg[] = { .owner = THIS_MODULE, }, { .name = "LDO_REG4", + .supply_name = "vcc9", .id = RK808_ID_LDO4, .ops = &rk808_reg_ops, .type = REGULATOR_VOLTAGE, @@ -208,6 +216,7 @@ static const struct regulator_desc rk808_reg[] = { .owner = THIS_MODULE, }, { .name = "LDO_REG5", + .supply_name = "vcc9", .id = RK808_ID_LDO5, .ops = &rk808_reg_ops, .type = REGULATOR_VOLTAGE, @@ -221,6 +230,7 @@ static const struct regulator_desc rk808_reg[] = { .owner = THIS_MODULE, }, { .name = "LDO_REG6", + .supply_name = "vcc10", .id = RK808_ID_LDO6, .ops = &rk808_reg_ops, .type = REGULATOR_VOLTAGE, @@ -234,6 +244,7 @@ static const struct regulator_desc rk808_reg[] = { .owner = THIS_MODULE, }, { .name = "LDO_REG7", + .supply_name = "vcc7", .id = RK808_ID_LDO7, .ops = &rk808_reg_ops, .type = REGULATOR_VOLTAGE, @@ -247,6 +258,7 @@ static const struct regulator_desc rk808_reg[] = { .owner = THIS_MODULE, }, { .name = "LDO_REG8", + .supply_name = "vcc11", .id = RK808_ID_LDO8, .ops = &rk808_reg_ops, .type = REGULATOR_VOLTAGE, @@ -260,6 +272,7 @@ static const struct regulator_desc rk808_reg[] = { .owner = THIS_MODULE, }, { .name = "SWITCH_REG1", + .supply_name = "vcc8", .id = RK808_ID_SWITCH1, .ops = &rk808_switch_ops, .type = REGULATOR_VOLTAGE, @@ -268,6 +281,7 @@ static const struct regulator_desc rk808_reg[] = { .owner = THIS_MODULE, }, { .name = "SWITCH_REG2", + .supply_name = "vcc12", .id = RK808_ID_SWITCH2, .ops = &rk808_switch_ops, .type = REGULATOR_VOLTAGE, @@ -364,7 +378,6 @@ static int rk808_regulator_probe(struct platform_device *pdev) if (client->dev.of_node) config.of_node = pdata->of_node[i]; - reg_data->supply_regulator = rk808_reg[i].name; config.init_data = reg_data; rk808_rdev = devm_regulator_register(&pdev->dev, -- 2.1.0.rc2.206.gedb03e5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH 2/2] dt-bindings: Add input supplies to rk808 bindings 2014-09-02 16:14 [PATCH 0/2] Add input supplies to rk808 regulator Doug Anderson 2014-09-02 16:14 ` [PATCH 1/2] regulator: RK808: Add proper input supplies for rk808 Doug Anderson @ 2014-09-02 16:14 ` Doug Anderson 2014-09-02 16:31 ` Mark Brown 2014-09-02 19:48 ` [PATCH 0/2] Add input supplies to rk808 regulator Heiko Stübner 2 siblings, 1 reply; 7+ messages in thread From: Doug Anderson @ 2014-09-02 16:14 UTC (permalink / raw) To: Mark Brown, Chris Zhong Cc: Sonny Rao, Heiko Stuebner, linux-arm-kernel, linux-rockchip, Doug Anderson, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, zhangqing, devicetree, linux-kernel The original bindings for rk808 didn't include input supplies. Add them. Signed-off-by: Doug Anderson <dianders@chromium.org> --- Documentation/devicetree/bindings/mfd/rk808.txt | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Documentation/devicetree/bindings/mfd/rk808.txt b/Documentation/devicetree/bindings/mfd/rk808.txt index f8932ac..283a906 100644 --- a/Documentation/devicetree/bindings/mfd/rk808.txt +++ b/Documentation/devicetree/bindings/mfd/rk808.txt @@ -13,6 +13,17 @@ Optional properties: default output clock name - rockchip,system-power-controller: Telling whether or not this pmic is controlling the system power. +- vcc1-supply: The input supply for DCDC_REG1 +- vcc2-supply: The input supply for DCDC_REG2 +- vcc3-supply: The input supply for DCDC_REG3 +- vcc4-supply: The input supply for DCDC_REG4 +- vcc6-supply: The input supply for LDO_REG1 and LDO_REG2 +- vcc7-supply: The input supply for LDO_REG3 and LDO_REG7 +- vcc8-supply: The input supply for SWITCH_REG1 +- vcc9-supply: The input supply for LDO_REG4 and LDO_REG5 +- vcc10-supply: The input supply for LDO_REG6 +- vcc11-supply: The input supply for LDO_REG8 +- vcc12-supply: The input supply for SWITCH_REG2 Regulators: All the regulators of RK808 to be instantiated shall be listed in a child node named 'regulators'. Each regulator is represented -- 2.1.0.rc2.206.gedb03e5 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] dt-bindings: Add input supplies to rk808 bindings 2014-09-02 16:14 ` [PATCH 2/2] dt-bindings: Add input supplies to rk808 bindings Doug Anderson @ 2014-09-02 16:31 ` Mark Brown 2014-09-02 16:53 ` Doug Anderson 0 siblings, 1 reply; 7+ messages in thread From: Mark Brown @ 2014-09-02 16:31 UTC (permalink / raw) To: Doug Anderson Cc: Chris Zhong, Sonny Rao, Heiko Stuebner, linux-arm-kernel, linux-rockchip, robh+dt, pawel.moll, mark.rutland, ijc+devicetree, galak, zhangqing, devicetree, linux-kernel [-- Attachment #1: Type: text/plain, Size: 226 bytes --] On Tue, Sep 02, 2014 at 09:14:29AM -0700, Doug Anderson wrote: > The original bindings for rk808 didn't include input supplies. Add > them. Acked-by: Mark Brown <broonie@linaro.org> You probably want to send this to Lee... [-- Attachment #2: Digital signature --] [-- Type: application/pgp-signature, Size: 819 bytes --] ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 2/2] dt-bindings: Add input supplies to rk808 bindings 2014-09-02 16:31 ` Mark Brown @ 2014-09-02 16:53 ` Doug Anderson 0 siblings, 0 replies; 7+ messages in thread From: Doug Anderson @ 2014-09-02 16:53 UTC (permalink / raw) To: Mark Brown Cc: Chris Zhong, Sonny Rao, Heiko Stuebner, linux-arm-kernel, linux-rockchip, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, zhangqing, devicetree, linux-kernel Mark, On Tue, Sep 2, 2014 at 9:31 AM, Mark Brown <broonie@kernel.org> wrote: > On Tue, Sep 02, 2014 at 09:14:29AM -0700, Doug Anderson wrote: >> The original bindings for rk808 didn't include input supplies. Add >> them. > > Acked-by: Mark Brown <broonie@linaro.org> > > You probably want to send this to Lee... Good point. I think it might actually be better for Chris to just squash my bindings patch into his bindings patch since he still has to send out another version. If you haven't applied the regulator patch by the time he sends his next version he can include my patch in his series (with your Ack). Chris did get an Ack for the MFD patch from Lee but I requested some changes to the regulator patch. When things look good Chris will add you back to the CC list for the regulator part of his series. Thanks! -Doug ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/2] Add input supplies to rk808 regulator 2014-09-02 16:14 [PATCH 0/2] Add input supplies to rk808 regulator Doug Anderson 2014-09-02 16:14 ` [PATCH 1/2] regulator: RK808: Add proper input supplies for rk808 Doug Anderson 2014-09-02 16:14 ` [PATCH 2/2] dt-bindings: Add input supplies to rk808 bindings Doug Anderson @ 2014-09-02 19:48 ` Heiko Stübner 2014-09-02 19:50 ` Doug Anderson 2 siblings, 1 reply; 7+ messages in thread From: Heiko Stübner @ 2014-09-02 19:48 UTC (permalink / raw) To: Doug Anderson Cc: Mark Brown, Chris Zhong, Sonny Rao, linux-arm-kernel, linux-rockchip, mark.rutland, devicetree, pawel.moll, ijc+devicetree, zhangqing, lgirdwood, robh+dt, linux-kernel, galak Am Dienstag, 2. September 2014, 09:14:27 schrieb Doug Anderson: > We want to specify the input supplies to the rk808 regulator. This > patch series adds them to the driver. Note that the bindings are > based atop Chris's most recent version at > <https://patchwork.kernel.org/patch/4817931/>. If the regulator patch > is applied before Chris sends out his next version then I think Chris > could squash my bindings change (patch 2) into his next version. > > > Doug Anderson (2): > regulator: RK808: Add proper input supplies for rk808 Patch 1 didn't apply, as it didn't take the recent pdata removal Chris posted. After fixing this [0], it sucessfully solved the missing supplies I've seen on the weekend, so Tested-by: Heiko Stuebner <heiko@sntech.de> > dt-bindings: Add input supplies to rk808 bindings > > Documentation/devicetree/bindings/mfd/rk808.txt | 11 +++++++++++ > drivers/regulator/rk808-regulator.c | 15 ++++++++++++++- > 2 files changed, 25 insertions(+), 1 deletion(-) [0] --- "[PATCH 1_2] regulator_RK808_Add proper input supplies for rk808.mbox.orig" 2014-09-02 20:49:12.000000000 +0200 +++ "[PATCH 1_2] regulator_RK808_Add proper input supplies for rk808.mbox" 2014-09-02 21:22:57.052197875 +0200 @@ -203,7 +203,7 @@ .type = REGULATOR_VOLTAGE, @@ -364,7 +378,6 @@ static int rk808_regulator_probe(struct platform_device *pdev) if (client->dev.of_node) - config.of_node = pdata->of_node[i]; + config.of_node = rk808_regulator->of_node[i]; - reg_data->supply_regulator = rk808_reg[i].name; config.init_data = reg_data; As Chris is supposed to merge these changes into his series, this doesn't really matter though. ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 0/2] Add input supplies to rk808 regulator 2014-09-02 19:48 ` [PATCH 0/2] Add input supplies to rk808 regulator Heiko Stübner @ 2014-09-02 19:50 ` Doug Anderson 0 siblings, 0 replies; 7+ messages in thread From: Doug Anderson @ 2014-09-02 19:50 UTC (permalink / raw) To: Heiko Stübner Cc: Mark Brown, Chris Zhong, Sonny Rao, linux-arm-kernel, linux-rockchip, Mark Rutland, devicetree, Pawel Moll, Ian Campbell, zhangqing, Liam Girdwood, Rob Herring, linux-kernel, Kumar Gala Heiko, On Tue, Sep 2, 2014 at 12:48 PM, Heiko Stübner <heiko@sntech.de> wrote: > Am Dienstag, 2. September 2014, 09:14:27 schrieb Doug Anderson: >> We want to specify the input supplies to the rk808 regulator. This >> patch series adds them to the driver. Note that the bindings are >> based atop Chris's most recent version at >> <https://patchwork.kernel.org/patch/4817931/>. If the regulator patch >> is applied before Chris sends out his next version then I think Chris >> could squash my bindings change (patch 2) into his next version. >> >> >> Doug Anderson (2): >> regulator: RK808: Add proper input supplies for rk808 > > Patch 1 didn't apply, as it didn't take the recent pdata removal Chris > posted. After fixing this [0], it sucessfully solved the missing supplies > I've seen on the weekend, so > > Tested-by: Heiko Stuebner <heiko@sntech.de> Thanks! ...ah, I guess I usually apply things with "git am -3" and it didn't complain about applying my patch atop Chris's or not atop Chris's. Sorry for not making it clear. ^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2014-09-02 19:50 UTC | newest] Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2014-09-02 16:14 [PATCH 0/2] Add input supplies to rk808 regulator Doug Anderson 2014-09-02 16:14 ` [PATCH 1/2] regulator: RK808: Add proper input supplies for rk808 Doug Anderson 2014-09-02 16:14 ` [PATCH 2/2] dt-bindings: Add input supplies to rk808 bindings Doug Anderson 2014-09-02 16:31 ` Mark Brown 2014-09-02 16:53 ` Doug Anderson 2014-09-02 19:48 ` [PATCH 0/2] Add input supplies to rk808 regulator Heiko Stübner 2014-09-02 19:50 ` Doug Anderson
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).