Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 372633
b: refs/heads/master
c: e111471
h: refs/heads/master
i:
  372631: c0231ec
v: v3
  • Loading branch information
Laurent Pinchart committed Mar 15, 2013
1 parent 48644b6 commit 80e10db
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 52c5d0327e101ff57d7a6be8a983a610588d7332
refs/heads/master: e1114715f4dc2c6f75a9d6e25ebc519faa4437fb
8 changes: 4 additions & 4 deletions trunk/drivers/pinctrl/sh-pfc/pfc-r8a7779.c
Original file line number Diff line number Diff line change
Expand Up @@ -2677,7 +2677,7 @@ static const struct pinmux_func pinmux_func_gpios[] = {
GPIO_FN(A19),

/* IPSR0 */
GPIO_FN(USB_PENC2), GPIO_FN(PWM1), GPIO_FN(PWMFSW0),
GPIO_FN(PWM1), GPIO_FN(PWMFSW0),
GPIO_FN(SCIF_CLK), GPIO_FN(TCLK0_C), GPIO_FN(BS),
GPIO_FN(FD2), GPIO_FN(ATADIR0), GPIO_FN(SDSELF),
GPIO_FN(HCTS1), GPIO_FN(A0),
Expand Down Expand Up @@ -2802,7 +2802,7 @@ static const struct pinmux_func pinmux_func_gpios[] = {
GPIO_FN(VI1_FIELD),
GPIO_FN(VI3_FIELD), GPIO_FN(AUDIO_CLKOUT),
GPIO_FN(GPS_CLK_C), GPIO_FN(GPS_CLK_D), GPIO_FN(AUDIO_CLKA),
GPIO_FN(CAN_TXCLK), GPIO_FN(AUDIO_CLKB), GPIO_FN(USB_OVC2),
GPIO_FN(CAN_TXCLK), GPIO_FN(AUDIO_CLKB),
GPIO_FN(CAN_DEBUGOUT0), GPIO_FN(MOUT0),

/* IPSR6 */
Expand Down Expand Up @@ -2843,10 +2843,10 @@ static const struct pinmux_func pinmux_func_gpios[] = {
GPIO_FN(DACK2),

/* IPSR8 */
GPIO_FN(USB_OVC0), GPIO_FN(AD_CLK),
GPIO_FN(AD_CLK),
GPIO_FN(CC5_STATE4), GPIO_FN(CC5_STATE12), GPIO_FN(CC5_STATE20),
GPIO_FN(CC5_STATE28), GPIO_FN(CC5_STATE36),
GPIO_FN(USB_OVC1), GPIO_FN(AD_DI),
GPIO_FN(AD_DI),
GPIO_FN(CC5_STATE5), GPIO_FN(CC5_STATE13), GPIO_FN(CC5_STATE21),
GPIO_FN(CC5_STATE29), GPIO_FN(CC5_STATE37),
GPIO_FN(CAN_DEBUG_HW_TRIGGER), GPIO_FN(AD_DO),
Expand Down

0 comments on commit 80e10db

Please sign in to comment.