← Back to branch summary

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

« back to all changes in this revision

Viewing changes to include/linux/mfd/88pm860x.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/88pm860x.h
131
131
        PM8607_ID_LDO8,
132
132
        PM8607_ID_LDO9,
133
133
        PM8607_ID_LDO10,
 
134
        PM8607_ID_LDO11,
134
135
        PM8607_ID_LDO12,
135
136
        PM8607_ID_LDO13,
136
137
        PM8607_ID_LDO14,
 
138
        PM8607_ID_LDO15,
137
139
 
138
140
        PM8607_ID_RG_MAX,
139
141
};
310
312
 
311
313
};
312
314
 
313
 
#define PM8607_MAX_REGULATOR    PM8607_ID_RG_MAX        /* 3 Bucks, 13 LDOs */
314
 
 
315
315
enum {
316
316
        GI2C_PORT = 0,
317
317
        PI2C_PORT,
351
351
        struct pm860x_led_pdata         *led;
352
352
        struct pm860x_touch_pdata       *touch;
353
353
        struct pm860x_power_pdata       *power;
 
354
        struct regulator_init_data      *regulator;
354
355
 
355
356
        unsigned short  companion_addr; /* I2C address of companion chip */
356
357
        int             i2c_port;       /* Controlled by GI2C or PI2C */
357
358
        int             irq_mode;       /* Clear interrupt by read/write(0/1) */
358
359
        int             irq_base;       /* IRQ base number of 88pm860x */
359
 
        struct regulator_init_data *regulator[PM8607_MAX_REGULATOR];
 
360
        int             num_leds;
 
361
        int             num_backlights;
 
362
        int             num_regulators;
360
363
};
361
364
 
362
 
extern char pm860x_backlight_name[][MFD_NAME_SIZE];
363
 
extern char pm860x_led_name[][MFD_NAME_SIZE];
364
 
 
365
365
extern int pm860x_reg_read(struct i2c_client *, int);
366
366
extern int pm860x_reg_write(struct i2c_client *, int, unsigned char);
367
367
extern int pm860x_bulk_read(struct i2c_client *, int, int, unsigned char *);
368
368
extern int pm860x_bulk_write(struct i2c_client *, int, int, unsigned char *);
369
369
extern int pm860x_set_bits(struct i2c_client *, int, unsigned char,
370
370
                           unsigned char);
 
371
extern int pm860x_page_reg_read(struct i2c_client *, int);
 
372
extern int pm860x_page_reg_write(struct i2c_client *, int, unsigned char);
 
373
extern int pm860x_page_bulk_read(struct i2c_client *, int, int,
 
374
                                 unsigned char *);
 
375
extern int pm860x_page_bulk_write(struct i2c_client *, int, int,
 
376
                                  unsigned char *);
 
377
extern int pm860x_page_set_bits(struct i2c_client *, int, unsigned char,
 
378
                                unsigned char);
371
379
 
372
380
extern int pm860x_device_init(struct pm860x_chip *chip,
373
381
                              struct pm860x_platform_data *pdata) __devinit ;