diff mbox

ARM: ux500: 8500: use hsit_a_2 group for HSI

Message ID 1347620075-18022-1-git-send-email-linus.walleij@stericsson.com (mailing list archive)
State New, archived
Headers show

Commit Message

Linus Walleij Sept. 14, 2012, 10:54 a.m. UTC 
From: Patrice Chotard <patrice.chotard@stericsson.com>

Due to specific constraint, pin HSIT_ACWAKE0_a is
not driven by HSI block but as a GPIO.

Cc: arm@kernel.org
Signed-off-by: Patrice Chotard <patrice.chotard@stericsson.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ARM SoC maintainers - I'll take this fixup through the pinctrl
tree if you don't mind.
---
 arch/arm/mach-ux500/board-mop500-pins.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Olof Johansson Sept. 17, 2012, 1:10 a.m. UTC | #1 
On Fri, Sep 14, 2012 at 12:54:35PM +0200, Linus Walleij wrote:
> From: Patrice Chotard <patrice.chotard@stericsson.com>
> 
> Due to specific constraint, pin HSIT_ACWAKE0_a is
> not driven by HSI block but as a GPIO.
> 
> Cc: arm@kernel.org
> Signed-off-by: Patrice Chotard <patrice.chotard@stericsson.com>
> Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
> ---
> ARM SoC maintainers - I'll take this fixup through the pinctrl
> tree if you don't mind.

Sure, you should know best yourself if you're likely to have conflicts with
other updates in this merge window anyway.

Acked-by: Olof Johansson <olof@lixom.net>


-Olof
diff mbox

Patch

diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c
index 32fd992..f0affc3 100644
--- a/arch/arm/mach-ux500/board-mop500-pins.c
+++ b/arch/arm/mach-ux500/board-mop500-pins.c
@@ -410,7 +410,7 @@  static struct pinctrl_map __initdata u9500_pinmap[] = {
 	DB8500_PIN_HOG("GPIO144_B13", gpio_in_pu),
 	/* HSI */
 	DB8500_MUX_HOG("hsir_a_1", "hsi"),
-	DB8500_MUX_HOG("hsit_a_1", "hsi"),
+	DB8500_MUX_HOG("hsit_a_2", "hsi"),
 	DB8500_PIN_HOG("GPIO219_AG10", in_pd), /* RX FLA0 */
 	DB8500_PIN_HOG("GPIO220_AH10", in_pd), /* RX DAT0 */
 	DB8500_PIN_HOG("GPIO221_AJ11", out_lo), /* RX RDY0 */
@@ -418,7 +418,7 @@  static struct pinctrl_map __initdata u9500_pinmap[] = {
 	DB8500_PIN_HOG("GPIO223_AH9", out_lo), /* TX DAT0 */
 	DB8500_PIN_HOG("GPIO224_AG9", in_pd), /* TX RDY0 */
 	DB8500_PIN_HOG("GPIO225_AG8", in_pd), /* CAWAKE0 */
-	DB8500_PIN_HOG("GPIO226_AF8", out_hi), /* ACWAKE0 */
+	DB8500_PIN_HOG("GPIO226_AF8", gpio_out_hi), /* ACWAKE0 */
 };
 
 static struct pinctrl_map __initdata u8500_pinmap[] = {