diff options
author | Magnus Damm <damm@igel.co.jp> | 2008-10-31 07:24:01 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2008-12-22 04:42:52 -0500 |
commit | ef6aff6884408db95ceb0f678f583536e0bd48f8 (patch) | |
tree | 2095f8513e56dd0ae19216cab6c3dad4949e5823 /arch/sh | |
parent | b51339fff240ff179730f8963a758147fd60f3ec (diff) |
sh: remove old sh_mobile mstpc clocks
Remove the old sh_mobile mstpcr clocks.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/clock-sh7722.c | 52 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7343.c | 14 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 16 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 14 | ||||
-rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 16 |
5 files changed, 19 insertions, 93 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c index fc69e18ddd63..83b69196bc1a 100644 --- a/arch/sh/kernel/cpu/sh4a/clock-sh7722.c +++ b/arch/sh/kernel/cpu/sh4a/clock-sh7722.c | |||
@@ -632,53 +632,6 @@ static struct clk_ops sh7722_mstpcr_clk_ops = { | |||
632 | .recalc = sh7722_mstpcr_recalc, | 632 | .recalc = sh7722_mstpcr_recalc, |
633 | }; | 633 | }; |
634 | 634 | ||
635 | #define DECLARE_MSTPCRN(regnr, bitnr, bitstr) \ | ||
636 | { \ | ||
637 | .name = "mstp" __stringify(regnr) bitstr, \ | ||
638 | .arch_flags = MSTPCR_ARCH_FLAGS(regnr, bitnr), \ | ||
639 | .ops = &sh7722_mstpcr_clk_ops, \ | ||
640 | } | ||
641 | |||
642 | #define DECLARE_MSTPCR(regnr) \ | ||
643 | DECLARE_MSTPCRN(regnr, 31, "31"), \ | ||
644 | DECLARE_MSTPCRN(regnr, 30, "30"), \ | ||
645 | DECLARE_MSTPCRN(regnr, 29, "29"), \ | ||
646 | DECLARE_MSTPCRN(regnr, 28, "28"), \ | ||
647 | DECLARE_MSTPCRN(regnr, 27, "27"), \ | ||
648 | DECLARE_MSTPCRN(regnr, 26, "26"), \ | ||
649 | DECLARE_MSTPCRN(regnr, 25, "25"), \ | ||
650 | DECLARE_MSTPCRN(regnr, 24, "24"), \ | ||
651 | DECLARE_MSTPCRN(regnr, 23, "23"), \ | ||
652 | DECLARE_MSTPCRN(regnr, 22, "22"), \ | ||
653 | DECLARE_MSTPCRN(regnr, 21, "21"), \ | ||
654 | DECLARE_MSTPCRN(regnr, 20, "20"), \ | ||
655 | DECLARE_MSTPCRN(regnr, 19, "19"), \ | ||
656 | DECLARE_MSTPCRN(regnr, 18, "18"), \ | ||
657 | DECLARE_MSTPCRN(regnr, 17, "17"), \ | ||
658 | DECLARE_MSTPCRN(regnr, 16, "16"), \ | ||
659 | DECLARE_MSTPCRN(regnr, 15, "15"), \ | ||
660 | DECLARE_MSTPCRN(regnr, 14, "14"), \ | ||
661 | DECLARE_MSTPCRN(regnr, 13, "13"), \ | ||
662 | DECLARE_MSTPCRN(regnr, 12, "12"), \ | ||
663 | DECLARE_MSTPCRN(regnr, 11, "11"), \ | ||
664 | DECLARE_MSTPCRN(regnr, 10, "10"), \ | ||
665 | DECLARE_MSTPCRN(regnr, 9, "09"), \ | ||
666 | DECLARE_MSTPCRN(regnr, 8, "08"), \ | ||
667 | DECLARE_MSTPCRN(regnr, 7, "07"), \ | ||
668 | DECLARE_MSTPCRN(regnr, 6, "06"), \ | ||
669 | DECLARE_MSTPCRN(regnr, 5, "05"), \ | ||
670 | DECLARE_MSTPCRN(regnr, 4, "04"), \ | ||
671 | DECLARE_MSTPCRN(regnr, 3, "03"), \ | ||
672 | DECLARE_MSTPCRN(regnr, 2, "02"), \ | ||
673 | DECLARE_MSTPCRN(regnr, 1, "01"), \ | ||
674 | DECLARE_MSTPCRN(regnr, 0, "00") | ||
675 | |||
676 | static struct clk sh7722_mstpcr[] = { | ||
677 | DECLARE_MSTPCR(0), | ||
678 | DECLARE_MSTPCR(1), | ||
679 | DECLARE_MSTPCR(2), | ||
680 | }; | ||
681 | |||
682 | #define MSTPCR(_name, _parent, regnr, bitnr) \ | 635 | #define MSTPCR(_name, _parent, regnr, bitnr) \ |
683 | { \ | 636 | { \ |
684 | .name = _name, \ | 637 | .name = _name, \ |
@@ -885,10 +838,5 @@ int __init arch_clk_init(void) | |||
885 | clk_put(clk); | 838 | clk_put(clk); |
886 | } | 839 | } |
887 | 840 | ||
888 | for (i = 0; i < ARRAY_SIZE(sh7722_mstpcr); i++) { | ||
889 | pr_debug( "Registering mstpcr '%s'\n", sh7722_mstpcr[i].name); | ||
890 | clk_register(&sh7722_mstpcr[i]); | ||
891 | } | ||
892 | |||
893 | return 0; | 841 | return 0; |
894 | } | 842 | } |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c index e88577f4074a..75b9c819e442 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7343.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7343.c | |||
@@ -141,16 +141,10 @@ static struct platform_device *sh7343_devices[] __initdata = { | |||
141 | 141 | ||
142 | static int __init sh7343_devices_setup(void) | 142 | static int __init sh7343_devices_setup(void) |
143 | { | 143 | { |
144 | clk_always_enable("mstp031"); /* TLB */ | 144 | clk_always_enable("uram0"); /* URAM */ |
145 | clk_always_enable("mstp030"); /* IC */ | 145 | clk_always_enable("xymem0"); /* XYMEM */ |
146 | clk_always_enable("mstp029"); /* OC */ | 146 | clk_always_enable("veu0"); /* VEU */ |
147 | clk_always_enable("mstp028"); /* URAM */ | 147 | clk_always_enable("vpu0"); /* VPU */ |
148 | clk_always_enable("mstp026"); /* XYMEM */ | ||
149 | clk_always_enable("mstp023"); /* INTC3 */ | ||
150 | clk_always_enable("mstp022"); /* INTC */ | ||
151 | clk_always_enable("mstp020"); /* SuperHyway */ | ||
152 | clk_always_enable("mstp202"); /* VEU */ | ||
153 | clk_always_enable("mstp201"); /* VPU */ | ||
154 | 148 | ||
155 | platform_resource_setup_memory(&vpu_device, "vpu", 1 << 20); | 149 | platform_resource_setup_memory(&vpu_device, "vpu", 1 << 20); |
156 | platform_resource_setup_memory(&veu_device, "veu", 2 << 20); | 150 | platform_resource_setup_memory(&veu_device, "veu", 2 << 20); |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c index 5f92c864d7bc..839ae97a7fd2 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7366.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7366.c | |||
@@ -177,17 +177,11 @@ static struct platform_device *sh7366_devices[] __initdata = { | |||
177 | 177 | ||
178 | static int __init sh7366_devices_setup(void) | 178 | static int __init sh7366_devices_setup(void) |
179 | { | 179 | { |
180 | clk_always_enable("mstp031"); /* TLB */ | 180 | clk_always_enable("rsmem0"); /* RSMEM */ |
181 | clk_always_enable("mstp030"); /* IC */ | 181 | clk_always_enable("xymem0"); /* XYMEM */ |
182 | clk_always_enable("mstp029"); /* OC */ | 182 | clk_always_enable("veu1"); /* VEU-2 */ |
183 | clk_always_enable("mstp028"); /* RSMEM */ | 183 | clk_always_enable("veu0"); /* VEU-1 */ |
184 | clk_always_enable("mstp026"); /* XYMEM */ | 184 | clk_always_enable("vpu0"); /* VPU */ |
185 | clk_always_enable("mstp023"); /* INTC3 */ | ||
186 | clk_always_enable("mstp022"); /* INTC */ | ||
187 | clk_always_enable("mstp020"); /* SuperHyway */ | ||
188 | clk_always_enable("mstp207"); /* VEU-2 */ | ||
189 | clk_always_enable("mstp202"); /* VEU-1 */ | ||
190 | clk_always_enable("mstp201"); /* VPU */ | ||
191 | 185 | ||
192 | platform_resource_setup_memory(&vpu_device, "vpu", 2 << 20); | 186 | platform_resource_setup_memory(&vpu_device, "vpu", 2 << 20); |
193 | platform_resource_setup_memory(&veu0_device, "veu0", 2 << 20); | 187 | platform_resource_setup_memory(&veu0_device, "veu0", 2 << 20); |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c index 4953e74f9193..9162013ec695 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7722.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7722.c | |||
@@ -191,15 +191,11 @@ static struct platform_device *sh7722_devices[] __initdata = { | |||
191 | 191 | ||
192 | static int __init sh7722_devices_setup(void) | 192 | static int __init sh7722_devices_setup(void) |
193 | { | 193 | { |
194 | clk_always_enable("mstp031"); /* TLB */ | 194 | clk_always_enable("uram0"); /* URAM */ |
195 | clk_always_enable("mstp030"); /* IC */ | 195 | clk_always_enable("xymem0"); /* XYMEM */ |
196 | clk_always_enable("mstp029"); /* OC */ | 196 | clk_always_enable("rtc0"); /* RTC */ |
197 | clk_always_enable("mstp028"); /* URAM */ | 197 | clk_always_enable("veu0"); /* VEU */ |
198 | clk_always_enable("mstp026"); /* XYMEM */ | 198 | clk_always_enable("vpu0"); /* VPU */ |
199 | clk_always_enable("mstp022"); /* INTC */ | ||
200 | clk_always_enable("mstp020"); /* SuperHyway */ | ||
201 | clk_always_enable("mstp202"); /* VEU */ | ||
202 | clk_always_enable("mstp201"); /* VPU */ | ||
203 | 199 | ||
204 | platform_resource_setup_memory(&vpu_device, "vpu", 1 << 20); | 200 | platform_resource_setup_memory(&vpu_device, "vpu", 1 << 20); |
205 | platform_resource_setup_memory(&veu_device, "veu", 2 << 20); | 201 | platform_resource_setup_memory(&veu_device, "veu", 2 << 20); |
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c index e9c9d7ead2b3..849770d780ae 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7723.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7723.c | |||
@@ -232,17 +232,11 @@ static struct platform_device *sh7723_devices[] __initdata = { | |||
232 | 232 | ||
233 | static int __init sh7723_devices_setup(void) | 233 | static int __init sh7723_devices_setup(void) |
234 | { | 234 | { |
235 | clk_always_enable("mstp031"); /* TLB */ | 235 | clk_always_enable("meram0"); /* MERAM */ |
236 | clk_always_enable("mstp030"); /* IC */ | 236 | clk_always_enable("rtc0"); /* RTC */ |
237 | clk_always_enable("mstp029"); /* OC */ | 237 | clk_always_enable("veu1"); /* VEU2H1 */ |
238 | clk_always_enable("mstp024"); /* FPU */ | 238 | clk_always_enable("veu0"); /* VEU2H0 */ |
239 | clk_always_enable("mstp022"); /* INTC */ | 239 | clk_always_enable("vpu0"); /* VPU */ |
240 | clk_always_enable("mstp020"); /* SuperHyway */ | ||
241 | clk_always_enable("mstp000"); /* MERAM */ | ||
242 | clk_always_enable("mstp108"); /* RTC */ | ||
243 | clk_always_enable("mstp206"); /* VEU2H1 */ | ||
244 | clk_always_enable("mstp202"); /* VEU2H0 */ | ||
245 | clk_always_enable("mstp201"); /* VPU */ | ||
246 | 240 | ||
247 | platform_resource_setup_memory(&vpu_device, "vpu", 2 << 20); | 241 | platform_resource_setup_memory(&vpu_device, "vpu", 2 << 20); |
248 | platform_resource_setup_memory(&veu0_device, "veu0", 2 << 20); | 242 | platform_resource_setup_memory(&veu0_device, "veu0", 2 << 20); |