提交 aaed44e1 编写于 作者: M Mark Brown 提交者: Kukjin Kim

ARM: S3C64XX: Correct reservation of GPIOs for CPU module on Cragganmore

The gpio_base for the PMIC on the CPU module was being incorrectly set to
be the same as that for the CODEC causing the two GPIO drivers to collide.
Signed-off-by: NMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: NKukjin Kim <kgene.kim@samsung.com>
上级 4ff13995
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
#define GLENFARCLAS_PMIC_IRQ_BASE (IRQ_BOARD_START + 64) #define GLENFARCLAS_PMIC_IRQ_BASE (IRQ_BOARD_START + 64)
#define PCA935X_GPIO_BASE GPIO_BOARD_START #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 GLENFARCLAS_PMIC_GPIO_BASE (GPIO_BOARD_START + 16)
#define BANFF_PMIC_GPIO_BASE (GPIO_BOARD_START + 32)
#endif #endif
...@@ -500,7 +500,7 @@ static struct wm831x_touch_pdata touch_pdata __initdata = { ...@@ -500,7 +500,7 @@ static struct wm831x_touch_pdata touch_pdata __initdata = {
static struct wm831x_pdata crag_pmic_pdata __initdata = { static struct wm831x_pdata crag_pmic_pdata __initdata = {
.wm831x_num = 1, .wm831x_num = 1,
.irq_base = BANFF_PMIC_IRQ_BASE, .irq_base = BANFF_PMIC_IRQ_BASE,
.gpio_base = GPIO_BOARD_START + 8, .gpio_base = BANFF_PMIC_GPIO_BASE,
.backup = &banff_backup_pdata, .backup = &banff_backup_pdata,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册