summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/arm/mach-ux500/board-mop500.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c
index 3b9d60c6c76..11f5e9477ed 100644
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
@@ -185,7 +185,7 @@ static struct ab8500_gpio_platform_data ab8505_gpio_pdata = {
* as GPIO then this register selectes the alternate functions
* GpioSel7 = 0x22 => Pins GPIO50 to GPIO52 are configured as GPIO.
*/
- .config_reg = {0x0F, 0x9E, 0x80, 0x01, 0x78, 0x02, 0x22},
+ .config_reg = {0x0F, 0x9E, 0x80, 0x01, 0x7A, 0x02, 0x22},
/*
* config_direction allows for the initial GPIO direction to
@@ -1319,6 +1319,11 @@ static void __init hrefv60_init_machine(void)
* button press/release are inverted.
*/
ab8500_accdet_pdata.is_detection_inverted = true;
+
+ if (machine_is_u8520()) {
+ ab8500_accdet_pdata.video_ctrl_gpio = AB8500_PIN_GPIO10;
+ ab8500_accdet_pdata.mic_ctrl = AB8500_PIN_GPIO34;
+ }
#endif
parent = u8500_init_devices();