* [PATCH 1/2] rtc-imxdi: Support for i.MX53
@ 2012-10-18 16:06 Roland Stigge
2012-10-18 16:06 ` [PATCH 2/2] rtc-imxdi: Add devicetree support Roland Stigge
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Roland Stigge @ 2012-10-18 16:06 UTC (permalink / raw)
To: a.zummo, grant.likely, rob.herring, rtc-linux, linux-kernel,
devicetree-discuss, s.hauer, linux-arm-kernel
Cc: Roland Stigge
This patch enables support for i.MX53 in addition to i.MX25 by enabling the
driver on ARCH_MXC generally.
Signed-off-by: Roland Stigge <stigge@antcom.de>
---
drivers/rtc/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- linux-2.6.orig/drivers/rtc/Kconfig
+++ linux-2.6/drivers/rtc/Kconfig
@@ -768,7 +768,7 @@ config RTC_DRV_DAVINCI
config RTC_DRV_IMXDI
tristate "Freescale IMX DryIce Real Time Clock"
- depends on SOC_IMX25
+ depends on ARCH_MXC
help
Support for Freescale IMX DryIce RTC
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 2/2] rtc-imxdi: Add devicetree support
2012-10-18 16:06 [PATCH 1/2] rtc-imxdi: Support for i.MX53 Roland Stigge
@ 2012-10-18 16:06 ` Roland Stigge
2012-10-29 21:00 ` Sascha Hauer
2012-10-18 16:06 ` [PATCH] ARM: mach-imx: Support for DryIce RTC in i.MX53 Roland Stigge
2012-10-29 21:00 ` [PATCH 1/2] rtc-imxdi: Support for i.MX53 Sascha Hauer
2 siblings, 1 reply; 7+ messages in thread
From: Roland Stigge @ 2012-10-18 16:06 UTC (permalink / raw)
To: a.zummo, grant.likely, rob.herring, rtc-linux, linux-kernel,
devicetree-discuss, s.hauer, linux-arm-kernel
Cc: Roland Stigge
This patch adds device tree support to the rtc-imxdi driver.
Signed-off-by: Roland Stigge <stigge@antcom.de>
---
Documentation/devicetree/bindings/rtc/imxdi-rtc.txt | 17 +++++++++++++++++
drivers/rtc/rtc-imxdi.c | 11 +++++++++++
2 files changed, 28 insertions(+)
--- /dev/null
+++ linux-2.6/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@80056000 {
+ compatible = "fsl,imx53-rtc", "fsl,imx25-rtc";
+ reg = <0x80056000 2000>;
+ interrupts = <29>;
+};
--- linux-2.6.orig/drivers/rtc/rtc-imxdi.c
+++ linux-2.6/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 */
@@ -493,10 +494,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),
};
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH 2/2] rtc-imxdi: Add devicetree support
2012-10-18 16:06 ` [PATCH 2/2] rtc-imxdi: Add devicetree support Roland Stigge
@ 2012-10-29 21:00 ` Sascha Hauer
0 siblings, 0 replies; 7+ messages in thread
From: Sascha Hauer @ 2012-10-29 21:00 UTC (permalink / raw)
To: Roland Stigge
Cc: a.zummo, grant.likely, rob.herring, rtc-linux, linux-kernel,
devicetree-discuss, linux-arm-kernel
On Thu, Oct 18, 2012 at 06:06:09PM +0200, Roland Stigge wrote:
> This patch adds device tree support to the rtc-imxdi driver.
>
> Signed-off-by: Roland Stigge <stigge@antcom.de>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> Documentation/devicetree/bindings/rtc/imxdi-rtc.txt | 17 +++++++++++++++++
> drivers/rtc/rtc-imxdi.c | 11 +++++++++++
> 2 files changed, 28 insertions(+)
>
> --- /dev/null
> +++ linux-2.6/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@80056000 {
> + compatible = "fsl,imx53-rtc", "fsl,imx25-rtc";
> + reg = <0x80056000 2000>;
> + interrupts = <29>;
> +};
> --- linux-2.6.orig/drivers/rtc/rtc-imxdi.c
> +++ linux-2.6/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 */
>
> @@ -493,10 +494,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),
> };
>
--
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 |
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] ARM: mach-imx: Support for DryIce RTC in i.MX53
2012-10-18 16:06 [PATCH 1/2] rtc-imxdi: Support for i.MX53 Roland Stigge
2012-10-18 16:06 ` [PATCH 2/2] rtc-imxdi: Add devicetree support Roland Stigge
@ 2012-10-18 16:06 ` Roland Stigge
2012-10-29 21:03 ` Sascha Hauer
2012-10-29 21:00 ` [PATCH 1/2] rtc-imxdi: Support for i.MX53 Sascha Hauer
2 siblings, 1 reply; 7+ messages in thread
From: Roland Stigge @ 2012-10-18 16:06 UTC (permalink / raw)
To: a.zummo, grant.likely, rob.herring, rtc-linux, linux-kernel,
devicetree-discuss, s.hauer, linux-arm-kernel
Cc: Roland Stigge
This patch enables support for i.MX53 in addition to i.MX25 by providing a
dummy clock on i.MX53 since this one doesn't have a separate clock for internal
RTC but the driver requests one.
Signed-off-by: Roland Stigge <stigge@antcom.de>
---
arch/arm/mach-imx/clk-imx51-imx53.c | 1 +
1 file changed, 1 insertion(+)
--- linux-2.6.orig/arch/arm/mach-imx/clk-imx51-imx53.c
+++ linux-2.6/arch/arm/mach-imx/clk-imx51-imx53.c
@@ -467,6 +467,7 @@ int __init mx53_clocks_init(unsigned lon
clk_register_clkdev(clk[can1_serial_gate], "per", "53fc8000.can");
clk_register_clkdev(clk[can2_ipg_gate], "ipg", "53fcc000.can");
clk_register_clkdev(clk[can2_serial_gate], "per", "53fcc000.can");
+ clk_register_clkdev(clk[dummy], NULL, "53fa4000.rtc");
/* set SDHC root clock to 200MHZ*/
clk_set_rate(clk[esdhc_a_podf], 200000000);
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] ARM: mach-imx: Support for DryIce RTC in i.MX53
2012-10-18 16:06 ` [PATCH] ARM: mach-imx: Support for DryIce RTC in i.MX53 Roland Stigge
@ 2012-10-29 21:03 ` Sascha Hauer
0 siblings, 0 replies; 7+ messages in thread
From: Sascha Hauer @ 2012-10-29 21:03 UTC (permalink / raw)
To: Roland Stigge
Cc: a.zummo, grant.likely, rob.herring, rtc-linux, linux-kernel,
devicetree-discuss, linux-arm-kernel
On Thu, Oct 18, 2012 at 06:06:10PM +0200, Roland Stigge wrote:
> This patch enables support for i.MX53 in addition to i.MX25 by providing a
> dummy clock on i.MX53 since this one doesn't have a separate clock for internal
> RTC but the driver requests one.
>
> Signed-off-by: Roland Stigge <stigge@antcom.de>
Applied, thanks
Sascha
> ---
> arch/arm/mach-imx/clk-imx51-imx53.c | 1 +
> 1 file changed, 1 insertion(+)
>
> --- linux-2.6.orig/arch/arm/mach-imx/clk-imx51-imx53.c
> +++ linux-2.6/arch/arm/mach-imx/clk-imx51-imx53.c
> @@ -467,6 +467,7 @@ int __init mx53_clocks_init(unsigned lon
> clk_register_clkdev(clk[can1_serial_gate], "per", "53fc8000.can");
> clk_register_clkdev(clk[can2_ipg_gate], "ipg", "53fcc000.can");
> clk_register_clkdev(clk[can2_serial_gate], "per", "53fcc000.can");
> + clk_register_clkdev(clk[dummy], NULL, "53fa4000.rtc");
>
> /* set SDHC root clock to 200MHZ*/
> clk_set_rate(clk[esdhc_a_podf], 200000000);
>
--
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 |
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH 1/2] rtc-imxdi: Support for i.MX53
2012-10-18 16:06 [PATCH 1/2] rtc-imxdi: Support for i.MX53 Roland Stigge
2012-10-18 16:06 ` [PATCH 2/2] rtc-imxdi: Add devicetree support Roland Stigge
2012-10-18 16:06 ` [PATCH] ARM: mach-imx: Support for DryIce RTC in i.MX53 Roland Stigge
@ 2012-10-29 21:00 ` Sascha Hauer
2 siblings, 0 replies; 7+ messages in thread
From: Sascha Hauer @ 2012-10-29 21:00 UTC (permalink / raw)
To: Roland Stigge
Cc: a.zummo, grant.likely, rob.herring, rtc-linux, linux-kernel,
devicetree-discuss, linux-arm-kernel
On Thu, Oct 18, 2012 at 06:06:08PM +0200, Roland Stigge wrote:
> This patch enables support for i.MX53 in addition to i.MX25 by enabling the
> driver on ARCH_MXC generally.
>
> Signed-off-by: Roland Stigge <stigge@antcom.de>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> drivers/rtc/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> --- linux-2.6.orig/drivers/rtc/Kconfig
> +++ linux-2.6/drivers/rtc/Kconfig
> @@ -768,7 +768,7 @@ config RTC_DRV_DAVINCI
>
> config RTC_DRV_IMXDI
> tristate "Freescale IMX DryIce Real Time Clock"
> - depends on SOC_IMX25
> + depends on ARCH_MXC
> help
> Support for Freescale IMX DryIce RTC
>
>
--
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 |
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH 1/2] rtc-imxdi: Support for i.MX53
@ 2012-10-16 14:51 Roland Stigge
2012-10-16 14:51 ` [PATCH 2/2] rtc-imxdi: Add devicetree support Roland Stigge
0 siblings, 1 reply; 7+ messages in thread
From: Roland Stigge @ 2012-10-16 14:51 UTC (permalink / raw)
To: a.zummo, grant.likely, rob.herring, rtc-linux, linux-kernel,
devicetree-discuss, s.hauer
Cc: Roland Stigge
This patch enables support for i.MX53 in addition to i.MX25
Signed-off-by: Roland Stigge <stigge@antcom.de>
---
drivers/rtc/Kconfig | 2 +-
drivers/rtc/rtc-imxdi.c | 25 ++++++++++++++++---------
2 files changed, 17 insertions(+), 10 deletions(-)
--- linux-2.6.orig/drivers/rtc/Kconfig
+++ linux-2.6/drivers/rtc/Kconfig
@@ -768,7 +768,7 @@ config RTC_DRV_DAVINCI
config RTC_DRV_IMXDI
tristate "Freescale IMX DryIce Real Time Clock"
- depends on SOC_IMX25
+ depends on SOC_IMX25 || SOC_IMX53
help
Support for Freescale IMX DryIce RTC
--- linux-2.6.orig/drivers/rtc/rtc-imxdi.c
+++ linux-2.6/drivers/rtc/rtc-imxdi.c
@@ -37,6 +37,7 @@
#include <linux/rtc.h>
#include <linux/sched.h>
#include <linux/workqueue.h>
+#include <mach/hardware.h>
/* DryIce Register Definitions */
@@ -402,11 +403,13 @@ static int dryice_rtc_probe(struct platf
mutex_init(&imxdi->write_mutex);
- imxdi->clk = clk_get(&pdev->dev, NULL);
- if (IS_ERR(imxdi->clk))
- return PTR_ERR(imxdi->clk);
- clk_prepare_enable(imxdi->clk);
-
+ /* For IMX53, RTC is available always */
+ if (cpu_is_mx25()) {
+ imxdi->clk = clk_get(&pdev->dev, NULL);
+ if (IS_ERR(imxdi->clk))
+ return PTR_ERR(imxdi->clk);
+ clk_prepare_enable(imxdi->clk);
+ }
/*
* Initialize dryice hardware
*/
@@ -470,8 +473,10 @@ static int dryice_rtc_probe(struct platf
return 0;
err:
- clk_disable_unprepare(imxdi->clk);
- clk_put(imxdi->clk);
+ if (cpu_is_mx25()) {
+ clk_disable_unprepare(imxdi->clk);
+ clk_put(imxdi->clk);
+ }
return rc;
}
@@ -487,8 +492,10 @@ static int __devexit dryice_rtc_remove(s
rtc_device_unregister(imxdi->rtc);
- clk_disable_unprepare(imxdi->clk);
- clk_put(imxdi->clk);
+ if (cpu_is_mx25()) {
+ clk_disable_unprepare(imxdi->clk);
+ clk_put(imxdi->clk);
+ }
return 0;
}
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH 2/2] rtc-imxdi: Add devicetree support
2012-10-16 14:51 Roland Stigge
@ 2012-10-16 14:51 ` Roland Stigge
0 siblings, 0 replies; 7+ messages in thread
From: Roland Stigge @ 2012-10-16 14:51 UTC (permalink / raw)
To: a.zummo, grant.likely, rob.herring, rtc-linux, linux-kernel,
devicetree-discuss, s.hauer
Cc: Roland Stigge
This patch adds device tree support to the rtc-imxdi driver.
Signed-off-by: Roland Stigge <stigge@antcom.de>
---
Documentation/devicetree/bindings/rtc/imxdi-rtc.txt | 17 +++++++++++++++++
drivers/rtc/rtc-imxdi.c | 11 +++++++++++
2 files changed, 28 insertions(+)
--- /dev/null
+++ linux-2.6/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@80056000 {
+ compatible = "fsl,imx53-rtc", "fsl,imx25-rtc";
+ reg = <0x80056000 2000>;
+ interrupts = <29>;
+};
--- linux-2.6.orig/drivers/rtc/rtc-imxdi.c
+++ linux-2.6/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>
#include <mach/hardware.h>
/* DryIce Register Definitions */
@@ -500,10 +501,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),
};
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-10-29 21:03 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-10-18 16:06 [PATCH 1/2] rtc-imxdi: Support for i.MX53 Roland Stigge
2012-10-18 16:06 ` [PATCH 2/2] rtc-imxdi: Add devicetree support Roland Stigge
2012-10-29 21:00 ` Sascha Hauer
2012-10-18 16:06 ` [PATCH] ARM: mach-imx: Support for DryIce RTC in i.MX53 Roland Stigge
2012-10-29 21:03 ` Sascha Hauer
2012-10-29 21:00 ` [PATCH 1/2] rtc-imxdi: Support for i.MX53 Sascha Hauer
-- strict thread matches above, loose matches on Subject: below --
2012-10-16 14:51 Roland Stigge
2012-10-16 14:51 ` [PATCH 2/2] rtc-imxdi: Add devicetree support Roland Stigge
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).