← Back to branch summary

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

« back to all changes in this revision

Viewing changes to include/linux/mfd/wm831x/pdata.h

  • 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:
include/linux/mfd/wm831x/pdata.h
103
103
#define WM831X_MAX_ISINK  2
104
104
 
105
105
struct wm831x_pdata {
 
106
        /** Used to distinguish multiple WM831x chips */
 
107
        int wm831x_num;
 
108
 
106
109
        /** Called before subdevices are set up */
107
110
        int (*pre_init)(struct wm831x *wm831x);
108
111
        /** Called after subdevices are set up */
109
112
        int (*post_init)(struct wm831x *wm831x);
110
113
 
 
114
        /** Put the /IRQ line into CMOS mode */
 
115
        bool irq_cmos;
 
116
 
111
117
        int irq_base;
112
118
        int gpio_base;
113
119
        struct wm831x_backlight_pdata *backlight;