Merge branches 'acerhdf', 'acpi-pci-bind', 'bjorn-pci-root', 'bugzilla-12904', 'bugzi...
[safe/jmp/linux-2.6] / arch / powerpc / sysdev / fsl_soc.c
index dbe92ae..95dbc64 100644 (file)
 #include <linux/module.h>
 #include <linux/device.h>
 #include <linux/platform_device.h>
+#include <linux/of.h>
+#include <linux/of_platform.h>
+#include <linux/phy.h>
+#include <linux/phy_fixed.h>
+#include <linux/spi/spi.h>
 #include <linux/fsl_devices.h>
 #include <linux/fs_enet_pd.h>
 #include <linux/fs_uart_pd.h>
@@ -37,7 +42,8 @@
 #include <asm/cpm2.h>
 
 extern void init_fcc_ioports(struct fs_platform_info*);
-extern void init_scc_ioports(struct fs_uart_platform_info*);
+extern void init_fec_ioports(struct fs_platform_info*);
+extern void init_smc_ioports(struct fs_uart_platform_info*);
 static phys_addr_t immrbase = -1;
 
 phys_addr_t get_immrbase(void)
@@ -49,40 +55,96 @@ phys_addr_t get_immrbase(void)
 
        soc = of_find_node_by_type(NULL, "soc");
        if (soc) {
-               unsigned int size;
-               const void *prop = get_property(soc, "reg", &size);
+               int size;
+               u32 naddr;
+               const u32 *prop = of_get_property(soc, "#address-cells", &size);
 
+               if (prop && size == 4)
+                       naddr = *prop;
+               else
+                       naddr = 2;
+
+               prop = of_get_property(soc, "ranges", &size);
                if (prop)
-                       immrbase = of_translate_address(soc, prop);
+                       immrbase = of_translate_address(soc, prop + naddr);
+
                of_node_put(soc);
-       };
+       }
 
        return immrbase;
 }
 
 EXPORT_SYMBOL(get_immrbase);
 
-#ifdef CONFIG_CPM2
+static u32 sysfreq = -1;
+
+u32 fsl_get_sys_freq(void)
+{
+       struct device_node *soc;
+       const u32 *prop;
+       int size;
+
+       if (sysfreq != -1)
+               return sysfreq;
+
+       soc = of_find_node_by_type(NULL, "soc");
+       if (!soc)
+               return -1;
+
+       prop = of_get_property(soc, "clock-frequency", &size);
+       if (!prop || size != sizeof(*prop) || *prop == 0)
+               prop = of_get_property(soc, "bus-frequency", &size);
+
+       if (prop && size == sizeof(*prop))
+               sysfreq = *prop;
+
+       of_node_put(soc);
+       return sysfreq;
+}
+EXPORT_SYMBOL(fsl_get_sys_freq);
+
+#if defined(CONFIG_CPM2) || defined(CONFIG_QUICC_ENGINE) || defined(CONFIG_8xx)
 
 static u32 brgfreq = -1;
 
 u32 get_brgfreq(void)
 {
        struct device_node *node;
+       const unsigned int *prop;
+       int size;
 
        if (brgfreq != -1)
                return brgfreq;
 
-       node = of_find_node_by_type(NULL, "cpm");
+       node = of_find_compatible_node(NULL, NULL, "fsl,cpm-brg");
        if (node) {
-               unsigned int size;
-               const unsigned int *prop = get_property(node, "brg-frequency",
-                                       &size);
+               prop = of_get_property(node, "clock-frequency", &size);
+               if (prop && size == 4)
+                       brgfreq = *prop;
 
-               if (prop)
+               of_node_put(node);
+               return brgfreq;
+       }
+
+       /* Legacy device binding -- will go away when no users are left. */
+       node = of_find_node_by_type(NULL, "cpm");
+       if (!node)
+               node = of_find_compatible_node(NULL, NULL, "fsl,qe");
+       if (!node)
+               node = of_find_node_by_type(NULL, "qe");
+
+       if (node) {
+               prop = of_get_property(node, "brg-frequency", &size);
+               if (prop && size == 4)
                        brgfreq = *prop;
+
+               if (brgfreq == -1 || brgfreq == 0) {
+                       prop = of_get_property(node, "bus-frequency", &size);
+                       if (prop && size == 4)
+                               brgfreq = *prop / 2;
+               }
                of_node_put(node);
-       };
+       }
 
        return brgfreq;
 }
