Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 192549
b: refs/heads/master
c: f722377
h: refs/heads/master
i:
  192547: 7623b04
v: v3
  • Loading branch information
Thomas Weber authored and Jiri Kosina committed Mar 23, 2010
1 parent 9741ce9 commit 5fc1be7
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b7a5633ab39105b47b341249824f9387a002cea9
refs/heads/master: f722377bfa869c9c1abeca88266bb4cfd3a5d06d
8 changes: 4 additions & 4 deletions trunk/include/linux/i2c/twl.h
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ struct twl4030_madc_platform_data {
int irq_line;
};

/* Boards have uniqe mappings of {row, col} --> keycode.
/* Boards have unique mappings of {row, col} --> keycode.
* Column and row are 8 bits each, but range only from 0..7.
* a PERSISTENT_KEY is "always on" and never reported.
*/
Expand Down Expand Up @@ -664,15 +664,15 @@ static inline int twl4030charger_usb_en(int enable) { return 0; }
#define TWL4030_REG_VUSB3V1 19

/* TWL6030 SMPS/LDO's */
/* EXTERNAL dc-to-dc buck convertor contollable via SR */
/* EXTERNAL dc-to-dc buck convertor controllable via SR */
#define TWL6030_REG_VDD1 30
#define TWL6030_REG_VDD2 31
#define TWL6030_REG_VDD3 32

/* Non SR compliant dc-to-dc buck convertors */
#define TWL6030_REG_VMEM 33
#define TWL6030_REG_VMEM 33
#define TWL6030_REG_V2V1 34
#define TWL6030_REG_V1V29 35
#define TWL6030_REG_V1V29 35
#define TWL6030_REG_V1V8 36

/* EXTERNAL LDOs */
Expand Down

0 comments on commit 5fc1be7

Please sign in to comment.