mfd: Add WM831x revision B support

[safe/jmp/linux-2.6] / drivers / mfd / htc-pasic3.c

diff --git a/drivers/mfd/htc-pasic3.c b/drivers/mfd/htc-pasic3.c
index 92b6837..cb73051 100644 (file)
--- a/drivers/mfd/htc-pasic3.c
+++ b/drivers/mfd/htc-pasic3.c
@@ -35,7 +35,7 @@ struct pasic3_data {
  */
 void pasic3_write_register(struct device *dev, u32 reg, u8 val)
 {
-       struct pasic3_data *asic = dev->driver_data;
+       struct pasic3_data *asic = dev_get_drvdata(dev);
        int bus_shift = asic->bus_shift;
        void __iomem *addr = asic->mapping + (REG_ADDR << bus_shift);
        void __iomem *data = asic->mapping + (REG_DATA << bus_shift);
@@ -50,7 +50,7 @@ EXPORT_SYMBOL(pasic3_write_register); /* for leds-pasic3 */
  */
 u8 pasic3_read_register(struct device *dev, u32 reg)
 {
-       struct pasic3_data *asic = dev->driver_data;
+       struct pasic3_data *asic = dev_get_drvdata(dev);
        int bus_shift = asic->bus_shift;
        void __iomem *addr = asic->mapping + (REG_ADDR << bus_shift);
        void __iomem *data = asic->mapping + (REG_DATA << bus_shift);
@@ -167,15 +167,19 @@ static int __init pasic3_probe(struct platform_device *pdev)
        /* calculate bus shift from mem resource */
        asic->bus_shift = (resource_size(r) - 5) >> 3;
 
-       /* the first 5 PASIC3 registers control the DS1WM */
-       ds1wm_resources[0].end = (5 << asic->bus_shift) - 1;
-       ds1wm_cell.platform_data = &ds1wm_cell;
-       ds1wm_cell.data_size = sizeof(ds1wm_cell);
-       ret = mfd_add_devices(&pdev->dev, pdev->id, &ds1wm_cell, 1, r, irq);
-       if (ret < 0)
-               dev_warn(dev, "failed to register DS1WM\n");
+       if (pdata && pdata->clock_rate) {
+               ds1wm_pdata.clock_rate = pdata->clock_rate;
+               /* the first 5 PASIC3 registers control the DS1WM */
+               ds1wm_resources[0].end = (5 << asic->bus_shift) - 1;
+               ds1wm_cell.platform_data = &ds1wm_cell;
+               ds1wm_cell.data_size = sizeof(ds1wm_cell);
+               ret = mfd_add_devices(&pdev->dev, pdev->id,
+                               &ds1wm_cell, 1, r, irq);
+               if (ret < 0)
+                       dev_warn(dev, "failed to register DS1WM\n");
+       }
 
-       if (pdata->led_pdata) {
+       if (pdata && pdata->led_pdata) {
                led_cell.driver_data = pdata->led_pdata;
                led_cell.platform_data = &led_cell;
                led_cell.data_size = sizeof(ds1wm_cell);