Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-2.6

[linux-2.6] / arch / powerpc / sysdev / fsl_soc.c

diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 4e72bb983636ec89af5f98021685a25e31a07ccc..7d759f1c26b19fe61a5df4813861b18b3071d509 100644 (file)
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -37,6 +37,7 @@
 #include <asm/cpm2.h>
 
 extern void init_fcc_ioports(struct fs_platform_info*);
+extern void init_scc_ioports(struct fs_uart_platform_info*);
 static phys_addr_t immrbase = -1;
 
 phys_addr_t get_immrbase(void)
@@ -566,7 +567,7 @@ static int __init fs_enet_of_init(void)
                struct resource r[4];
                struct device_node *phy, *mdio;
                struct fs_platform_info fs_enet_data;
-               const unsigned int *id, *phy_addr;
+               const unsigned int *id, *phy_addr, phy_irq;
                const void *mac_addr;
                const phandle *ph;
                const char *model;
@@ -588,6 +589,7 @@ static int __init fs_enet_of_init(void)
                if (ret)
                        goto err;
                r[2].name = fcc_regs_c;
+               fs_enet_data.fcc_regs_c = r[2].start;
 
                r[3].start = r[3].end = irq_of_parse_and_map(np, 0);
                r[3].flags = IORESOURCE_IRQ;
@@ -620,8 +622,11 @@ static int __init fs_enet_of_init(void)
                phy_addr = get_property(phy, "reg", NULL);
                fs_enet_data.phy_addr = *phy_addr;
 
+               phy_irq = get_property(phy, "interrupts", NULL);
+
                id = get_property(np, "device-id", NULL);
                fs_enet_data.fs_no = *id;
+               strcpy(fs_enet_data.fs_type, model);
 
                mdio = of_get_parent(phy);
                 ret = of_address_to_resource(mdio, 0, &res);
@@ -635,7 +640,8 @@ static int __init fs_enet_of_init(void)
                fs_enet_data.clk_tx = *((u32 *) get_property(np, "tx-clock", NULL));
 
                if (strstr(model, "FCC")) {
-                       int fcc_index = fs_get_fcc_index(*id);
+                       int fcc_index = *id - 1;
+                       unsigned char* mdio_bb_prop;
 
                        fs_enet_data.dpram_offset = (u32)cpm_dpram_addr(0);
                        fs_enet_data.rx_ring = 32;
@@ -651,14 +657,57 @@ static int __init fs_enet_of_init(void)
                                                        (u32)res.start, fs_enet_data.phy_addr);
                        fs_enet_data.bus_id = (char*)&bus_id[(*id)];
                        fs_enet_data.init_ioports = init_fcc_ioports;
-               }
 
-               of_node_put(phy);
-               of_node_put(mdio);
+                       mdio_bb_prop = get_property(phy, "bitbang", NULL);
+                       if (mdio_bb_prop) {
+                               struct platform_device *fs_enet_mdio_bb_dev;
+                               struct fs_mii_bb_platform_info fs_enet_mdio_bb_data;
+
+                               fs_enet_mdio_bb_dev =
+                                       platform_device_register_simple("fsl-bb-mdio",
+                                                       i, NULL, 0);
+                               memset(&fs_enet_mdio_bb_data, 0,
+                                               sizeof(struct fs_mii_bb_platform_info));
+                               fs_enet_mdio_bb_data.mdio_dat.bit =
+                                       mdio_bb_prop[0];
+                               fs_enet_mdio_bb_data.mdio_dir.bit =
+                                       mdio_bb_prop[1];
+                               fs_enet_mdio_bb_data.mdc_dat.bit =
+                                       mdio_bb_prop[2];
+                               fs_enet_mdio_bb_data.mdio_port =
+                                       mdio_bb_prop[3];
+                               fs_enet_mdio_bb_data.mdc_port =
+                                       mdio_bb_prop[4];
+                               fs_enet_mdio_bb_data.delay =
+                                       mdio_bb_prop[5];
+
+                               fs_enet_mdio_bb_data.irq[0] = phy_irq[0];
+                               fs_enet_mdio_bb_data.irq[1] = -1;
+                               fs_enet_mdio_bb_data.irq[2] = -1;
+                               fs_enet_mdio_bb_data.irq[3] = phy_irq[0];
+                               fs_enet_mdio_bb_data.irq[31] = -1;
+
+                               fs_enet_mdio_bb_data.mdio_dat.offset =
+                                       (u32)&cpm2_immr->im_ioport.iop_pdatc;
+                               fs_enet_mdio_bb_data.mdio_dir.offset =
+                                       (u32)&cpm2_immr->im_ioport.iop_pdirc;
+                               fs_enet_mdio_bb_data.mdc_dat.offset =
+                                       (u32)&cpm2_immr->im_ioport.iop_pdatc;
+
+                               ret = platform_device_add_data(
+                                               fs_enet_mdio_bb_dev,
+                                               &fs_enet_mdio_bb_data,
+                                               sizeof(struct fs_mii_bb_platform_info));
+                               if (ret)
+                                       goto unreg;
+                       }
+                       
+                       of_node_put(phy);
+                       of_node_put(mdio);
 
-               ret = platform_device_add_data(fs_enet_dev, &fs_enet_data,
-                                            sizeof(struct
-                                                   fs_platform_info));
+                       ret = platform_device_add_data(fs_enet_dev, &fs_enet_data,
+                                                    sizeof(struct
+                                                           fs_platform_info));
                if (ret)
                        goto unreg;
        }
@@ -688,6 +737,7 @@ static int __init cpm_uart_of_init(void)
                struct resource r[3];
                struct fs_uart_platform_info cpm_uart_data;
                const int *id;
+               const char *model;
 
                memset(r, 0, sizeof(r));
                memset(&cpm_uart_data, 0, sizeof(cpm_uart_data));
@@ -716,6 +766,10 @@ static int __init cpm_uart_of_init(void)
 
                id = get_property(np, "device-id", NULL);
                cpm_uart_data.fs_no = *id;
+
+               model = (char*)get_property(np, "model", NULL);
+               strcpy(cpm_uart_data.fs_type, model);
+
                cpm_uart_data.uart_clk = ppc_proc_freq;
 
                cpm_uart_data.tx_num_fifo = 4;