Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 372577
b: refs/heads/master
c: a6aa1c7
h: refs/heads/master
i:
  372575: 3e4c6e0
v: v3
  • Loading branch information
Laurent Pinchart committed Mar 15, 2013
1 parent dbc8098 commit 766a059
Show file tree
Hide file tree
Showing 2 changed files with 15 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: e24c62a6ce6b789d1372397894ffdea43e3a9f36
refs/heads/master: a6aa1c7b0ac6a57dac5855c64316057771f186e4
14 changes: 14 additions & 0 deletions trunk/drivers/pinctrl/sh-pfc/pfc-sh73a0.c
Original file line number Diff line number Diff line change
Expand Up @@ -2909,6 +2909,14 @@ static const unsigned int sdhi2_ctrl_pins[] = {
static const unsigned int sdhi2_ctrl_mux[] = {
SDHICMD2_MARK, SDHICLK2_MARK,
};
/* - USB -------------------------------------------------------------------- */
static const unsigned int usb_vbus_pins[] = {
/* VBUS */
0,
};
static const unsigned int usb_vbus_mux[] = {
VBUS_0_MARK,
};

static const struct sh_pfc_pin_group pinmux_groups[] = {
SH_PFC_PIN_GROUP(bsc_data_0_7),
Expand Down Expand Up @@ -3050,6 +3058,7 @@ static const struct sh_pfc_pin_group pinmux_groups[] = {
SH_PFC_PIN_GROUP(sdhi2_data1),
SH_PFC_PIN_GROUP(sdhi2_data4),
SH_PFC_PIN_GROUP(sdhi2_ctrl),
SH_PFC_PIN_GROUP(usb_vbus),
};

static const char * const bsc_groups[] = {
Expand Down Expand Up @@ -3259,6 +3268,10 @@ static const char * const sdhi2_groups[] = {
"sdhi2_ctrl",
};

static const char * const usb_groups[] = {
"usb_vbus",
};

static const struct sh_pfc_function pinmux_functions[] = {
SH_PFC_FUNCTION(bsc),
SH_PFC_FUNCTION(fsia),
Expand All @@ -3283,6 +3296,7 @@ static const struct sh_pfc_function pinmux_functions[] = {
SH_PFC_FUNCTION(sdhi0),
SH_PFC_FUNCTION(sdhi1),
SH_PFC_FUNCTION(sdhi2),
SH_PFC_FUNCTION(usb),
};

#define PINMUX_FN_BASE GPIO_FN_VBUS_0
Expand Down

0 comments on commit 766a059

Please sign in to comment.