From patchwork Fri May 6 14:21:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 9033621 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 519499F1D3 for ; Fri, 6 May 2016 14:23:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 66D3E20218 for ; Fri, 6 May 2016 14:23:49 +0000 (UTC) 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.kernel.org (Postfix) with ESMTPS id 8B5B420381 for ; Fri, 6 May 2016 14:23:48 +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 1ayge1-0007lL-U9; Fri, 06 May 2016 14:22:17 +0000 Received: from mail-pa0-x230.google.com ([2607:f8b0:400e:c03::230]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aygdZ-0007WU-Sg for linux-arm-kernel@lists.infradead.org; Fri, 06 May 2016 14:21:52 +0000 Received: by mail-pa0-x230.google.com with SMTP id r5so49353452pag.1 for ; Fri, 06 May 2016 07:21: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=4oK/aGtUs8zE0ZnYgnO1/voxObS0r/oHVp+SxmpbNwk=; b=Qntr4SeDLPEQBdjEluy8FnjfsEJJ0X6z9INAqVhL8K6X6UvWh513QyC5QrWn96j/od mY7Y8453sYnGBeGY+I1mh4RA5Uu8iQqqS2CRRwGt4h3bAqXmkl6ShqGfIWa4/h+pcwVa uBZriHFCaaAFfLOICz8bvkC40veXayDRJSn6JQh29PMVJmh36hrcbpr2fRdgGPIHvFr1 mclJF2gIVQiUuYj7CvOZqz+MfjE6SRoIlXsfAmKQGkBS2e/paiw4OJc8BrlIHYh2LG2N 3P88FSQI+I7N0HCuVdxYC+R/Em+Ip7ZOzy0b2JwBikUZtJy6OHQ+ndrBwpIzhr8H5jc7 12mA== 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=4oK/aGtUs8zE0ZnYgnO1/voxObS0r/oHVp+SxmpbNwk=; b=XuJH9vOvIFlW6+fJ8WlwR1E1ZjxUTkK9hSfXwiy1Bykg/xzN/Ixz0VwDbukm82lRDK IWZcTsBDmgXEdC/BvKQ74e/uLwVZH28BPXECtTHTElMx2BFh8skUzS6HPB5MbP+3Hxda N8UuFXsMTrvNfFfzRX/4cs0Zk6IdUmWv3wywVK8qvmfYHVPK1Hybyn6ys2gywRj3Ubas B3YiybVm0XugrYR+5/GcGsBjioDt1hxziUT5AXYoba8oEkL10z4sYdpRoZiEoZ1tVVbm 3lqafzHu0cntN5KZVtoM90WUdvcH6MH6+taDHtVno1Lsw0LVBmr4bttAEvzak5wTQxsG fiHw== X-Gm-Message-State: AOPr4FWoVzTw9xtvwkkODbv1M5CSL551Ve7EHGOB0rzmZkek+yXPl0HxQbiA1HM/XuTjQrui X-Received: by 10.66.138.16 with SMTP id qm16mr29433358pab.28.1462544489432; Fri, 06 May 2016 07:21: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 19sm21529489pfu.83.2016.05.06.07.21.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 06 May 2016 07:21:28 -0700 (PDT) From: Kevin Hilman To: linux-amlogic@lists.infradead.org, Carlo Caione , Linus Walleij Subject: [PATCH 2/7] pinctrl: amlogic: gxbb: add EMMC and SD pins Date: Fri, 6 May 2016 07:21:21 -0700 Message-Id: <1462544486-9516-3-git-send-email-khilman@baylibre.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1462544486-9516-1-git-send-email-khilman@baylibre.com> References: <1462544486-9516-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-20160506_072150_063351_3757B607 X-CRM114-Status: GOOD ( 12.39 ) X-Spam-Score: -1.9 (-) 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 , linux-meson@googlegroups.com, linux-gpio@vger.kernel.org, Carlo Caione , Jerry Cao , =?UTF-8?q?Andreas=20F=C3=A4rber?= , 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-Spam-Status: No, score=-6.2 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add EE domain pins for eMMC and SD card. Cc: 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 50551677b0ee..5dc98ee35265 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[] = {