From patchwork Fri Mar 29 12:29:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Baltieri X-Patchwork-Id: 15768 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 8AF6723E10 for ; Fri, 29 Mar 2013 12:30:03 +0000 (UTC) Received: from mail-ve0-f173.google.com (mail-ve0-f173.google.com [209.85.128.173]) by fiordland.canonical.com (Postfix) with ESMTP id 0714FA18D81 for ; Fri, 29 Mar 2013 12:30:02 +0000 (UTC) Received: by mail-ve0-f173.google.com with SMTP id cy12so486642veb.32 for ; Fri, 29 Mar 2013 05:30:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=NAAjaIumOCn9K/W9h1rTY9iTQqg+jfV9qd6xj0apGQA=; b=hWyrIbKh3dQQdTq9L9hQ2ckO/yGGsK3M60Slve46FyrauBggjWbFSGepHIAYIIvFzW enkrdLjYoTrZaqY0eKa9xWT47HzMkbdnsOQQoTd627IHb1MzaRwvcJT6Wb7UD57kvHu7 2gk9bKfD2rrXuCR4JaOiFEiuUVCextvCakD8SXZ8YLbHvj+19jkfsDoCoRw9tadU1uUj eXm3Hc/HcFUEHgd0HJcVYTHJV64c8ZAXrPyUK8+ps2mJ9DJHcM32ttJt64LXBLnkarBg aotgxS4GoT6QDoBxwXh5XFgQibLDK93kUQqHVNneEGAU270Wyg8PsQ8rJnJQBin4wGpa feQg== X-Received: by 10.52.76.103 with SMTP id j7mr1376953vdw.90.1364560202516; Fri, 29 Mar 2013 05:30:02 -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.59.4.204 with SMTP id cg12csp58084ved; Fri, 29 Mar 2013 05:30:01 -0700 (PDT) X-Received: by 10.14.179.5 with SMTP id g5mr7326571eem.41.1364560201294; Fri, 29 Mar 2013 05:30:01 -0700 (PDT) Received: from mail-ea0-x22a.google.com ([2a00:1450:4013:c01::22a]) by mx.google.com with ESMTPS id u3si3469679eeg.67.2013.03.29.05.30.00 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 29 Mar 2013 05:30:01 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:4013:c01::22a is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) client-ip=2a00:1450:4013:c01::22a; Authentication-Results: mx.google.com; spf=neutral (google.com: 2a00:1450:4013:c01::22a is neither permitted nor denied by best guess record for domain of fabio.baltieri@linaro.org) smtp.mail=fabio.baltieri@linaro.org Received: by mail-ea0-f170.google.com with SMTP id a15so208129eae.29 for ; Fri, 29 Mar 2013 05:30:00 -0700 (PDT) X-Received: by 10.14.0.73 with SMTP id 49mr7495631eea.21.1364560200639; Fri, 29 Mar 2013 05:30:00 -0700 (PDT) Received: from localhost ([2a01:2003:1:1e91:8e70:5aff:feac:ad8]) by mx.google.com with ESMTPS id h5sm3852946eem.1.2013.03.29.05.29.53 (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 29 Mar 2013 05:29:59 -0700 (PDT) From: Fabio Baltieri To: Linus Walleij Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Srinidhi Kasagar , Patrice Chotard , Fabio Baltieri Subject: [PATCH v2 2/2] ARM: ux500: 8500: add ab8500-musb pinctrl support Date: Fri, 29 Mar 2013 13:29:47 +0100 Message-Id: <1364560187-20495-1-git-send-email-fabio.baltieri@linaro.org> X-Mailer: git-send-email 1.8.1.3 In-Reply-To: <1364487669-24368-3-git-send-email-fabio.baltieri@linaro.org> References: <1364487669-24368-3-git-send-email-fabio.baltieri@linaro.org> X-Gm-Message-State: ALoCoQn0Xc6VbsSlDh30WZub13qxmetBQE7uDZWCgRzRO/xbOV18+tMyOQL8ByuxSANzIWknFl4y From: Patrice Chotard Add necessary definitions to support ab8500-musb pinctrl default and sleep states. Signed-off-by: Patrice Chotard Signed-off-by: Fabio Baltieri --- Hi Linus, I'm sending a v2 on this one as I mis-replaced a device id (manually applied patch, sorry about that). Changes from v1: - fix typo in GPIO257_AE29 device name Thanks, Fabio arch/arm/mach-ux500/board-mop500-pins.c | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-ux500/board-mop500-pins.c b/arch/arm/mach-ux500/board-mop500-pins.c index 625880f..fee7fda 100644 --- a/arch/arm/mach-ux500/board-mop500-pins.c +++ b/arch/arm/mach-ux500/board-mop500-pins.c @@ -48,8 +48,12 @@ BIAS(slpm_in_nopull_wkup, PIN_SLEEPMODE_ENABLED| PIN_SLPM_DIR_INPUT|PIN_SLPM_PULL_NONE|PIN_SLPM_WAKEUP_ENABLE); BIAS(slpm_in_wkup_pdis, PIN_SLEEPMODE_ENABLED| PIN_SLPM_DIR_INPUT|PIN_SLPM_WAKEUP_ENABLE|PIN_SLPM_PDIS_DISABLED); +BIAS(slpm_in_wkup_pdis_en, PIN_SLEEPMODE_ENABLED| + PIN_SLPM_DIR_INPUT|PIN_SLPM_WAKEUP_ENABLE|PIN_SLPM_PDIS_ENABLED); BIAS(slpm_wkup_pdis, PIN_SLEEPMODE_ENABLED| PIN_SLPM_WAKEUP_ENABLE|PIN_SLPM_PDIS_DISABLED); +BIAS(slpm_wkup_pdis_en, PIN_SLEEPMODE_ENABLED| + PIN_SLPM_WAKEUP_ENABLE|PIN_SLPM_PDIS_ENABLED); BIAS(slpm_out_lo_pdis, PIN_SLEEPMODE_ENABLED| PIN_SLPM_OUTPUT_LOW|PIN_SLPM_WAKEUP_DISABLE|PIN_SLPM_PDIS_DISABLED); BIAS(slpm_out_lo_wkup, PIN_SLEEPMODE_ENABLED| @@ -306,8 +310,23 @@ static struct pinctrl_map __initdata mop500_family_pinmap[] = { DB8500_PIN_SLEEP("GPIO207_AJ23", slpm_in_wkup_pdis, "sdi4"), /* DAT4 */ /* Mux in USB pins, drive STP high */ - DB8500_MUX("usb_a_1", "usb", "musb-ux500.0"), - DB8500_PIN("GPIO257_AE29", out_hi, "musb-ux500.0"), /* STP */ + /* USB default state */ + DB8500_MUX("usb_a_1", "usb", "ab8500-usb.0"), + DB8500_PIN("GPIO257_AE29", out_hi, "ab8500-usb.0"), /* STP */ + /* USB sleep state */ + DB8500_PIN_SLEEP("GPIO256_AF28", slpm_wkup_pdis_en, "ab8500-usb.0"), /* NXT */ + DB8500_PIN_SLEEP("GPIO257_AE29", slpm_out_hi_wkup_pdis, "ab8500-usb.0"), /* STP */ + DB8500_PIN_SLEEP("GPIO258_AD29", slpm_wkup_pdis_en, "ab8500-usb.0"), /* XCLK */ + DB8500_PIN_SLEEP("GPIO259_AC29", slpm_wkup_pdis_en, "ab8500-usb.0"), /* DIR */ + DB8500_PIN_SLEEP("GPIO260_AD28", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT7 */ + DB8500_PIN_SLEEP("GPIO261_AD26", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT6 */ + DB8500_PIN_SLEEP("GPIO262_AE26", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT5 */ + DB8500_PIN_SLEEP("GPIO263_AG29", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT4 */ + DB8500_PIN_SLEEP("GPIO264_AE27", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT3 */ + DB8500_PIN_SLEEP("GPIO265_AD27", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT2 */ + DB8500_PIN_SLEEP("GPIO266_AC28", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT1 */ + DB8500_PIN_SLEEP("GPIO267_AC27", slpm_in_wkup_pdis_en, "ab8500-usb.0"), /* DAT0 */ + /* Mux in SPI2 pins on the "other C1" altfunction */ DB8500_MUX("spi2_oc1_2", "spi2", "spi2"), DB8500_PIN("GPIO216_AG12", gpio_out_hi, "spi2"), /* FRM */