From patchwork Thu May 26 21:24:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 9137441 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 49F6B6075A for ; Thu, 26 May 2016 21:26:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3B86627D11 for ; Thu, 26 May 2016 21:26:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 30646282FA; Thu, 26 May 2016 21:26:18 +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 B043927D11 for ; Thu, 26 May 2016 21:26:17 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1b62m8-0000bZ-UJ; Thu, 26 May 2016 21:25:04 +0000 Received: from mail-pa0-x22f.google.com ([2607:f8b0:400e:c03::22f]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1b62lu-0000Ow-GZ for linux-arm-kernel@lists.infradead.org; Thu, 26 May 2016 21:24:52 +0000 Received: by mail-pa0-x22f.google.com with SMTP id xk12so33049023pac.0 for ; Thu, 26 May 2016 14:24:29 -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 :mime-version:content-transfer-encoding; bh=e8VteMQHDzOzi0N6NAN/ftsKzLdXcD75NdbRE9Eel4U=; b=bfGmjKuSDEw4FhPJFzGYUmragcaQVw3n1NVYTknlVHI/MnWO+kvhpWa/wRHLqjvmxA fEoW4b+K4Shc1gjLFvt6H0eCSsGyvuDZLFWGZ8J+tg2BbjJpJgqj3xNpFyDl9RzFmpyf rcVlJyNWHMRwGEh4f3tzfcYa4qYajTSTRburnj1kSIeTL8Iuv7ItJDcX/wuVn5sJDHad /EBahNUHjP5whxGzF+dRAvbbqH8lsc74r5SClXaLvFHENz7fcZ0alua1Dirz62e9iSkd HDOAnIjscIhc8+lKjFT5fK5iVMvMpOpehqMbqHPRRIXantvynv+BeCTa50SwYZWyBZaz W4/g== 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:mime-version:content-transfer-encoding; bh=e8VteMQHDzOzi0N6NAN/ftsKzLdXcD75NdbRE9Eel4U=; b=ipiIZRiBb8+Uwzdi9m348QEO2Qbcg1WRo29CcYg8VWzqH/0nCKbcIQsvHGaEKK/94q QBvtTCSBG67M9rKQTXyGm88mxfuRm0bYPc7GnA+m+Y49oIKxV/wMKj9eYiRBA4KoNhWT Rr9B6PzZuBkot7n6QaSVxt6KICW8T8aGoEKEsoCiGWwVRf/qp97sm4AixDV21SK9F6ya yqT872SoO9mkxWRMn3V+475TYdUGkvSMP+Vr5bEAupQDHgf8O6/mLYg9VZxI76Z9iFFm vG/7AVzr0o8ngt3+EeXj8e4KfK0Sb2bw8gbr74mH0v14mnCmGnAFAcPFsOqqIwI26VED A3eA== X-Gm-Message-State: ALyK8tKLpHOKA7h4ACE+g9U/ZICzGYTXBlKyKpU8uGpEQgGU2OAqeJAgV1sKWrrKs8aQHsG2 X-Received: by 10.66.220.168 with SMTP id px8mr12147215pac.83.1464297869402; Thu, 26 May 2016 14:24:29 -0700 (PDT) Received: from localhost (c-98-203-232-209.hsd1.wa.comcast.net. [98.203.232.209]) by smtp.gmail.com with ESMTPSA id qh5sm22738687pab.17.2016.05.26.14.24.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 May 2016 14:24:28 -0700 (PDT) From: Kevin Hilman To: Linus Walleij , linux-gpio@vger.kernel.org Subject: [PATCH v2 2/4] pinctrl: amlogic: gxbb: add EMMC and SD pins Date: Thu, 26 May 2016 14:24:23 -0700 Message-Id: <1464297865-8965-3-git-send-email-khilman@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1464297865-8965-1-git-send-email-khilman@baylibre.com> References: <1464297865-8965-1-git-send-email-khilman@baylibre.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160526_142450_577501_280094C9 X-CRM114-Status: GOOD ( 11.47 ) 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: Xing Wu , Victor Wan , Jerry Cao , Carlo Caione , linux-amlogic@lists.infradead.org, linux-arm-kernel@lists.infradead.org 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 domain pins for eMMC and SD card. Acked-by: Carlo Caione Signed-off-by: Kevin Hilman --- drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 41 ++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c index a188d9dae0f2..f0459f26c16c 100644 --- a/drivers/pinctrl/meson/pinctrl-meson-gxbb.c +++ b/drivers/pinctrl/meson/pinctrl-meson-gxbb.c @@ -147,6 +147,22 @@ static const struct pinctrl_pin_desc meson_gxbb_periphs_pins[] = { MESON_PIN(GPIO_TEST_N, EE_OFF), }; +static const unsigned int emmc_nand_d07_pins[] = { + PIN(BOOT_0, EE_OFF), PIN(BOOT_1, EE_OFF), PIN(BOOT_2, EE_OFF), + PIN(BOOT_3, EE_OFF), PIN(BOOT_4, EE_OFF), PIN(BOOT_5, EE_OFF), + PIN(BOOT_6, EE_OFF), PIN(BOOT_7, EE_OFF), +}; +static const unsigned int emmc_clk_pins[] = { PIN(BOOT_8, EE_OFF) }; +static const unsigned int emmc_cmd_pins[] = { PIN(BOOT_10, EE_OFF) }; +static const unsigned int emmc_ds_pins[] = { PIN(BOOT_15, EE_OFF) }; + +static const unsigned int sdcard_d0_pins[] = { PIN(CARD_1, EE_OFF) }; +static const unsigned int sdcard_d1_pins[] = { PIN(CARD_0, EE_OFF) }; +static const unsigned int sdcard_d2_pins[] = { PIN(CARD_5, EE_OFF) }; +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 struct pinctrl_pin_desc meson_gxbb_aobus_pins[] = { MESON_PIN(GPIOAO_0, 0), MESON_PIN(GPIOAO_1, 0), @@ -307,6 +323,20 @@ static struct meson_pmx_group meson_gxbb_periphs_groups[] = { GPIO_GROUP(GPIOCLK_3, EE_OFF), GPIO_GROUP(GPIO_TEST_N, EE_OFF), + + /* Bank BOOT */ + GROUP(emmc_nand_d07, 4, 30), + GROUP(emmc_clk, 4, 18), + GROUP(emmc_cmd, 4, 19), + GROUP(emmc_ds, 4, 31), + + /* Bank CARD */ + GROUP(sdcard_d1, 2, 14), + GROUP(sdcard_d0, 2, 15), + GROUP(sdcard_d3, 2, 12), + GROUP(sdcard_d2, 2, 13), + GROUP(sdcard_cmd, 2, 10), + GROUP(sdcard_clk, 2, 11), }; static struct meson_pmx_group meson_gxbb_aobus_groups[] = { @@ -377,6 +407,15 @@ static const char * const gpio_periphs_groups[] = { "GPIO_TEST_N", }; +static const char * const emmc_groups[] = { + "emmc_nand_d07", "emmc_clk", "emmc_cmd", "emmc_ds", +}; + +static const char * const sdcard_groups[] = { + "sdcard_d0", "sdcard_d1", "sdcard_d2", "sdcard_d3", + "sdcard_cmd", "sdcard_clk", +}; + static const char * const gpio_aobus_groups[] = { "GPIOAO_0", "GPIOAO_1", "GPIOAO_2", "GPIOAO_3", "GPIOAO_4", "GPIOAO_5", "GPIOAO_6", "GPIOAO_7", "GPIOAO_8", "GPIOAO_9", @@ -401,6 +440,8 @@ static const char * const i2c_slave_ao_groups[] = { static struct meson_pmx_func meson_gxbb_periphs_functions[] = { FUNCTION(gpio_periphs), + FUNCTION(emmc), + FUNCTION(sdcard), }; static struct meson_pmx_func meson_gxbb_aobus_functions[] = {