diff mbox

drivers/rtc/rtc-mcp795.c: add devicetree support

Message ID 20160321000610.GA21979@emba-laptop
State Accepted
Headers show

Commit Message

Emil Bartczak March 21, 2016, 12:06 a.m. UTC 
Add device tree support to the rtc-mcp795 driver.

Signed-off-by: Emil Bartczak <emilbart@gmail.com>
---
 Documentation/devicetree/bindings/rtc/maxim,mcp795.txt | 11 +++++++++++
 drivers/rtc/rtc-mcp795.c                               | 10 ++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/rtc/maxim,mcp795.txt

Comments

Rob Herring March 21, 2016, 1:15 p.m. UTC | #1 
On Mon, Mar 21, 2016 at 01:06:10AM +0100, Emil Bartczak wrote:
> Add device tree support to the rtc-mcp795 driver.
> 
> Signed-off-by: Emil Bartczak <emilbart@gmail.com>
> ---
>  Documentation/devicetree/bindings/rtc/maxim,mcp795.txt | 11 +++++++++++
>  drivers/rtc/rtc-mcp795.c                               | 10 ++++++++++
>  2 files changed, 21 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/rtc/maxim,mcp795.txt

Acked-by: Rob Herring <robh@kernel.org>
Alexandre Belloni March 21, 2016, 9:57 p.m. UTC | #2 
On 21/03/2016 at 01:06:10 +0100, Emil Bartczak wrote :
> Add device tree support to the rtc-mcp795 driver.
> 
> Signed-off-by: Emil Bartczak <emilbart@gmail.com>
> ---
>  Documentation/devicetree/bindings/rtc/maxim,mcp795.txt | 11 +++++++++++
>  drivers/rtc/rtc-mcp795.c                               | 10 ++++++++++
>  2 files changed, 21 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/rtc/maxim,mcp795.txt
Applied, thanks.
diff mbox

Patch

diff --git a/Documentation/devicetree/bindings/rtc/maxim,mcp795.txt b/Documentation/devicetree/bindings/rtc/maxim,mcp795.txt
new file mode 100644
index 0000000..a59fdd8
--- /dev/null
+++ b/Documentation/devicetree/bindings/rtc/maxim,mcp795.txt
@@ -0,0 +1,11 @@ 
+* Maxim MCP795		SPI Serial Real-Time Clock
+
+Required properties:
+- compatible: Should contain "maxim,mcp795".
+- reg: SPI address for chip
+
+Example:
+	mcp795: rtc@0 {
+		compatible = "maxim,mcp795";
+		reg = <0>;
+	};
diff --git a/drivers/rtc/rtc-mcp795.c b/drivers/rtc/rtc-mcp795.c
index 1c91ce8..025bb33 100644
--- a/drivers/rtc/rtc-mcp795.c
+++ b/drivers/rtc/rtc-mcp795.c
@@ -20,6 +20,7 @@ 
 #include <linux/printk.h>
 #include <linux/spi/spi.h>
 #include <linux/rtc.h>
+#include <linux/of.h>
 
 /* MCP795 Instructions, see datasheet table 3-1 */
 #define MCP795_EEREAD	0x03
@@ -183,9 +184,18 @@  static int mcp795_probe(struct spi_device *spi)
 	return 0;
 }
 
+#ifdef CONFIG_OF
+static const struct of_device_id mcp795_of_match[] = {
+	{ .compatible = "maxim,mcp795" },
+	{ }
+};
+MODULE_DEVICE_TABLE(of, mcp795_of_match);
+#endif
+
 static struct spi_driver mcp795_driver = {
 		.driver = {
 				.name = "rtc-mcp795",
+				.of_match_table = of_match_ptr(mcp795_of_match),
 		},
 		.probe = mcp795_probe,
 };