@@ -100,14 +162,14 @@ u32 get_baudrate(void)
 
        node = of_find_node_by_type(NULL, "serial");
        if (node) {
-               unsigned int size;
-               const unsigned int *prop = get_property(node, "current-speed",
-                               &size);
+               int size;
+               const unsigned int *prop = of_get_property(node,
+                               "current-speed", &size);
 
                if (prop)
                        fs_baudrate = *prop;
                of_node_put(node);
-       };
+       }
 
        return fs_baudrate;
 }
@@ -115,312 +177,36 @@ u32 get_baudrate(void)
 EXPORT_SYMBOL(get_baudrate);
 #endif /* CONFIG_CPM2 */
 
-static int __init gfar_mdio_of_init(void)
+#ifdef CONFIG_FIXED_PHY
+static int __init of_add_fixed_phys(void)
 {
-       struct device_node *np;
-       unsigned int i;
-       struct platform_device *mdio_dev;
-       struct resource res;
        int ret;
-
-       for (np = NULL, i = 0;
-            (np = of_find_compatible_node(np, "mdio", "gianfar")) != NULL;
-            i++) {
-               int k;
-               struct device_node *child = NULL;
-               struct gianfar_mdio_data mdio_data;
-
-               memset(&res, 0, sizeof(res));
-               memset(&mdio_data, 0, sizeof(mdio_data));
-
-               ret = of_address_to_resource(np, 0, &res);
-               if (ret)
-                       goto err;
-
-               mdio_dev =
-                   platform_device_register_simple("fsl-gianfar_mdio",
-                                                   res.start, &res, 1);
-               if (IS_ERR(mdio_dev)) {
-                       ret = PTR_ERR(mdio_dev);
-                       goto err;
-               }
-
-               for (k = 0; k < 32; k++)
-                       mdio_data.irq[k] = -1;
-
-               while ((child = of_get_next_child(np, child)) != NULL) {
-                       int irq = irq_of_parse_and_map(child, 0);
-                       if (irq != NO_IRQ) {
-                               const u32 *id = get_property(child, "reg", NULL);
-                               mdio_data.irq[*id] = irq;
-                       }
-               }
-
-               ret =
-                   platform_device_add_data(mdio_dev, &mdio_data,
-                                            sizeof(struct gianfar_mdio_data));
-               if (ret)
-                       goto unreg;
-       }
-
-       return 0;
-
-unreg:
-       platform_device_unregister(mdio_dev);
-err:
-       return ret;
-}
-
-arch_initcall(gfar_mdio_of_init);
-
-static const char *gfar_tx_intr = "tx";
-static const char *gfar_rx_intr = "rx";
-static const char *gfar_err_intr = "error";
-
-static int __init gfar_of_init(void)
-{
        struct device_node *np;
-       unsigned int i;
-       struct platform_device *gfar_dev;
-       struct resource res;
-       int ret;
+       u32 *fixed_link;
+       struct fixed_phy_status status = {};
 
-       for (np = NULL, i = 0;
-            (np = of_find_compatible_node(np, "network", "gianfar")) != NULL;
-            i++) {
-               struct resource r[4];
-               struct device_node *phy, *mdio;
-               struct gianfar_platform_data gfar_data;
-               const unsigned int *id;
-               const char *model;
-               const void *mac_addr;
-               const phandle *ph;
-               int n_res = 2;
-
-               memset(r, 0, sizeof(r));
-               memset(&gfar_data, 0, sizeof(gfar_data));
+       for_each_node_by_name(np, "ethernet") {
+               fixed_link  = (u32 *)of_get_property(np, "fixed-link", NULL);
+               if (!fixed_link)
+                       continue;
 
-               ret = of_address_to_resource(np, 0, &r[0]);
-               if (ret)
-                       goto err;
-
-               r[1].start = r[1].end = irq_of_parse_and_map(np, 0);
-               r[1].flags = IORESOURCE_IRQ;
-
-               model = get_property(np, "model", NULL);
-
-               /* If we aren't the FEC we have multiple interrupts */
-               if (model && strcasecmp(model, "FEC")) {
-                       r[1].name = gfar_tx_intr;
-
-                       r[2].name = gfar_rx_intr;
-                       r[2].start = r[2].end = irq_of_parse_and_map(np, 1);
-                       r[2].flags = IORESOURCE_IRQ;
-
-                       r[3].name = gfar_err_intr;
-                       r[3].start = r[3].end = irq_of_parse_and_map(np, 2);
-                       r[3].flags = IORESOURCE_IRQ;
-
-                       n_res += 2;
-               }
-
-               gfar_dev =
-                   platform_device_register_simple("fsl-gianfar", i, &r[0],
-                                                   n_res);
-
-               if (IS_ERR(gfar_dev)) {
-                       ret = PTR_ERR(gfar_dev);
-                       goto err;
-               }
+               status.link = 1;
+               status.duplex = fixed_link[1];
+               status.speed = fixed_link[2];
+               status.pause = fixed_link[3];
+               status.asym_pause = fixed_link[4];
 
-               mac_addr = get_property(np, "local-mac-address", NULL);
-               if (mac_addr == NULL)
-                       mac_addr = get_property(np, "mac-address", NULL);
-               if (mac_addr == NULL) {
-                       /* Obsolete */
-                       mac_addr = get_property(np, "address", NULL);
-               }
-
-               if (mac_addr)
-                       memcpy(gfar_data.mac_addr, mac_addr, 6);
-
-               if (model && !strcasecmp(model, "TSEC"))
-                       gfar_data.device_flags =
-                           FSL_GIANFAR_DEV_HAS_GIGABIT |
-                           FSL_GIANFAR_DEV_HAS_COALESCE |
-                           FSL_GIANFAR_DEV_HAS_RMON |
-                           FSL_GIANFAR_DEV_HAS_MULTI_INTR;
-               if (model && !strcasecmp(model, "eTSEC"))
-                       gfar_data.device_flags =
-                           FSL_GIANFAR_DEV_HAS_GIGABIT |
-                           FSL_GIANFAR_DEV_HAS_COALESCE |
-                           FSL_GIANFAR_DEV_HAS_RMON |
-                           FSL_GIANFAR_DEV_HAS_MULTI_INTR |
-                           FSL_GIANFAR_DEV_HAS_CSUM |
-                           FSL_GIANFAR_DEV_HAS_VLAN |
-                           FSL_GIANFAR_DEV_HAS_EXTENDED_HASH;
-
-               ph = get_property(np, "phy-handle", NULL);
-               phy = of_find_node_by_phandle(*ph);
-
-               if (phy == NULL) {
-                       ret = -ENODEV;
-                       goto unreg;
-               }
-
-               mdio = of_get_parent(phy);
-
-               id = get_property(phy, "reg", NULL);
-               ret = of_address_to_resource(mdio, 0, &res);
+               ret = fixed_phy_add(PHY_POLL, fixed_link[0], &status);
                if (ret) {
-                       of_node_put(phy);
-                       of_node_put(mdio);
-                       goto unreg;
+                       of_node_put(np);
+                       return ret;
                }
-
-               gfar_data.phy_id = *id;
-               gfar_data.bus_id = res.start;
-
-               of_node_put(phy);
-               of_node_put(mdio);
-
-               ret =
-                   platform_device_add_data(gfar_dev, &gfar_data,
-                                            sizeof(struct
-                                                   gianfar_platform_data));
-               if (ret)
-                       goto unreg;
        }
 
        return 0;
-
-unreg:
-       platform_device_unregister(gfar_dev);
-err:
-       return ret;
 }
-
-arch_initcall(gfar_of_init);
-
-static int __init fsl_i2c_of_init(void)
-{
-       struct device_node *np;
-       unsigned int i;
-       struct platform_device *i2c_dev;
-       int ret;
-
-       for (np = NULL, i = 0;
-            (np = of_find_compatible_node(np, "i2c", "fsl-i2c")) != NULL;
-            i++) {
-               struct resource r[2];
-               struct fsl_i2c_platform_data i2c_data;
-               const unsigned char *flags = NULL;
-
-               memset(&r, 0, sizeof(r));
-               memset(&i2c_data, 0, sizeof(i2c_data));
-
-               ret = of_address_to_resource(np, 0, &r[0]);
-               if (ret)
-                       goto err;
-
-               r[1].start = r[1].end = irq_of_parse_and_map(np, 0);
-               r[1].flags = IORESOURCE_IRQ;
-
-               i2c_dev = platform_device_register_simple("fsl-i2c", i, r, 2);
-               if (IS_ERR(i2c_dev)) {
-                       ret = PTR_ERR(i2c_dev);
-                       goto err;
-               }
-
-               i2c_data.device_flags = 0;
-               flags = get_property(np, "dfsrr", NULL);
-               if (flags)
-                       i2c_data.device_flags |= FSL_I2C_DEV_SEPARATE_DFSRR;
-
-               flags = get_property(np, "fsl5200-clocking", NULL);
-               if (flags)
-                       i2c_data.device_flags |= FSL_I2C_DEV_CLOCK_5200;
-
-               ret =
-                   platform_device_add_data(i2c_dev, &i2c_data,
-                                            sizeof(struct
-                                                   fsl_i2c_platform_data));
-               if (ret)
-                       goto unreg;
-       }
-
-       return 0;
-
-unreg:
-       platform_device_unregister(i2c_dev);
-err:
-       return ret;
-}
-
-arch_initcall(fsl_i2c_of_init);
-
-#ifdef CONFIG_PPC_83xx
-static int __init mpc83xx_wdt_init(void)
-{
-       struct resource r;
-       struct device_node *soc, *np;
-       struct platform_device *dev;
-       const unsigned int *freq;
-       int ret;
-
-       np = of_find_compatible_node(NULL, "watchdog", "mpc83xx_wdt");
-
-       if (!np) {
-               ret = -ENODEV;
-               goto nodev;
-       }
-
-       soc = of_find_node_by_type(NULL, "soc");
-
-       if (!soc) {
-               ret = -ENODEV;
-               goto nosoc;
-       }
-
-       freq = get_property(soc, "bus-frequency", NULL);
-       if (!freq) {
-               ret = -ENODEV;
-               goto err;
-       }
-
-       memset(&r, 0, sizeof(r));
-
-       ret = of_address_to_resource(np, 0, &r);
-       if (ret)
-               goto err;
-
-       dev = platform_device_register_simple("mpc83xx_wdt", 0, &r, 1);
-       if (IS_ERR(dev)) {
-               ret = PTR_ERR(dev);
-               goto err;
-       }
-
-       ret = platform_device_add_data(dev, freq, sizeof(int));
-       if (ret)
-               goto unreg;
-
-       of_node_put(soc);
-       of_node_put(np);
-
-       return 0;
-
-unreg:
-       platform_device_unregister(dev);
-err:
-       of_node_put(soc);
-nosoc:
-       of_node_put(np);
-nodev:
-       return ret;
-}
-
-arch_initcall(mpc83xx_wdt_init);
-#endif
+arch_initcall(of_add_fixed_phys);
+#endif /* CONFIG_FIXED_PHY */
 
 static enum fsl_usb2_phy_modes determine_usb_phy(const char *phy_type)
 {
@@ -441,13 +227,12 @@ static enum fsl_usb2_phy_modes determine_usb_phy(const char *phy_type)
 static int __init fsl_usb_of_init(void)
 {
        struct device_node *np;
-       unsigned int i;
-       struct platform_device *usb_dev_mph = NULL, *usb_dev_dr = NULL;
+       unsigned int i = 0;
+       struct platform_device *usb_dev_mph = NULL, *usb_dev_dr_host = NULL,
+               *usb_dev_dr_client = NULL;
        int ret;
 
-       for (np = NULL, i = 0;
-            (np = of_find_compatible_node(np, "usb", "fsl-usb2-mph")) != NULL;
-            i++) {
+       for_each_compatible_node(np, NULL, "fsl-usb2-mph") {
                struct resource r[2];
                struct fsl_usb2_platform_data usb_data;
                const unsigned char *prop = NULL;
@@ -459,8 +244,7 @@ static int __init fsl_usb_of_init(void)
                if (ret)
                        goto err;
 
-               r[1].start = r[1].end = irq_of_parse_and_map(np, 0);
-               r[1].flags = IORESOURCE_IRQ;
+               of_irq_to_resource(np, 0, &r[1]);
 
                usb_dev_mph =
                    platform_device_register_simple("fsl-ehci", i, r, 2);
@@ -474,15 +258,15 @@ static int __init fsl_usb_of_init(void)
 
                usb_data.operating_mode = FSL_USB2_MPH_HOST;
 
-               prop = get_property(np, "port0", NULL);
+               prop = of_get_property(np, "port0", NULL);
                if (prop)
                        usb_data.port_enables |= FSL_USB2_PORT0_ENABLED;
 
-               prop = get_property(np, "port1", NULL);
+               prop = of_get_property(np, "port1", NULL);
                if (prop)
                        usb_data.port_enables |= FSL_USB2_PORT1_ENABLED;
 
-               prop = get_property(np, "phy_type", NULL);
+               prop = of_get_property(np, "phy_type", NULL);
                usb_data.phy_mode = determine_usb_phy(prop);
 
                ret =
@@ -491,15 +275,17 @@ static int __init fsl_usb_of_init(void)
                                                    fsl_usb2_platform_data));
                if (ret)
                        goto unreg_mph;
+               i++;
        }
 
-       for (np = NULL;
-            (np = of_find_compatible_node(np, "usb", "fsl-usb2-dr")) != NULL;
-            i++) {
+       for_each_compatible_node(np, NULL, "fsl-usb2-dr") {
                struct resource r[2];
                struct fsl_usb2_platform_data usb_data;
                const unsigned char *prop = NULL;
 
+               if (!of_device_is_available(np))
+                       continue;
+
                memset(&r, 0, sizeof(r));
                memset(&usb_data, 0, sizeof(usb_data));
 
@@ -507,36 +293,75 @@ static int __init fsl_usb_of_init(void)
                if (ret)
                        goto unreg_mph;
 
-               r[1].start = r[1].end = irq_of_parse_and_map(np, 0);
-               r[1].flags = IORESOURCE_IRQ;
+               of_irq_to_resource(np, 0, &r[1]);
 
-               usb_dev_dr =
-                   platform_device_register_simple("fsl-ehci", i, r, 2);
-               if (IS_ERR(usb_dev_dr)) {
-                       ret = PTR_ERR(usb_dev_dr);
+               prop = of_get_property(np, "dr_mode", NULL);
+
+               if (!prop || !strcmp(prop, "host")) {
+                       usb_data.operating_mode = FSL_USB2_DR_HOST;
+                       usb_dev_dr_host = platform_device_register_simple(
+                                       "fsl-ehci", i, r, 2);
+                       if (IS_ERR(usb_dev_dr_host)) {
+                               ret = PTR_ERR(usb_dev_dr_host);
+                               goto err;
+                       }
+               } else if (prop && !strcmp(prop, "peripheral")) {
+                       usb_data.operating_mode = FSL_USB2_DR_DEVICE;
+                       usb_dev_dr_client = platform_device_register_simple(
+                                       "fsl-usb2-udc", i, r, 2);
+                       if (IS_ERR(usb_dev_dr_client)) {
+                               ret = PTR_ERR(usb_dev_dr_client);
+                               goto err;
+                       }
+               } else if (prop && !strcmp(prop, "otg")) {
+                       usb_data.operating_mode = FSL_USB2_DR_OTG;
+                       usb_dev_dr_host = platform_device_register_simple(
+                                       "fsl-ehci", i, r, 2);
+                       if (IS_ERR(usb_dev_dr_host)) {
+                               ret = PTR_ERR(usb_dev_dr_host);
+                               goto err;
+                       }
+                       usb_dev_dr_client = platform_device_register_simple(
+                                       "fsl-usb2-udc", i, r, 2);
+                       if (IS_ERR(usb_dev_dr_client)) {
+                               ret = PTR_ERR(usb_dev_dr_client);
+                               goto err;
+                       }
+               } else {
+                       ret = -EINVAL;
                        goto err;
                }
 
-               usb_dev_dr->dev.coherent_dma_mask = 0xffffffffUL;
-               usb_dev_dr->dev.dma_mask = &usb_dev_dr->dev.coherent_dma_mask;
-
-               usb_data.operating_mode = FSL_USB2_DR_HOST;
-
-               prop = get_property(np, "phy_type", NULL);
+               prop = of_get_property(np, "phy_type", NULL);
                usb_data.phy_mode = determine_usb_phy(prop);
 
-               ret =
-                   platform_device_add_data(usb_dev_dr, &usb_data,
-                                            sizeof(struct
-                                                   fsl_usb2_platform_data));
-               if (ret)
-                       goto unreg_dr;
+               if (usb_dev_dr_host) {
+                       usb_dev_dr_host->dev.coherent_dma_mask = 0xffffffffUL;
+                       usb_dev_dr_host->dev.dma_mask = &usb_dev_dr_host->
+                               dev.coherent_dma_mask;
+                       if ((ret = platform_device_add_data(usb_dev_dr_host,
+                                               &usb_data, sizeof(struct
+                                               fsl_usb2_platform_data))))
+                               goto unreg_dr;
+               }
+               if (usb_dev_dr_client) {
+                       usb_dev_dr_client->dev.coherent_dma_mask = 0xffffffffUL;
+                       usb_dev_dr_client->dev.dma_mask = &usb_dev_dr_client->
+                               dev.coherent_dma_mask;
+                       if ((ret = platform_device_add_data(usb_dev_dr_client,
+                                               &usb_data, sizeof(struct
+                                               fsl_usb2_platform_data))))
+                               goto unreg_dr;
+               }
+               i++;
        }
        return 0;
 
 unreg_dr:
-       if (usb_dev_dr)
-               platform_device_unregister(usb_dev_dr);
+       if (usb_dev_dr_host)
+               platform_device_unregister(usb_dev_dr_host);
+       if (usb_dev_dr_client)
+               platform_device_unregister(usb_dev_dr_client);
 unreg_mph:
        if (usb_dev_mph)
                platform_device_unregister(usb_dev_mph);
@@ -546,255 +371,39 @@ err:
 
 arch_initcall(fsl_usb_of_init);
 
-#ifdef CONFIG_CPM2
+#if defined(CONFIG_PPC_85xx) || defined(CONFIG_PPC_86xx)
+static __be32 __iomem *rstcr;
 
-static const char fcc_regs[] = "fcc_regs";
-static const char fcc_regs_c[] = "fcc_regs_c";
-static const char fcc_pram[] = "fcc_pram";
-static char bus_id[9][BUS_ID_SIZE];
-
-static int __init fs_enet_of_init(void)
+static int __init setup_rstcr(void)
 {
        struct device_node *np;
-       unsigned int i;
-       struct platform_device *fs_enet_dev;
-       struct resource res;
-       int ret;
-
-       for (np = NULL, i = 0;
-            (np = of_find_compatible_node(np, "network", "fs_enet")) != NULL;
-            i++) {
-               struct resource r[4];
-               struct device_node *phy, *mdio;
-               struct fs_platform_info fs_enet_data;
-               const unsigned int *id, *phy_addr, *phy_irq;
-               const void *mac_addr;
-               const phandle *ph;
-               const char *model;
-
-               memset(r, 0, sizeof(r));
-               memset(&fs_enet_data, 0, sizeof(fs_enet_data));
-
-               ret = of_address_to_resource(np, 0, &r[0]);
-               if (ret)
-                       goto err;
-               r[0].name = fcc_regs;
-
-               ret = of_address_to_resource(np, 1, &r[1]);
-               if (ret)
-                       goto err;
-               r[1].name = fcc_pram;
-
-               ret = of_address_to_resource(np, 2, &r[2]);
-               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;
-
-               fs_enet_dev =
-                   platform_device_register_simple("fsl-cpm-fcc", i, &r[0], 4);
-
-               if (IS_ERR(fs_enet_dev)) {
-                       ret = PTR_ERR(fs_enet_dev);
-                       goto err;
-               }
-
-               model = get_property(np, "model", NULL);
-               if (model == NULL) {
-                       ret = -ENODEV;
-                       goto unreg;
-               }
-
-               mac_addr = get_property(np, "mac-address", NULL);
-               memcpy(fs_enet_data.macaddr, mac_addr, 6);
-
-               ph = get_property(np, "phy-handle", NULL);
-               phy = of_find_node_by_phandle(*ph);
-
-               if (phy == NULL) {
-                       ret = -ENODEV;
-                       goto unreg;
-               }
-
-               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);
-                if (ret) {
-                        of_node_put(phy);
-                        of_node_put(mdio);
-                        goto unreg;
-                }
-
-               fs_enet_data.clk_rx = *((u32 *) get_property(np, "rx-clock", NULL));
-               fs_enet_data.clk_tx = *((u32 *) get_property(np, "tx-clock", NULL));
-
-               if (strstr(model, "FCC")) {
-                       int fcc_index = *id - 1;
-                       const unsigned char *mdio_bb_prop;
-
-                       fs_enet_data.dpram_offset = (u32)cpm_dpram_addr(0);
-                       fs_enet_data.rx_ring = 32;
-                       fs_enet_data.tx_ring = 32;
-                       fs_enet_data.rx_copybreak = 240;
-                       fs_enet_data.use_napi = 0;
-                       fs_enet_data.napi_weight = 17;
-                       fs_enet_data.mem_offset = FCC_MEM_OFFSET(fcc_index);
-                       fs_enet_data.cp_page = CPM_CR_FCC_PAGE(fcc_index);
-                       fs_enet_data.cp_block = CPM_CR_FCC_SBLOCK(fcc_index);
-
-                       snprintf((char*)&bus_id[(*id)], BUS_ID_SIZE, "%x:%02x",
-                                                       (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;
-
-                       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));
-                       if (ret)
-                               goto unreg;
-               }
-       }
+       np = of_find_node_by_name(NULL, "global-utilities");
+       if ((np && of_get_property(np, "fsl,has-rstcr", NULL))) {
+               rstcr = of_iomap(np, 0) + 0xb0;
+               if (!rstcr)
+                       printk (KERN_EMERG "Error: reset control register "
+                                       "not mapped!\n");
+       } else
+               printk (KERN_INFO "rstcr compatible register does not exist!\n");
+       if (np)
+               of_node_put(np);
        return 0;
-
-unreg:
-       platform_device_unregister(fs_enet_dev);
-err:
-       return ret;
 }
 
-arch_initcall(fs_enet_of_init);
-
-static const char scc_regs[] = "regs";
-static const char scc_pram[] = "pram";
+arch_initcall(setup_rstcr);
 
-static int __init cpm_uart_of_init(void)
+void fsl_rstcr_restart(char *cmd)
 {
-       struct device_node *np;
-       unsigned int i;
-       struct platform_device *cpm_uart_dev;
-       int ret;
-
-       for (np = NULL, i = 0;
-            (np = of_find_compatible_node(np, "serial", "cpm_uart")) != NULL;
-            i++) {
-               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));
-
-               ret = of_address_to_resource(np, 0, &r[0]);
-               if (ret)
-                       goto err;
-
-               r[0].name = scc_regs;
-
-               ret = of_address_to_resource(np, 1, &r[1]);
-               if (ret)
-                       goto err;
-               r[1].name = scc_pram;
-
-               r[2].start = r[2].end = irq_of_parse_and_map(np, 0);
-               r[2].flags = IORESOURCE_IRQ;
-
-               cpm_uart_dev =
-                   platform_device_register_simple("fsl-cpm-scc:uart", i, &r[0], 3);
-
-               if (IS_ERR(cpm_uart_dev)) {
-                       ret = PTR_ERR(cpm_uart_dev);
-                       goto err;
-               }
-
-               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);
+       local_irq_disable();
+       if (rstcr)
+               /* set reset control register */
+               out_be32(rstcr, 0x2);   /* HRESET_REQ */
 
-               cpm_uart_data.uart_clk = ppc_proc_freq;
-
-               cpm_uart_data.tx_num_fifo = 4;
-               cpm_uart_data.tx_buf_size = 32;
-               cpm_uart_data.rx_num_fifo = 4;
-               cpm_uart_data.rx_buf_size = 32;
-               cpm_uart_data.clk_rx = *((u32 *) get_property(np, "rx-clock", NULL));
-               cpm_uart_data.clk_tx = *((u32 *) get_property(np, "tx-clock", NULL));
-
-               ret =
-                   platform_device_add_data(cpm_uart_dev, &cpm_uart_data,
-                                            sizeof(struct
-                                                   fs_uart_platform_info));
-               if (ret)
-                       goto unreg;
-       }
-
-       return 0;
-
-unreg:
-       platform_device_unregister(cpm_uart_dev);
-err:
-       return ret;
+       while (1) ;
 }
+#endif
 
-arch_initcall(cpm_uart_of_init);
-#endif /* CONFIG_CPM2 */
+#if defined(CONFIG_FB_FSL_DIU) || defined(CONFIG_FB_FSL_DIU_MODULE)
+struct platform_diu_data_ops diu_ops;
+EXPORT_SYMBOL(diu_ops);
+#endif