Merge branch 'master' of /usr/src/ntfs-2.6/
[sfrench/cifs-2.6.git] / arch / ppc / syslib / ppc_sys.c
index 52ba0c68078df3c09052d4fcac72550af29b86cb..60c724e1158499e6c136542447c96f9a13ddce96 100644 (file)
@@ -1,9 +1,7 @@
 /*
- * arch/ppc/syslib/ppc_sys.c
- *
  * PPC System library functions
  *
- * Maintainer: Kumar Gala <kumar.gala@freescale.com>
+ * Maintainer: Kumar Gala <galak@kernel.crashing.org>
  *
  * Copyright 2005 Freescale Semiconductor Inc.
  * Copyright 2005 MontaVista, Inc. by Vitaly Bordug <vbordug@ru.mvista.com>
  * option) any later version.
  */
 
+#include <linux/string.h>
+#include <linux/bootmem.h>
 #include <asm/ppc_sys.h>
 
 int (*ppc_sys_device_fixup) (struct platform_device * pdev);
 
 static int ppc_sys_inited;
+static int ppc_sys_func_inited;
+
+static const char *ppc_sys_func_names[] = {
+       [PPC_SYS_FUNC_DUMMY] = "dummy",
+       [PPC_SYS_FUNC_ETH] = "eth",
+       [PPC_SYS_FUNC_UART] = "uart",
+       [PPC_SYS_FUNC_HLDC] = "hldc",
+       [PPC_SYS_FUNC_USB] = "usb",
+       [PPC_SYS_FUNC_IRDA] = "irda",
+};
 
 void __init identify_ppc_sys_by_id(u32 id)
 {
@@ -37,13 +47,13 @@ void __init identify_ppc_sys_by_id(u32 id)
 void __init identify_ppc_sys_by_name(char *name)
 {
        unsigned int i = 0;
-       while (ppc_sys_specs[i].ppc_sys_name[0])
-       {
+       while (ppc_sys_specs[i].ppc_sys_name[0]) {
                if (!strcmp(ppc_sys_specs[i].ppc_sys_name, name))
                        break;
                i++;
        }
        cur_ppc_sys_spec = &ppc_sys_specs[i];
+
        return;
 }
 
@@ -69,6 +79,9 @@ static int __init find_chip_by_name_and_id(char *name, u32 id)
                        matched[j++] = i;
                i++;
        }
+
+       ret = i;
+
        if (j != 0) {
                for (i = 0; i < j; i++) {
                        if ((ppc_sys_specs[matched[i]].mask & id) ==
@@ -124,6 +137,165 @@ void ppc_sys_device_remove(enum ppc_sys_devices dev)
        }
 }
 
+/* Platform-notify mapping
+ * Helper function for BSP code to assign board-specific platfom-divice bits
+ */
+
+void platform_notify_map(const struct platform_notify_dev_map *map,
+                        struct device *dev)
+{
+       struct platform_device *pdev;
+       int len, idx;
+       const char *s;
+
+       /* do nothing if no device or no bus_id */
+       if (!dev || !dev->bus_id)
+               return;
+
+       /* call per device map */
+       while (map->bus_id != NULL) {
+               idx = -1;
+               s = strrchr(dev->bus_id, '.');
+               if (s != NULL)
+                       idx = (int)simple_strtol(s + 1, NULL, 10);
+               else
+                       s = dev->bus_id;
+
+               len = s - dev->bus_id;
+
+               if (!strncmp(dev->bus_id, map->bus_id, len)) {
+                       pdev = container_of(dev, struct platform_device, dev);
+                       map->rtn(pdev, idx);
+               }
+               map++;
+       }
+}
+
+/*
+   Function assignment stuff.
+ Intended to work as follows:
+ the device name defined in foo_devices.c will be concatenated with :"func",
+ where func is string map of respective function from platfom_device_func enum
+
+ The PPC_SYS_FUNC_DUMMY function is intended to remove all assignments, making the device to appear
+ in platform bus with unmodified name.
+ */
+
+/*
+   Here we'll replace .name pointers with fixed-lenght strings
+   Hereby, this should be called *before* any func stuff triggeded.
+ */
+void ppc_sys_device_initfunc(void)
+{
+       int i;
+       const char *name;
+       static char new_names[NUM_PPC_SYS_DEVS][BUS_ID_SIZE];
+       enum ppc_sys_devices cur_dev;
+
+       /* If inited yet, do nothing */
+       if (ppc_sys_func_inited)
+               return;
+
+       for (i = 0; i < cur_ppc_sys_spec->num_devices; i++) {
+               if ((cur_dev = cur_ppc_sys_spec->device_list[i]) < 0)
+                       continue;
+
+               if (ppc_sys_platform_devices[cur_dev].name) {
+                       /*backup name */
+                       name = ppc_sys_platform_devices[cur_dev].name;
+                       strlcpy(new_names[i], name, BUS_ID_SIZE);
+                       ppc_sys_platform_devices[cur_dev].name = new_names[i];
+               }
+       }
+
+       ppc_sys_func_inited = 1;
+}
+
+/*The "engine" of the func stuff. Here we either concat specified function string description
+ to the name, or remove it if PPC_SYS_FUNC_DUMMY parameter is passed here*/
+void ppc_sys_device_setfunc(enum ppc_sys_devices dev,
+                           enum platform_device_func func)
+{
+       char *s;
+       char *name = (char *)ppc_sys_platform_devices[dev].name;
+       char tmp[BUS_ID_SIZE];
+
+       if (!ppc_sys_func_inited) {
+               printk(KERN_ERR "Unable to alter function - not inited!\n");
+               return;
+       }
+
+       if (ppc_sys_inited) {
+               platform_device_unregister(&ppc_sys_platform_devices[dev]);
+       }
+
+       if ((s = (char *)strchr(name, ':')) != NULL) {  /* reassign */
+               /* Either change the name after ':' or remove func modifications */
+               if (func != PPC_SYS_FUNC_DUMMY)
+                       strlcpy(s + 1, ppc_sys_func_names[func], BUS_ID_SIZE);
+               else
+                       *s = 0;
+       } else if (func != PPC_SYS_FUNC_DUMMY) {
+               /* do assignment if it is not just "clear"  request */
+               sprintf(tmp, "%s:%s", name, ppc_sys_func_names[func]);
+               strlcpy(name, tmp, BUS_ID_SIZE);
+       }
+
+       if (ppc_sys_inited) {
+               platform_device_register(&ppc_sys_platform_devices[dev]);
+       }
+}
+
+void ppc_sys_device_disable(enum ppc_sys_devices dev)
+{
+       BUG_ON(cur_ppc_sys_spec == NULL);
+
+       /*Check if it is enabled*/
+       if(!(cur_ppc_sys_spec->config[dev] & PPC_SYS_CONFIG_DISABLED)) {
+               if (ppc_sys_inited) {
+                       platform_device_unregister(&ppc_sys_platform_devices[dev]);
+               }
+               cur_ppc_sys_spec->config[dev] |= PPC_SYS_CONFIG_DISABLED;
+       }
+}
+
+void ppc_sys_device_enable(enum ppc_sys_devices dev)
+{
+       BUG_ON(cur_ppc_sys_spec == NULL);
+
+       /*Check if it is disabled*/
+       if(cur_ppc_sys_spec->config[dev] & PPC_SYS_CONFIG_DISABLED) {
+               if (ppc_sys_inited) {
+                       platform_device_register(&ppc_sys_platform_devices[dev]);
+               }
+               cur_ppc_sys_spec->config[dev] &= ~PPC_SYS_CONFIG_DISABLED;
+       }
+
+}
+
+void ppc_sys_device_enable_all(void)
+{
+       enum ppc_sys_devices cur_dev;
+       int i;
+
+       for (i = 0; i < cur_ppc_sys_spec->num_devices; i++) {
+               cur_dev = cur_ppc_sys_spec->device_list[i];
+               ppc_sys_device_enable(cur_dev);
+       }
+}
+
+void ppc_sys_device_disable_all(void)
+{
+       enum ppc_sys_devices cur_dev;
+       int i;
+
+       for (i = 0; i < cur_ppc_sys_spec->num_devices; i++) {
+               cur_dev = cur_ppc_sys_spec->device_list[i];
+               ppc_sys_device_disable(cur_dev);
+       }
+}
+
+
 static int __init ppc_sys_init(void)
 {
        unsigned int i, dev_id, ret = 0;
@@ -132,7 +304,8 @@ static int __init ppc_sys_init(void)
 
        for (i = 0; i < cur_ppc_sys_spec->num_devices; i++) {
                dev_id = cur_ppc_sys_spec->device_list[i];
-               if (dev_id != -1) {
+               if ((dev_id != -1) &&
+               !(cur_ppc_sys_spec->config[dev_id] & PPC_SYS_CONFIG_DISABLED)) {
                        if (ppc_sys_device_fixup != NULL)
                                ppc_sys_device_fixup(&ppc_sys_platform_devices
                                                     [dev_id]);