From: martin.blumenstingl@googlemail.com (Martin Blumenstingl)
To: linux-arm-kernel@lists.infradead.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 [thread overview]
Message-ID: <20160828164725.19429-2-martin.blumenstingl@googlemail.com> (raw)
In-Reply-To: <20160828164725.19429-1-martin.blumenstingl@googlemail.com>
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 <martin.blumenstingl@googlemail.com>
---
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),
--
2.9.3
next prev parent reply other threads:[~2016-08-28 16:47 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-08-28 16:47 [PATCH 0/2] add support for the SDIO pins on GXBB Martin Blumenstingl
2016-08-28 16:47 ` Martin Blumenstingl [this message]
2016-09-07 14:24 ` [PATCH 1/2] pinctrl: meson-gxbb: add the pins for the SDIO/sd_emmc_a controller Linus Walleij
2016-09-07 18:55 ` Martin Blumenstingl
2016-09-12 12:22 ` Linus Walleij
2016-09-07 19:07 ` Kevin Hilman
2016-08-28 16:47 ` [PATCH 2/2] ARM64: dts: meson-gxbb: add the SDIO pins Martin Blumenstingl
2016-08-28 19:13 ` Rask Ingemann Lambertsen
2016-09-04 17:55 ` Martin Blumenstingl
2016-09-07 14:23 ` Linus Walleij
2016-09-11 12:39 ` [PATCH v2 0/2] add support for the SDIO pins on GXBB Martin Blumenstingl
2016-09-11 12:39 ` [PATCH v2 1/2] pinctrl: meson-gxbb: add the missing SDIO interrupt pin Martin Blumenstingl
2016-09-12 18:07 ` Kevin Hilman
2016-09-13 11:38 ` Linus Walleij
2016-09-11 12:39 ` [PATCH v2 2/2] ARM64: dts: meson-gxbb: add the SDIO pins Martin Blumenstingl
2016-09-12 18:13 ` Kevin Hilman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160828164725.19429-2-martin.blumenstingl@googlemail.com \
--to=martin.blumenstingl@googlemail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox