sparc/of: Move of_device fields into struct pdev_archdata

This patch moves SPARC architecture specific data members out of
struct of_device and into the pdev_archdata structure.  The reason
for this change is to unify the struct of_device definition amongst
all the architectures.  It also remvoes the .sysdata, .slot, .portid
and .clock_freq properties because they aren't actually used by
anything.

A subsequent patch will replace struct of_device entirely with struct
platform_device and the of_platform support code will share common
routines with the platform bus (but the bus instances themselves can
remain separate).

This patch also adds 'struct resources *resource' and num_resources
to match the fields defined in struct platform_device.  After this
change, 'struct platform_device' can be used as a drop-in replacement
for 'struct of_platform'.

This change is in preparation for merging the of_platform_bus_type
with the platform_bus_type.

Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Acked-by: David S. Miller <davem@davemloft.net>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>

12 files changed, 56 insertions, 64 deletions

diff --git a/arch/sparc/include/asm/device.h b/arch/sparc/include/asm/device.h
index d4c452147412..f9740d065fe7 100644
--- a/arch/sparc/include/asm/device.h
+++ b/arch/sparc/include/asm/device.h
@@ -6,6 +6,8 @@
 #ifndef _ASM_SPARC_DEVICE_H
 #define _ASM_SPARC_DEVICE_H
 
+#include <asm/openprom.h>
+
 struct device_node;
 struct of_device;
 
@@ -18,6 +20,9 @@ struct dev_archdata {
 };
 
 struct pdev_archdata {
+        struct resource         resource[PROMREG_MAX];
+        unsigned int            irqs[PROMINTR_MAX];
+        int                     num_irqs;
 };
 
 #endif /* _ASM_SPARC_DEVICE_H */
