aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/alchemy/devboards
diff options
context:
space:
mode:
authorManuel Lauss <manuel.lauss@googlemail.com>2011-08-12 05:39:40 -0400
committerRalf Baechle <ralf@linux-mips.org>2011-10-24 18:34:24 -0400
commit7cc2e272da3d88c0de9e05b32729402785bd9206 (patch)
tree47abef81764180bad7399eba690a0407260cf3b0 /arch/mips/alchemy/devboards
parentb9581b84884eac4146720817a6eb0672074284fb (diff)
MIPS: Alchemy: more base address cleanup
remove all redundant peripheral base address defines, fix all affected boards and drivers. Signed-off-by: Manuel Lauss <manuel.lauss@googlemail.com> To: Linux-MIPS <linux-mips@linux-mips.org> Patchwork: https://patchwork.linux-mips.org/patch/2700/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/alchemy/devboards')
-rw-r--r--arch/mips/alchemy/devboards/db1200/platform.c52
-rw-r--r--arch/mips/alchemy/devboards/db1x00/platform.c40
-rw-r--r--arch/mips/alchemy/devboards/pb1100/platform.c20
-rw-r--r--arch/mips/alchemy/devboards/pb1200/platform.c42
-rw-r--r--arch/mips/alchemy/devboards/pb1500/platform.c22
-rw-r--r--arch/mips/alchemy/devboards/pb1550/platform.c40
6 files changed, 97 insertions, 119 deletions
diff --git a/arch/mips/alchemy/devboards/db1200/platform.c b/arch/mips/alchemy/devboards/db1200/platform.c
index fbb55935b99..95c7327affc 100644
--- a/arch/mips/alchemy/devboards/db1200/platform.c
+++ b/arch/mips/alchemy/devboards/db1200/platform.c
@@ -343,8 +343,8 @@ struct au1xmmc_platform_data au1xmmc_platdata[] = {
343 343
344static struct resource au1200_psc0_res[] = { 344static struct resource au1200_psc0_res[] = {
345 [0] = { 345 [0] = {
346 .start = PSC0_PHYS_ADDR, 346 .start = AU1550_PSC0_PHYS_ADDR,
347 .end = PSC0_PHYS_ADDR + 0x000fffff, 347 .end = AU1550_PSC0_PHYS_ADDR + 0xfff,
348 .flags = IORESOURCE_MEM, 348 .flags = IORESOURCE_MEM,
349 }, 349 },
350 [1] = { 350 [1] = {
@@ -401,8 +401,8 @@ static struct platform_device db1200_spi_dev = {
401 401
402static struct resource au1200_psc1_res[] = { 402static struct resource au1200_psc1_res[] = {
403 [0] = { 403 [0] = {
404 .start = PSC1_PHYS_ADDR, 404 .start = AU1550_PSC1_PHYS_ADDR,
405 .end = PSC1_PHYS_ADDR + 0x000fffff, 405 .end = AU1550_PSC1_PHYS_ADDR + 0xfff,
406 .flags = IORESOURCE_MEM, 406 .flags = IORESOURCE_MEM,
407 }, 407 },
408 [1] = { 408 [1] = {
@@ -510,32 +510,28 @@ static int __init db1200_dev_init(void)
510 510
511 /* Audio PSC clock is supplied externally. (FIXME: platdata!!) */ 511 /* Audio PSC clock is supplied externally. (FIXME: platdata!!) */
512 __raw_writel(PSC_SEL_CLK_SERCLK, 512 __raw_writel(PSC_SEL_CLK_SERCLK,
513 (void __iomem *)KSEG1ADDR(PSC1_PHYS_ADDR) + PSC_SEL_OFFSET); 513 (void __iomem *)KSEG1ADDR(AU1550_PSC1_PHYS_ADDR) + PSC_SEL_OFFSET);
514 wmb(); 514 wmb();
515 515
516 db1x_register_pcmcia_socket(PCMCIA_ATTR_PHYS_ADDR, 516 db1x_register_pcmcia_socket(
517 PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1, 517 AU1000_PCMCIA_ATTR_PHYS_ADDR,
518 PCMCIA_MEM_PHYS_ADDR, 518 AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,
519 PCMCIA_MEM_PHYS_ADDR + 0x000400000 - 1, 519 AU1000_PCMCIA_MEM_PHYS_ADDR,
520 PCMCIA_IO_PHYS_ADDR, 520 AU1000_PCMCIA_MEM_PHYS_ADDR + 0x000400000 - 1,
521 PCMCIA_IO_PHYS_ADDR + 0x000010000 - 1, 521 AU1000_PCMCIA_IO_PHYS_ADDR,
522 DB1200_PC0_INT, 522 AU1000_PCMCIA_IO_PHYS_ADDR + 0x000010000 - 1,
523 DB1200_PC0_INSERT_INT, 523 DB1200_PC0_INT, DB1200_PC0_INSERT_INT,
524 /*DB1200_PC0_STSCHG_INT*/0, 524 /*DB1200_PC0_STSCHG_INT*/0, DB1200_PC0_EJECT_INT, 0);
525 DB1200_PC0_EJECT_INT, 525
526 0); 526 db1x_register_pcmcia_socket(
527 527 AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004000000,
528 db1x_register_pcmcia_socket(PCMCIA_ATTR_PHYS_ADDR + 0x004000000, 528 AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1,
529 PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1, 529 AU1000_PCMCIA_MEM_PHYS_ADDR + 0x004000000,
530 PCMCIA_MEM_PHYS_ADDR + 0x004000000, 530 AU1000_PCMCIA_MEM_PHYS_ADDR + 0x004400000 - 1,
531 PCMCIA_MEM_PHYS_ADDR + 0x004400000 - 1, 531 AU1000_PCMCIA_IO_PHYS_ADDR + 0x004000000,
532 PCMCIA_IO_PHYS_ADDR + 0x004000000, 532 AU1000_PCMCIA_IO_PHYS_ADDR + 0x004010000 - 1,
533 PCMCIA_IO_PHYS_ADDR + 0x004010000 - 1, 533 DB1200_PC1_INT, DB1200_PC1_INSERT_INT,
534 DB1200_PC1_INT, 534 /*DB1200_PC1_STSCHG_INT*/0, DB1200_PC1_EJECT_INT, 1);
535 DB1200_PC1_INSERT_INT,
536 /*DB1200_PC1_STSCHG_INT*/0,
537 DB1200_PC1_EJECT_INT,
538 1);
539 535
540 swapped = bcsr_read(BCSR_STATUS) & BCSR_STATUS_DB1200_SWAPBOOT; 536 swapped = bcsr_read(BCSR_STATUS) & BCSR_STATUS_DB1200_SWAPBOOT;
541 db1x_register_norflash(64 << 20, 2, swapped); 537 db1x_register_norflash(64 << 20, 2, swapped);
diff --git a/arch/mips/alchemy/devboards/db1x00/platform.c b/arch/mips/alchemy/devboards/db1x00/platform.c
index 978d5ab3d67..ef8017f23cd 100644
--- a/arch/mips/alchemy/devboards/db1x00/platform.c
+++ b/arch/mips/alchemy/devboards/db1x00/platform.c
@@ -88,29 +88,25 @@
88static int __init db1xxx_dev_init(void) 88static int __init db1xxx_dev_init(void)
89{ 89{
90#ifdef DB1XXX_HAS_PCMCIA 90#ifdef DB1XXX_HAS_PCMCIA
91 db1x_register_pcmcia_socket(PCMCIA_ATTR_PHYS_ADDR, 91 db1x_register_pcmcia_socket(
92 PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1, 92 AU1000_PCMCIA_ATTR_PHYS_ADDR,
93 PCMCIA_MEM_PHYS_ADDR, 93 AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,
94 PCMCIA_MEM_PHYS_ADDR + 0x000400000 - 1, 94 AU1000_PCMCIA_MEM_PHYS_ADDR,
95 PCMCIA_IO_PHYS_ADDR, 95 AU1000_PCMCIA_MEM_PHYS_ADDR + 0x000400000 - 1,
96 PCMCIA_IO_PHYS_ADDR + 0x000010000 - 1, 96 AU1000_PCMCIA_IO_PHYS_ADDR,
97 DB1XXX_PCMCIA_CARD0, 97 AU1000_PCMCIA_IO_PHYS_ADDR + 0x000010000 - 1,
98 DB1XXX_PCMCIA_CD0, 98 DB1XXX_PCMCIA_CARD0, DB1XXX_PCMCIA_CD0,
99 /*DB1XXX_PCMCIA_STSCHG0*/0, 99 /*DB1XXX_PCMCIA_STSCHG0*/0, 0, 0);
100 0,
101 0);
102 100
103 db1x_register_pcmcia_socket(PCMCIA_ATTR_PHYS_ADDR + 0x004000000, 101 db1x_register_pcmcia_socket(
104 PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1, 102 AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004000000,
105 PCMCIA_MEM_PHYS_ADDR + 0x004000000, 103 AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x004400000 - 1,
106 PCMCIA_MEM_PHYS_ADDR + 0x004400000 - 1, 104 AU1000_PCMCIA_MEM_PHYS_ADDR + 0x004000000,
107 PCMCIA_IO_PHYS_ADDR + 0x004000000, 105 AU1000_PCMCIA_MEM_PHYS_ADDR + 0x004400000 - 1,
108 PCMCIA_IO_PHYS_ADDR + 0x004010000 - 1, 106 AU1000_PCMCIA_IO_PHYS_ADDR + 0x004000000,
109 DB1XXX_PCMCIA_CARD1, 107 AU1000_PCMCIA_IO_PHYS_ADDR + 0x004010000 - 1,
110 DB1XXX_PCMCIA_CD1, 108 DB1XXX_PCMCIA_CARD1, DB1XXX_PCMCIA_CD1,
111 /*DB1XXX_PCMCIA_STSCHG1*/0, 109 /*DB1XXX_PCMCIA_STSCHG1*/0, 0, 1);
112 0,
113 1);
114#endif 110#endif
115 db1x_register_norflash(BOARD_FLASH_SIZE, BOARD_FLASH_WIDTH, F_SWAPPED); 111 db1x_register_norflash(BOARD_FLASH_SIZE, BOARD_FLASH_WIDTH, F_SWAPPED);
116 return 0; 112 return 0;
diff --git a/arch/mips/alchemy/devboards/pb1100/platform.c b/arch/mips/alchemy/devboards/pb1100/platform.c
index 2c8dc29759f..8a4e733f0f9 100644
--- a/arch/mips/alchemy/devboards/pb1100/platform.c
+++ b/arch/mips/alchemy/devboards/pb1100/platform.c
@@ -30,17 +30,15 @@ static int __init pb1100_dev_init(void)
30 int swapped; 30 int swapped;
31 31
32 /* PCMCIA. single socket, identical to Pb1500 */ 32 /* PCMCIA. single socket, identical to Pb1500 */
33 db1x_register_pcmcia_socket(PCMCIA_ATTR_PHYS_ADDR, 33 db1x_register_pcmcia_socket(
34 PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1, 34 AU1000_PCMCIA_ATTR_PHYS_ADDR,
35 PCMCIA_MEM_PHYS_ADDR, 35 AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,
36 PCMCIA_MEM_PHYS_ADDR + 0x000400000 - 1, 36 AU1000_PCMCIA_MEM_PHYS_ADDR,
37 PCMCIA_IO_PHYS_ADDR, 37 AU1000_PCMCIA_MEM_PHYS_ADDR + 0x000400000 - 1,
38 PCMCIA_IO_PHYS_ADDR + 0x000010000 - 1, 38 AU1000_PCMCIA_IO_PHYS_ADDR,
39 AU1100_GPIO11_INT, /* card */ 39 AU1000_PCMCIA_IO_PHYS_ADDR + 0x000010000 - 1,
40 AU1100_GPIO9_INT, /* insert */ 40 AU1100_GPIO11_INT, AU1100_GPIO9_INT, /* card / insert */
41 /*AU1100_GPIO10_INT*/0, /* stschg */ 41 /*AU1100_GPIO10_INT*/0, 0, 0); /* stschg / eject / id */
42 0, /* eject */
43 0); /* id */
44 42
45 swapped = bcsr_read(BCSR_STATUS) & BCSR_STATUS_DB1000_SWAPBOOT; 43 swapped = bcsr_read(BCSR_STATUS) & BCSR_STATUS_DB1000_SWAPBOOT;
46 db1x_register_norflash(64 * 1024 * 1024, 4, swapped); 44 db1x_register_norflash(64 * 1024 * 1024, 4, swapped);
diff --git a/arch/mips/alchemy/devboards/pb1200/platform.c b/arch/mips/alchemy/devboards/pb1200/platform.c
index 3ef2dceeb79..c52809d1115 100644
--- a/arch/mips/alchemy/devboards/pb1200/platform.c
+++ b/arch/mips/alchemy/devboards/pb1200/platform.c
@@ -170,29 +170,25 @@ static int __init board_register_devices(void)
170{ 170{
171 int swapped; 171 int swapped;
172 172
173 db1x_register_pcmcia_socket(PCMCIA_ATTR_PHYS_ADDR, 173 db1x_register_pcmcia_socket(
174 PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1, 174 AU1000_PCMCIA_ATTR_PHYS_ADDR,
175 PCMCIA_MEM_PHYS_ADDR, 175 AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,
176 PCMCIA_MEM_PHYS_ADDR + 0x000400000 - 1, 176 AU1000_PCMCIA_MEM_PHYS_ADDR,
177 PCMCIA_IO_PHYS_ADDR, 177 AU1000_PCMCIA_MEM_PHYS_ADDR + 0x000400000 - 1,
178 PCMCIA_IO_PHYS_ADDR + 0x000010000 - 1, 178 AU1000_PCMCIA_IO_PHYS_ADDR,
179 PB1200_PC0_INT, 179 AU1000_PCMCIA_IO_PHYS_ADDR + 0x000010000 - 1,
180 PB1200_PC0_INSERT_INT, 180 PB1200_PC0_INT, PB1200_PC0_INSERT_INT,
181 /*PB1200_PC0_STSCHG_INT*/0, 181 /*PB1200_PC0_STSCHG_INT*/0, PB1200_PC0_EJECT_INT, 0);
182 PB1200_PC0_EJECT_INT, 182
183 0); 183 db1x_register_pcmcia_socket(
184 184 AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x008000000,
185 db1x_register_pcmcia_socket(PCMCIA_ATTR_PHYS_ADDR + 0x008000000, 185 AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x008400000 - 1,
186 PCMCIA_ATTR_PHYS_ADDR + 0x008400000 - 1, 186 AU1000_PCMCIA_MEM_PHYS_ADDR + 0x008000000,
187 PCMCIA_MEM_PHYS_ADDR + 0x008000000, 187 AU1000_PCMCIA_MEM_PHYS_ADDR + 0x008400000 - 1,
188 PCMCIA_MEM_PHYS_ADDR + 0x008400000 - 1, 188 AU1000_PCMCIA_IO_PHYS_ADDR + 0x008000000,
189 PCMCIA_IO_PHYS_ADDR + 0x008000000, 189 AU1000_PCMCIA_IO_PHYS_ADDR + 0x008010000 - 1,
190 PCMCIA_IO_PHYS_ADDR + 0x008010000 - 1, 190 PB1200_PC1_INT, PB1200_PC1_INSERT_INT,
191 PB1200_PC1_INT, 191 /*PB1200_PC1_STSCHG_INT*/0, PB1200_PC1_EJECT_INT, 1);
192 PB1200_PC1_INSERT_INT,
193 /*PB1200_PC1_STSCHG_INT*/0,
194 PB1200_PC1_EJECT_INT,
195 1);
196 192
197 swapped = bcsr_read(BCSR_STATUS) & BCSR_STATUS_DB1200_SWAPBOOT; 193 swapped = bcsr_read(BCSR_STATUS) & BCSR_STATUS_DB1200_SWAPBOOT;
198 db1x_register_norflash(128 * 1024 * 1024, 2, swapped); 194 db1x_register_norflash(128 * 1024 * 1024, 2, swapped);
diff --git a/arch/mips/alchemy/devboards/pb1500/platform.c b/arch/mips/alchemy/devboards/pb1500/platform.c
index d443bc7aa76..42b0e6b8cd5 100644
--- a/arch/mips/alchemy/devboards/pb1500/platform.c
+++ b/arch/mips/alchemy/devboards/pb1500/platform.c
@@ -28,18 +28,16 @@ static int __init pb1500_dev_init(void)
28{ 28{
29 int swapped; 29 int swapped;
30 30
31 /* PCMCIA. single socket, identical to Pb1500 */ 31 /* PCMCIA. single socket, identical to Pb1100 */
32 db1x_register_pcmcia_socket(PCMCIA_ATTR_PHYS_ADDR, 32 db1x_register_pcmcia_socket(
33 PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1, 33 AU1000_PCMCIA_ATTR_PHYS_ADDR,
34 PCMCIA_MEM_PHYS_ADDR, 34 AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,
35 PCMCIA_MEM_PHYS_ADDR + 0x000400000 - 1, 35 AU1000_PCMCIA_MEM_PHYS_ADDR,
36 PCMCIA_IO_PHYS_ADDR, 36 AU1000_PCMCIA_MEM_PHYS_ADDR + 0x000400000 - 1,
37 PCMCIA_IO_PHYS_ADDR + 0x000010000 - 1, 37 AU1000_PCMCIA_IO_PHYS_ADDR,
38 AU1500_GPIO11_INT, /* card */ 38 AU1000_PCMCIA_IO_PHYS_ADDR + 0x000010000 - 1,
39 AU1500_GPIO9_INT, /* insert */ 39 AU1500_GPIO11_INT, AU1500_GPIO9_INT, /* card / insert */
40 /*AU1500_GPIO10_INT*/0, /* stschg */ 40 /*AU1500_GPIO10_INT*/0, 0, 0); /* stschg / eject / id */
41 0, /* eject */
42 0); /* id */
43 41
44 swapped = bcsr_read(BCSR_STATUS) & BCSR_STATUS_DB1000_SWAPBOOT; 42 swapped = bcsr_read(BCSR_STATUS) & BCSR_STATUS_DB1000_SWAPBOOT;
45 db1x_register_norflash(64 * 1024 * 1024, 4, swapped); 43 db1x_register_norflash(64 * 1024 * 1024, 4, swapped);
diff --git a/arch/mips/alchemy/devboards/pb1550/platform.c b/arch/mips/alchemy/devboards/pb1550/platform.c
index d7150d0f49c..87c79b7f312 100644
--- a/arch/mips/alchemy/devboards/pb1550/platform.c
+++ b/arch/mips/alchemy/devboards/pb1550/platform.c
@@ -37,29 +37,23 @@ static int __init pb1550_dev_init(void)
37 * drivers are used to shared irqs and b) statuschange isn't really use- 37 * drivers are used to shared irqs and b) statuschange isn't really use-
38 * ful anyway. 38 * ful anyway.
39 */ 39 */
40 db1x_register_pcmcia_socket(PCMCIA_ATTR_PHYS_ADDR, 40 db1x_register_pcmcia_socket(
41 PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1, 41 AU1000_PCMCIA_ATTR_PHYS_ADDR,
42 PCMCIA_MEM_PHYS_ADDR, 42 AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x000400000 - 1,
43 PCMCIA_MEM_PHYS_ADDR + 0x000400000 - 1, 43 AU1000_PCMCIA_MEM_PHYS_ADDR,
44 PCMCIA_IO_PHYS_ADDR, 44 AU1000_PCMCIA_MEM_PHYS_ADDR + 0x000400000 - 1,
45 PCMCIA_IO_PHYS_ADDR + 0x000010000 - 1, 45 AU1000_PCMCIA_IO_PHYS_ADDR,
46 AU1550_GPIO201_205_INT, 46 AU1000_PCMCIA_IO_PHYS_ADDR + 0x000010000 - 1,
47 AU1550_GPIO0_INT, 47 AU1550_GPIO201_205_INT, AU1550_GPIO0_INT, 0, 0, 0);
48 0, 48
49 0, 49 db1x_register_pcmcia_socket(
50 0); 50 AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x008000000,
51 51 AU1000_PCMCIA_ATTR_PHYS_ADDR + 0x008400000 - 1,
52 db1x_register_pcmcia_socket(PCMCIA_ATTR_PHYS_ADDR + 0x008000000, 52 AU1000_PCMCIA_MEM_PHYS_ADDR + 0x008000000,
53 PCMCIA_ATTR_PHYS_ADDR + 0x008400000 - 1, 53 AU1000_PCMCIA_MEM_PHYS_ADDR + 0x008400000 - 1,
54 PCMCIA_MEM_PHYS_ADDR + 0x008000000, 54 AU1000_PCMCIA_IO_PHYS_ADDR + 0x008000000,
55 PCMCIA_MEM_PHYS_ADDR + 0x008400000 - 1, 55 AU1000_PCMCIA_IO_PHYS_ADDR + 0x008010000 - 1,
56 PCMCIA_IO_PHYS_ADDR + 0x008000000, 56 AU1550_GPIO201_205_INT, AU1550_GPIO1_INT, 0, 0, 1);
57 PCMCIA_IO_PHYS_ADDR + 0x008010000 - 1,
58 AU1550_GPIO201_205_INT,
59 AU1550_GPIO1_INT,
60 0,
61 0,
62 1);
63 57
64 swapped = bcsr_read(BCSR_STATUS) & BCSR_STATUS_PB1550_SWAPBOOT; 58 swapped = bcsr_read(BCSR_STATUS) & BCSR_STATUS_PB1550_SWAPBOOT;
65 db1x_register_norflash(128 * 1024 * 1024, 4, swapped); 59 db1x_register_norflash(128 * 1024 * 1024, 4, swapped);
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-19 15:41:00 -0400