aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pinctrl/sh-pfc
diff options
context:
space:
mode:
authorBastian Hecht <hechtb@gmail.com>2013-04-17 06:34:01 -0400
committerSimon Horman <horms+renesas@verge.net.au>2013-06-04 08:04:02 -0400
commit8fbfdbbb04f88604f58c032440a2bc03649697ba (patch)
treec100d06266ccae9f9ef7bfb795cbe60b8aae41d6 /drivers/pinctrl/sh-pfc
parent87f8c988636db0d477bb63fddfaefb5be9b1c386 (diff)
sh-pfc: r8a7740: Add SCIFA1 data group
Add SCIFA1 as preparation to switch to pinctrl in board files. Signed-off-by: Bastian Hecht <hechtb+renesas@gmail.com> Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'drivers/pinctrl/sh-pfc')
-rw-r--r--drivers/pinctrl/sh-pfc/pfc-r8a7740.c14
1 files changed, 14 insertions, 0 deletions
diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c
index d95040c3ccaa..4753f544bcc3 100644
--- a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c
+++ b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c
@@ -1999,6 +1999,14 @@ static const unsigned int mmc0_ctrl_1_pins[] = {
1999static const unsigned int mmc0_ctrl_1_mux[] = { 1999static const unsigned int mmc0_ctrl_1_mux[] = {
2000 MMC1_CMD_PORT104_MARK, MMC1_CLK_PORT103_MARK, 2000 MMC1_CMD_PORT104_MARK, MMC1_CLK_PORT103_MARK,
2001}; 2001};
2002/* - SCIFA1 ----------------------------------------------------------------- */
2003static const unsigned int scifa1_data_pins[] = {
2004 /* RXD, TXD */
2005 195, 196,
2006};
2007static const unsigned int scifa1_data_mux[] = {
2008 SCIFA1_RXD_MARK, SCIFA1_TXD_MARK,
2009};
2002/* - SDHI0 ------------------------------------------------------------------ */ 2010/* - SDHI0 ------------------------------------------------------------------ */
2003static const unsigned int sdhi0_data1_pins[] = { 2011static const unsigned int sdhi0_data1_pins[] = {
2004 /* D0 */ 2012 /* D0 */
@@ -2204,6 +2212,7 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
2204 SH_PFC_PIN_GROUP(mmc0_data4_1), 2212 SH_PFC_PIN_GROUP(mmc0_data4_1),
2205 SH_PFC_PIN_GROUP(mmc0_data8_1), 2213 SH_PFC_PIN_GROUP(mmc0_data8_1),
2206 SH_PFC_PIN_GROUP(mmc0_ctrl_1), 2214 SH_PFC_PIN_GROUP(mmc0_ctrl_1),
2215 SH_PFC_PIN_GROUP(scifa1_data),
2207 SH_PFC_PIN_GROUP(sdhi0_data1), 2216 SH_PFC_PIN_GROUP(sdhi0_data1),
2208 SH_PFC_PIN_GROUP(sdhi0_data4), 2217 SH_PFC_PIN_GROUP(sdhi0_data4),
2209 SH_PFC_PIN_GROUP(sdhi0_ctrl), 2218 SH_PFC_PIN_GROUP(sdhi0_ctrl),
@@ -2316,6 +2325,10 @@ static const char * const mmc0_groups[] = {
2316 "mmc0_ctrl_1", 2325 "mmc0_ctrl_1",
2317}; 2326};
2318 2327
2328static const char * const scifa1_groups[] = {
2329 "scifa1_data",
2330};
2331
2319static const char * const sdhi0_groups[] = { 2332static const char * const sdhi0_groups[] = {
2320 "sdhi0_data1", 2333 "sdhi0_data1",
2321 "sdhi0_data4", 2334 "sdhi0_data4",
@@ -2346,6 +2359,7 @@ static const struct sh_pfc_function pinmux_functions[] = {
2346 SH_PFC_FUNCTION(lcd0), 2359 SH_PFC_FUNCTION(lcd0),
2347 SH_PFC_FUNCTION(lcd1), 2360 SH_PFC_FUNCTION(lcd1),
2348 SH_PFC_FUNCTION(mmc0), 2361 SH_PFC_FUNCTION(mmc0),
2362 SH_PFC_FUNCTION(scifa1),
2349 SH_PFC_FUNCTION(sdhi0), 2363 SH_PFC_FUNCTION(sdhi0),
2350 SH_PFC_FUNCTION(sdhi1), 2364 SH_PFC_FUNCTION(sdhi1),
2351 SH_PFC_FUNCTION(sdhi2), 2365 SH_PFC_FUNCTION(sdhi2),