[PATCH] powerpc: Fix Maple build

The changes to the device node structure broke Maple build. This fixes it.
Unfortunately I coudn't test as my Maple board appears to be dead.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/arch/powerpc/platforms/maple/pci.c b/arch/powerpc/platforms/maple/pci.c
index f40451da037c00bd5bc6bc066c2dee90fd1212b0..7d4099a34f925763ee394d6cf96b2bf670cff766 100644 (file)
--- a/arch/powerpc/platforms/maple/pci.c
+++ b/arch/powerpc/platforms/maple/pci.c
@@ -316,7 +316,6 @@ static int __init add_bridge(struct device_node *dev)
        char* disp_name;
        int *bus_range;
        int primary = 1;
-       struct property *of_prop;
 
        DBG("Adding PCI host bridge %s\n", dev->full_name);
 

diff --git a/arch/powerpc/platforms/maple/setup.c b/arch/powerpc/platforms/maple/setup.c
index a1cb4d2367204ecd01b3df138f8ac9dd4f7d7f86..ec5c1e10c407253bc2e8b3ba0ea2f3b738f6d7aa 100644 (file)
--- a/arch/powerpc/platforms/maple/setup.c
+++ b/arch/powerpc/platforms/maple/setup.c
@@ -71,38 +71,60 @@
 #define DBG(fmt...)
 #endif
 
