regulator: Fix pbias regulator enable
Subsystems (4)
v2 cover regulator: Fix pbias regulator enable
vsel_reg and enable_reg of the pbias regulator descriptor should actually have the offset from syscon.
However after
"ARM: dts: <platform>: add minimal l4 bus layout with control module support"vsel_reg and enable_reg started to have the absolute address because of address translation that happens due to pbias node made as the child node of syscon. This breaks the pbias regulator enable.
This series adds the 'offset' to be populated in vsel_reg and enable_reg in the pbias driver itself.
Changes from v1:
*) Fixed Tony's review comments on adding a 'comment' for adding offset in
the driver and adding a warning for using platform_get_resource.
*) Added Tony's Acked-by.
Tested these patches against mmc -next in omap4 panda, omap3 beagle xm, dra72 and omap5 uevm
Kishon Vijay Abraham I (6):
regulator: pbias: program pbias register offset in pbias driver
ARM: dts: dra7: use "ti,pbias-dra7" compatible string for pbias
ARM: dts: omap243x: use "ti,pbias-omap2" compatible string for pbias
ARM: dts: omap3: use "ti,pbias-omap3" compatible string for pbias
ARM: dts: omap4: use "ti,pbias-omap4" compatible string for pbias
ARM: dts: omap5: use "ti,pbias-omap5" compatible string for pbias
.../bindings/regulator/pbias-regulator.txt | 7 ++- arch/arm/boot/dts/dra7.dtsi | 2 +- arch/arm/boot/dts/omap2430.dtsi | 2 +- arch/arm/boot/dts/omap3.dtsi | 2 +- arch/arm/boot/dts/omap4.dtsi | 2 +- arch/arm/boot/dts/omap5.dtsi | 2 +- drivers/regulator/pbias-regulator.c | 56 +++++++++++++++++--- 7 files changed, 61 insertions(+), 12 deletions(-)
Signature · 1 line
1.7.9.5
PATCH v2 1/6 regulator: pbias: program pbias register offset in pbias driver
Add separate compatible strings for every platform and populate the pbias register offset in the driver data.
This helps avoid depending on the dt for pbias register offset.
Also update the dt binding documentation for the new compatible strings.
--- .../bindings/regulator/pbias-regulator.txt | 7 ++- drivers/regulator/pbias-regulator.c | 56 +++++++++++++++++--- 2 files changed, 56 insertions(+), 7 deletions(-)
Documentation/devicetree/bindings/regulator/pbias-regulator.txt +6 -1
@@ -2,7 +2,12 @@ PBIAS internal regulator for SD card dual voltage i/o pads on OMAP SoCs. Required properties: - compatible: - - "ti,pbias-omap" for OMAP2, OMAP3, OMAP4, OMAP5, DRA7. + - should be "ti,pbias-dra7" for DRA7 + - should be "ti,pbias-omap2" for OMAP2 + - should be "ti,pbias-omap3" for OMAP3 + - should be "ti,pbias-omap4" for OMAP4 + - should be "ti,pbias-omap5" for OMAP5 + - "ti,pbias-omap" is deprecated - reg: pbias register offset from syscon base and size of pbias register. - syscon : phandle of the system control module - regulator-name : should be
drivers/regulator/pbias-regulator.c +50 -6
95 lines not on this page · raw message
Signature · 1 line
1.7.9.5
Mark Brown
maintainerApplied "regulator: pbias: program pbias register offset in pbias driver" to the regulator tree
The patch
regulator: pbias: program pbias register offset in pbias driver
has been applied to the regulator tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark
Quoted 1 line
From
b9c93646fd5cb669d096fec5ad25a01f04cfde27Mon Sep 17 00:00:00 2001
From: Kishon Vijay Abraham I <[email protected]>
Date: Thu, 3 Sep 2015 12:20:37 +0530
Subject: [PATCH] regulator: pbias: program pbias register offset in pbias
driver
Add separate compatible strings for every platform and populate the pbias register offset in the driver data.
This helps avoid depending on the dt for pbias register offset.
Also update the dt binding documentation for the new compatible strings.
--- .../bindings/regulator/pbias-regulator.txt | 7 ++- drivers/regulator/pbias-regulator.c | 56 +++++++++++++++++++--- 2 files changed, 56 insertions(+), 7 deletions(-)
Documentation/devicetree/bindings/regulator/pbias-regulator.txt +6 -1
@@ -2,7 +2,12 @@ PBIAS internal regulator for SD card dual voltage i/o pads on OMAP SoCs. Required properties: - compatible: - - "ti,pbias-omap" for OMAP2, OMAP3, OMAP4, OMAP5, DRA7. + - should be "ti,pbias-dra7" for DRA7 + - should be "ti,pbias-omap2" for OMAP2 + - should be "ti,pbias-omap3" for OMAP3 + - should be "ti,pbias-omap4" for OMAP4 + - should be "ti,pbias-omap5" for OMAP5 + - "ti,pbias-omap" is deprecated - reg: pbias register offset from syscon base and size of pbias register. - syscon : phandle of the system control module - regulator-name : should be
drivers/regulator/pbias-regulator.c +50 -6
95 lines not on this page · raw message
Signature · 1 line
2.5.0
PATCH v2 2/6 ARM: dts: dra7: use "ti,pbias-dra7" compatible string for pbias
In reply to Kishon Vijay Abraham IUse "ti,pbias-dra7" compatible string which is specifically added for DRA7 SoCs.
--- arch/arm/boot/dts/dra7.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/dra7.dtsi +1 -1
@@ -122,7 +122,7 @@ #size-cells = <1>; pbias_regulator: pbias_regulator { - compatible = "ti,pbias-omap"; + compatible = "ti,pbias-dra7", "ti,pbias-omap"; reg = <0xe00 0x4>; syscon = <&scm_conf>; pbias_mmc_reg: pbias_mmc_omap5 {
Signature · 1 line
1.7.9.5
PATCH v2 3/6 ARM: dts: omap243x: use "ti,pbias-omap2" compatible string for pbias
In reply to Kishon Vijay Abraham IUse "ti,pbias-omap2" compatible string which is specifically added for OMAP2.
--- arch/arm/boot/dts/omap2430.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/omap2430.dtsi +1 -1
@@ -63,7 +63,7 @@ }; pbias_regulator: pbias_regulator { - compatible = "ti,pbias-omap"; + compatible = "ti,pbias-omap2", "ti,pbias-omap"; reg = <0x230 0x4>; syscon = <&scm_conf>; pbias_mmc_reg: pbias_mmc_omap2430 {
Signature · 1 line
1.7.9.5
PATCH v2 4/6 ARM: dts: omap3: use "ti,pbias-omap3" compatible string for pbias
In reply to Kishon Vijay Abraham IUse "ti,pbias-omap3" compatible string which is specifically added for OMAP3.
--- arch/arm/boot/dts/omap3.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/omap3.dtsi +1 -1
@@ -203,7 +203,7 @@ }; pbias_regulator: pbias_regulator { - compatible = "ti,pbias-omap"; + compatible = "ti,pbias-omap3", "ti,pbias-omap"; reg = <0x2b0 0x4>; syscon = <&scm_conf>; pbias_mmc_reg: pbias_mmc_omap2430 {
Signature · 1 line
1.7.9.5
PATCH v2 5/6 ARM: dts: omap4: use "ti,pbias-omap4" compatible string for pbias
In reply to Kishon Vijay Abraham IUse "ti,pbias-omap4" compatible string which is specifically added for OMAP4.
--- arch/arm/boot/dts/omap4.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/omap4.dtsi +1 -1
@@ -198,7 +198,7 @@ #size-cells = <1>; pbias_regulator: pbias_regulator { - compatible = "ti,pbias-omap"; + compatible = "ti,pbias-omap4", "ti,pbias-omap"; reg = <0x60 0x4>; syscon = <&omap4_padconf_global>; pbias_mmc_reg: pbias_mmc_omap4 {
Signature · 1 line
1.7.9.5
PATCH v2 6/6 ARM: dts: omap5: use "ti,pbias-omap5" compatible string for pbias
In reply to Kishon Vijay Abraham IUse "ti,pbias-omap5" compatible string which is specifically added for OMAP5.
--- arch/arm/boot/dts/omap5.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/omap5.dtsi +1 -1
@@ -187,7 +187,7 @@ #size-cells = <1>; pbias_regulator: pbias_regulator { - compatible = "ti,pbias-omap"; + compatible = "ti,pbias-omap5", "ti,pbias-omap"; reg = <0x60 0x4>; syscon = <&omap5_padconf_global>; pbias_mmc_reg: pbias_mmc_omap5 {
Signature · 1 line
1.7.9.5
+Olof
Quoted 38 lines · Kishon Vijay Abraham I
vsel_regandenable_regof the pbias regulator descriptor should actually have the offset from syscon.However after
"ARM: dts: <platform>: add minimal l4 bus layout with control module support"vsel_regandenable_regstarted to have the absolute address because of address translation that happens due to pbias node made as the child node of syscon. This breaks the pbias regulator enable.This series adds the 'offset' to be populated in
vsel_regandenable_regin the pbias driver itself.Changes from v1:
*) Fixed Tony's review comments on adding a 'comment' for adding offset in
the driver and adding a warning for usingplatform_get_resource.
*) Added Tony's Acked-by.Tested these patches against mmc -next in omap4 panda, omap3 beagle xm, dra72 and omap5 uevm
Kishon Vijay Abraham I (6):
regulator: pbias: program pbias register offset in pbias driver
ARM: dts: dra7: use "ti,pbias-dra7" compatible string for pbias
ARM: dts: omap243x: use "ti,pbias-omap2" compatible string for pbias
ARM: dts: omap3: use "ti,pbias-omap3" compatible string for pbias
ARM: dts: omap4: use "ti,pbias-omap4" compatible string for pbias
ARM: dts: omap5: use "ti,pbias-omap5" compatible string for pbias.../bindings/regulator/pbias-regulator.txt | 7 ++- arch/arm/boot/dts/dra7.dtsi | 2 +- arch/arm/boot/dts/omap2430.dtsi | 2 +- arch/arm/boot/dts/omap3.dtsi | 2 +- arch/arm/boot/dts/omap4.dtsi | 2 +- arch/arm/boot/dts/omap5.dtsi | 2 +- drivers/regulator/pbias-regulator.c | 56 +++++++++++++++++--- 7 files changed, 61 insertions(+), 12 deletions(-)
Quoted 3 lines
--
1.7.9.5
I have recently queued another patchset [1] for the mmc omap driver for 4.3 through my mmc tree for which Olof Johansson reported a regression [2] for Panda ES with multi_v7_defconfig.
Kishon, could you please clarify if $subject patchset solves that regression reported by Olof? Or perhaps Olof can run a test?
Finally, perhaps it's better if we queue this through my mmc tree since we would then be able to avoid the regression - if I put $subject patchset before [1], right? Then I need an ack from Mark for the regulator patch.
Please tell me if you guys prefer another way.
Kind regards
Uffe
Hi,
Quoted 41 lines · Ulf Hansson
+Olof
Quoted 38 lines · Kishon Vijay Abraham I
vsel_regandenable_regof the pbias regulator descriptor should actually have the offset from syscon.However after
"ARM: dts: <platform>: add minimal l4 bus layout with control module support"vsel_regandenable_regstarted to have the absolute address because of address translation that happens due to pbias node made as the child node of syscon. This breaks the pbias regulator enable.This series adds the 'offset' to be populated in
vsel_regandenable_regin the pbias driver itself.Changes from v1:
*) Fixed Tony's review comments on adding a 'comment' for adding offset in
the driver and adding a warning for usingplatform_get_resource.
*) Added Tony's Acked-by.Tested these patches against mmc -next in omap4 panda, omap3 beagle xm, dra72 and omap5 uevm
Kishon Vijay Abraham I (6):
regulator: pbias: program pbias register offset in pbias driver
ARM: dts: dra7: use "ti,pbias-dra7" compatible string for pbias
ARM: dts: omap243x: use "ti,pbias-omap2" compatible string for pbias
ARM: dts: omap3: use "ti,pbias-omap3" compatible string for pbias
ARM: dts: omap4: use "ti,pbias-omap4" compatible string for pbias
ARM: dts: omap5: use "ti,pbias-omap5" compatible string for pbias.../bindings/regulator/pbias-regulator.txt | 7 ++- arch/arm/boot/dts/dra7.dtsi | 2 +- arch/arm/boot/dts/omap2430.dtsi | 2 +- arch/arm/boot/dts/omap3.dtsi | 2 +- arch/arm/boot/dts/omap4.dtsi | 2 +- arch/arm/boot/dts/omap5.dtsi | 2 +- drivers/regulator/pbias-regulator.c | 56 +++++++++++++++++--- 7 files changed, 61 insertions(+), 12 deletions(-)
Quoted 7 lines
Quoted 3 lines
--
1.7.9.5I have recently queued another patchset [1] for the mmc omap driver for 4.3 through my mmc tree for which Olof Johansson reported a regression [2] for Panda ES with
multi_v7_defconfig.
I generally perform my tests with omap2plus_defconfig and without this series MMC doesn't work with omap2plus_defconfig.
Quoted 3 lines
Kishon, could you please clarify if $subject patchset solves that regression reported by Olof? Or perhaps Olof can run a test?
Just checked multi_v7_defconfig and this series is definitely required to get MMC working. But we also have to enable 'CONFIG_REGULATOR_PBIAS' which is not enabled by default in multi_v7_defconfig.
So we should have a patch to enable 'CONFIG_REGULATOR_PBIAS' in multi_v7_defconfig to completely solve the problem reported by Olof. I'll prepare a patch for multi_v7_defconfig and post it asap.
Thanks
Kishon
Quoted 16 lines
Finally, perhaps it's better if we queue this through my mmc tree since we would then be able to avoid the regression - if I put $subject patchset before [1], right? Then I need an ack from Mark for the regulator patch.
Please tell me if you guys prefer another way.Kind regards
Uffe
Tony Lindgren
maintainerQuoted 7 lines · Kishon Vijay Abraham I
Quoted 6 lines · Ulf Hansson
Finally, perhaps it's better if we queue this through my mmc tree since we would then be able to avoid the regression - if I put $subject patchset before [1], right? Then I need an ack from Mark for the regulator patch.
Please tell me if you guys prefer another way.
That works for me too. Or Mark can set up an immutable signed branch that you can merge in, up to you guys.
It's still going to break git bisect for booting but removes the regression when mergeing to mainline.
I'd squash all the one liner dts changes into a single patch though when applying to cut down on the commit noise.
Regards,
Tony