From patchwork Tue Jul 3 09:23:10 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Linus Walleij X-Patchwork-Id: 9781 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 BF20523F28 for ; Tue, 3 Jul 2012 09:23:30 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 649C5A18075 for ; Tue, 3 Jul 2012 09:23:30 +0000 (UTC) Received: by yenq6 with SMTP id q6so5448537yen.11 for ; Tue, 03 Jul 2012 02:23:29 -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=vihdKWVadJC7H4KdBgly54Ffj/5rIBMc+RLYUIZMs3k=; b=geDBoWLwMLrTZvkoD639zQEtABxcLQGrSaZ5h1x3ZzQmIoVurWbNHUlAGVccCZpiin P3ru9Y/Zii44cFjkBeGGxBDGgvXR7qDD1/6ObiwuxmSMxldp5nC/zCWFWGB5PPPwImtE tvfhIRKfwkarf8Bzu+I8+cOsLlqjBYVv2D1JR0bp5qe3QDnzFoSdRzhHd4bcnnRW7xEB NlDwbvKRN28i/OwiJSnSk6xRyKMoSrtzG63zQWXd6E460/io77ai6ju91adS/nT+pXen rEr+O3qQF3gzOsmDp145Y2OeGgknLhjNBS1xGzQDm9/mIANVECIxk74nDIIX8umLbuzZ vFvA== Received: by 10.50.195.234 with SMTP id ih10mr7746029igc.0.1341307409541; Tue, 03 Jul 2012 02:23:29 -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.231.24.148 with SMTP id v20csp37160ibb; Tue, 3 Jul 2012 02:23:28 -0700 (PDT) Received: by 10.14.101.79 with SMTP id a55mr3818299eeg.32.1341307407863; Tue, 03 Jul 2012 02:23:27 -0700 (PDT) Received: from eu1sys200aog116.obsmtp.com (eu1sys200aog116.obsmtp.com. [207.126.144.141]) by mx.google.com with SMTP id d5si7833318eeb.56.2012.07.03.02.23.17 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 03 Jul 2012 02:23:27 -0700 (PDT) Received-SPF: neutral (google.com: 207.126.144.141 is neither permitted nor denied by best guess record for domain of linus.walleij@stericsson.com) client-ip=207.126.144.141; Authentication-Results: mx.google.com; spf=neutral (google.com: 207.126.144.141 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-us.st.com ([167.4.1.35]) (using TLSv1) by eu1sys200aob116.postini.com ([207.126.147.11]) with SMTP ID DSNKT/K6BYr+K727qioaLkb4BRE75R10LqIc@postini.com; Tue, 03 Jul 2012 09:23:27 UTC Received: from zeta.dmz-us.st.com (ns4.st.com [167.4.16.71]) by beta.dmz-us.st.com (STMicroelectronics) with ESMTP id C7EC040; Tue, 3 Jul 2012 09:22:53 +0000 (GMT) Received: from relay2.stm.gmessaging.net (unknown [10.230.100.18]) by zeta.dmz-us.st.com (STMicroelectronics) with ESMTP id BAAD848; Tue, 3 Jul 2012 06:18:53 +0000 (GMT) Received: from exdcvycastm022.EQ1STM.local (alteon-source-exch [10.230.100.61]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "exdcvycastm022", Issuer "exdcvycastm022" (not verified)) by relay2.stm.gmessaging.net (Postfix) with ESMTPS id 3CD66A8096; Tue, 3 Jul 2012 11:23:10 +0200 (CEST) Received: from steludxu4075.lud.stericsson.com (10.230.100.153) by smtp.stericsson.com (10.230.100.30) with Microsoft SMTP Server (TLS) id 8.3.83.0; Tue, 3 Jul 2012 11:23:14 +0200 From: Linus Walleij To: , Cc: Stephen Warren , Patrice Chotard , Linus Walleij Subject: [PATCH 3/3] pinctrl/nomadik: add hsit_a_2 pin group Date: Tue, 3 Jul 2012 11:23:10 +0200 Message-ID: <1341307390-28861-1-git-send-email-linus.walleij@stericsson.com> X-Mailer: git-send-email 1.7.9.2 MIME-Version: 1.0 X-Gm-Message-State: ALoCoQncKhkzjsE05JPD85dnCa3J3cFKKKw/gdG6cJpfn7J7kdDdhVoZMlpVS1RLOpSoLXkEzW6A From: Patrice Chotard On 8500 and 9540, all HSI pins are driven by HSI block except HSIT_ACWAKE0_a which is driven as GPIO due to specific constraints. A new group hsit_a_2 is created which exclude HSIT_ACWAKE0_a pin. Signed-off-by: Patrice Chotard Signed-off-by: Linus Walleij --- drivers/pinctrl/pinctrl-nomadik-db8500.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/pinctrl/pinctrl-nomadik-db8500.c b/drivers/pinctrl/pinctrl-nomadik-db8500.c index 9e7f379..42c4b77 100644 --- a/drivers/pinctrl/pinctrl-nomadik-db8500.c +++ b/drivers/pinctrl/pinctrl-nomadik-db8500.c @@ -471,6 +471,8 @@ static const unsigned hsir_a_1_pins[] = { DB8500_PIN_AG10, DB8500_PIN_AH10, DB8500_PIN_AJ11 }; static const unsigned hsit_a_1_pins[] = { DB8500_PIN_AJ9, DB8500_PIN_AH9, DB8500_PIN_AG9, DB8500_PIN_AG8, DB8500_PIN_AF8 }; +static const unsigned hsit_a_2_pins[] = { DB8500_PIN_AJ9, DB8500_PIN_AH9, + DB8500_PIN_AG9, DB8500_PIN_AG8 }; static const unsigned clkout_a_1_pins[] = { DB8500_PIN_AH7, DB8500_PIN_AJ6 }; static const unsigned clkout_a_2_pins[] = { DB8500_PIN_AG7, DB8500_PIN_AF7 }; static const unsigned usb_a_1_pins[] = { DB8500_PIN_AF28, DB8500_PIN_AE29, @@ -635,6 +637,7 @@ static const struct nmk_pingroup nmk_db8500_groups[] = { DB8500_PIN_GROUP(mc1_a_1, NMK_GPIO_ALT_A), DB8500_PIN_GROUP(hsir_a_1, NMK_GPIO_ALT_A), DB8500_PIN_GROUP(hsit_a_1, NMK_GPIO_ALT_A), + DB8500_PIN_GROUP(hsit_a_2, NMK_GPIO_ALT_A), DB8500_PIN_GROUP(clkout_a_1, NMK_GPIO_ALT_A), DB8500_PIN_GROUP(clkout_a_2, NMK_GPIO_ALT_A), DB8500_PIN_GROUP(usb_a_1, NMK_GPIO_ALT_A), @@ -758,7 +761,7 @@ DB8500_FUNC_GROUPS(ipgpio, "ipgpio0_a_1", "ipgpio1_a_1", "ipgpio7_b_1", DB8500_FUNC_GROUPS(msp2, "msp2sck_a_1", "msp2_a_1"); DB8500_FUNC_GROUPS(mc4, "mc4_a_1", "mc4rstn_c_1"); DB8500_FUNC_GROUPS(mc1, "mc1_a_1", "mc1dir_a_1"); -DB8500_FUNC_GROUPS(hsi, "hsir1_a_1", "hsit1_a_1"); +DB8500_FUNC_GROUPS(hsi, "hsir1_a_1", "hsit1_a_1", "hsit_a_2"); DB8500_FUNC_GROUPS(clkout, "clkout_a_1", "clkout_a_2", "clkout_c_1"); DB8500_FUNC_GROUPS(usb, "usb_a_1"); DB8500_FUNC_GROUPS(trig, "trig_b_1");