diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2012-12-15 17:50:36 -0500 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-01-24 19:24:19 -0500 |
commit | bcdccf9e28c7af97f841c716516483c65e093d79 (patch) | |
tree | b8697c6ad336edec6788fe70b759c4e7f1a7b2ad | |
parent | 38357e647f81605bc86ba9f030bf1a3299029796 (diff) |
sh: sh7269: Rename CRX0CRX1(CRX2) marks to match GPIO names
Rename CRX0CRX1_MARK and CRX0CRX1CRX2_MARK to CRX0_CRX1_MARK and
CRX0_CRX1_CRX2_MARK respectively to match the GPIO_FN_CRX0_CRX1 and
GPIO_FN_CRX0_CRX1_CRX2 GPIO names.
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>
-rw-r--r-- | arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c b/arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c index 039e4587dd9b..1289fd922c72 100644 --- a/arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c +++ b/arch/sh/kernel/cpu/sh2a/pinmux-sh7269.c | |||
@@ -739,8 +739,8 @@ enum { | |||
739 | CRX0_MARK, CTX0_MARK, | 739 | CRX0_MARK, CTX0_MARK, |
740 | CRX1_MARK, CTX1_MARK, | 740 | CRX1_MARK, CTX1_MARK, |
741 | CRX2_MARK, CTX2_MARK, | 741 | CRX2_MARK, CTX2_MARK, |
742 | CRX0CRX1_MARK, | 742 | CRX0_CRX1_MARK, |
743 | CRX0CRX1CRX2_MARK, | 743 | CRX0_CRX1_CRX2_MARK, |
744 | CTX0CTX1CTX2_MARK, | 744 | CTX0CTX1CTX2_MARK, |
745 | CRX1_PJ22_MARK, CTX1_PJ23_MARK, | 745 | CRX1_PJ22_MARK, CTX1_PJ23_MARK, |
746 | CRX2_PJ20_MARK, CTX2_PJ21_MARK, | 746 | CRX2_PJ20_MARK, CTX2_PJ21_MARK, |
@@ -829,7 +829,7 @@ static pinmux_enum_t pinmux_data[] = { | |||
829 | PINMUX_DATA(CKE_MARK, PC7MD_001), | 829 | PINMUX_DATA(CKE_MARK, PC7MD_001), |
830 | PINMUX_DATA(RXD7_MARK, PC7MD_010), | 830 | PINMUX_DATA(RXD7_MARK, PC7MD_010), |
831 | PINMUX_DATA(CRX1_MARK, PC7MD_011), | 831 | PINMUX_DATA(CRX1_MARK, PC7MD_011), |
832 | PINMUX_DATA(CRX0CRX1_MARK, PC7MD_100), | 832 | PINMUX_DATA(CRX0_CRX1_MARK, PC7MD_100), |
833 | PINMUX_DATA(IRQ1_PC_MARK, PC7MD_101), | 833 | PINMUX_DATA(IRQ1_PC_MARK, PC7MD_101), |
834 | 834 | ||
835 | PINMUX_DATA(PC6_DATA, PC6MD_000), | 835 | PINMUX_DATA(PC6_DATA, PC6MD_000), |
@@ -1300,7 +1300,7 @@ static pinmux_enum_t pinmux_data[] = { | |||
1300 | PINMUX_DATA(LCD_TCON5_MARK, PJ22MD_011), | 1300 | PINMUX_DATA(LCD_TCON5_MARK, PJ22MD_011), |
1301 | PINMUX_DATA(IRQ2_PJ_MARK, PJ22MD_100), | 1301 | PINMUX_DATA(IRQ2_PJ_MARK, PJ22MD_100), |
1302 | PINMUX_DATA(CRX1_MARK, PJ22MD_101), | 1302 | PINMUX_DATA(CRX1_MARK, PJ22MD_101), |
1303 | PINMUX_DATA(CRX0CRX1_MARK, PJ22MD_110), | 1303 | PINMUX_DATA(CRX0_CRX1_MARK, PJ22MD_110), |
1304 | 1304 | ||
1305 | PINMUX_DATA(PJ21_DATA, PJ21MD_000), | 1305 | PINMUX_DATA(PJ21_DATA, PJ21MD_000), |
1306 | PINMUX_DATA(DV_DATA21_MARK, PJ21MD_001), | 1306 | PINMUX_DATA(DV_DATA21_MARK, PJ21MD_001), |
@@ -1666,8 +1666,8 @@ static struct pinmux_gpio pinmux_gpios[] = { | |||
1666 | PINMUX_GPIO(GPIO_FN_CRX1, CRX1_MARK), | 1666 | PINMUX_GPIO(GPIO_FN_CRX1, CRX1_MARK), |
1667 | PINMUX_GPIO(GPIO_FN_CTX0, CTX0_MARK), | 1667 | PINMUX_GPIO(GPIO_FN_CTX0, CTX0_MARK), |
1668 | PINMUX_GPIO(GPIO_FN_CRX0, CRX0_MARK), | 1668 | PINMUX_GPIO(GPIO_FN_CRX0, CRX0_MARK), |
1669 | PINMUX_GPIO(GPIO_FN_CRX0_CRX1, CRX0CRX1_MARK), | 1669 | PINMUX_GPIO(GPIO_FN_CRX0_CRX1, CRX0_CRX1_MARK), |
1670 | PINMUX_GPIO(GPIO_FN_CRX0_CRX1_CRX2, CRX0CRX1CRX2_MARK), | 1670 | PINMUX_GPIO(GPIO_FN_CRX0_CRX1_CRX2, CRX0_CRX1_CRX2_MARK), |
1671 | 1671 | ||
1672 | /* DMAC */ | 1672 | /* DMAC */ |
1673 | PINMUX_GPIO(GPIO_FN_TEND0, TEND0_MARK), | 1673 | PINMUX_GPIO(GPIO_FN_TEND0, TEND0_MARK), |