aboutsummaryrefslogtreecommitdiffstats
path: root/arch/mips/pnx833x
diff options
context:
space:
mode:
Diffstat (limited to 'arch/mips/pnx833x')
-rw-r--r--arch/mips/pnx833x/Platform2
-rw-r--r--arch/mips/pnx833x/common/interrupts.c110
-rw-r--r--arch/mips/pnx833x/common/platform.c34
-rw-r--r--arch/mips/pnx833x/common/prom.c2
-rw-r--r--arch/mips/pnx833x/common/reset.c2
-rw-r--r--arch/mips/pnx833x/common/setup.c2
-rw-r--r--arch/mips/pnx833x/stb22x/board.c2
7 files changed, 77 insertions, 77 deletions
diff --git a/arch/mips/pnx833x/Platform b/arch/mips/pnx833x/Platform
index 7e6ec4dbc8dd..794526caab12 100644
--- a/arch/mips/pnx833x/Platform
+++ b/arch/mips/pnx833x/Platform
@@ -1,5 +1,5 @@
1# NXP STB225 1# NXP STB225
2platform-$(CONFIG_SOC_PNX833X) += pnx833x/ 2platform-$(CONFIG_SOC_PNX833X) += pnx833x/
3cflags-$(CONFIG_SOC_PNX833X) += -Iarch/mips/include/asm/mach-pnx833x 3cflags-$(CONFIG_SOC_PNX833X) += -Iarch/mips/include/asm/mach-pnx833x
4load-$(CONFIG_NXP_STB220) += 0xffffffff80001000 4load-$(CONFIG_NXP_STB220) += 0xffffffff80001000
5load-$(CONFIG_NXP_STB225) += 0xffffffff80001000 5load-$(CONFIG_NXP_STB225) += 0xffffffff80001000
diff --git a/arch/mips/pnx833x/common/interrupts.c b/arch/mips/pnx833x/common/interrupts.c
index a86d5d5fceb0..a4a90596c0ad 100644
--- a/arch/mips/pnx833x/common/interrupts.c
+++ b/arch/mips/pnx833x/common/interrupts.c
@@ -35,64 +35,64 @@ static int mips_cpu_timer_irq;
35static const unsigned int irq_prio[PNX833X_PIC_NUM_IRQ] = 35static const unsigned int irq_prio[PNX833X_PIC_NUM_IRQ] =
36{ 36{
37 0, /* unused */ 37 0, /* unused */
38 4, /* PNX833X_PIC_I2C0_INT 1 */ 38 4, /* PNX833X_PIC_I2C0_INT 1 */
39 4, /* PNX833X_PIC_I2C1_INT 2 */ 39 4, /* PNX833X_PIC_I2C1_INT 2 */
40 1, /* PNX833X_PIC_UART0_INT 3 */ 40 1, /* PNX833X_PIC_UART0_INT 3 */
41 1, /* PNX833X_PIC_UART1_INT 4 */ 41 1, /* PNX833X_PIC_UART1_INT 4 */
42 6, /* PNX833X_PIC_TS_IN0_DV_INT 5 */ 42 6, /* PNX833X_PIC_TS_IN0_DV_INT 5 */
43 6, /* PNX833X_PIC_TS_IN0_DMA_INT 6 */ 43 6, /* PNX833X_PIC_TS_IN0_DMA_INT 6 */
44 7, /* PNX833X_PIC_GPIO_INT 7 */ 44 7, /* PNX833X_PIC_GPIO_INT 7 */
45 4, /* PNX833X_PIC_AUDIO_DEC_INT 8 */ 45 4, /* PNX833X_PIC_AUDIO_DEC_INT 8 */
46 5, /* PNX833X_PIC_VIDEO_DEC_INT 9 */ 46 5, /* PNX833X_PIC_VIDEO_DEC_INT 9 */
47 4, /* PNX833X_PIC_CONFIG_INT 10 */ 47 4, /* PNX833X_PIC_CONFIG_INT 10 */
48 4, /* PNX833X_PIC_AOI_INT 11 */ 48 4, /* PNX833X_PIC_AOI_INT 11 */
49 9, /* PNX833X_PIC_SYNC_INT 12 */ 49 9, /* PNX833X_PIC_SYNC_INT 12 */
50 9, /* PNX8335_PIC_SATA_INT 13 */ 50 9, /* PNX8335_PIC_SATA_INT 13 */
51 4, /* PNX833X_PIC_OSD_INT 14 */ 51 4, /* PNX833X_PIC_OSD_INT 14 */
52 9, /* PNX833X_PIC_DISP1_INT 15 */ 52 9, /* PNX833X_PIC_DISP1_INT 15 */
53 4, /* PNX833X_PIC_DEINTERLACER_INT 16 */ 53 4, /* PNX833X_PIC_DEINTERLACER_INT 16 */
54 9, /* PNX833X_PIC_DISPLAY2_INT 17 */ 54 9, /* PNX833X_PIC_DISPLAY2_INT 17 */
55 4, /* PNX833X_PIC_VC_INT 18 */ 55 4, /* PNX833X_PIC_VC_INT 18 */
56 4, /* PNX833X_PIC_SC_INT 19 */ 56 4, /* PNX833X_PIC_SC_INT 19 */
57 9, /* PNX833X_PIC_IDE_INT 20 */ 57 9, /* PNX833X_PIC_IDE_INT 20 */
58 9, /* PNX833X_PIC_IDE_DMA_INT 21 */ 58 9, /* PNX833X_PIC_IDE_DMA_INT 21 */
59 6, /* PNX833X_PIC_TS_IN1_DV_INT 22 */ 59 6, /* PNX833X_PIC_TS_IN1_DV_INT 22 */
60 6, /* PNX833X_PIC_TS_IN1_DMA_INT 23 */ 60 6, /* PNX833X_PIC_TS_IN1_DMA_INT 23 */
61 4, /* PNX833X_PIC_SGDX_DMA_INT 24 */ 61 4, /* PNX833X_PIC_SGDX_DMA_INT 24 */
62 4, /* PNX833X_PIC_TS_OUT_INT 25 */ 62 4, /* PNX833X_PIC_TS_OUT_INT 25 */
63 4, /* PNX833X_PIC_IR_INT 26 */ 63 4, /* PNX833X_PIC_IR_INT 26 */
64 3, /* PNX833X_PIC_VMSP1_INT 27 */ 64 3, /* PNX833X_PIC_VMSP1_INT 27 */
65 3, /* PNX833X_PIC_VMSP2_INT 28 */ 65 3, /* PNX833X_PIC_VMSP2_INT 28 */
66 4, /* PNX833X_PIC_PIBC_INT 29 */ 66 4, /* PNX833X_PIC_PIBC_INT 29 */
67 4, /* PNX833X_PIC_TS_IN0_TRD_INT 30 */ 67 4, /* PNX833X_PIC_TS_IN0_TRD_INT 30 */
68 4, /* PNX833X_PIC_SGDX_TPD_INT 31 */ 68 4, /* PNX833X_PIC_SGDX_TPD_INT 31 */
69 5, /* PNX833X_PIC_USB_INT 32 */ 69 5, /* PNX833X_PIC_USB_INT 32 */
70 4, /* PNX833X_PIC_TS_IN1_TRD_INT 33 */ 70 4, /* PNX833X_PIC_TS_IN1_TRD_INT 33 */
71 4, /* PNX833X_PIC_CLOCK_INT 34 */ 71 4, /* PNX833X_PIC_CLOCK_INT 34 */
72 4, /* PNX833X_PIC_SGDX_PARSER_INT 35 */ 72 4, /* PNX833X_PIC_SGDX_PARSER_INT 35 */
73 4, /* PNX833X_PIC_VMSP_DMA_INT 36 */ 73 4, /* PNX833X_PIC_VMSP_DMA_INT 36 */
74#if defined(CONFIG_SOC_PNX8335) 74#if defined(CONFIG_SOC_PNX8335)
75 4, /* PNX8335_PIC_MIU_INT 37 */ 75 4, /* PNX8335_PIC_MIU_INT 37 */
76 4, /* PNX8335_PIC_AVCHIP_IRQ_INT 38 */ 76 4, /* PNX8335_PIC_AVCHIP_IRQ_INT 38 */
77 9, /* PNX8335_PIC_SYNC_HD_INT 39 */ 77 9, /* PNX8335_PIC_SYNC_HD_INT 39 */
78 9, /* PNX8335_PIC_DISP_HD_INT 40 */ 78 9, /* PNX8335_PIC_DISP_HD_INT 40 */
79 9, /* PNX8335_PIC_DISP_SCALER_INT 41 */ 79 9, /* PNX8335_PIC_DISP_SCALER_INT 41 */
80 4, /* PNX8335_PIC_OSD_HD1_INT 42 */ 80 4, /* PNX8335_PIC_OSD_HD1_INT 42 */
81 4, /* PNX8335_PIC_DTL_WRITER_Y_INT 43 */ 81 4, /* PNX8335_PIC_DTL_WRITER_Y_INT 43 */
82 4, /* PNX8335_PIC_DTL_WRITER_C_INT 44 */ 82 4, /* PNX8335_PIC_DTL_WRITER_C_INT 44 */
83 4, /* PNX8335_PIC_DTL_EMULATOR_Y_IR_INT 45 */ 83 4, /* PNX8335_PIC_DTL_EMULATOR_Y_IR_INT 45 */
84 4, /* PNX8335_PIC_DTL_EMULATOR_C_IR_INT 46 */ 84 4, /* PNX8335_PIC_DTL_EMULATOR_C_IR_INT 46 */
85 4, /* PNX8335_PIC_DENC_TTX_INT 47 */ 85 4, /* PNX8335_PIC_DENC_TTX_INT 47 */
86 4, /* PNX8335_PIC_MMI_SIF0_INT 48 */ 86 4, /* PNX8335_PIC_MMI_SIF0_INT 48 */
87 4, /* PNX8335_PIC_MMI_SIF1_INT 49 */ 87 4, /* PNX8335_PIC_MMI_SIF1_INT 49 */
88 4, /* PNX8335_PIC_MMI_CDMMU_INT 50 */ 88 4, /* PNX8335_PIC_MMI_CDMMU_INT 50 */
89 4, /* PNX8335_PIC_PIBCS_INT 51 */ 89 4, /* PNX8335_PIC_PIBCS_INT 51 */
90 12, /* PNX8335_PIC_ETHERNET_INT 52 */ 90 12, /* PNX8335_PIC_ETHERNET_INT 52 */
91 3, /* PNX8335_PIC_VMSP1_0_INT 53 */ 91 3, /* PNX8335_PIC_VMSP1_0_INT 53 */
92 3, /* PNX8335_PIC_VMSP1_1_INT 54 */ 92 3, /* PNX8335_PIC_VMSP1_1_INT 54 */
93 4, /* PNX8335_PIC_VMSP1_DMA_INT 55 */ 93 4, /* PNX8335_PIC_VMSP1_DMA_INT 55 */
94 4, /* PNX8335_PIC_TDGR_DE_INT 56 */ 94 4, /* PNX8335_PIC_TDGR_DE_INT 56 */
95 4, /* PNX8335_PIC_IR1_IRQ_INT 57 */ 95 4, /* PNX8335_PIC_IR1_IRQ_INT 57 */
96#endif 96#endif
97}; 97};
98 98
diff --git a/arch/mips/pnx833x/common/platform.c b/arch/mips/pnx833x/common/platform.c
index 05a1d922cd60..d22dc0d6f289 100644
--- a/arch/mips/pnx833x/common/platform.c
+++ b/arch/mips/pnx833x/common/platform.c
@@ -6,7 +6,7 @@
6 * Daniel Laird <daniel.j.laird@nxp.com> 6 * Daniel Laird <daniel.j.laird@nxp.com>
7 * 7 *
8 * Based on software written by: 8 * Based on software written by:
9 * Nikita Youshchenko <yoush@debian.org>, based on PNX8550 code. 9 * Nikita Youshchenko <yoush@debian.org>, based on PNX8550 code.
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by
@@ -42,7 +42,7 @@
42#include <irq-mapping.h> 42#include <irq-mapping.h>
43#include <pnx833x.h> 43#include <pnx833x.h>
44 44
45static u64 uart_dmamask = DMA_BIT_MASK(32); 45static u64 uart_dmamask = DMA_BIT_MASK(32);
46 46
47static struct resource pnx833x_uart_resources[] = { 47static struct resource pnx833x_uart_resources[] = {
48 [0] = { 48 [0] = {
@@ -69,7 +69,7 @@ static struct resource pnx833x_uart_resources[] = {
69 69
70struct pnx8xxx_port pnx8xxx_ports[] = { 70struct pnx8xxx_port pnx8xxx_ports[] = {
71 [0] = { 71 [0] = {
72 .port = { 72 .port = {
73 .type = PORT_PNX8XXX, 73 .type = PORT_PNX8XXX,
74 .iotype = UPIO_MEM, 74 .iotype = UPIO_MEM,
75 .membase = (void __iomem *)PNX833X_UART0_PORTS_START, 75 .membase = (void __iomem *)PNX833X_UART0_PORTS_START,
@@ -82,7 +82,7 @@ struct pnx8xxx_port pnx8xxx_ports[] = {
82 }, 82 },
83 }, 83 },
84 [1] = { 84 [1] = {
85 .port = { 85 .port = {
86 .type = PORT_PNX8XXX, 86 .type = PORT_PNX8XXX,
87 .iotype = UPIO_MEM, 87 .iotype = UPIO_MEM,
88 .membase = (void __iomem *)PNX833X_UART1_PORTS_START, 88 .membase = (void __iomem *)PNX833X_UART1_PORTS_START,
@@ -108,7 +108,7 @@ static struct platform_device pnx833x_uart_device = {
108 .resource = pnx833x_uart_resources, 108 .resource = pnx833x_uart_resources,
109}; 109};
110 110
111static u64 ehci_dmamask = DMA_BIT_MASK(32); 111static u64 ehci_dmamask = DMA_BIT_MASK(32);
112 112
113static struct resource pnx833x_usb_ehci_resources[] = { 113static struct resource pnx833x_usb_ehci_resources[] = {
114 [0] = { 114 [0] = {
@@ -183,7 +183,7 @@ static struct platform_device pnx833x_i2c0_device = {
183 .dev = { 183 .dev = {
184 .platform_data = &pnx833x_i2c_dev[0], 184 .platform_data = &pnx833x_i2c_dev[0],
185 }, 185 },
186 .num_resources = ARRAY_SIZE(pnx833x_i2c0_resources), 186 .num_resources = ARRAY_SIZE(pnx833x_i2c0_resources),
187 .resource = pnx833x_i2c0_resources, 187 .resource = pnx833x_i2c0_resources,
188}; 188};
189 189
@@ -193,7 +193,7 @@ static struct platform_device pnx833x_i2c1_device = {
193 .dev = { 193 .dev = {
194 .platform_data = &pnx833x_i2c_dev[1], 194 .platform_data = &pnx833x_i2c_dev[1],
195 }, 195 },
196 .num_resources = ARRAY_SIZE(pnx833x_i2c1_resources), 196 .num_resources = ARRAY_SIZE(pnx833x_i2c1_resources),
197 .resource = pnx833x_i2c1_resources, 197 .resource = pnx833x_i2c1_resources,
198}; 198};
199#endif 199#endif
@@ -217,7 +217,7 @@ static struct platform_device pnx833x_ethernet_device = {
217 .name = "ip3902-eth", 217 .name = "ip3902-eth",
218 .id = -1, 218 .id = -1,
219 .dev = { 219 .dev = {
220 .dma_mask = &ethernet_dmamask, 220 .dma_mask = &ethernet_dmamask,
221 .coherent_dma_mask = DMA_BIT_MASK(32), 221 .coherent_dma_mask = DMA_BIT_MASK(32),
222 }, 222 },
223 .num_resources = ARRAY_SIZE(pnx833x_ethernet_resources), 223 .num_resources = ARRAY_SIZE(pnx833x_ethernet_resources),
@@ -238,8 +238,8 @@ static struct resource pnx833x_sata_resources[] = {
238}; 238};
239 239
240static struct platform_device pnx833x_sata_device = { 240static struct platform_device pnx833x_sata_device = {
241 .name = "pnx833x-sata", 241 .name = "pnx833x-sata",
242 .id = -1, 242 .id = -1,
243 .num_resources = ARRAY_SIZE(pnx833x_sata_resources), 243 .num_resources = ARRAY_SIZE(pnx833x_sata_resources),
244 .resource = pnx833x_sata_resources, 244 .resource = pnx833x_sata_resources,
245}; 245};
@@ -265,7 +265,7 @@ static struct platform_nand_data pnx833x_flash_nand_data = {
265 .chip_delay = 25, 265 .chip_delay = 25,
266 }, 266 },
267 .ctrl = { 267 .ctrl = {
268 .cmd_ctrl = pnx833x_flash_nand_cmd_ctrl 268 .cmd_ctrl = pnx833x_flash_nand_cmd_ctrl
269 } 269 }
270}; 270};
271 271
@@ -274,17 +274,17 @@ static struct platform_nand_data pnx833x_flash_nand_data = {
274 * 12 bytes more seems to be the standard that allows for NAND access. 274 * 12 bytes more seems to be the standard that allows for NAND access.
275 */ 275 */
276static struct resource pnx833x_flash_nand_resource = { 276static struct resource pnx833x_flash_nand_resource = {
277 .start = PNX8335_NAND_BASE, 277 .start = PNX8335_NAND_BASE,
278 .end = PNX8335_NAND_BASE + 12, 278 .end = PNX8335_NAND_BASE + 12,
279 .flags = IORESOURCE_MEM, 279 .flags = IORESOURCE_MEM,
280}; 280};
281 281
282static struct platform_device pnx833x_flash_nand = { 282static struct platform_device pnx833x_flash_nand = {
283 .name = "gen_nand", 283 .name = "gen_nand",
284 .id = -1, 284 .id = -1,
285 .num_resources = 1, 285 .num_resources = 1,
286 .resource = &pnx833x_flash_nand_resource, 286 .resource = &pnx833x_flash_nand_resource,
287 .dev = { 287 .dev = {
288 .platform_data = &pnx833x_flash_nand_data, 288 .platform_data = &pnx833x_flash_nand_data,
289 }, 289 },
290}; 290};
diff --git a/arch/mips/pnx833x/common/prom.c b/arch/mips/pnx833x/common/prom.c
index 29969f90a6b0..dfafdd732ca1 100644
--- a/arch/mips/pnx833x/common/prom.c
+++ b/arch/mips/pnx833x/common/prom.c
@@ -6,7 +6,7 @@
6 * Daniel Laird <daniel.j.laird@nxp.com> 6 * Daniel Laird <daniel.j.laird@nxp.com>
7 * 7 *
8 * Based on software written by: 8 * Based on software written by:
9 * Nikita Youshchenko <yoush@debian.org>, based on PNX8550 code. 9 * Nikita Youshchenko <yoush@debian.org>, based on PNX8550 code.
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by
diff --git a/arch/mips/pnx833x/common/reset.c b/arch/mips/pnx833x/common/reset.c
index e0ea96d29fde..5cc9a9b3601c 100644
--- a/arch/mips/pnx833x/common/reset.c
+++ b/arch/mips/pnx833x/common/reset.c
@@ -6,7 +6,7 @@
6 * Daniel Laird <daniel.j.laird@nxp.com> 6 * Daniel Laird <daniel.j.laird@nxp.com>
7 * 7 *
8 * Based on software written by: 8 * Based on software written by:
9 * Nikita Youshchenko <yoush@debian.org>, based on PNX8550 code. 9 * Nikita Youshchenko <yoush@debian.org>, based on PNX8550 code.
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by
diff --git a/arch/mips/pnx833x/common/setup.c b/arch/mips/pnx833x/common/setup.c
index e51fbc4b644d..99b4d94236cc 100644
--- a/arch/mips/pnx833x/common/setup.c
+++ b/arch/mips/pnx833x/common/setup.c
@@ -6,7 +6,7 @@
6 * Daniel Laird <daniel.j.laird@nxp.com> 6 * Daniel Laird <daniel.j.laird@nxp.com>
7 * 7 *
8 * Based on software written by: 8 * Based on software written by:
9 * Nikita Youshchenko <yoush@debian.org>, based on PNX8550 code. 9 * Nikita Youshchenko <yoush@debian.org>, based on PNX8550 code.
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by
diff --git a/arch/mips/pnx833x/stb22x/board.c b/arch/mips/pnx833x/stb22x/board.c
index 4b328ac43050..2ac5203438d8 100644
--- a/arch/mips/pnx833x/stb22x/board.c
+++ b/arch/mips/pnx833x/stb22x/board.c
@@ -6,7 +6,7 @@
6 * Daniel Laird <daniel.j.laird@nxp.com> 6 * Daniel Laird <daniel.j.laird@nxp.com>
7 * 7 *
8 * Based on software written by: 8 * Based on software written by:
9 * Nikita Youshchenko <yoush@debian.org>, based on PNX8550 code. 9 * Nikita Youshchenko <yoush@debian.org>, based on PNX8550 code.
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by
generated by cgit v1.2.2 (git 2.25.0) at 2024-10-09 19:37:30 -0400