8 files changed, 76 insertions, 4 deletions

diff --git a/arch/powerpc/boot/dts/ebony.dts b/arch/powerpc/boot/dts/ebony.dts
index f8790c4747df..7aad135a44b0 100644
--- a/arch/powerpc/boot/dts/ebony.dts
+++ b/arch/powerpc/boot/dts/ebony.dts
@@ -158,9 +158,10 @@
                                         };
                                 };
 
-                                ds1743@1,0 {
+                                nvram@1,0 {
                                         /* NVRAM & RTC */
-                                        compatible = "ds1743";
+                                        compatible = "ds1743-nvram";
+                                        #bytes = <2000>;
                                         reg = <1 0 2000>;
                                 };
 
diff --git a/arch/powerpc/boot/dts/walnut.dts b/arch/powerpc/boot/dts/walnut.dts
index 0e3825e599dc..dcc21b0438e5 100644
--- a/arch/powerpc/boot/dts/walnut.dts
+++ b/arch/powerpc/boot/dts/walnut.dts
@@ -175,9 +175,10 @@
                                 };
                         };
 
-                        ds1743@1,0 {
+                        nvram@1,0 {
                                 /* NVRAM and RTC */
-                                compatible = "ds1743";
+                                compatible = "ds1743-nvram";
+                                #bytes = <2000>;
                                 reg = <1 0 2000>;
                         };
 
diff --git a/arch/powerpc/platforms/40x/walnut.c b/arch/powerpc/platforms/40x/walnut.c
index f115b6dbf5ad..5d9edd917f92 100644
--- a/arch/powerpc/platforms/40x/walnut.c
+++ b/arch/powerpc/platforms/40x/walnut.c
@@ -36,6 +36,7 @@ static __initdata struct of_device_id walnut_of_bus[] = {
 static int __init walnut_device_probe(void)
 {
         of_platform_bus_probe(NULL, walnut_of_bus, NULL);
+        of_instantiate_rtc();
 
         return 0;
 }
diff --git a/arch/powerpc/platforms/44x/Kconfig b/arch/powerpc/platforms/44x/Kconfig
index d24801305344..c3e4e8c3c467 100644
--- a/arch/powerpc/platforms/44x/Kconfig
+++ b/arch/powerpc/platforms/44x/Kconfig
@@ -13,6 +13,7 @@ config EBONY
         default y
         select 440GP
         select PCI
+        select OF_RTC
         help
           This option enables support for the IBM PPC440GP evaluation board.
 
diff --git a/arch/powerpc/platforms/44x/ebony.c b/arch/powerpc/platforms/44x/ebony.c
index 481a016e1535..1a8d467bff85 100644
--- a/arch/powerpc/platforms/44x/ebony.c
+++ b/arch/powerpc/platforms/44x/ebony.c
@@ -18,6 +18,7 @@
 
 #include <linux/init.h>
 #include <linux/of_platform.h>
+#include <linux/rtc.h>
 
 #include <asm/machdep.h>
 #include <asm/prom.h>
@@ -38,6 +39,7 @@ static __initdata struct of_device_id ebony_of_bus[] = {
 static int __init ebony_device_probe(void)
 {
         of_platform_bus_probe(NULL, ebony_of_bus, NULL);
+        of_instantiate_rtc();
 
         return 0;
 }
diff --git a/arch/powerpc/platforms/Kconfig b/arch/powerpc/platforms/Kconfig
index 2cec34314d2e..4286664741dd 100644
--- a/arch/powerpc/platforms/Kconfig
+++ b/arch/powerpc/platforms/Kconfig
@@ -321,6 +321,12 @@ config FSL_ULI1575
 config CPM
         bool
 
+config OF_RTC
+        bool
+        help
+          Uses information from the OF or flattened device tree to instatiate
+          platform devices for direct mapped RTC chips like the DS1742 or DS1743.
+
 source "arch/powerpc/sysdev/bestcomm/Kconfig"
 
 endmenu
diff --git a/arch/powerpc/sysdev/Makefile b/arch/powerpc/sysdev/Makefile
index f17e7b885f60..702916bf28fa 100644
--- a/arch/powerpc/sysdev/Makefile
+++ b/arch/powerpc/sysdev/Makefile
@@ -28,6 +28,7 @@ obj-$(CONFIG_PPC_I8259)		+= i8259.o
 obj-$(CONFIG_IPIC)              += ipic.o
 obj-$(CONFIG_4xx)               += uic.o
 obj-$(CONFIG_XILINX_VIRTEX)     += xilinx_intc.o
+obj-$(CONFIG_OF_RTC)            += of_rtc.o
 ifeq ($(CONFIG_PCI),y)
 obj-$(CONFIG_4xx)               += ppc4xx_pci.o
 endif
diff --git a/arch/powerpc/sysdev/of_rtc.c b/arch/powerpc/sysdev/of_rtc.c
new file mode 100644
index 000000000000..3d54450640c1
--- /dev/null
+++ b/arch/powerpc/sysdev/of_rtc.c
@@ -0,0 +1,59 @@
+/*
+ * Instantiate mmio-mapped RTC chips based on device tree information
+ *
+ * Copyright 2007 David Gibson <dwg@au1.ibm.com>, IBM Corporation.
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ */
+#include <linux/kernel.h>
+#include <linux/of.h>
+#include <linux/init.h>
+#include <linux/of_platform.h>
+
+static __initdata struct {
+        const char *compatible;
+        char *plat_name;
+} of_rtc_table[] = {
+        { "ds1743-nvram", "rtc-ds1742" },
+};
+
+void __init of_instantiate_rtc(void)
+{
+        struct device_node *node;
+        int err;
+        int i;
+
+        for (i = 0; i < ARRAY_SIZE(of_rtc_table); i++) {
+                char *plat_name = of_rtc_table[i].plat_name;
+
+                for_each_compatible_node(node, NULL,
+                                         of_rtc_table[i].compatible) {
+                        struct resource *res;
+
+                        res = kmalloc(sizeof(*res), GFP_KERNEL);
+                        if (!res) {
+                                printk(KERN_ERR "OF RTC: Out of memory "
+                                       "allocating resource structure for %s\n",
+                                       node->full_name);
+                                continue;
+                        }
+
+                        err = of_address_to_resource(node, 0, res);
+                        if (err) {
+                                printk(KERN_ERR "OF RTC: Error "
+                                       "translating resources for %s\n",
+                                       node->full_name);
+                                continue;
+                        }
+
+                        printk(KERN_INFO "OF_RTC: %s is a %s @ 0x%llx-0x%llx\n",
+                               node->full_name, plat_name,
+                               (unsigned long long)res->start,
+                               (unsigned long long)res->end);
+                        platform_device_register_simple(plat_name, -1, res, 1);
+                }
+        }
+}