+static unsigned long maple_find_nvram_base(void)
+{
+       struct device_node *rtcs;
+       unsigned long result = 0;
+
+       /* find NVRAM device */
+       rtcs = of_find_compatible_node(NULL, "nvram", "AMD8111");
+       if (rtcs) {
+               struct resource r;
+               if (of_address_to_resource(rtcs, 0, &r)) {
+                       printk(KERN_EMERG "Maple: Unable to translate NVRAM"
+                              " address\n");
+                       goto bail;
+               }
+               if (!(r.flags & IORESOURCE_IO)) {
+                       printk(KERN_EMERG "Maple: NVRAM address isn't PIO!\n");
+                       goto bail;
+               }
+               result = r.start;
+       } else
+               printk(KERN_EMERG "Maple: Unable to find NVRAM\n");
+ bail:
+       of_node_put(rtcs);
+       return result;
+}
+
 static void maple_restart(char *cmd)
 {
        unsigned int maple_nvram_base;
        unsigned int maple_nvram_offset;
        unsigned int maple_nvram_command;
-       struct device_node *rtcs;
+       struct device_node *sp;
 
-       /* find NVRAM device */
-       rtcs = find_compatible_devices("nvram", "AMD8111");
-       if (rtcs && rtcs->addrs) {
-               maple_nvram_base = rtcs->addrs[0].address;
-       } else {
-               printk(KERN_EMERG "Maple: Unable to find NVRAM\n");
-               printk(KERN_EMERG "Maple: Manual Restart Required\n");
-               return;
-       }
+       maple_nvram_base = maple_find_nvram_base();
+       if (maple_nvram_base == 0)
+               goto fail;
 
        /* find service processor device */
-       rtcs = find_devices("service-processor");
-       if (!rtcs) {
+       sp = of_find_node_by_name(NULL, "service-processor");
+       if (!sp) {
                printk(KERN_EMERG "Maple: Unable to find Service Processor\n");
-               printk(KERN_EMERG "Maple: Manual Restart Required\n");
-               return;
+               goto fail;
        }
-       maple_nvram_offset = *(unsigned int*) get_property(rtcs,
+       maple_nvram_offset = *(unsigned int*) get_property(sp,
                        "restart-addr", NULL);
-       maple_nvram_command = *(unsigned int*) get_property(rtcs,
+       maple_nvram_command = *(unsigned int*) get_property(sp,
                        "restart-value", NULL);
+       of_node_put(sp);
 
        /* send command */
        outb_p(maple_nvram_command, maple_nvram_base + maple_nvram_offset);
        for (;;) ;
+ fail:
+       printk(KERN_EMERG "Maple: Manual Restart Required\n");
 }
 
 static void maple_power_off(void)
@@ -110,33 +132,29 @@ static void maple_power_off(void)
        unsigned int maple_nvram_base;
        unsigned int maple_nvram_offset;
        unsigned int maple_nvram_command;
-       struct device_node *rtcs;
+       struct device_node *sp;
 
-       /* find NVRAM device */
-       rtcs = find_compatible_devices("nvram", "AMD8111");
-       if (rtcs && rtcs->addrs) {
-               maple_nvram_base = rtcs->addrs[0].address;
-       } else {
-               printk(KERN_EMERG "Maple: Unable to find NVRAM\n");
-               printk(KERN_EMERG "Maple: Manual Power-Down Required\n");
-               return;
-       }
+       maple_nvram_base = maple_find_nvram_base();
+       if (maple_nvram_base == 0)
+               goto fail;
 
        /* find service processor device */
-       rtcs = find_devices("service-processor");
-       if (!rtcs) {
+       sp = of_find_node_by_name(NULL, "service-processor");
+       if (!sp) {
                printk(KERN_EMERG "Maple: Unable to find Service Processor\n");
-               printk(KERN_EMERG "Maple: Manual Power-Down Required\n");
-               return;
+               goto fail;
        }
-       maple_nvram_offset = *(unsigned int*) get_property(rtcs,
+       maple_nvram_offset = *(unsigned int*) get_property(sp,
                        "power-off-addr", NULL);
-       maple_nvram_command = *(unsigned int*) get_property(rtcs,
+       maple_nvram_command = *(unsigned int*) get_property(sp,
                        "power-off-value", NULL);
+       of_node_put(sp);
 
        /* send command */
        outb_p(maple_nvram_command, maple_nvram_base + maple_nvram_offset);
        for (;;) ;
+ fail:
+       printk(KERN_EMERG "Maple: Manual Power-Down Required\n");
 }
 
 static void maple_halt(void)
@@ -179,9 +197,6 @@ void __init maple_setup_arch(void)
  */
 static void __init maple_init_early(void)
 {
-       unsigned int default_speed;
-       u64 physport;
-
        DBG(" -> maple_init_early\n");
 
        /* Initialize hash table, from now on, we can take hash faults

diff --git a/arch/powerpc/platforms/maple/time.c b/arch/powerpc/platforms/maple/time.c
index 15846cc938acd4a87158a47b19ba547f5af062d5..50bc4eb853535bca3e78eae519dbf98367b7f294 100644 (file)
--- a/arch/powerpc/platforms/maple/time.c
+++ b/arch/powerpc/platforms/maple/time.c
@@ -168,11 +168,24 @@ unsigned long __init maple_get_boot_time(void)
        struct rtc_time tm;
        struct device_node *rtcs;
 
-       rtcs = find_compatible_devices("rtc", "pnpPNP,b00");
-       if (rtcs && rtcs->addrs) {
-               maple_rtc_addr = rtcs->addrs[0].address;
-               printk(KERN_INFO "Maple: Found RTC at 0x%x\n", maple_rtc_addr);
-       } else {
+       rtcs = of_find_compatible_node(NULL, "rtc", "pnpPNP,b00");
+       if (rtcs) {
+               struct resource r;
+               if (of_address_to_resource(rtcs, 0, &r)) {
+                       printk(KERN_EMERG "Maple: Unable to translate RTC"
+                              " address\n");
+                       goto bail;
+               }
+               if (!(r.flags & IORESOURCE_IO)) {
+                       printk(KERN_EMERG "Maple: RTC address isn't PIO!\n");
+                       goto bail;
+               }
+               maple_rtc_addr = r.start;
+               printk(KERN_INFO "Maple: Found RTC at IO 0x%x\n",
+                      maple_rtc_addr);
+       }
+ bail:
+       if (maple_rtc_addr == 0) {
                maple_rtc_addr = RTC_PORT(0); /* legacy address */
                printk(KERN_INFO "Maple: No device node for RTC, assuming "
                       "legacy address (0x%x)\n", maple_rtc_addr);