diff options
Diffstat (limited to 'arch/mips/lantiq/xway')
-rw-r--r-- | arch/mips/lantiq/xway/dma.c | 6 | ||||
-rw-r--r-- | arch/mips/lantiq/xway/ebu.c | 6 | ||||
-rw-r--r-- | arch/mips/lantiq/xway/pmu.c | 8 | ||||
-rw-r--r-- | arch/mips/lantiq/xway/reset.c | 6 |
4 files changed, 13 insertions, 13 deletions
diff --git a/arch/mips/lantiq/xway/dma.c b/arch/mips/lantiq/xway/dma.c index cbb6ae5747b..b210e936c7c 100644 --- a/arch/mips/lantiq/xway/dma.c +++ b/arch/mips/lantiq/xway/dma.c | |||
@@ -222,17 +222,17 @@ ltq_dma_init(void) | |||
222 | 222 | ||
223 | /* insert and request the memory region */ | 223 | /* insert and request the memory region */ |
224 | if (insert_resource(&iomem_resource, <q_dma_resource) < 0) | 224 | if (insert_resource(&iomem_resource, <q_dma_resource) < 0) |
225 | panic("Failed to insert dma memory\n"); | 225 | panic("Failed to insert dma memory"); |
226 | 226 | ||
227 | if (request_mem_region(ltq_dma_resource.start, | 227 | if (request_mem_region(ltq_dma_resource.start, |
228 | resource_size(<q_dma_resource), "dma") < 0) | 228 | resource_size(<q_dma_resource), "dma") < 0) |
229 | panic("Failed to request dma memory\n"); | 229 | panic("Failed to request dma memory"); |
230 | 230 | ||
231 | /* remap dma register range */ | 231 | /* remap dma register range */ |
232 | ltq_dma_membase = ioremap_nocache(ltq_dma_resource.start, | 232 | ltq_dma_membase = ioremap_nocache(ltq_dma_resource.start, |
233 | resource_size(<q_dma_resource)); | 233 | resource_size(<q_dma_resource)); |
234 | if (!ltq_dma_membase) | 234 | if (!ltq_dma_membase) |
235 | panic("Failed to remap dma memory\n"); | 235 | panic("Failed to remap dma memory"); |
236 | 236 | ||
237 | /* power up and reset the dma engine */ | 237 | /* power up and reset the dma engine */ |
238 | ltq_pmu_enable(PMU_DMA); | 238 | ltq_pmu_enable(PMU_DMA); |
diff --git a/arch/mips/lantiq/xway/ebu.c b/arch/mips/lantiq/xway/ebu.c index 033b3184c7a..862e3e83068 100644 --- a/arch/mips/lantiq/xway/ebu.c +++ b/arch/mips/lantiq/xway/ebu.c | |||
@@ -32,17 +32,17 @@ static int __init lantiq_ebu_init(void) | |||
32 | { | 32 | { |
33 | /* insert and request the memory region */ | 33 | /* insert and request the memory region */ |
34 | if (insert_resource(&iomem_resource, <q_ebu_resource) < 0) | 34 | if (insert_resource(&iomem_resource, <q_ebu_resource) < 0) |
35 | panic("Failed to insert ebu memory\n"); | 35 | panic("Failed to insert ebu memory"); |
36 | 36 | ||
37 | if (request_mem_region(ltq_ebu_resource.start, | 37 | if (request_mem_region(ltq_ebu_resource.start, |
38 | resource_size(<q_ebu_resource), "ebu") < 0) | 38 | resource_size(<q_ebu_resource), "ebu") < 0) |
39 | panic("Failed to request ebu memory\n"); | 39 | panic("Failed to request ebu memory"); |
40 | 40 | ||
41 | /* remap ebu register range */ | 41 | /* remap ebu register range */ |
42 | ltq_ebu_membase = ioremap_nocache(ltq_ebu_resource.start, | 42 | ltq_ebu_membase = ioremap_nocache(ltq_ebu_resource.start, |
43 | resource_size(<q_ebu_resource)); | 43 | resource_size(<q_ebu_resource)); |
44 | if (!ltq_ebu_membase) | 44 | if (!ltq_ebu_membase) |
45 | panic("Failed to remap ebu memory\n"); | 45 | panic("Failed to remap ebu memory"); |
46 | 46 | ||
47 | /* make sure to unprotect the memory region where flash is located */ | 47 | /* make sure to unprotect the memory region where flash is located */ |
48 | ltq_ebu_w32(ltq_ebu_r32(LTQ_EBU_BUSCON0) & ~EBU_WRDIS, LTQ_EBU_BUSCON0); | 48 | ltq_ebu_w32(ltq_ebu_r32(LTQ_EBU_BUSCON0) & ~EBU_WRDIS, LTQ_EBU_BUSCON0); |
diff --git a/arch/mips/lantiq/xway/pmu.c b/arch/mips/lantiq/xway/pmu.c index 39f0d2641cb..fe85361e032 100644 --- a/arch/mips/lantiq/xway/pmu.c +++ b/arch/mips/lantiq/xway/pmu.c | |||
@@ -40,7 +40,7 @@ void ltq_pmu_enable(unsigned int module) | |||
40 | do {} while (--err && (ltq_pmu_r32(LTQ_PMU_PWDSR) & module)); | 40 | do {} while (--err && (ltq_pmu_r32(LTQ_PMU_PWDSR) & module)); |
41 | 41 | ||
42 | if (!err) | 42 | if (!err) |
43 | panic("activating PMU module failed!\n"); | 43 | panic("activating PMU module failed!"); |
44 | } | 44 | } |
45 | EXPORT_SYMBOL(ltq_pmu_enable); | 45 | EXPORT_SYMBOL(ltq_pmu_enable); |
46 | 46 | ||
@@ -53,16 +53,16 @@ EXPORT_SYMBOL(ltq_pmu_disable); | |||
53 | int __init ltq_pmu_init(void) | 53 | int __init ltq_pmu_init(void) |
54 | { | 54 | { |
55 | if (insert_resource(&iomem_resource, <q_pmu_resource) < 0) | 55 | if (insert_resource(&iomem_resource, <q_pmu_resource) < 0) |
56 | panic("Failed to insert pmu memory\n"); | 56 | panic("Failed to insert pmu memory"); |
57 | 57 | ||
58 | if (request_mem_region(ltq_pmu_resource.start, | 58 | if (request_mem_region(ltq_pmu_resource.start, |
59 | resource_size(<q_pmu_resource), "pmu") < 0) | 59 | resource_size(<q_pmu_resource), "pmu") < 0) |
60 | panic("Failed to request pmu memory\n"); | 60 | panic("Failed to request pmu memory"); |
61 | 61 | ||
62 | ltq_pmu_membase = ioremap_nocache(ltq_pmu_resource.start, | 62 | ltq_pmu_membase = ioremap_nocache(ltq_pmu_resource.start, |
63 | resource_size(<q_pmu_resource)); | 63 | resource_size(<q_pmu_resource)); |
64 | if (!ltq_pmu_membase) | 64 | if (!ltq_pmu_membase) |
65 | panic("Failed to remap pmu memory\n"); | 65 | panic("Failed to remap pmu memory"); |
66 | return 0; | 66 | return 0; |
67 | } | 67 | } |
68 | 68 | ||
diff --git a/arch/mips/lantiq/xway/reset.c b/arch/mips/lantiq/xway/reset.c index 3d41f0bb5bf..8b66bd87f0c 100644 --- a/arch/mips/lantiq/xway/reset.c +++ b/arch/mips/lantiq/xway/reset.c | |||
@@ -69,17 +69,17 @@ static int __init mips_reboot_setup(void) | |||
69 | { | 69 | { |
70 | /* insert and request the memory region */ | 70 | /* insert and request the memory region */ |
71 | if (insert_resource(&iomem_resource, <q_rcu_resource) < 0) | 71 | if (insert_resource(&iomem_resource, <q_rcu_resource) < 0) |
72 | panic("Failed to insert rcu memory\n"); | 72 | panic("Failed to insert rcu memory"); |
73 | 73 | ||
74 | if (request_mem_region(ltq_rcu_resource.start, | 74 | if (request_mem_region(ltq_rcu_resource.start, |
75 | resource_size(<q_rcu_resource), "rcu") < 0) | 75 | resource_size(<q_rcu_resource), "rcu") < 0) |
76 | panic("Failed to request rcu memory\n"); | 76 | panic("Failed to request rcu memory"); |
77 | 77 | ||
78 | /* remap rcu register range */ | 78 | /* remap rcu register range */ |
79 | ltq_rcu_membase = ioremap_nocache(ltq_rcu_resource.start, | 79 | ltq_rcu_membase = ioremap_nocache(ltq_rcu_resource.start, |
80 | resource_size(<q_rcu_resource)); | 80 | resource_size(<q_rcu_resource)); |
81 | if (!ltq_rcu_membase) | 81 | if (!ltq_rcu_membase) |
82 | panic("Failed to remap rcu memory\n"); | 82 | panic("Failed to remap rcu memory"); |
83 | 83 | ||
84 | _machine_restart = ltq_machine_restart; | 84 | _machine_restart = ltq_machine_restart; |
85 | _machine_halt = ltq_machine_halt; | 85 | _machine_halt = ltq_machine_halt; |