Skip to contentSkip to conversation

rtc: i.MX dryice: Add devicetree support

PATCH RESEND Superseded Sascha Hauer 3 participants 4 messages Nov 12, 2012 – Nov 15, 2012

Subsystems (3)
Device tree bindings Arm i.MX and Layerscape Real time clock (RTC)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Sascha Hauer

author maintainer
#0 lore raw

PATCH RESEND 1/1 rtc: i.MX dryice: Add devicetree support

Add devicetree probing, fixing some whitespace damage along the way.

Signed-off-by Sascha Hauer <[email protected]>

---

Just a resend with Andrew Morton on Cc since I got no reaction from the RTC Maintainer.

 Documentation/devicetree/bindings/rtc/imx-di.txt |   19 +++++++++++++++++++
 drivers/rtc/rtc-imxdi.c                          |   12 +++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/rtc/imx-di.txt
Documentation/devicetree/bindings/rtc/imx-di.txt new file +19 -0
new file mode 100644
index 0000000..42b92b5
@@ -0,0 +1,19 @@
+* i.MX25 dryice Real Time Clock controller
+
+This RTC is part of the i.MX25 dryice module. Documentation for this
+unit is not publically available. This binding only makes use of the
+RTC.
+
+Required properties:
+- compatible: should be "fsl,imx25-rtc"
+- reg: physical base address of the controller and length of memory mapped
+  region.
+- interrupts: interrupt source for the dryice module
+
+Example:
+
+	dryice at 53ffc000 {
+		compatible = "fsl,imx25-dryice", "fsl,imx25-rtc";
+		reg = <0x53ffc000 0x4000>;
+		interrupts = <25>;
+	};
drivers/rtc/rtc-imxdi.c +9 -3
index 891cd6c..b2fe920 100644
@@ -493,11 +493,17 @@ static int __devexit dryice_rtc_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static const struct of_device_id of_dryice_rtc_match[] = {
+	{ .compatible = "fsl,imx25-rtc", },
+	{ },
+};
+
 static struct platform_driver dryice_rtc_driver = {
 	.driver = {
-		   .name = "imxdi_rtc",
-		   .owner = THIS_MODULE,
-		   },
+		.name = "imxdi_rtc",
+		.owner = THIS_MODULE,
+		.of_match_table = of_dryice_rtc_match,
+	},
 	.remove = __devexit_p(dryice_rtc_remove),
 };
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH RESEND 1/1 rtc: i.MX dryice: Add devicetree support

Quoted 3 lines · Sascha Hauer

Add devicetree probing, fixing some whitespace damage along the way.

Signed-off-by Sascha Hauer <[email protected]>
Reviewed-by Shawn Guo <[email protected]>
Quoted 63 lines

---

Just a resend with Andrew Morton on Cc since I got no reaction from the RTC Maintainer.

 Documentation/devicetree/bindings/rtc/imx-di.txt |   19 +++++++++++++++++++
 drivers/rtc/rtc-imxdi.c                          |   12 +++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/rtc/imx-di.txt
Documentation/devicetree/bindings/rtc/imx-di.txt new file +19 -0
new file mode 100644
index 0000000..42b92b5
@@ -0,0 +1,19 @@
+* i.MX25 dryice Real Time Clock controller
+
+This RTC is part of the i.MX25 dryice module. Documentation for this
+unit is not publically available. This binding only makes use of the
+RTC.
+
+Required properties:
+- compatible: should be "fsl,imx25-rtc"
+- reg: physical base address of the controller and length of memory mapped
+  region.
+- interrupts: interrupt source for the dryice module
+
+Example:
+
+	dryice at 53ffc000 {
+		compatible = "fsl,imx25-dryice", "fsl,imx25-rtc";
+		reg = <0x53ffc000 0x4000>;
+		interrupts = <25>;
+	};
drivers/rtc/rtc-imxdi.c +9 -3
index 891cd6c..b2fe920 100644
@@ -493,11 +493,17 @@ static int __devexit dryice_rtc_remove(struct platform_device *pdev)
 	return 0;
 }
 
