From 80e10db43eba92031eb21264e1af7a961670f83d Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Thu, 7 Mar 2013 13:58:48 +0100 Subject: [PATCH] --- yaml --- r: 372633 b: refs/heads/master c: e1114715f4dc2c6f75a9d6e25ebc519faa4437fb h: refs/heads/master i: 372631: c0231ec18bd373e091049ed7dac7d9eb3c6eb11f v: v3 --- [refs] | 2 +- trunk/drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index b251db0528d7..b086b47fdf9e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 52c5d0327e101ff57d7a6be8a983a610588d7332 +refs/heads/master: e1114715f4dc2c6f75a9d6e25ebc519faa4437fb diff --git a/trunk/drivers/pinctrl/sh-pfc/pfc-r8a7779.c b/trunk/drivers/pinctrl/sh-pfc/pfc-r8a7779.c index ca59a187b021..6f8cc53c07d5 100644 --- a/trunk/drivers/pinctrl/sh-pfc/pfc-r8a7779.c +++ b/trunk/drivers/pinctrl/sh-pfc/pfc-r8a7779.c @@ -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), @@ -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 */ @@ -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),