ipmi_si: Switch hotmod to use a platform device

[linux-2.6-block.git] / drivers / char / ipmi / ipmi_si_platform.c

diff --git a/drivers/char/ipmi/ipmi_si_platform.c b/drivers/char/ipmi/ipmi_si_platform.c
index 15cf819f884f6336b269dcdb16d807eb1c29f7b0..0f493fe8370179c22416301f7f6661090a9da15d 100644 (file)
--- a/drivers/char/ipmi/ipmi_si_platform.c
+++ b/drivers/char/ipmi/ipmi_si_platform.c
@@ -107,11 +107,11 @@ ipmi_get_info_from_resources(struct platform_device *pdev,
 
        res = platform_get_resource(pdev, IORESOURCE_IO, 0);
        if (res) {
-               io->addr_type = IPMI_IO_ADDR_SPACE;
+               io->addr_space = IPMI_IO_ADDR_SPACE;
        } else {
                res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
                if (res)
-                       io->addr_type = IPMI_MEM_ADDR_SPACE;
+                       io->addr_space = IPMI_MEM_ADDR_SPACE;
        }
        if (!res) {
                dev_err(&pdev->dev, "no I/O or memory address\n");
@@ -121,15 +121,13 @@ ipmi_get_info_from_resources(struct platform_device *pdev,
 
        io->regspacing = DEFAULT_REGSPACING;
        res_second = platform_get_resource(pdev,
-                              (io->addr_type == IPMI_IO_ADDR_SPACE) ?
+                              (io->addr_space == IPMI_IO_ADDR_SPACE) ?
                                        IORESOURCE_IO : IORESOURCE_MEM,
                               1);
        if (res_second) {
                if (res_second->start > io->addr_data)
                        io->regspacing = res_second->start - io->addr_data;
        }
-       io->regsize = DEFAULT_REGSIZE;
-       io->regshift = 0;
 
        return res;
 }
@@ -137,7 +135,7 @@ ipmi_get_info_from_resources(struct platform_device *pdev,
 static int platform_ipmi_probe(struct platform_device *pdev)
 {
        struct si_sm_io io;
-       u8 type, slave_addr, addr_source;
+       u8 type, slave_addr, addr_source, regsize, regshift;
        int rv;
 
        rv = device_property_read_u8(&pdev->dev, "addr-source", &addr_source);
@@ -149,7 +147,7 @@ static int platform_ipmi_probe(struct platform_device *pdev)
        if (addr_source == SI_SMBIOS) {
                if (!si_trydmi)
                        return -ENODEV;
-       } else {
+       } else if (addr_source != SI_HARDCODED) {
                if (!si_tryplatform)
                        return -ENODEV;
        }
@@ -169,11 +167,23 @@ static int platform_ipmi_probe(struct platform_device *pdev)
        case SI_BT:
                io.si_type = type;
                break;
+       case SI_TYPE_INVALID: /* User disabled this in hardcode. */
+               return -ENODEV;
        default:
                dev_err(&pdev->dev, "ipmi-type property is invalid\n");
                return -EINVAL;
        }
 
+       io.regsize = DEFAULT_REGSIZE;
+       rv = device_property_read_u8(&pdev->dev, "reg-size", &regsize);
+       if (!rv)
+               io.regsize = regsize;
+
+       io.regshift = 0;
+       rv = device_property_read_u8(&pdev->dev, "reg-shift", &regshift);
+       if (!rv)
+               io.regshift = regshift;
+
        if (!ipmi_get_info_from_resources(pdev, &io))
                return -EINVAL;
 
@@ -193,8 +203,9 @@ static int platform_ipmi_probe(struct platform_device *pdev)
 
        io.dev = &pdev->dev;
 
-       pr_info("ipmi_si: SMBIOS: %s %#lx regsize %d spacing %d irq %d\n",
-               (io.addr_type == IPMI_IO_ADDR_SPACE) ? "io" : "mem",
+       pr_info("ipmi_si: %s: %s %#lx regsize %d spacing %d irq %d\n",
+               ipmi_addr_src_to_str(addr_source),
+               (io.addr_space == IPMI_IO_ADDR_SPACE) ? "io" : "mem",
                io.addr_data, io.regsize, io.regspacing, io.irq);
 
        ipmi_si_add_smi(&io);
@@ -266,9 +277,9 @@ static int of_ipmi_probe(struct platform_device *pdev)
        io.irq_setup    = ipmi_std_irq_setup;
 
        if (resource.flags & IORESOURCE_IO)
-               io.addr_type = IPMI_IO_ADDR_SPACE;
+               io.addr_space = IPMI_IO_ADDR_SPACE;
        else
-               io.addr_type = IPMI_MEM_ADDR_SPACE;
+               io.addr_space = IPMI_MEM_ADDR_SPACE;
 
        io.addr_data    = resource.start;
 
@@ -296,15 +307,10 @@ static int of_ipmi_probe(struct platform_device *dev)
 static int find_slave_address(struct si_sm_io *io, int slave_addr)
 {
 #ifdef CONFIG_IPMI_DMI_DECODE
-       if (!slave_addr) {
-               u32 flags = IORESOURCE_IO;
-
-               if (io->addr_type == IPMI_MEM_ADDR_SPACE)
-                       flags = IORESOURCE_MEM;
-
-               slave_addr = ipmi_dmi_get_slave_addr(io->si_type, flags,
+       if (!slave_addr)
+               slave_addr = ipmi_dmi_get_slave_addr(io->si_type,
+                                                    io->addr_space,
                                                     io->addr_data);
-       }
 #endif
 
        return slave_addr;
@@ -358,6 +364,9 @@ static int acpi_ipmi_probe(struct platform_device *pdev)
                goto err_free;
        }
 
+       io.regsize = DEFAULT_REGSIZE;
+       io.regshift = 0;
+
        res = ipmi_get_info_from_resources(pdev, &io);
        if (!res) {
                rv = -EINVAL;
@@ -420,8 +429,10 @@ static int ipmi_remove(struct platform_device *pdev)
 }
 
 static const struct platform_device_id si_plat_ids[] = {
-    { "dmi-ipmi-si", 0 },
-    { }
+       { "dmi-ipmi-si", 0 },
+       { "hardcode-ipmi-si", 0 },
+       { "hotmod-ipmi-si", 0 },
+       { }
 };
 
 struct platform_driver ipmi_platform_driver = {