diff --git a/[refs] b/[refs] index 1de5a058f12f..8d1168bc30b2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a26d7344f2c304cc58e937fda1d03469de3d60a +refs/heads/master: 89e1c3d0fffa0d610fa7292bbfafb5e87dc6be34 diff --git a/trunk/arch/arm/mach-s3c64xx/mach-crag6410.c b/trunk/arch/arm/mach-s3c64xx/mach-crag6410.c index 474f0d27e979..9026249233ad 100644 --- a/trunk/arch/arm/mach-s3c64xx/mach-crag6410.c +++ b/trunk/arch/arm/mach-s3c64xx/mach-crag6410.c @@ -474,6 +474,12 @@ static struct regulator_init_data vddalive __initdata = { .supply_regulator = "WALLVDD", }; +static struct wm831x_backup_pdata banff_backup_pdata __initdata = { + .charger_enable = 1, + .vlim = 2500, /* mV */ + .ilim = 200, /* uA */ +}; + static struct wm831x_status_pdata banff_red_led __initdata = { .name = "banff:red:", .default_src = WM831X_STATUS_MANUAL, @@ -494,6 +500,8 @@ static struct wm831x_pdata crag_pmic_pdata __initdata = { .irq_base = BANFF_PMIC_IRQ_BASE, .gpio_base = GPIO_BOARD_START + 8, + .backup = &banff_backup_pdata, + .gpio_defaults = { /* GPIO11: Touchscreen data - CMOS, DBVDD, active high*/ [10] = WM831X_GPN_POL | WM831X_GPN_ENA | 0x6,