Skip to contentSkip to conversation

rtc: omap: Add support for regulator supply

PATCH New Lokesh Vutla 4 participants 7 messages Oct 28, 2014

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v4 cover rtc: omap: Add support for regulator supply

This series adds support for regulator supply.

Changes since V3:
- Removed extra Optional properties header.
- Moved regulator get before platform_set_drvdata().
- Updated commit message for Patch 3/3.
- Added new dt properties for min and max voltages if default voltage needs to be changed.

Changes since v2:
- Rebased on top of Johan Hovold's recent rtc cleanup series[1]
- Addressed Johan Hovold's comments.

[1] https://www.mail-archive.com/linux-kernel at vger.kernel.org/msg748519.html Lokesh Vutla (2):
rtc: omap: use module_platform_driver
rtc: omap: Support regulator supply for RTC

Tero Kristo (1):
rtc: omap: Update Kconfig for OMAP RTC

 Documentation/devicetree/bindings/rtc/rtc-omap.txt |  6 +++
 drivers/rtc/Kconfig                                |  6 +--
 drivers/rtc/rtc-omap.c                             | 47 ++++++++++++++++++++--
 3 files changed, 52 insertions(+), 7 deletions(-)
Signature · 1 line
1.9.1
#1 lore raw

PATCH v4 1/3 rtc: omap: use module_platform_driver

module_platform_driver_probe() prevents driver from requesting probe deferral. So using module_platform_drive() to support probe deferral.
And also removing .owner field which is set by module_platform_driver.

---
 drivers/rtc/rtc-omap.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/rtc/rtc-omap.c +3 -3
index e74750f..d9bb5e7 100644
@@ -477,7 +477,7 @@ static const struct of_device_id omap_rtc_of_match[] = {
 };
 MODULE_DEVICE_TABLE(of, omap_rtc_of_match);
 
-static int __init omap_rtc_probe(struct platform_device *pdev)
+static int omap_rtc_probe(struct platform_device *pdev)
 {
 	struct omap_rtc	*rtc;
 	struct resource	*res;
@@ -708,18 +708,18 @@ static void omap_rtc_shutdown(struct platform_device *pdev)
 }
 
 static struct platform_driver omap_rtc_driver = {
+	.probe		= omap_rtc_probe,
 	.remove		= __exit_p(omap_rtc_remove),
 	.shutdown	= omap_rtc_shutdown,
 	.driver		= {
 		.name	= "omap_rtc",
-		.owner	= THIS_MODULE,
 		.pm	= &omap_rtc_pm_ops,
 		.of_match_table = omap_rtc_of_match,
 	},
 	.id_table	= omap_rtc_id_table,
 };
 
-module_platform_driver_probe(omap_rtc_driver, omap_rtc_probe);
+module_platform_driver(omap_rtc_driver);
 
 MODULE_ALIAS("platform:omap_rtc");
 MODULE_AUTHOR("George G. Davis (and others)");
Signature · 1 line
1.9.1
#2 lore raw

PATCH v4 2/3 rtc: omap: Update Kconfig for OMAP RTC

In reply to Lokesh Vutla

From: Tero Kristo <[email protected]>

RTC is present in AM43xx and DRA7xx also. Updating the Kconfig to depend on ARCH_OMAP or ARCH_DAVINCI

---
 drivers/rtc/Kconfig | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/rtc/Kconfig +3 -3
index 94ae179..8dfcb1b 100644
@@ -1001,11 +1001,11 @@ config RTC_DRV_IMXDI
 	   will be called "rtc-imxdi".
 
 config RTC_DRV_OMAP
-	tristate "TI OMAP1"
-	depends on ARCH_OMAP15XX || ARCH_OMAP16XX || ARCH_OMAP730 || ARCH_DAVINCI_DA8XX || SOC_AM33XX
+	tristate "TI OMAP Real Time Clock"
+	depends on ARCH_OMAP || ARCH_DAVINCI
 	help
 	  Say "yes" here to support the on chip real time clock
-	  present on TI OMAP1, AM33xx and DA8xx/OMAP-L13x.
+	  present on TI OMAP1, AM33xx, DA8xx/OMAP-L13x, AM43xx and DRA7xx.
 
 	  This driver can also be built as a module, if so, module
 	  will be called rtc-omap.
Signature · 1 line
1.9.1
#3 lore raw

PATCH v4 3/3 rtc: omap: Support regulator supply for RTC

In reply to Lokesh Vutla

Certain SoCs such as DRA7, RTC is an independent voltage domain of it's own and on platforms such as DRA7-evm, this may be supplied by individual regulator on it's own.
So make the OMAP RTC driver support a power regulator.

---
- Dropped the Reviewed-by tags as this patch is changed from previous version.

 Documentation/devicetree/bindings/rtc/rtc-omap.txt |  6 ++++
 drivers/rtc/rtc-omap.c                             | 41 +++++++++++++++++++++-
 2 files changed, 46 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/rtc/rtc-omap.txt +6 -0