+static const struct of_device_id of_dryice_rtc_match[] = {
+	{ .compatible = "fsl,imx25-rtc", },
+	{ },
+};
+
 static struct platform_driver dryice_rtc_driver = {
 	.driver = {
-		   .name = "imxdi_rtc",
-		   .owner = THIS_MODULE,
-		   },
+		.name = "imxdi_rtc",
+		.owner = THIS_MODULE,
+		.of_match_table = of_dryice_rtc_match,
+	},
 	.remove = __devexit_p(dryice_rtc_remove),
 };
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH RESEND 1/1 rtc: i.MX dryice: Add devicetree support

In reply to Sascha Hauer
Quoted 2 lines · On Mon, 12 Nov 2012 09:42:50 +0100 Sascha Hauer <[email protected]> wrote:

Add devicetree probing, fixing some whitespace damage along the way.

I've already merged the below. It has better code but a little less documentation:

From: Roland Stigge <[email protected]>
Subject: drivers/rtc/rtc-imxdi.c: add devicetree support

Add device tree support to the rtc-imxdi driver.

Signed-off-by Roland Stigge <[email protected]>
Cc Alessandro Zummo <[email protected]>
Cc Grant Likely <[email protected]>
Cc Sascha Hauer <[email protected]>
Cc Russell King <[email protected]>
Signed-off-by Andrew Morton <[email protected]>

---

 Documentation/devicetree/bindings/rtc/imxdi-rtc.txt |   17 ++++++++++
 drivers/rtc/rtc-imxdi.c                             |   11 ++++++
 2 files changed, 28 insertions(+)
Documentation/devicetree/bindings/rtc/imxdi-rtc.txt new file +17 -0
diff -puN /dev/null Documentation/devicetree/bindings/rtc/imxdi-rtc.txt
@@ -0,0 +1,17 @@
+* i.MX25 Real Time Clock controller
+
+This binding supports the following chips: i.MX25, i.MX53
+
+Required properties:
+- compatible: should be: "fsl,imx25-rtc"
+- reg: physical base address of the controller and length of memory mapped
+  region.
+- interrupts: rtc alarm interrupt
+
+Example:
+
+rtc at 80056000 {
+	compatible = "fsl,imx53-rtc", "fsl,imx25-rtc";
+	reg = <0x80056000 2000>;
+	interrupts = <29>;
+};
drivers/rtc/rtc-imxdi.c renamed from drivers/rtc/rtc-imxdi.c~rtc-imxdi-add-devicetree-support +11 -0
diff -puN drivers/rtc/rtc-imxdi.c~rtc-imxdi-add-devicetree-support drivers/rtc/rtc-imxdi.c
@@ -37,6 +37,7 @@
 #include <linux/rtc.h>
 #include <linux/sched.h>
 #include <linux/workqueue.h>
+#include <linux/of.h>
 
 /* DryIce Register Definitions */
 

@@ -495,10 +496,20 @@ static int __devexit dryice_rtc_remove(s
 	return 0;
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id dryice_dt_ids[] = {
+	{ .compatible = "fsl,imx25-rtc" },
+	{ /* sentinel */ }
+};
+
+MODULE_DEVICE_TABLE(of, dryice_dt_ids);
+#endif
+
 static struct platform_driver dryice_rtc_driver = {
 	.driver = {
 		   .name = "imxdi_rtc",
 		   .owner = THIS_MODULE,
+		   .of_match_table = of_match_ptr(dryice_dt_ids),
 		   },
 	.remove = __devexit_p(dryice_rtc_remove),
 };

_

author maintainer
#3 lore raw

PATCH RESEND 1/1 rtc: i.MX dryice: Add devicetree support

Quoted 8 lines · Andrew Morton
Quoted 2 lines · On Mon, 12 Nov 2012 09:42:50 +0100 Sascha Hauer <[email protected]> wrote:

Add devicetree probing, fixing some whitespace damage along the way.

I've already merged the below. It has better code but a little less documentation:

Oops, missed that. Too many RTCs...

Sorry for the noise.

Sascha

Signature · 4 lines
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |