← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-linaro-u8500/precise

« back to all changes in this revision

Viewing changes to drivers/mfd/htc-pasic3.c

  • Committer: Bazaar Package Importer
  • Author(s): John Rigby, Upstream Fixes, Andy Green, John Rigby
  • Date: 2011-04-14 12:16:06 UTC
  • Revision ID: james.westby@ubuntu.com-20110414121606-b77podkyqgr2oix7
Tags: 2.6.38-1002.3
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/747639
https://launchpad.net/bugs/752900
https://launchpad.net/bugs/745737
https://launchpad.net/bugs/732842
https://launchpad.net/bugs/732912
[ Upstream Fixes ]

* MUSB: shutdown: Make sure block is awake before doing shutdown
  - LP: #745737
* Fixed gpio polarity of gpio USB-phy reset.
  - LP: #747639

[ Andy Green ]

* LINARO: SAUCE: disable CONFIG_OMAP_RESET_CLOCKS
  - LP: #752900

[ John Rigby ]

* Rebase to new upstreams:
  Linux v2.6.38.1
  linaro-linux-2.6.38-upstream-29Mar2011
  Ubuntu-2.6.38-7.35
* SAUCE: OMAP4: clock: wait for module to become accessible on
  a clk enable
  - LP: #745737
* Rebase to new upstreams:
  Linux v2.6.38.2
  linaro-linux-2.6.38-upstream-5Apr2011
  Ubuntu-2.6.38-8.41
  - LP: #732842
* Update configs for device tree, dvfs and lttng
* LINARO: add building of dtb's
* LINARO: SAUCE: Disable lowest operating freqs on omap34xx
  - LP: #732912

Show diffs side-by-side

added added

removed removed

Lines of Context:
drivers/mfd/htc-pasic3.c
117
117
        .name          = "ds1wm",
118
118
        .enable        = ds1wm_enable,
119
119
        .disable       = ds1wm_disable,
120
 
        .driver_data   = &ds1wm_pdata,
 
120
        .mfd_data      = &ds1wm_pdata,
121
121
        .num_resources = 2,
122
122
        .resources     = ds1wm_resources,
123
123
};
165
165
                ds1wm_pdata.clock_rate = pdata->clock_rate;
166
166
                /* the first 5 PASIC3 registers control the DS1WM */
167
167
                ds1wm_resources[0].end = (5 << asic->bus_shift) - 1;
168
 
                ds1wm_cell.platform_data = &ds1wm_cell;
169
 
                ds1wm_cell.data_size = sizeof(ds1wm_cell);
170
168
                ret = mfd_add_devices(&pdev->dev, pdev->id,
171
169
                                &ds1wm_cell, 1, r, irq);
172
170
                if (ret < 0)
174
172
        }
175
173
 
176
174
        if (pdata && pdata->led_pdata) {
177
 
                led_cell.driver_data = pdata->led_pdata;
178
 
                led_cell.platform_data = &led_cell;
179
 
                led_cell.data_size = sizeof(ds1wm_cell);
180
175
                ret = mfd_add_devices(&pdev->dev, pdev->id, &led_cell, 1, r, 0);
181
176
                if (ret < 0)
182
177
                        dev_warn(dev, "failed to register LED device\n");