Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 372578
b: refs/heads/master
c: 512b156
h: refs/heads/master
v: v3
  • Loading branch information
Laurent Pinchart committed Mar 15, 2013
1 parent 766a059 commit d0fec61
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: a6aa1c7b0ac6a57dac5855c64316057771f186e4
refs/heads/master: 512b156cefb2931a483ff3dd25852d122230894a
23 changes: 23 additions & 0 deletions trunk/drivers/pinctrl/sh-pfc/pfc-sh73a0.c
Original file line number Diff line number Diff line change
Expand Up @@ -2169,6 +2169,21 @@ static const unsigned int i2c3_2_pins[] = {
static const unsigned int i2c3_2_mux[] = {
PORT115_I2C_SCL3_MARK, PORT116_I2C_SDA3_MARK,
};
/* - IrDA ------------------------------------------------------------------- */
static const unsigned int irda_0_pins[] = {
/* OUT, IN, FIRSEL */
241, 242, 243,
};
static const unsigned int irda_0_mux[] = {
PORT241_IRDA_OUT_MARK, PORT242_IRDA_IN_MARK, PORT243_IRDA_FIRSEL_MARK,
};
static const unsigned int irda_1_pins[] = {
/* OUT, IN, FIRSEL */
49, 53, 54,
};
static const unsigned int irda_1_mux[] = {
PORT49_IRDA_OUT_MARK, PORT53_IRDA_IN_MARK, PORT54_IRDA_FIRSEL_MARK,
};
/* - KEYSC ------------------------------------------------------------------ */
static const unsigned int keysc_in5_pins[] = {
/* KEYIN[0:4] */
Expand Down Expand Up @@ -2963,6 +2978,8 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
SH_PFC_PIN_GROUP(i2c3_0),
SH_PFC_PIN_GROUP(i2c3_1),
SH_PFC_PIN_GROUP(i2c3_2),
SH_PFC_PIN_GROUP(irda_0),
SH_PFC_PIN_GROUP(irda_1),
SH_PFC_PIN_GROUP(keysc_in5),
SH_PFC_PIN_GROUP(keysc_in6),
SH_PFC_PIN_GROUP(keysc_in7),
Expand Down Expand Up @@ -3125,6 +3142,11 @@ static const char * const i2c3_groups[] = {
"i2c3_2",
};

static const char * const irda_groups[] = {
"irda_0",
"irda_1",
};

static const char * const keysc_groups[] = {
"keysc_in5",
"keysc_in6",
Expand Down Expand Up @@ -3280,6 +3302,7 @@ static const struct sh_pfc_function pinmux_functions[] = {
SH_PFC_FUNCTION(fsid),
SH_PFC_FUNCTION(i2c2),
SH_PFC_FUNCTION(i2c3),
SH_PFC_FUNCTION(irda),
SH_PFC_FUNCTION(keysc),
SH_PFC_FUNCTION(lcd),
SH_PFC_FUNCTION(lcd2),
Expand Down

0 comments on commit d0fec61

Please sign in to comment.