diff --git a/arch/sparc/include/asm/floppy_64.h b/arch/sparc/include/asm/floppy_64.h
index 8fac3ab22f36..4f5bde638f72 100644
--- a/arch/sparc/include/asm/floppy_64.h
+++ b/arch/sparc/include/asm/floppy_64.h
@@ -567,7 +567,7 @@ static unsigned long __init sun_floppy_init(void)
         }
         if (op) {
                 floppy_op = op;
-                FLOPPY_IRQ = op->irqs[0];
+                FLOPPY_IRQ = op->archdata.irqs[0];
         } else {
                 struct device_node *ebus_dp;
                 void __iomem *auxio_reg;
@@ -593,7 +593,7 @@ static unsigned long __init sun_floppy_init(void)
                 if (state_prop && !strncmp(state_prop, "disabled", 8))
                         return 0;
 
-                FLOPPY_IRQ = op->irqs[0];
+                FLOPPY_IRQ = op->archdata.irqs[0];
 
                 /* Make sure the high density bit is set, some systems
                  * (most notably Ultra5/Ultra10) come up with it clear.
diff --git a/arch/sparc/include/asm/of_device.h b/arch/sparc/include/asm/of_device.h
index f320246a0586..6d1844a547b4 100644
--- a/arch/sparc/include/asm/of_device.h
+++ b/arch/sparc/include/asm/of_device.h
@@ -15,15 +15,10 @@
 struct of_device
 {
         struct device                   dev;
-        struct resource                 resource[PROMREG_MAX];
-        unsigned int                    irqs[PROMINTR_MAX];
-        int                             num_irqs;
+        u32                             num_resources;
+        struct resource                 *resource;
 
-        void                            *sysdata;
-
-        int                             slot;
-        int                             portid;
-        int                             clock_freq;
+        struct pdev_archdata            archdata;
 };
 
 extern void __iomem *of_ioremap(struct resource *res, unsigned long offset, unsigned long size, char *name);
diff --git a/arch/sparc/include/asm/parport.h b/arch/sparc/include/asm/parport.h
index c333b8d0949b..0c34a8792fc7 100644
--- a/arch/sparc/include/asm/parport.h
+++ b/arch/sparc/include/asm/parport.h
@@ -116,7 +116,7 @@ static int __devinit ecpp_probe(struct of_device *op, const struct of_device_id
         parent = op->dev.of_node->parent;
         if (!strcmp(parent->name, "dma")) {
                 p = parport_pc_probe_port(base, base + 0x400,
-                                          op->irqs[0], PARPORT_DMA_NOFIFO,
+                                          op->archdata.irqs[0], PARPORT_DMA_NOFIFO,
                                           op->dev.parent->parent, 0);
                 if (!p)
                         return -ENOMEM;
@@ -166,7 +166,7 @@ static int __devinit ecpp_probe(struct of_device *op, const struct of_device_id
                        0, PTR_LPT_REG_DIR);
 
         p = parport_pc_probe_port(base, base + 0x400,
-                                  op->irqs[0],
+                                  op->archdata.irqs[0],
                                   slot,
                                   op->dev.parent,
                                   0);
diff --git a/arch/sparc/kernel/of_device_32.c b/arch/sparc/kernel/of_device_32.c
index 47e63f1e719c..331de91ad2bc 100644
--- a/arch/sparc/kernel/of_device_32.c
+++ b/arch/sparc/kernel/of_device_32.c
@@ -267,6 +267,8 @@ static void __init build_device_resources(struct of_device *op,
         /* Conver to num-entries.  */
         num_reg /= na + ns;
 
+        op->resource = op->archdata.resource;
+        op->num_resources = num_reg;
         for (index = 0; index < num_reg; index++) {
                 struct resource *r = &op->resource[index];
                 u32 addr[OF_MAX_ADDR_CELLS];
@@ -349,27 +351,21 @@ static struct of_device * __init scan_one_device(struct device_node *dp,
 
         op->dev.of_node = dp;
 
-        op->clock_freq = of_getintprop_default(dp, "clock-frequency",
-                                               (25*1000*1000));
-        op->portid = of_getintprop_default(dp, "upa-portid", -1);
-        if (op->portid == -1)
-                op->portid = of_getintprop_default(dp, "portid", -1);
-
         intr = of_get_property(dp, "intr", &len);
         if (intr) {
-                op->num_irqs = len / sizeof(struct linux_prom_irqs);
-                for (i = 0; i < op->num_irqs; i++)
-                        op->irqs[i] = intr[i].pri;
+                op->archdata.num_irqs = len / sizeof(struct linux_prom_irqs);
+                for (i = 0; i < op->archdata.num_irqs; i++)
+                        op->archdata.irqs[i] = intr[i].pri;
         } else {
                 const unsigned int *irq =
                         of_get_property(dp, "interrupts", &len);
 
                 if (irq) {
-                        op->num_irqs = len / sizeof(unsigned int);
-                        for (i = 0; i < op->num_irqs; i++)
-                                op->irqs[i] = irq[i];
+                        op->archdata.num_irqs = len / sizeof(unsigned int);
+                        for (i = 0; i < op->archdata.num_irqs; i++)
+                                op->archdata.irqs[i] = irq[i];
                 } else {
-                        op->num_irqs = 0;
+                        op->archdata.num_irqs = 0;
                 }
         }
         if (sparc_cpu_model == sun4d) {
@@ -411,8 +407,8 @@ static struct of_device * __init scan_one_device(struct device_node *dp,
                         goto build_resources;
                 }
 
-                for (i = 0; i < op->num_irqs; i++) {
-                        int this_irq = op->irqs[i];
+                for (i = 0; i < op->archdata.num_irqs; i++) {
+                        int this_irq = op->archdata.irqs[i];
                         int sbusl = pil_to_sbus[this_irq];
 
                         if (sbusl)
@@ -420,7 +416,7 @@ static struct of_device * __init scan_one_device(struct device_node *dp,
                                             (sbusl << 2) +
                                             slot);
 
-                        op->irqs[i] = this_irq;
+                        op->archdata.irqs[i] = this_irq;
                 }
         }
 
diff --git a/arch/sparc/kernel/of_device_64.c b/arch/sparc/kernel/of_device_64.c
index 1dae8079f728..5e8cbb942d3d 100644
--- a/arch/sparc/kernel/of_device_64.c
+++ b/arch/sparc/kernel/of_device_64.c
@@ -344,6 +344,8 @@ static void __init build_device_resources(struct of_device *op,
                 num_reg = PROMREG_MAX;
         }
 
+        op->resource = op->archdata.resource;
+        op->num_resources = num_reg;
         for (index = 0; index < num_reg; index++) {
                 struct resource *r = &op->resource[index];
                 u32 addr[OF_MAX_ADDR_CELLS];
@@ -644,31 +646,25 @@ static struct of_device * __init scan_one_device(struct device_node *dp,
 
         op->dev.of_node = dp;
 
-        op->clock_freq = of_getintprop_default(dp, "clock-frequency",
-                                               (25*1000*1000));
-        op->portid = of_getintprop_default(dp, "upa-portid", -1);
-        if (op->portid == -1)
-                op->portid = of_getintprop_default(dp, "portid", -1);
-
         irq = of_get_property(dp, "interrupts", &len);
         if (irq) {
-                op->num_irqs = len / 4;
+                op->archdata.num_irqs = len / 4;
 
                 /* Prevent overrunning the op->irqs[] array.  */
-                if (op->num_irqs > PROMINTR_MAX) {
+                if (op->archdata.num_irqs > PROMINTR_MAX) {
                         printk(KERN_WARNING "%s: Too many irqs (%d), "
                                "limiting to %d.\n",
-                               dp->full_name, op->num_irqs, PROMINTR_MAX);
-                        op->num_irqs = PROMINTR_MAX;
+                               dp->full_name, op->archdata.num_irqs, PROMINTR_MAX);
+                        op->archdata.num_irqs = PROMINTR_MAX;
                 }
-                memcpy(op->irqs, irq, op->num_irqs * 4);
+                memcpy(op->archdata.irqs, irq, op->archdata.num_irqs * 4);
         } else {
-                op->num_irqs = 0;
+                op->archdata.num_irqs = 0;
         }
 
         build_device_resources(op, parent);
-        for (i = 0; i < op->num_irqs; i++)
-                op->irqs[i] = build_one_device_irq(op, parent, op->irqs[i]);
+        for (i = 0; i < op->archdata.num_irqs; i++)
+                op->archdata.irqs[i] = build_one_device_irq(op, parent, op->archdata.irqs[i]);
 
         op->dev.parent = parent;
         op->dev.bus = &of_platform_bus_type;
diff --git a/arch/sparc/kernel/of_device_common.c b/arch/sparc/kernel/of_device_common.c
index 10c6c36a6e75..016c947d4cae 100644
--- a/arch/sparc/kernel/of_device_common.c
+++ b/arch/sparc/kernel/of_device_common.c
@@ -35,10 +35,10 @@ unsigned int irq_of_parse_and_map(struct device_node *node, int index)
 {
         struct of_device *op = of_find_device_by_node(node);
 
-        if (!op || index >= op->num_irqs)
+        if (!op || index >= op->archdata.num_irqs)
                 return 0;
 
-        return op->irqs[index];
+        return op->archdata.irqs[index];
 }
 EXPORT_SYMBOL(irq_of_parse_and_map);
 
diff --git a/arch/sparc/kernel/pci.c b/arch/sparc/kernel/pci.c
index 8a8363adb8bd..1523290db0a1 100644
--- a/arch/sparc/kernel/pci.c
+++ b/arch/sparc/kernel/pci.c
@@ -340,7 +340,7 @@ static struct pci_dev *of_create_pci_dev(struct pci_pbm_info *pbm,
                 dev->hdr_type = PCI_HEADER_TYPE_NORMAL;
                 dev->rom_base_reg = PCI_ROM_ADDRESS;
 
-                dev->irq = sd->op->irqs[0];
+                dev->irq = sd->op->archdata.irqs[0];
                 if (dev->irq == 0xffffffff)
                         dev->irq = PCI_IRQ_NONE;
         }
diff --git a/arch/sparc/kernel/pci_psycho.c b/arch/sparc/kernel/pci_psycho.c
index 558a70512824..93011e6e7ddc 100644
--- a/arch/sparc/kernel/pci_psycho.c
+++ b/arch/sparc/kernel/pci_psycho.c
@@ -302,23 +302,23 @@ static void psycho_register_error_handlers(struct pci_pbm_info *pbm)
          * 5: POWER MANAGEMENT
          */
 
-        if (op->num_irqs < 6)
+        if (op->archdata.num_irqs < 6)
                 return;
 
         /* We really mean to ignore the return result here.  Two
          * PCI controller share the same interrupt numbers and
          * drive the same front-end hardware.
          */
-        err = request_irq(op->irqs[1], psycho_ue_intr, IRQF_SHARED,
+        err = request_irq(op->archdata.irqs[1], psycho_ue_intr, IRQF_SHARED,
                           "PSYCHO_UE", pbm);
-        err = request_irq(op->irqs[2], psycho_ce_intr, IRQF_SHARED,
+        err = request_irq(op->archdata.irqs[2], psycho_ce_intr, IRQF_SHARED,
                           "PSYCHO_CE", pbm);
 
         /* This one, however, ought not to fail.  We can just warn
          * about it since the system can still operate properly even
          * if this fails.
          */
-        err = request_irq(op->irqs[0], psycho_pcierr_intr, IRQF_SHARED,
+        err = request_irq(op->archdata.irqs[0], psycho_pcierr_intr, IRQF_SHARED,
                           "PSYCHO_PCIERR", pbm);
         if (err)
                 printk(KERN_WARNING "%s: Could not register PCIERR, "
diff --git a/arch/sparc/kernel/pci_sabre.c b/arch/sparc/kernel/pci_sabre.c
index 6dad8e3b7506..99c6dba7d4fd 100644
--- a/arch/sparc/kernel/pci_sabre.c
+++ b/arch/sparc/kernel/pci_sabre.c
@@ -329,7 +329,7 @@ static void sabre_register_error_handlers(struct pci_pbm_info *pbm)
          * 2: CE ERR
          * 3: POWER FAIL
          */
-        if (op->num_irqs < 4)
+        if (op->archdata.num_irqs < 4)
                 return;
 
         /* We clear the error bits in the appropriate AFSR before
@@ -341,7 +341,7 @@ static void sabre_register_error_handlers(struct pci_pbm_info *pbm)
                     SABRE_UEAFSR_SDTE | SABRE_UEAFSR_PDTE),
                    base + SABRE_UE_AFSR);
 
-        err = request_irq(op->irqs[1], sabre_ue_intr, 0, "SABRE_UE", pbm);
+        err = request_irq(op->archdata.irqs[1], sabre_ue_intr, 0, "SABRE_UE", pbm);
         if (err)
                 printk(KERN_WARNING "%s: Couldn't register UE, err=%d.\n",
                        pbm->name, err);
@@ -351,11 +351,11 @@ static void sabre_register_error_handlers(struct pci_pbm_info *pbm)
                    base + SABRE_CE_AFSR);
 
 
-        err = request_irq(op->irqs[2], sabre_ce_intr, 0, "SABRE_CE", pbm);
+        err = request_irq(op->archdata.irqs[2], sabre_ce_intr, 0, "SABRE_CE", pbm);
         if (err)
                 printk(KERN_WARNING "%s: Couldn't register CE, err=%d.\n",
                        pbm->name, err);
-        err = request_irq(op->irqs[0], psycho_pcierr_intr, 0,
+        err = request_irq(op->archdata.irqs[0], psycho_pcierr_intr, 0,
                           "SABRE_PCIERR", pbm);
         if (err)
                 printk(KERN_WARNING "%s: Couldn't register PCIERR, err=%d.\n",
diff --git a/arch/sparc/kernel/pci_schizo.c b/arch/sparc/kernel/pci_schizo.c
index 97a1ae2e1c02..9041dae7aaca 100644
--- a/arch/sparc/kernel/pci_schizo.c
+++ b/arch/sparc/kernel/pci_schizo.c
@@ -857,14 +857,14 @@ static void tomatillo_register_error_handlers(struct pci_pbm_info *pbm)
          */
 
         if (pbm_routes_this_ino(pbm, SCHIZO_UE_INO)) {
-                err = request_irq(op->irqs[1], schizo_ue_intr, 0,
+                err = request_irq(op->archdata.irqs[1], schizo_ue_intr, 0,
                                   "TOMATILLO_UE", pbm);
                 if (err)
                         printk(KERN_WARNING "%s: Could not register UE, "
                                "err=%d\n", pbm->name, err);
         }
         if (pbm_routes_this_ino(pbm, SCHIZO_CE_INO)) {
-                err = request_irq(op->irqs[2], schizo_ce_intr, 0,
+                err = request_irq(op->archdata.irqs[2], schizo_ce_intr, 0,
                                   "TOMATILLO_CE", pbm);
                 if (err)
                         printk(KERN_WARNING "%s: Could not register CE, "
@@ -872,10 +872,10 @@ static void tomatillo_register_error_handlers(struct pci_pbm_info *pbm)
         }
         err = 0;
         if (pbm_routes_this_ino(pbm, SCHIZO_PCIERR_A_INO)) {
-                err = request_irq(op->irqs[0], schizo_pcierr_intr, 0,
+                err = request_irq(op->archdata.irqs[0], schizo_pcierr_intr, 0,
                                   "TOMATILLO_PCIERR", pbm);
         } else if (pbm_routes_this_ino(pbm, SCHIZO_PCIERR_B_INO)) {
-                err = request_irq(op->irqs[0], schizo_pcierr_intr, 0,
+                err = request_irq(op->archdata.irqs[0], schizo_pcierr_intr, 0,
                                   "TOMATILLO_PCIERR", pbm);
         }
         if (err)
@@ -883,7 +883,7 @@ static void tomatillo_register_error_handlers(struct pci_pbm_info *pbm)
                        "err=%d\n", pbm->name, err);
 
         if (pbm_routes_this_ino(pbm, SCHIZO_SERR_INO)) {
-                err = request_irq(op->irqs[3], schizo_safarierr_intr, 0,
+                err = request_irq(op->archdata.irqs[3], schizo_safarierr_intr, 0,
                                   "TOMATILLO_SERR", pbm);
                 if (err)
                         printk(KERN_WARNING "%s: Could not register SERR, "
@@ -952,14 +952,14 @@ static void schizo_register_error_handlers(struct pci_pbm_info *pbm)
          */
 
         if (pbm_routes_this_ino(pbm, SCHIZO_UE_INO)) {
-                err = request_irq(op->irqs[1], schizo_ue_intr, 0,
+                err = request_irq(op->archdata.irqs[1], schizo_ue_intr, 0,
                                   "SCHIZO_UE", pbm);
                 if (err)
                         printk(KERN_WARNING "%s: Could not register UE, "
                                "err=%d\n", pbm->name, err);
         }
         if (pbm_routes_this_ino(pbm, SCHIZO_CE_INO)) {
-                err = request_irq(op->irqs[2], schizo_ce_intr, 0,
+                err = request_irq(op->archdata.irqs[2], schizo_ce_intr, 0,
                                   "SCHIZO_CE", pbm);
                 if (err)
                         printk(KERN_WARNING "%s: Could not register CE, "
@@ -967,10 +967,10 @@ static void schizo_register_error_handlers(struct pci_pbm_info *pbm)
         }
         err = 0;
         if (pbm_routes_this_ino(pbm, SCHIZO_PCIERR_A_INO)) {
-                err = request_irq(op->irqs[0], schizo_pcierr_intr, 0,
+                err = request_irq(op->archdata.irqs[0], schizo_pcierr_intr, 0,
                                   "SCHIZO_PCIERR", pbm);
         } else if (pbm_routes_this_ino(pbm, SCHIZO_PCIERR_B_INO)) {
-                err = request_irq(op->irqs[0], schizo_pcierr_intr, 0,
+                err = request_irq(op->archdata.irqs[0], schizo_pcierr_intr, 0,
                                   "SCHIZO_PCIERR", pbm);
         }
         if (err)
@@ -978,7 +978,7 @@ static void schizo_register_error_handlers(struct pci_pbm_info *pbm)
                        "err=%d\n", pbm->name, err);
 
         if (pbm_routes_this_ino(pbm, SCHIZO_SERR_INO)) {
-                err = request_irq(op->irqs[3], schizo_safarierr_intr, 0,
+                err = request_irq(op->archdata.irqs[3], schizo_safarierr_intr, 0,
                                   "SCHIZO_SERR", pbm);
                 if (err)
                         printk(KERN_WARNING "%s: Could not register SERR, "
diff --git a/arch/sparc/kernel/power.c b/arch/sparc/kernel/power.c
index 168d4cb63f5b..1cfee577f6b5 100644
--- a/arch/sparc/kernel/power.c
+++ b/arch/sparc/kernel/power.c
@@ -36,7 +36,7 @@ static int __devinit has_button_interrupt(unsigned int irq, struct device_node *
 static int __devinit power_probe(struct of_device *op, const struct of_device_id *match)
 {
         struct resource *res = &op->resource[0];
-        unsigned int irq= op->irqs[0];
+        unsigned int irq = op->archdata.irqs[0];
 
         power_reg = of_ioremap(res, 0, 0x4, "power");