From patchwork Sun Aug 28 16:47:24 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Blumenstingl X-Patchwork-Id: 9302817 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id F2BD9601C0 for ; Sun, 28 Aug 2016 16:49:34 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E41CF287A4 for ; Sun, 28 Aug 2016 16:49:34 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D7FD3287E0; Sun, 28 Aug 2016 16:49:34 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 96E38287A4 for ; Sun, 28 Aug 2016 16:49:34 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1be3Fu-0003lc-7i; Sun, 28 Aug 2016 16:48:22 +0000 Received: from mail-wm0-x244.google.com ([2a00:1450:400c:c09::244]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1be3FT-0003bb-SG; Sun, 28 Aug 2016 16:47:56 +0000 Received: by mail-wm0-x244.google.com with SMTP id i138so6470417wmf.3; Sun, 28 Aug 2016 09:47:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=LvBXz4GcVQ8/n+Ip3NHgF1fuTRhGtR3a7L2C61O/pbY=; b=vTDK60Zzw6gzCIqlOSJYXG5jUwfYnc7yfCGVc8ombvqEVBqHsYjuVZ+89VbHNzP0mb YDLX00S+2NVjozRvCZhffIxzSIhjJme0w5TlP3aV6a2Y4F0tQeOcszlcKcKA55+cUU2p 3TOKGXlQ8ichDv+txX7z6ikkNq+adRpOpsxEIUc0aD6M+ROAB9Ig6SeddYY9fvc+H1Kx IrOOtxDzZEBL3+2u0sFRzbOdcJdohjm+zbq7U9Mc06i14I2i3Pu47hYaWclFKKz09rmV GexWt+PEuigY/3LuFpOi/dTF+raa7kUju4RQtBPZHWWJULdv9vjacIcqkKloX8hPYrl1 uDIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=LvBXz4GcVQ8/n+Ip3NHgF1fuTRhGtR3a7L2C61O/pbY=; b=CajSAIWG6yuO3vPHM7CMMd/Ry9Cw5MwLAMjcKlTOBqTbfl+bC5HfnuNKbZlHAbRSVq D72NVUJeBvToVOSu43nyHnL92q9w2eExRhSNgBzppsheZdkkh8wFuNJjPL7uLoMUNWIM goLVzl/khagSvzHlej0sm1RQzRML036GQ0P77djGSSbi7rgd/DpXbmepHPt/cqE0r9JB 1CpQH+pHIRsAZZ9uIg03q1U96LWtJ5ZjN14meYyH+JX9tI9miJHgaxjLpSPcSexKoNwt Jfhn9LbU1PjQdRRgsifhMjfBzNwoAj1XKsyWLaB1G/FJbCuXbO88cQKUo3CKDm6pmKJp lGPA== X-Gm-Message-State: AE9vXwNeI3jN2HBJYTeZwhajr5qZRxOUvDAHv2WrIuHCYcAFfPlctdDck41IXjGiJi1DKw== X-Received: by 10.28.141.6 with SMTP id p6mr7373874wmd.110.1472402854232; Sun, 28 Aug 2016 09:47:34 -0700 (PDT) Received: from blackbox.darklights.net (p200300DCD3CD1604DDE8B455CCB566F1.dip0.t-ipconnect.de. [2003:dc:d3cd:1604:dde8:b455:ccb5:66f1]) by smtp.googlemail.com with ESMTPSA id i3sm30159997wjd.31.2016.08.28.09.47.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 28 Aug 2016 09:47:33 -0700 (PDT) From: Martin Blumenstingl To: linux-gpio@vger.kernel.org, linux-amlogic@lists.infradead.org, linus.walleij@linaro.org, khilman@baylibre.com, carlo@caione.org Subject: [PATCH 1/2] pinctrl: meson-gxbb: add the pins for the SDIO/sd_emmc_a controller Date: Sun, 28 Aug 2016 18:47:24 +0200 Message-Id: <20160828164725.19429-2-martin.blumenstingl@googlemail.com> X-Mailer: git-send-email 2.9.3 In-Reply-To: <20160828164725.19429-1-martin.blumenstingl@googlemail.com> References: <20160828164725.19429-1-martin.blumenstingl@googlemail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160828_094756_100221_DA2F9B9E X-CRM114-Status: GOOD ( 10.10 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Martin Blumenstingl , linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP sd_emmc_a is used a controller for the SDIO modules. This adds the pin configuration for the SDIO controller. Signed-off-by: Martin Blumenstingl --- drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c index 77da6dd..fb479b8 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c @@ -163,6 +163,13 @@ static const unsigned int sdcard_d3_pins[] = { PIN(CARD_4, EE_OFF) }; static const unsigned int sdcard_cmd_pins[] = { PIN(CARD_3, EE_OFF) }; static const unsigned int sdcard_clk_pins[] = { PIN(CARD_2, EE_OFF) }; +static const unsigned int sdio_d0_pins[] = { PIN(GPIOX_0, EE_OFF) }; +static const unsigned int sdio_d1_pins[] = { PIN(GPIOX_1, EE_OFF) }; +static const unsigned int sdio_d2_pins[] = { PIN(GPIOX_2, EE_OFF) }; +static const unsigned int sdio_d3_pins[] = { PIN(GPIOX_3, EE_OFF) }; +static const unsigned int sdio_cmd_pins[] = { PIN(GPIOX_4, EE_OFF) }; +static const unsigned int sdio_clk_pins[] = { PIN(GPIOX_5, EE_OFF) }; + static const unsigned int uart_tx_a_pins[] = { PIN(GPIOX_12, EE_OFF) }; static const unsigned int uart_rx_a_pins[] = { PIN(GPIOX_13, EE_OFF) }; static const unsigned int uart_cts_a_pins[] = { PIN(GPIOX_14, EE_OFF) }; @@ -370,6 +377,12 @@ static struct meson_pmx_group meson_gxbb_periphs_groups[] = { GPIO_GROUP(GPIO_TEST_N, EE_OFF), /* Bank X */ + GROUP(sdio_d0, 8, 5), + GROUP(sdio_d1, 8, 4), + GROUP(sdio_d2, 8, 3), + GROUP(sdio_d3, 8, 2), + GROUP(sdio_cmd, 8, 1), + GROUP(sdio_clk, 8, 0), GROUP(uart_tx_a, 4, 13), GROUP(uart_rx_a, 4, 12), GROUP(uart_cts_a, 4, 11), @@ -507,6 +520,11 @@ static const char * const sdcard_groups[] = { "sdcard_cmd", "sdcard_clk", }; +static const char * const sdio_groups[] = { + "sdio_d0", "sdio_d1", "sdio_d2", "sdio_d3", + "sdio_cmd", "sdio_clk", +}; + static const char * const uart_a_groups[] = { "uart_tx_a", "uart_rx_a", "uart_cts_a", "uart_rts_a", }; @@ -600,6 +618,7 @@ static struct meson_pmx_func meson_gxbb_periphs_functions[] = { FUNCTION(gpio_periphs), FUNCTION(emmc), FUNCTION(sdcard), + FUNCTION(sdio), FUNCTION(uart_a), FUNCTION(uart_b), FUNCTION(uart_c),