From: Laurent Pinchart Date: Sat, 15 Dec 2012 22:50:35 +0000 (+0100) Subject: sh: sh7264: Rename CRX0CRX1 mark to match GPIO names X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=38357e647f81605bc86ba9f030bf1a3299029796;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git sh: sh7264: Rename CRX0CRX1 mark to match GPIO names Rename CRX0CRX1_MARK to CRX0_CRX1_MARK to match the GPIO_FN_CRX0_CRX1 name. Signed-off-by: Laurent Pinchart Acked-by: Linus Walleij Signed-off-by: Simon Horman --- diff --git a/arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c b/arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c index b055b55d6f27..79a0d6097f29 100644 --- a/arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c +++ b/arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c @@ -505,7 +505,7 @@ enum { PWM2A_MARK, PWM2B_MARK, PWM2C_MARK, PWM2D_MARK, PWM2E_MARK, PWM2F_MARK, PWM2G_MARK, PWM2H_MARK, IERXD_MARK, IETXD_MARK, - CRX0CRX1_MARK, + CRX0_CRX1_MARK, WDTOVF_MARK, CRX0X1_MARK, @@ -1003,7 +1003,7 @@ static pinmux_enum_t pinmux_data[] = { PINMUX_DATA(PJ2_DATA, PJ2MD_000), PINMUX_DATA(CTX1_MARK, PJ2MD_001), - PINMUX_DATA(CRX0CRX1_MARK, PJ2MD_010), + PINMUX_DATA(CRX0_CRX1_MARK, PJ2MD_010), PINMUX_DATA(CS2_MARK, PJ2MD_011), PINMUX_DATA(SCK0_MARK, PJ2MD_100), PINMUX_DATA(LCD_M_DISP_MARK, PJ2MD_101), @@ -1246,7 +1246,7 @@ static struct pinmux_gpio pinmux_gpios[] = { PINMUX_GPIO(GPIO_FN_CRX1, CRX1_MARK), PINMUX_GPIO(GPIO_FN_CTX0, CTX0_MARK), PINMUX_GPIO(GPIO_FN_CRX0, CRX0_MARK), - PINMUX_GPIO(GPIO_FN_CRX0_CRX1, CRX0CRX1_MARK), + PINMUX_GPIO(GPIO_FN_CRX0_CRX1, CRX0_CRX1_MARK), /* DMAC */ PINMUX_GPIO(GPIO_FN_TEND0, TEND0_MARK),