Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 281700
b: refs/heads/master
c: aaed44e
h: refs/heads/master
v: v3
  • Loading branch information
Mark Brown authored and Kukjin Kim committed Nov 8, 2011
1 parent 9552234 commit 5ccc378
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 3 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: 4ff13995b512cfadef44e0bf5cb15298d6094519
refs/heads/master: aaed44e1672c61b28dcae6e3d7bd5d15aef362f3
3 changes: 2 additions & 1 deletion trunk/arch/arm/mach-s3c64xx/include/mach/crag6410.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
#define GLENFARCLAS_PMIC_IRQ_BASE (IRQ_BOARD_START + 64)

#define PCA935X_GPIO_BASE GPIO_BOARD_START
#define CODEC_GPIO_BASE (GPIO_BOARD_START + 8)
#define CODEC_GPIO_BASE (GPIO_BOARD_START + 8)
#define GLENFARCLAS_PMIC_GPIO_BASE (GPIO_BOARD_START + 16)
#define BANFF_PMIC_GPIO_BASE (GPIO_BOARD_START + 32)

#endif
2 changes: 1 addition & 1 deletion trunk/arch/arm/mach-s3c64xx/mach-crag6410.c
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ static struct wm831x_touch_pdata touch_pdata __initdata = {
static struct wm831x_pdata crag_pmic_pdata __initdata = {
.wm831x_num = 1,
.irq_base = BANFF_PMIC_IRQ_BASE,
.gpio_base = GPIO_BOARD_START + 8,
.gpio_base = BANFF_PMIC_GPIO_BASE,

.backup = &banff_backup_pdata,

Expand Down

0 comments on commit 5ccc378

Please sign in to comment.