From patchwork Fri Sep 14 10:54:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 11416 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 6D7AA23E29 for ; Fri, 14 Sep 2012 10:54:59 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id BBD86A339A8 for ; Fri, 14 Sep 2012 10:54:58 +0000 (UTC) Received: by ieak11 with SMTP id k11so6330067iea.11 for ; Fri, 14 Sep 2012 03:54:58 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:mime-version:content-type :x-gm-message-state; bh=5K5w/CFO4pbFb1AVaVXWHvYxMYD/31XyevktBMH5Ejs=; b=bjZ26uGUg6fl1GzCrXYxphFV5yjTvSzH0Uob7YISmMX+6pv+jXvK7ucOXxpuJKd2dI 9U2WvgyDSfwCROtQ2l952lizeh2i1Hx40K/qwLmT21RKdQKsqPnM+dns/DHanx2W1m17 QEZzijfCad2hsv+aEJ4hK0voioZ4o8P5/eSdFscUeVPvbsUe77MFU9irJgdBpE/+3Xj8 fkYiJiUWlV19Bgiof+VsucN5OEclUSGbyBjsG3WnTeEWeWky96AQgvZrhPFy4VCK8yzG tKd6EsDhL0RX+ONqRGioAFSP3ZD8+20Ktwl7xXbbI7OkFoLluk7t2iBj08y95E8hoq0h COgQ== Received: by 10.50.242.3 with SMTP id wm3mr28360454igc.0.1347620097939; Fri, 14 Sep 2012 03:54:57 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp183051igc; Fri, 14 Sep 2012 03:54:57 -0700 (PDT) Received: by 10.14.219.198 with SMTP id m46mr2960368eep.18.1347620096647; Fri, 14 Sep 2012 03:54:56 -0700 (PDT) Received: from eu1sys200aog101.obsmtp.com (eu1sys200aog101.obsmtp.com [207.126.144.111]) by mx.google.com with SMTP id 43si700928eei.113.2012.09.14.03.54.46 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 14 Sep 2012 03:54:56 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.111 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.111; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.111 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) smtp.mail=linus.walleij@stericsson.com Received: from beta.dmz-ap.st.com ([138.198.100.35]) (using TLSv1) by eu1sys200aob101.postini.com ([207.126.147.11]) with SMTP ID DSNKUFMM9EpUNCY7M8HwegNA6rMZaoZvdGRl@postini.com; Fri, 14 Sep 2012 10:54:56 UTC Received: from zeta.dmz-ap.st.com (ns6.st.com [138.198.234.13]) by beta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 5309094; Fri, 14 Sep 2012 10:46:27 +0000 (GMT) Received: from relay1.stm.gmessaging.net (unknown [10.230.100.17]) by zeta.dmz-ap.st.com (STMicroelectronics) with ESMTP id 090D714E3; Fri, 14 Sep 2012 10:54:41 +0000 (GMT) Received: from exdcvycastm003.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm003", Issuer "exdcvycastm003" (not verified)) by relay1.stm.gmessaging.net (Postfix) with ESMTPS id 5210024C2AB; Fri, 14 Sep 2012 12:54:34 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.1) with Microsoft SMTP Server (TLS) id 8.3.83.0; Fri, 14 Sep 2012 12:54:39 +0200 From: Linus Walleij To: , Cc: Stephen Warren , Anmar Oueja , Patrice Chotard , , Linus Walleij Subject: [PATCH] ARM: ux500: 8500: use hsit_a_2 group for HSI Date: Fri, 14 Sep 2012 12:54:35 +0200 Message-ID: <1347620075-18022-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.11.3 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQm81Wl9dTblSSUaeavGOBbyRFnS+ilkzGNSi3M7fak2yY+MUG8F2aN+iCZKZ470vVMWvPd+ From: Patrice Chotard 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 Signed-off-by: Linus Walleij --- 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(-) 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[] = {