Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 346433
b: refs/heads/master
c: 968d21c
h: refs/heads/master
i:
  346431: ef62097
v: v3
  • Loading branch information
Roland Stigge authored and Linus Torvalds committed Dec 18, 2012
1 parent 41eeddb commit de8beef
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: ef216ad01728ecb8cf6c604ecb5f69e7fd671b52
refs/heads/master: 968d21c2cf01bde4b0e3ff0b0f821b51b9da8ffd
17 changes: 17 additions & 0 deletions trunk/Documentation/devicetree/bindings/rtc/imxdi-rtc.txt
Original file line number Diff line number Diff line change
@@ -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>;
};
11 changes: 11 additions & 0 deletions trunk/drivers/rtc/rtc-imxdi.c
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
#include <linux/rtc.h>
#include <linux/sched.h>
#include <linux/workqueue.h>
#include <linux/of.h>

/* DryIce Register Definitions */

Expand Down Expand Up @@ -495,10 +496,20 @@ static int __devexit dryice_rtc_remove(struct platform_device *pdev)
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),
};
Expand Down

0 comments on commit de8beef

Please sign in to comment.