index 750efd4..c1d84ac 100644
@@ -15,6 +15,9 @@ Required properties:
 Optional properties:
 - ti,system-power-controller: whether the rtc is controlling the system power
   through pmic_power_en
+- vrtc-supply: phandle to the regulator device tree node.
+- vrtc-minuV: Minimum required voltage in uV, If default voltage needs to be changed
+- vrtc-maxuV: Maximum acceptable voltage in uV, If default voltage needs to be changed
 
 Example:
 
@@ -25,4 +28,7 @@ rtc at 1c23000 {
 		      19>;
 	interrupt-parent = <&intc>;
 	ti,system-power-controller;
+	vrtc-supply = <&ldo9_reg>;
+	vrtc-minuV = <1050000>;
+	vrtc-maxuV = <1050000>;
 };
drivers/rtc/rtc-omap.c +40 -1

77 lines not on this page · raw message

Signature · 1 line
1.9.1
#4 lore raw

PATCH v4 3/3 rtc: omap: Support regulator supply for RTC

Quoted 27 lines · Lokesh Vutla

Certain SoCs such as DRA7, RTC is an independent voltage domain of it's own and on platforms such as DRA7-evm, this may be supplied by individual regulator on it's own.
So make the OMAP RTC driver support a power regulator.

---
- Dropped the Reviewed-by tags as this patch is changed from previous version.

 Documentation/devicetree/bindings/rtc/rtc-omap.txt |  6 ++++
 drivers/rtc/rtc-omap.c                             | 41 +++++++++++++++++++++-
 2 files changed, 46 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/rtc/rtc-omap.txt +3 -0
index 750efd4..c1d84ac 100644
@@ -15,6 +15,9 @@ Required properties:
 Optional properties:
 - ti,system-power-controller: whether the rtc is controlling the system power
   through pmic_power_en
+- vrtc-supply: phandle to the regulator device tree node.
+- vrtc-minuV: Minimum required voltage in uV, If default voltage needs to be changed
+- vrtc-maxuV: Maximum acceptable voltage in uV, If default voltage needs to be changed
 
 Example:
 

Documentation/devicetree/bindings/rtc/rtc-omap.txt rtc at 1c23000 { · line 33

Quoted 6 lines
Documentation/devicetree/bindings/rtc/rtc-omap.txt +3 -0
@@ -25,4 +28,7 @@ rtc at 1c23000 {
 		      19>;
 	interrupt-parent = <&intc>;
 	ti,system-power-controller;
+	vrtc-supply = <&ldo9_reg>;
+	vrtc-minuV = <1050000>;
+	vrtc-maxuV = <1050000>;

why would we want to duplicate machine constraints that regulators already have? if there is a constant voltage needed, then it should be compatible property as it is not really a configuration option, right?

[...]

Signature · 2 lines
Regards,
Nishanth Menon
#5 lore raw

PATCH v4 3/3 rtc: omap: Support regulator supply for RTC

In reply to Lokesh Vutla
Quoted 17 lines · Lokesh Vutla

Certain SoCs such as DRA7, RTC is an independent voltage domain of it's own and on platforms such as DRA7-evm, this may be supplied by individual regulator on it's own.
So make the OMAP RTC driver support a power regulator.

---
- Dropped the Reviewed-by tags as this patch is changed from previous version.

 Documentation/devicetree/bindings/rtc/rtc-omap.txt |  6 ++++
 drivers/rtc/rtc-omap.c                             | 41 +++++++++++++++++++++-
 2 files changed, 46 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/rtc/rtc-omap.txt +0 -0
index 750efd4..c1d84ac 100644

Documentation/devicetree/bindings/rtc/rtc-omap.txt Required properties: · line 20

Quoted 6 lines
Documentation/devicetree/bindings/rtc/rtc-omap.txt +3 -0
@@ -15,6 +15,9 @@ Required properties:
 Optional properties:
 - ti,system-power-controller: whether the rtc is controlling the system power
   through pmic_power_en
+- vrtc-supply: phandle to the regulator device tree node.
+- vrtc-minuV: Minimum required voltage in uV, If default voltage needs to be changed
+- vrtc-maxuV: Maximum acceptable voltage in uV, If default voltage needs to be changed

huh ? minuV and maxuV is already part of the regulator binding itself.

Documentation/devicetree/bindings/rtc/rtc-omap.txt static int omap_rtc_probe(struct platform_device *pdev) · line 519

Quoted 5 lines
Documentation/devicetree/bindings/rtc/rtc-omap.txt +1 -0
@@ -514,6 +516,37 @@ static int omap_rtc_probe(struct platform_device *pdev)
 	if (IS_ERR(rtc->base))
 		return PTR_ERR(rtc->base);
 
+	rtc->supply = devm_regulator_get_optional(&pdev->dev, "vrtc");

I'm not sure if this is optional either, it's just that many of our current DTS don't really pass a regulator to RTC, right ?

Quoted 11 lines
Documentation/devicetree/bindings/rtc/rtc-omap.txt +11 -0
+	if (IS_ERR(rtc->supply)) {
+		if (PTR_ERR(rtc->supply) == -EPROBE_DEFER)
+			return -EPROBE_DEFER;
+
+		rtc->supply = NULL;
+	}
+
+	if (rtc->supply) {
+		of_property_read_u32(pdev->dev.of_node, "vrtc-minuV",
+				     &vrtc_minuV);
+		of_property_read_u32(pdev->dev.of_node, "vrtc-maxuV",

Documentation/devicetree/bindings/rtc/rtc-omap.txt static int omap_rtc_probe(struct platform_device *pdev) · line 540

Quoted 10 lines
Documentation/devicetree/bindings/rtc/rtc-omap.txt +10 -0
+				     &vrtc_maxuV);
+		if (vrtc_minuV && vrtc_maxuV) {
+			ret = regulator_set_voltage(rtc->supply,
+						    vrtc_minuV, vrtc_maxuV);
+			if (ret) {
+				dev_err(&pdev->dev, "failed to set volt %d\n",
+					ret);
+				return ret;
+			}
+		}

I'd really like to Mark's comments here but I was under the impression that if the binding already gives min_microvolt == max_microvolt then driver shouldn't really care about a set_voltage. Mark ?

Quoted 35 lines
Documentation/devicetree/bindings/rtc/rtc-omap.txt +15 -0
+
+		ret = regulator_enable(rtc->supply);
+		if (ret) {
+			dev_err(&pdev->dev, "regulator enable failed %d\n",
+				ret);
+			return ret;
+		}
+	}
+
 	platform_set_drvdata(pdev, rtc);
 
 	/* Enable the clock/module so that we can access the registers */
@@ -624,6 +657,9 @@ err:
 	pm_runtime_put_sync(&pdev->dev);
 	pm_runtime_disable(&pdev->dev);
 
+	if (rtc->supply)
+		regulator_disable(rtc->supply);
+
 	return ret;
 }
 
@@ -649,6 +685,9 @@ static int __exit omap_rtc_remove(struct platform_device *pdev)
 	pm_runtime_put_sync(&pdev->dev);
 	pm_runtime_disable(&pdev->dev);
 
+	if (rtc->supply)
+		regulator_disable(rtc->supply);
+
 	return 0;
 }
 
