From patchwork Fri Sep 9 08:28:56 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 9322673 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 493C260752 for ; Fri, 9 Sep 2016 08:31:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3B3DB29CEB for ; Fri, 9 Sep 2016 08:31:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2FF3429CED; Fri, 9 Sep 2016 08:31:57 +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 BC6FC29CEB for ; Fri, 9 Sep 2016 08:31:56 +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 1biHCU-0002H5-Rk; Fri, 09 Sep 2016 08:30:18 +0000 Received: from mail-wm0-x236.google.com ([2a00:1450:400c:c09::236]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1biHBu-0001OT-Q8 for linux-arm-kernel@lists.infradead.org; Fri, 09 Sep 2016 08:29:47 +0000 Received: by mail-wm0-x236.google.com with SMTP id w12so18388953wmf.0 for ; Fri, 09 Sep 2016 01:29:25 -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=ReE64K9a5YcXk6OXLlZE4N0Rg9JL5TwvyEUAjQm+8Rg=; b=l1Rgv9GET3j4nNHR9CyYtJ5cakACGZG97Qngn6WLSoeOeONw1YVHZh+VGpjLnu9nh8 qCBa+stJgLBQODBjdkU9sl4iR21JuRAJZM+7gIerSrNWGJdOYOplpNXI3qT8LiCsHntk N2FNLm/UsZ2GjKkBWJgVTQDI+qe68Mic+JL8bRS+zavOL490LghixraO8YHDlFxF4bZM ze94SfAsdNfbhnagNepfBMgWZ3pCrEoWA/MBbtHK+BR7Lv7vryLmMV1QCdB76mtpQ9dZ ryCv1dlnwqC1hjcxw3V5XM0BWAkHeebdIwzJ4e4Uxiy07lepG7t/RneH4jxzgwoddPvF JNyg== 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=ReE64K9a5YcXk6OXLlZE4N0Rg9JL5TwvyEUAjQm+8Rg=; b=H3ue7ROe7F6fGyrdVynqWw75lBeStrfzLhmqRVpuzAV3nw/xLhbh4mjXuGTooOKiSh GJ1cToBgERSGoRzb67w+bC7B78Q6Q2oqSjwOyE7juvq2f4m1zl+wEpHE00rjx1AVD/0i /dmYi4rK1dcI2CmGDMji39tG+/UjL7kvA4A6llJVn5h+QFhByQNqH0nizL21ueBVp2DX q1CV6fZ1FDC3uQrtG0VgNx9p8MLzYWNktQyF9/rgaQob0jGrlIH3bcBwvfw+FaO3UvlU YXvEMThnkaB2Az7AhHmtidx6YorQoiKtn3M4XgENCxHs6DKbFQvDqX9cG6NqGZFx7H3A Er+g== X-Gm-Message-State: AE9vXwPFnkwdpvo4Asdnt9GfypYc5Tl63T+k1bofVXp3mcJOluHVK9d7W6ypfiX8/vKSH/qH X-Received: by 10.28.16.3 with SMTP id 3mr1739868wmq.58.1473409764604; Fri, 09 Sep 2016 01:29:24 -0700 (PDT) Received: from mogwai.baylibre.com ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id r4sm2147809wme.21.2016.09.09.01.29.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 09 Sep 2016 01:29:23 -0700 (PDT) From: Jerome Brunet To: Linus Walleij , Kevin Hilman , Carlo Caione Subject: [PATCH v2 2/4] pinctrl: amlogic: gxbb: add nand pins Date: Fri, 9 Sep 2016 10:28:56 +0200 Message-Id: <1473409738-27175-3-git-send-email-jbrunet@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1473409738-27175-1-git-send-email-jbrunet@baylibre.com> References: <1473409738-27175-1-git-send-email-jbrunet@baylibre.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160909_012943_130843_035D20D3 X-CRM114-Status: GOOD ( 11.74 ) 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 f74dbd5d350b..699f93c51040 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(nor_q, 5, 3), GROUP(nor_c, 5, 2), GROUP(nor_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(nor), FUNCTION(sdcard), + FUNCTION(nand), FUNCTION(uart_a), FUNCTION(uart_b), FUNCTION(uart_c),