diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-03-10 02:28:16 -0500 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-03-10 02:28:16 -0500 |
commit | ec0ffe2ee0e0fb9da4409d86bfd72636450f32df (patch) | |
tree | 75ec1d3de64fbadb5ebe5179926eb608dcfb81b6 /arch/sh/kernel/cpu/sh4/setup-sh7750.c | |
parent | 214a607a4f5bf5a14dab0304ba350cdaf3916795 (diff) |
sh: Kill off all timer name clobbering.
Now that dev_name() can be used early, we no longer require a static
string. Kill off all of the superfluous timer names.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu/sh4/setup-sh7750.c')
-rw-r--r-- | arch/sh/kernel/cpu/sh4/setup-sh7750.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/sh/kernel/cpu/sh4/setup-sh7750.c b/arch/sh/kernel/cpu/sh4/setup-sh7750.c index ffd79e57254f..2f337b143c8f 100644 --- a/arch/sh/kernel/cpu/sh4/setup-sh7750.c +++ b/arch/sh/kernel/cpu/sh4/setup-sh7750.c | |||
@@ -66,7 +66,6 @@ static struct platform_device scif1_device = { | |||
66 | }; | 66 | }; |
67 | 67 | ||
68 | static struct sh_timer_config tmu0_platform_data = { | 68 | static struct sh_timer_config tmu0_platform_data = { |
69 | .name = "TMU0", | ||
70 | .channel_offset = 0x04, | 69 | .channel_offset = 0x04, |
71 | .timer_bit = 0, | 70 | .timer_bit = 0, |
72 | .clk = "peripheral_clk", | 71 | .clk = "peripheral_clk", |
@@ -75,7 +74,6 @@ static struct sh_timer_config tmu0_platform_data = { | |||
75 | 74 | ||
76 | static struct resource tmu0_resources[] = { | 75 | static struct resource tmu0_resources[] = { |
77 | [0] = { | 76 | [0] = { |
78 | .name = "TMU0", | ||
79 | .start = 0xffd80008, | 77 | .start = 0xffd80008, |
80 | .end = 0xffd80013, | 78 | .end = 0xffd80013, |
81 | .flags = IORESOURCE_MEM, | 79 | .flags = IORESOURCE_MEM, |
@@ -97,7 +95,6 @@ static struct platform_device tmu0_device = { | |||
97 | }; | 95 | }; |
98 | 96 | ||
99 | static struct sh_timer_config tmu1_platform_data = { | 97 | static struct sh_timer_config tmu1_platform_data = { |
100 | .name = "TMU1", | ||
101 | .channel_offset = 0x10, | 98 | .channel_offset = 0x10, |
102 | .timer_bit = 1, | 99 | .timer_bit = 1, |
103 | .clk = "peripheral_clk", | 100 | .clk = "peripheral_clk", |
@@ -106,7 +103,6 @@ static struct sh_timer_config tmu1_platform_data = { | |||
106 | 103 | ||
107 | static struct resource tmu1_resources[] = { | 104 | static struct resource tmu1_resources[] = { |
108 | [0] = { | 105 | [0] = { |
109 | .name = "TMU1", | ||
110 | .start = 0xffd80014, | 106 | .start = 0xffd80014, |
111 | .end = 0xffd8001f, | 107 | .end = 0xffd8001f, |
112 | .flags = IORESOURCE_MEM, | 108 | .flags = IORESOURCE_MEM, |
@@ -128,7 +124,6 @@ static struct platform_device tmu1_device = { | |||
128 | }; | 124 | }; |
129 | 125 | ||
130 | static struct sh_timer_config tmu2_platform_data = { | 126 | static struct sh_timer_config tmu2_platform_data = { |
131 | .name = "TMU2", | ||
132 | .channel_offset = 0x1c, | 127 | .channel_offset = 0x1c, |
133 | .timer_bit = 2, | 128 | .timer_bit = 2, |
134 | .clk = "peripheral_clk", | 129 | .clk = "peripheral_clk", |
@@ -136,7 +131,6 @@ static struct sh_timer_config tmu2_platform_data = { | |||
136 | 131 | ||
137 | static struct resource tmu2_resources[] = { | 132 | static struct resource tmu2_resources[] = { |
138 | [0] = { | 133 | [0] = { |
139 | .name = "TMU2", | ||
140 | .start = 0xffd80020, | 134 | .start = 0xffd80020, |
141 | .end = 0xffd8002f, | 135 | .end = 0xffd8002f, |
142 | .flags = IORESOURCE_MEM, | 136 | .flags = IORESOURCE_MEM, |
@@ -163,7 +157,6 @@ static struct platform_device tmu2_device = { | |||
163 | defined(CONFIG_CPU_SUBTYPE_SH7751R) | 157 | defined(CONFIG_CPU_SUBTYPE_SH7751R) |
164 | 158 | ||
165 | static struct sh_timer_config tmu3_platform_data = { | 159 | static struct sh_timer_config tmu3_platform_data = { |
166 | .name = "TMU3", | ||
167 | .channel_offset = 0x04, | 160 | .channel_offset = 0x04, |
168 | .timer_bit = 0, | 161 | .timer_bit = 0, |
169 | .clk = "peripheral_clk", | 162 | .clk = "peripheral_clk", |
@@ -171,7 +164,6 @@ static struct sh_timer_config tmu3_platform_data = { | |||
171 | 164 | ||
172 | static struct resource tmu3_resources[] = { | 165 | static struct resource tmu3_resources[] = { |
173 | [0] = { | 166 | [0] = { |
174 | .name = "TMU3", | ||
175 | .start = 0xfe100008, | 167 | .start = 0xfe100008, |
176 | .end = 0xfe100013, | 168 | .end = 0xfe100013, |
177 | .flags = IORESOURCE_MEM, | 169 | .flags = IORESOURCE_MEM, |
@@ -193,7 +185,6 @@ static struct platform_device tmu3_device = { | |||
193 | }; | 185 | }; |
194 | 186 | ||
195 | static struct sh_timer_config tmu4_platform_data = { | 187 | static struct sh_timer_config tmu4_platform_data = { |
196 | .name = "TMU4", | ||
197 | .channel_offset = 0x10, | 188 | .channel_offset = 0x10, |
198 | .timer_bit = 1, | 189 | .timer_bit = 1, |
199 | .clk = "peripheral_clk", | 190 | .clk = "peripheral_clk", |
@@ -201,7 +192,6 @@ static struct sh_timer_config tmu4_platform_data = { | |||
201 | 192 | ||
202 | static struct resource tmu4_resources[] = { | 193 | static struct resource tmu4_resources[] = { |
203 | [0] = { | 194 | [0] = { |
204 | .name = "TMU4", | ||
205 | .start = 0xfe100014, | 195 | .start = 0xfe100014, |
206 | .end = 0xfe10001f, | 196 | .end = 0xfe10001f, |
207 | .flags = IORESOURCE_MEM, | 197 | .flags = IORESOURCE_MEM, |