From patchwork Wed Sep 7 15:13:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9319491 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 750AA6077F for ; Wed, 7 Sep 2016 15:18:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 709E8293CF for ; Wed, 7 Sep 2016 15:18:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 65218293DB; Wed, 7 Sep 2016 15:18:20 +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_SIGNED, 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 2270D293CF for ; Wed, 7 Sep 2016 15:18:20 +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 1bheZL-0007mV-Fg; Wed, 07 Sep 2016 15:15:19 +0000 Received: from mail-wm0-x233.google.com ([2a00:1450:400c:c09::233]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bheZ1-0006xt-Mw for linux-arm-kernel@lists.infradead.org; Wed, 07 Sep 2016 15:15:02 +0000 Received: by mail-wm0-x233.google.com with SMTP id b187so121485421wme.1 for ; Wed, 07 Sep 2016 08:14:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=+niQqj3adKJgXs6i++UFk9Y0S5j767B6VIUH1lpJVWA=; b=KP4ySYyWiAnJptgzjbf2fKQiJWd/VOuR0eARLu3YjLb3tMcaoUrprLZNW0BSBjWsa+ LZb9PeHGSElzcL+a2CBjxDhzhSmY6rICwrCRMf9KvQpaycKqDT/8p4V6iyhbx0P3SM90 wpLDVdxq/LrVwfDOm03yzi2bAfuBJVhkGKn3wJMGtf3erxxkom1SVoh7E6zT2sVkkDTx 8yMWiyfK1Kn9+N1wWstKcTajzUgOt3TS1NmdfT7EacjX/mHgjfJy4JVUQHsSOPPiWpSr z2AztOpxHEVWvJ87Lx2O2tkd8BIQVn+pgyhh17CiEKp/EKI+XKt+F1e1OOijNkNYR88X +YAA== 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=+niQqj3adKJgXs6i++UFk9Y0S5j767B6VIUH1lpJVWA=; b=T8NVtCtr8WYvMQn+i1Loga+RKU8TNcij6/bT7BAcuo3gLi4r6i6yDW3ylEE/nkgLOQ jK3PUz4hPQzjIp+I4DMeodAMVKd0U1s9l66FYUUz+ghd6CLTjUGeHUe+r84hY4H4kod2 MzHjJnHOgU+8zAsJvR/+jZ4yJtzmXCDUrvWISfyGeL9POjkbteZTdT3g/D2vFpD/a07I bn4Oaw85/ermdOk3XiRBl06SHd0nilWkaTpUQkOrhGhvvr1we6CBew3PobikANRyULnq 5m+KYGhs0poCptDInuwY3IVOwwUXBYRuScbZDlW6npYqSasVVty4EBINIzJVUyw1xFw3 D2jg== X-Gm-Message-State: AE9vXwNELR2apSEs6DQ9JmMaXnS9xUTEE2LzCPDKgMb81Z6pAhCBCV/QygggRvFtQc/jOvBY X-Received: by 10.28.158.1 with SMTP id h1mr4661685wme.94.1473261277875; Wed, 07 Sep 2016 08:14:37 -0700 (PDT) Received: from mogwai.baylibre.com ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id d8sm4825250wmi.0.2016.09.07.08.14.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Sep 2016 08:14:37 -0700 (PDT) From: Jerome Brunet To: Linus Walleij , Kevin Hilman , Carlo Caione Subject: [PATCH 2/7] pinctrl: amlogic: gxbb: add nand pins Date: Wed, 7 Sep 2016 17:13:38 +0200 Message-Id: <1473261223-15412-3-git-send-email-jbrunet@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473261223-15412-1-git-send-email-jbrunet@baylibre.com> References: <1473261223-15412-1-git-send-email-jbrunet@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160907_081500_246369_C08124B0 X-CRM114-Status: GOOD ( 11.83 ) 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: linux-amlogic@lists.infradead.org, linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Jerome Brunet 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 Add EE domains pins for the NAND flash controller. Even tough we have no driver for the NAND flash controller yet, we need to have these pins in pinctrl as the actual pin are shared with the spifc controller. The bootloader on the S905-P200 setup pinmux for the NAND controller so we need the kernel to properly deactivate this if necessary. Signed-off-by: Jerome Brunet Acked-by: Kevin Hilman --- drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c index 802ad83..08e6cdd 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c @@ -168,6 +168,15 @@ 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 nand_ce0_pins[] = { PIN(BOOT_8, EE_OFF) }; +static const unsigned int nand_ce1_pins[] = { PIN(BOOT_9, EE_OFF) }; +static const unsigned int nand_rb0_pins[] = { PIN(BOOT_10, EE_OFF) }; +static const unsigned int nand_ale_pins[] = { PIN(BOOT_11, EE_OFF) }; +static const unsigned int nand_cle_pins[] = { PIN(BOOT_12, EE_OFF) }; +static const unsigned int nand_wen_clk_pins[] = { PIN(BOOT_13, EE_OFF) }; +static const unsigned int nand_ren_wr_pins[] = { PIN(BOOT_14, EE_OFF) }; +static const unsigned int nand_dqs_pins[] = { PIN(BOOT_15, 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) }; @@ -402,6 +411,14 @@ static struct meson_pmx_group meson_gxbb_periphs_groups[] = { GROUP(spifc_q, 5, 3), GROUP(spifc_c, 5, 2), GROUP(spifc_cs, 5, 0), + GROUP(nand_ce0, 4, 26), + GROUP(nand_ce1, 4, 27), + GROUP(nand_rb0, 4, 25), + GROUP(nand_ale, 4, 24), + GROUP(nand_cle, 4, 23), + GROUP(nand_wen_clk, 4, 22), + GROUP(nand_ren_wr, 4, 21), + GROUP(nand_dqs, 4, 20), /* Bank CARD */ GROUP(sdcard_d1, 2, 14), @@ -493,6 +510,11 @@ static const char * const sdcard_groups[] = { "sdcard_cmd", "sdcard_clk", }; +static const char * const nand_groups[] = { + "nand_ce0", "nand_ce1", "nand_rb0", "nand_ale", "nand_cle", + "nand_wen_clk", "nand_ren_wr", "nand_dqs", +}; + static const char * const uart_a_groups[] = { "uart_tx_a", "uart_rx_a", "uart_cts_a", "uart_rts_a", }; @@ -539,6 +561,7 @@ static struct meson_pmx_func meson_gxbb_periphs_functions[] = { FUNCTION(emmc), FUNCTION(spifc), FUNCTION(sdcard), + FUNCTION(nand), FUNCTION(uart_a), FUNCTION(uart_b), FUNCTION(uart_c),