Signature · 1 line
1.9.1
Signature · 8 lines
balbi
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141028/a12a912a/attachment.sig>
#6 lore raw

PATCH v4 3/3 rtc: omap: Support regulator supply for RTC

Quoted 6 lines · Felipe Balbi
Quoted 2 lines · Lokesh Vutla
+- vrtc-minuV: Minimum required voltage in uV, If default voltage needs to be changed
+- vrtc-maxuV: Maximum acceptable voltage in uV, If default voltage needs to be changed

huh ? minuV and maxuV is already part of the regulator binding itself.

No, they aren't - there's bindings for setting constraints but not bindings for setting values in consumers since consumers generally understand why they are setting a voltage if they do so. I'd expect that we'd have a property for whatever system feature might cause us to need to explicitly set the voltage if we need to vary the voltage at runtime, or alternatively for systems to set a voltage through the constraints on the supply rather than having properties on the consumer
- why are they here?

If for some reason we really need these properties they should be -max-uV and -min-uV.

Quoted 8 lines

drivers/rtc/rtc-omap.c static int omap_rtc_probe(struct platform_device *pdev) · line 519

Quoted 5 lines
drivers/rtc/rtc-omap.c +1 -0
@@ -514,6 +516,37 @@ static int omap_rtc_probe(struct platform_device *pdev)
 	if (IS_ERR(rtc->base))
 		return PTR_ERR(rtc->base);
 
+	rtc->supply = devm_regulator_get_optional(&pdev->dev, "vrtc");

I'm not sure if this is optional either, it's just that many of our current DTS don't really pass a regulator to RTC, right ?

If the RTC can run without power that would certainly be most impressive. I can't see any reason for this driver to use anything other than a standard regulator_get().

Quoted 5 lines
Quoted 5 lines
drivers/rtc/rtc-omap.c +5 -0
+		if (vrtc_minuV && vrtc_maxuV) {
+			ret = regulator_set_voltage(rtc->supply,
+						    vrtc_minuV, vrtc_maxuV);
+			if (ret) {
+				dev_err(&pdev->dev, "failed to set volt %d\n",
Quoted 8 lines

drivers/rtc/rtc-omap.c static int omap_rtc_probe(struct platform_device *pdev) · line 540

Quoted 4 lines
drivers/rtc/rtc-omap.c +4 -0
+					ret);
+				return ret;
+			}
+		}

I'd really like to Mark's comments here but I was under the impression that if the binding already gives min_microvolt == max_microvolt then driver shouldn't really care about a set_voltage. Mark ?

That's what happens for the standard properties on the supplying
regulator, these properties are separate to that. Like I say I'm not
sure I understand why this is being done on a per-consumer basis.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 473 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20141028/33561daf/attachment.sig>