* [PATCH 1/6] regulator: pbias: program pbias register offset in pbias driver
2015-09-02 10:47 [PATCH 0/6] Fix pbias regulator enable Kishon Vijay Abraham I
@ 2015-09-02 10:47 ` Kishon Vijay Abraham I
[not found] ` <1441190853-7133-2-git-send-email-kishon-l0cyMroinI0@public.gmane.org>
2015-09-02 10:47 ` [PATCH 2/6] ARM: dts: dra7: use "ti,pbias-dra7" compatible string for pbias Kishon Vijay Abraham I
` (4 subsequent siblings)
5 siblings, 1 reply; 9+ messages in thread
From: Kishon Vijay Abraham I @ 2015-09-02 10:47 UTC (permalink / raw)
To: tony, broonie, devicetree, linux-mmc, linux-kernel, nsekhar
Cc: ulf.hansson, robh+dt, pawel.moll, mark.rutland, ijc+devicetree,
galak, bcousson, linux, lgirdwood, linux-omap, linux-arm-kernel,
kishon
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 with the new compatible
strings.
Suggested-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
.../bindings/regulator/pbias-regulator.txt | 7 ++-
drivers/regulator/pbias-regulator.c | 52 +++++++++++++++++---
2 files changed, 52 insertions(+), 7 deletions(-)
diff --git a/Documentation/devicetree/bindings/regulator/pbias-regulator.txt b/Documentation/devicetree/bindings/regulator/pbias-regulator.txt
index 32aa26f..acbcb45 100644
--- a/Documentation/devicetree/bindings/regulator/pbias-regulator.txt
+++ b/Documentation/devicetree/bindings/regulator/pbias-regulator.txt
@@ -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
diff --git a/drivers/regulator/pbias-regulator.c b/drivers/regulator/pbias-regulator.c
index bd2b75c..afe5056 100644
--- a/drivers/regulator/pbias-regulator.c
+++ b/drivers/regulator/pbias-regulator.c
@@ -44,6 +44,10 @@ struct pbias_regulator_data {
int voltage;
};
+struct pbias_of_data {
+ unsigned int offset;
+};
+
static const unsigned int pbias_volt_table[] = {
1800000,
3000000
@@ -98,8 +102,33 @@ static struct of_regulator_match pbias_matches[] = {
};
#define PBIAS_NUM_REGS ARRAY_SIZE(pbias_matches)
+static const struct pbias_of_data pbias_of_data_omap2 = {
+ .offset = 0x230,
+};
+
+static const struct pbias_of_data pbias_of_data_omap3 = {
+ .offset = 0x2b0,
+};
+
+static const struct pbias_of_data pbias_of_data_omap4 = {
+ .offset = 0x60,
+};
+
+static const struct pbias_of_data pbias_of_data_omap5 = {
+ .offset = 0x60,
+};
+
+static const struct pbias_of_data pbias_of_data_dra7 = {
+ .offset = 0xe00,
+};
+
static const struct of_device_id pbias_of_match[] = {
{ .compatible = "ti,pbias-omap", },
+ { .compatible = "ti,pbias-omap2", .data = &pbias_of_data_omap2, },
+ { .compatible = "ti,pbias-omap3", .data = &pbias_of_data_omap3, },
+ { .compatible = "ti,pbias-omap4", .data = &pbias_of_data_omap4, },
+ { .compatible = "ti,pbias-omap5", .data = &pbias_of_data_omap5, },
+ { .compatible = "ti,pbias-dra7", .data = &pbias_of_data_dra7, },
{},
};
MODULE_DEVICE_TABLE(of, pbias_of_match);
@@ -114,6 +143,9 @@ static int pbias_regulator_probe(struct platform_device *pdev)
const struct pbias_reg_info *info;
int ret = 0;
int count, idx, data_idx = 0;
+ const struct of_device_id *match;
+ const struct pbias_of_data *data;
+ unsigned int offset;
count = of_regulator_match(&pdev->dev, np, pbias_matches,
PBIAS_NUM_REGS);
@@ -129,6 +161,18 @@ static int pbias_regulator_probe(struct platform_device *pdev)
if (IS_ERR(syscon))
return PTR_ERR(syscon);
+ match = of_match_device(of_match_ptr(pbias_of_match), &pdev->dev);
+ if (match && match->data) {
+ data = match->data;
+ offset = data->offset;
+ } else {
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
+ if (!res)
+ return -EINVAL;
+
+ offset = res->start;
+ }
+
cfg.regmap = syscon;
cfg.dev = &pdev->dev;
@@ -141,10 +185,6 @@ static int pbias_regulator_probe(struct platform_device *pdev)
if (!info)
return -ENODEV;
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!res)
- return -EINVAL;
-
drvdata[data_idx].syscon = syscon;
drvdata[data_idx].info = info;
drvdata[data_idx].desc.name = info->name;
@@ -154,9 +194,9 @@ static int pbias_regulator_probe(struct platform_device *pdev)
drvdata[data_idx].desc.volt_table = pbias_volt_table;
drvdata[data_idx].desc.n_voltages = 2;
drvdata[data_idx].desc.enable_time = info->enable_time;
- drvdata[data_idx].desc.vsel_reg = res->start;
+ drvdata[data_idx].desc.vsel_reg = offset;
drvdata[data_idx].desc.vsel_mask = info->vmode;
- drvdata[data_idx].desc.enable_reg = res->start;
+ drvdata[data_idx].desc.enable_reg = offset;
drvdata[data_idx].desc.enable_mask = info->enable_mask;
drvdata[data_idx].desc.enable_val = info->enable;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 2/6] ARM: dts: dra7: use "ti,pbias-dra7" compatible string for pbias
2015-09-02 10:47 [PATCH 0/6] Fix pbias regulator enable Kishon Vijay Abraham I
2015-09-02 10:47 ` [PATCH 1/6] regulator: pbias: program pbias register offset in pbias driver Kishon Vijay Abraham I
@ 2015-09-02 10:47 ` Kishon Vijay Abraham I
2015-09-02 10:47 ` [PATCH 3/6] ARM: dts: omap243x: use "ti, pbias-omap2" " Kishon Vijay Abraham I
` (3 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Kishon Vijay Abraham I @ 2015-09-02 10:47 UTC (permalink / raw)
To: tony, broonie, devicetree, linux-mmc, linux-kernel, nsekhar
Cc: ulf.hansson, robh+dt, pawel.moll, mark.rutland, ijc+devicetree,
galak, bcousson, linux, lgirdwood, linux-omap, linux-arm-kernel,
kishon
Use "ti,pbias-dra7" compatible string which is specifically added
for DRA7 SoCs.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/dra7.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi
index 1e29ccf..d6bc6db 100644
--- a/arch/arm/boot/dts/dra7.dtsi
+++ b/arch/arm/boot/dts/dra7.dtsi
@@ -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 {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 3/6] ARM: dts: omap243x: use "ti, pbias-omap2" compatible string for pbias
2015-09-02 10:47 [PATCH 0/6] Fix pbias regulator enable Kishon Vijay Abraham I
2015-09-02 10:47 ` [PATCH 1/6] regulator: pbias: program pbias register offset in pbias driver Kishon Vijay Abraham I
2015-09-02 10:47 ` [PATCH 2/6] ARM: dts: dra7: use "ti,pbias-dra7" compatible string for pbias Kishon Vijay Abraham I
@ 2015-09-02 10:47 ` Kishon Vijay Abraham I
[not found] ` <1441190853-7133-1-git-send-email-kishon-l0cyMroinI0@public.gmane.org>
` (2 subsequent siblings)
5 siblings, 0 replies; 9+ messages in thread
From: Kishon Vijay Abraham I @ 2015-09-02 10:47 UTC (permalink / raw)
To: tony, broonie, devicetree, linux-mmc, linux-kernel, nsekhar
Cc: mark.rutland, ulf.hansson, linux, pawel.moll, ijc+devicetree,
lgirdwood, kishon, robh+dt, bcousson, galak, linux-omap,
linux-arm-kernel
Use "ti,pbias-omap2" compatible string which is specifically added
for OMAP2.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/omap2430.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/omap2430.dtsi b/arch/arm/boot/dts/omap2430.dtsi
index 2390f38..3961a6f 100644
--- a/arch/arm/boot/dts/omap2430.dtsi
+++ b/arch/arm/boot/dts/omap2430.dtsi
@@ -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 {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
[parent not found: <1441190853-7133-1-git-send-email-kishon-l0cyMroinI0@public.gmane.org>]
* [PATCH 4/6] ARM: dts: omap3: use "ti,pbias-omap3" compatible string for pbias
[not found] ` <1441190853-7133-1-git-send-email-kishon-l0cyMroinI0@public.gmane.org>
@ 2015-09-02 10:47 ` Kishon Vijay Abraham I
0 siblings, 0 replies; 9+ messages in thread
From: Kishon Vijay Abraham I @ 2015-09-02 10:47 UTC (permalink / raw)
To: tony-4v6yS6AI5VpBDgjK7y7TUQ, broonie-DgEjT+Ai2ygdnm+yROfE0A,
devicetree-u79uwXL29TY76Z2rM5mHXA,
linux-mmc-u79uwXL29TY76Z2rM5mHXA,
linux-kernel-u79uwXL29TY76Z2rM5mHXA, nsekhar-l0cyMroinI0
Cc: ulf.hansson-QSEj5FYQhm4dnm+yROfE0A,
robh+dt-DgEjT+Ai2ygdnm+yROfE0A, pawel.moll-5wv7dgnIgG8,
mark.rutland-5wv7dgnIgG8, ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg,
galak-sgV2jX0FEOL9JmXXK+q4OQ, bcousson-rdvid1DuHRBWk0Htik3J/w,
linux-lFZ/pmaqli7XmaaqVzeoHQ, lgirdwood-Re5JQEeQqe8AvxtiuMwx3w,
linux-omap-u79uwXL29TY76Z2rM5mHXA,
linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r,
kishon-l0cyMroinI0
Use "ti,pbias-omap3" compatible string which is specifically added
for OMAP3.
Signed-off-by: Kishon Vijay Abraham I <kishon-l0cyMroinI0@public.gmane.org>
---
arch/arm/boot/dts/omap3.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/omap3.dtsi b/arch/arm/boot/dts/omap3.dtsi
index 69a40cf..9af9ae1 100644
--- a/arch/arm/boot/dts/omap3.dtsi
+++ b/arch/arm/boot/dts/omap3.dtsi
@@ -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 {
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 5/6] ARM: dts: OMAP4: use "ti, pbias-omap4" compatible string for pbias
2015-09-02 10:47 [PATCH 0/6] Fix pbias regulator enable Kishon Vijay Abraham I
` (3 preceding siblings ...)
[not found] ` <1441190853-7133-1-git-send-email-kishon-l0cyMroinI0@public.gmane.org>
@ 2015-09-02 10:47 ` Kishon Vijay Abraham I
2015-09-02 10:47 ` [PATCH 6/6] ARM: dts: OMAP5: use "ti,pbias-omap5" " Kishon Vijay Abraham I
5 siblings, 0 replies; 9+ messages in thread
From: Kishon Vijay Abraham I @ 2015-09-02 10:47 UTC (permalink / raw)
To: tony, broonie, devicetree, linux-mmc, linux-kernel, nsekhar
Cc: mark.rutland, ulf.hansson, linux, pawel.moll, ijc+devicetree,
lgirdwood, kishon, robh+dt, bcousson, galak, linux-omap,
linux-arm-kernel
Use "ti,pbias-omap4" compatible string which is specifically added
for OMAP4.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/omap4.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index abc4473..5aad7f3 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -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 {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH 6/6] ARM: dts: OMAP5: use "ti,pbias-omap5" compatible string for pbias
2015-09-02 10:47 [PATCH 0/6] Fix pbias regulator enable Kishon Vijay Abraham I
` (4 preceding siblings ...)
2015-09-02 10:47 ` [PATCH 5/6] ARM: dts: OMAP4: use "ti, pbias-omap4" " Kishon Vijay Abraham I
@ 2015-09-02 10:47 ` Kishon Vijay Abraham I
5 siblings, 0 replies; 9+ messages in thread
From: Kishon Vijay Abraham I @ 2015-09-02 10:47 UTC (permalink / raw)
To: tony, broonie, devicetree, linux-mmc, linux-kernel, nsekhar
Cc: ulf.hansson, robh+dt, pawel.moll, mark.rutland, ijc+devicetree,
galak, bcousson, linux, lgirdwood, linux-omap, linux-arm-kernel,
kishon
Use "ti,pbias-omap5" compatible string which is specifically added
for OMAP5.
Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
---
arch/arm/boot/dts/omap5.dtsi | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index b1a1263..76ef595 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -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 {
--
1.7.9.5
^ permalink raw reply related [flat|nested] 9+ messages in thread