aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-10-03 16:00:19 -0400
committerPaul Mundt <lethal@linux-sh.org>2010-10-03 16:00:19 -0400
commit872f36a69fea9763f000ec1bc7a5282e43b67b96 (patch)
treeec7c5f65ffb3b6246cbff8d54ff8b2a755d6fc29
parentb72421d8aa39724474ec2bfb91e182001f1f25a7 (diff)
sh: Drop __initdata for SH-X3 pinmux tables.
The gpio sysfs support needs to get at these later, so drop the __initdata annotations. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/kernel/cpu/sh4a/pinmux-shx3.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/pinmux-shx3.c b/arch/sh/kernel/cpu/sh4a/pinmux-shx3.c
index cc3bfac69fdf..aaa5338abbff 100644
--- a/arch/sh/kernel/cpu/sh4a/pinmux-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/pinmux-shx3.c
@@ -146,7 +146,7 @@ enum {
146 PINMUX_MARK_END, 146 PINMUX_MARK_END,
147}; 147};
148 148
149static pinmux_enum_t shx3_pinmux_data[] __initdata = { 149static pinmux_enum_t shx3_pinmux_data[] = {
150 150
151 /* PA GPIO */ 151 /* PA GPIO */
152 PINMUX_DATA(PA7_DATA, PA7_IN, PA7_OUT, PA7_IN_PU), 152 PINMUX_DATA(PA7_DATA, PA7_IN, PA7_OUT, PA7_IN_PU),
@@ -305,7 +305,7 @@ static pinmux_enum_t shx3_pinmux_data[] __initdata = {
305 PINMUX_DATA(IRQOUT_MARK, PH0_FN), 305 PINMUX_DATA(IRQOUT_MARK, PH0_FN),
306}; 306};
307 307
308static struct pinmux_gpio shx3_pinmux_gpios[] __initdata = { 308static struct pinmux_gpio shx3_pinmux_gpios[] = {
309 /* PA */ 309 /* PA */
310 PINMUX_GPIO(GPIO_PA7, PA7_DATA), 310 PINMUX_GPIO(GPIO_PA7, PA7_DATA),
311 PINMUX_GPIO(GPIO_PA6, PA6_DATA), 311 PINMUX_GPIO(GPIO_PA6, PA6_DATA),
@@ -449,7 +449,7 @@ static struct pinmux_gpio shx3_pinmux_gpios[] __initdata = {
449 PINMUX_GPIO(GPIO_FN_IRQOUT, IRQOUT_MARK), 449 PINMUX_GPIO(GPIO_FN_IRQOUT, IRQOUT_MARK),
450}; 450};
451 451
452static struct pinmux_cfg_reg shx3_pinmux_config_regs[] __initdata = { 452static struct pinmux_cfg_reg shx3_pinmux_config_regs[] = {
453 { PINMUX_CFG_REG("PABCR", 0xffc70000, 32, 2) { 453 { PINMUX_CFG_REG("PABCR", 0xffc70000, 32, 2) {
454 PA7_FN, PA7_OUT, PA7_IN, PA7_IN_PU, 454 PA7_FN, PA7_OUT, PA7_IN, PA7_IN_PU,
455 PA6_FN, PA6_OUT, PA6_IN, PA6_IN_PU, 455 PA6_FN, PA6_OUT, PA6_IN, PA6_IN_PU,
@@ -525,7 +525,7 @@ static struct pinmux_cfg_reg shx3_pinmux_config_regs[] __initdata = {
525 { }, 525 { },
526}; 526};
527 527
528static struct pinmux_data_reg shx3_pinmux_data_regs[] __initdata = { 528static struct pinmux_data_reg shx3_pinmux_data_regs[] = {
529 { PINMUX_DATA_REG("PABDR", 0xffc70010, 32) { 529 { PINMUX_DATA_REG("PABDR", 0xffc70010, 32) {
530 0, 0, 0, 0, 0, 0, 0, 0, 530 0, 0, 0, 0, 0, 0, 0, 0,
531 PA7_DATA, PA6_DATA, PA5_DATA, PA4_DATA, 531 PA7_DATA, PA6_DATA, PA5_DATA, PA4_DATA,
@@ -561,7 +561,7 @@ static struct pinmux_data_reg shx3_pinmux_data_regs[] __initdata = {
561 { }, 561 { },
562}; 562};
563 563
564static struct pinmux_info shx3_pinmux_info __initdata = { 564static struct pinmux_info shx3_pinmux_info = {
565 .name = "shx3_pfc", 565 .name = "shx3_pfc",
566 .reserved_id = PINMUX_RESERVED, 566 .reserved_id = PINMUX_RESERVED,
567 .data = { PINMUX_DATA_BEGIN, PINMUX_DATA_END }, 567 .data = { PINMUX_DATA_BEGIN, PINMUX_DATA_END },