From dbf5760a103e55ab2a036590c738b1d16d8d6137 Mon Sep 17 00:00:00 2001 From: Philippe Langlais Date: Wed, 12 Oct 2011 10:58:21 +0200 Subject: mac-ux500: regulator Added regulator for sysclkreq and connected BT and WLAN ST-Ericsson Linux next: - ST-Ericsson ID: ER 324615 ST-Ericsson FOSS-OUT ID: Trivial Change-Id: I616eda9d8e292c05dd8094d8085f5b488ee90396 Signed-off-by: Bengt Jonsson Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/19533 Reviewed-by: Par-Gunnar HJALMDAHL Reviewed-by: Yvan FILLION Tested-by: Yvan FILLION Reviewed-by: Henrik CARLING Conflicts: arch/arm/mach-ux500/board-mop500-regulators.c arch/arm/mach-ux500/board-mop500.c arch/arm/mach-ux500/virt-regulator-u8500.c drivers/regulator/ab8500.c include/linux/mfd/ab8500/ab8500-gpio.h Signed-off-by: Philippe Langlais Conflicts: arch/arm/mach-ux500/board-mop500-regulators.c arch/arm/mach-ux500/cpu-db8500.c arch/arm/mach-ux500/virt-regulator-u8500.c drivers/gpio/ab8500-gpio.c include/linux/mfd/ab8500/gpio.h --- arch/arm/mach-ux500/board-mop500.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index f065fdba66f..4e4d6a99e29 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -95,7 +95,9 @@ static struct ab8500_gpio_platform_data ab8500_gpio_pdata = { * register. This is the array of 7 configuration settings. * One has to compile time decide these settings. Below is the * explaination of these setting - * GpioSel1 = 0x02 => Pin GPIO2 (SysClkReq3) is configured as GPIO + * GpioSel1 = 0x07 => Pin GPIO1 (SysClkReq2) + * Pin GPIO2 (SysClkReq3) + * Pin GPIO3 (SysClkReq4) are configured as GPIO * GpioSel2 = 0x9E => Pins GPIO10..13 & GPIO16 are configured as GPIO * GpioSel3 = 0x80 => Pin GPIO24 is configured as GPIO * GpioSel4 = 0x01 => Pin GPIo25 is configured as GPIO @@ -104,7 +106,7 @@ static struct ab8500_gpio_platform_data ab8500_gpio_pdata = { * AlternaFunction = 0x00 => If Pins GPIO10 to 13 are not configured * as GPIO then this register selectes the alternate fucntions */ - .config_reg = {0x02, 0x9E, 0x80, 0x01, + .config_reg = {0x07, 0x9E, 0x80, 0x01, 0x7A, 0x02, 0x00}, }; -- cgit v1.2.3