diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2012-12-15 17:50:35 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-01-24 19:24:19 -0500 |
commit | 38357e647f81605bc86ba9f030bf1a3299029796 (patch) | |
tree | 8f0284e11c12931acf4ced85ecd4af5071ca1e8e /arch/sh/kernel/cpu | |
parent | 9931faca02c604c22335f5a935a501bb2ace6e20 (diff) |
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 <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch/sh/kernel/cpu')
-rw-r--r-- | arch/sh/kernel/cpu/sh2a/pinmux-sh7264.c | 6 |
1 files changed, 3 insertions, 3 deletions
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 { | |||
505 | PWM2A_MARK, PWM2B_MARK, PWM2C_MARK, PWM2D_MARK, | 505 | PWM2A_MARK, PWM2B_MARK, PWM2C_MARK, PWM2D_MARK, |
506 | PWM2E_MARK, PWM2F_MARK, PWM2G_MARK, PWM2H_MARK, | 506 | PWM2E_MARK, PWM2F_MARK, PWM2G_MARK, PWM2H_MARK, |
507 | IERXD_MARK, IETXD_MARK, | 507 | IERXD_MARK, IETXD_MARK, |
508 | CRX0CRX1_MARK, | 508 | CRX0_CRX1_MARK, |
509 | WDTOVF_MARK, | 509 | WDTOVF_MARK, |
510 | 510 | ||
511 | CRX0X1_MARK, | 511 | CRX0X1_MARK, |
@@ -1003,7 +1003,7 @@ static pinmux_enum_t pinmux_data[] = { | |||
1003 | 1003 | ||
1004 | PINMUX_DATA(PJ2_DATA, PJ2MD_000), | 1004 | PINMUX_DATA(PJ2_DATA, PJ2MD_000), |
1005 | PINMUX_DATA(CTX1_MARK, PJ2MD_001), | 1005 | PINMUX_DATA(CTX1_MARK, PJ2MD_001), |
1006 | PINMUX_DATA(CRX0CRX1_MARK, PJ2MD_010), | 1006 | PINMUX_DATA(CRX0_CRX1_MARK, PJ2MD_010), |
1007 | PINMUX_DATA(CS2_MARK, PJ2MD_011), | 1007 | PINMUX_DATA(CS2_MARK, PJ2MD_011), |
1008 | PINMUX_DATA(SCK0_MARK, PJ2MD_100), | 1008 | PINMUX_DATA(SCK0_MARK, PJ2MD_100), |
1009 | PINMUX_DATA(LCD_M_DISP_MARK, PJ2MD_101), | 1009 | PINMUX_DATA(LCD_M_DISP_MARK, PJ2MD_101), |
@@ -1246,7 +1246,7 @@ static struct pinmux_gpio pinmux_gpios[] = { | |||
1246 | PINMUX_GPIO(GPIO_FN_CRX1, CRX1_MARK), | 1246 | PINMUX_GPIO(GPIO_FN_CRX1, CRX1_MARK), |
1247 | PINMUX_GPIO(GPIO_FN_CTX0, CTX0_MARK), | 1247 | PINMUX_GPIO(GPIO_FN_CTX0, CTX0_MARK), |
1248 | PINMUX_GPIO(GPIO_FN_CRX0, CRX0_MARK), | 1248 | PINMUX_GPIO(GPIO_FN_CRX0, CRX0_MARK), |
1249 | PINMUX_GPIO(GPIO_FN_CRX0_CRX1, CRX0CRX1_MARK), | 1249 | PINMUX_GPIO(GPIO_FN_CRX0_CRX1, CRX0_CRX1_MARK), |
1250 | 1250 | ||
1251 | /* DMAC */ | 1251 | /* DMAC */ |
1252 | PINMUX_GPIO(GPIO_FN_TEND0, TEND0_MARK), | 1252 | PINMUX_GPIO(GPIO_FN_TEND0, TEND0_MARK), |