diff options
Diffstat (limited to 'include/asm-arm/arch-orion')
-rw-r--r-- | include/asm-arm/arch-orion/debug-macro.S | 22 | ||||
-rw-r--r-- | include/asm-arm/arch-orion/dma.h | 1 | ||||
-rw-r--r-- | include/asm-arm/arch-orion/entry-macro.S | 31 | ||||
-rw-r--r-- | include/asm-arm/arch-orion/gpio.h | 28 | ||||
-rw-r--r-- | include/asm-arm/arch-orion/hardware.h | 21 | ||||
-rw-r--r-- | include/asm-arm/arch-orion/io.h | 27 | ||||
-rw-r--r-- | include/asm-arm/arch-orion/irqs.h | 61 | ||||
-rw-r--r-- | include/asm-arm/arch-orion/memory.h | 15 | ||||
-rw-r--r-- | include/asm-arm/arch-orion/orion.h | 165 | ||||
-rw-r--r-- | include/asm-arm/arch-orion/platform.h | 25 | ||||
-rw-r--r-- | include/asm-arm/arch-orion/system.h | 31 | ||||
-rw-r--r-- | include/asm-arm/arch-orion/timex.h | 12 | ||||
-rw-r--r-- | include/asm-arm/arch-orion/uncompress.h | 34 | ||||
-rw-r--r-- | include/asm-arm/arch-orion/vmalloc.h | 5 |
14 files changed, 0 insertions, 478 deletions
diff --git a/include/asm-arm/arch-orion/debug-macro.S b/include/asm-arm/arch-orion/debug-macro.S deleted file mode 100644 index 2746220f5d85..000000000000 --- a/include/asm-arm/arch-orion/debug-macro.S +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | /* | ||
2 | * linux/include/asm-arm/arch-orion/debug-macro.S | ||
3 | * | ||
4 | * Debugging macro include header | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or modify | ||
7 | * it under the terms of the GNU General Public License version 2 as | ||
8 | * published by the Free Software Foundation. | ||
9 | */ | ||
10 | |||
11 | #include <asm/arch/orion.h> | ||
12 | |||
13 | .macro addruart,rx | ||
14 | mrc p15, 0, \rx, c1, c0 | ||
15 | tst \rx, #1 @ MMU enabled? | ||
16 | ldreq \rx, =ORION_REGS_PHYS_BASE | ||
17 | ldrne \rx, =ORION_REGS_VIRT_BASE | ||
18 | orr \rx, \rx, #0x00012000 | ||
19 | .endm | ||
20 | |||
21 | #define UART_SHIFT 2 | ||
22 | #include <asm/hardware/debug-8250.S> | ||
diff --git a/include/asm-arm/arch-orion/dma.h b/include/asm-arm/arch-orion/dma.h deleted file mode 100644 index 40a8c178f10d..000000000000 --- a/include/asm-arm/arch-orion/dma.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | /* empty */ | ||
diff --git a/include/asm-arm/arch-orion/entry-macro.S b/include/asm-arm/arch-orion/entry-macro.S deleted file mode 100644 index cda096b2acfd..000000000000 --- a/include/asm-arm/arch-orion/entry-macro.S +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-arm/arch-orion/entry-macro.S | ||
3 | * | ||
4 | * Low-level IRQ helper macros for Orion platforms | ||
5 | * | ||
6 | * This file is licensed under the terms of the GNU General Public | ||
7 | * License version 2. This program is licensed "as is" without any | ||
8 | * warranty of any kind, whether express or implied. | ||
9 | */ | ||
10 | |||
11 | #include <asm/arch/orion.h> | ||
12 | |||
13 | .macro disable_fiq | ||
14 | .endm | ||
15 | |||
16 | .macro arch_ret_to_user, tmp1, tmp2 | ||
17 | .endm | ||
18 | |||
19 | .macro get_irqnr_preamble, base, tmp | ||
20 | ldr \base, =MAIN_IRQ_CAUSE | ||
21 | .endm | ||
22 | |||
23 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp | ||
24 | ldr \irqstat, [\base, #0] @ main cause | ||
25 | ldr \tmp, [\base, #(MAIN_IRQ_MASK - MAIN_IRQ_CAUSE)] @ main mask | ||
26 | mov \irqnr, #0 @ default irqnr | ||
27 | @ find cause bits that are unmasked | ||
28 | ands \irqstat, \irqstat, \tmp @ clear Z flag if any | ||
29 | clzne \irqnr, \irqstat @ calc irqnr | ||
30 | rsbne \irqnr, \irqnr, #31 | ||
31 | .endm | ||
diff --git a/include/asm-arm/arch-orion/gpio.h b/include/asm-arm/arch-orion/gpio.h deleted file mode 100644 index d66284f9a14c..000000000000 --- a/include/asm-arm/arch-orion/gpio.h +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-arm/arch-orion/gpio.h | ||
3 | * | ||
4 | * This file is licensed under the terms of the GNU General Public | ||
5 | * License version 2. This program is licensed "as is" without any | ||
6 | * warranty of any kind, whether express or implied. | ||
7 | */ | ||
8 | |||
9 | extern int gpio_request(unsigned pin, const char *label); | ||
10 | extern void gpio_free(unsigned pin); | ||
11 | extern int gpio_direction_input(unsigned pin); | ||
12 | extern int gpio_direction_output(unsigned pin, int value); | ||
13 | extern int gpio_get_value(unsigned pin); | ||
14 | extern void gpio_set_value(unsigned pin, int value); | ||
15 | extern void orion_gpio_set_blink(unsigned pin, int blink); | ||
16 | extern void gpio_display(void); /* debug */ | ||
17 | |||
18 | static inline int gpio_to_irq(int pin) | ||
19 | { | ||
20 | return pin + IRQ_ORION_GPIO_START; | ||
21 | } | ||
22 | |||
23 | static inline int irq_to_gpio(int irq) | ||
24 | { | ||
25 | return irq - IRQ_ORION_GPIO_START; | ||
26 | } | ||
27 | |||
28 | #include <asm-generic/gpio.h> /* cansleep wrappers */ | ||
diff --git a/include/asm-arm/arch-orion/hardware.h b/include/asm-arm/arch-orion/hardware.h deleted file mode 100644 index 65da374de735..000000000000 --- a/include/asm-arm/arch-orion/hardware.h +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-arm/arch-orion/hardware.h | ||
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License version 2 as | ||
6 | * published by the Free Software Foundation. | ||
7 | */ | ||
8 | |||
9 | #ifndef __ASM_ARCH_HARDWARE_H__ | ||
10 | #define __ASM_ARCH_HARDWARE_H__ | ||
11 | |||
12 | #include "orion.h" | ||
13 | |||
14 | #define pcibios_assign_all_busses() 1 | ||
15 | |||
16 | #define PCIBIOS_MIN_IO 0x00001000 | ||
17 | #define PCIBIOS_MIN_MEM 0x01000000 | ||
18 | #define PCIMEM_BASE ORION_PCIE_MEM_PHYS_BASE | ||
19 | |||
20 | |||
21 | #endif | ||
diff --git a/include/asm-arm/arch-orion/io.h b/include/asm-arm/arch-orion/io.h deleted file mode 100644 index e0b8c39b9167..000000000000 --- a/include/asm-arm/arch-orion/io.h +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-arm/arch-orion/io.h | ||
3 | * | ||
4 | * Tzachi Perelstein <tzachi@marvell.com> | ||
5 | * | ||
6 | * This file is licensed under the terms of the GNU General Public | ||
7 | * License version 2. This program is licensed "as is" without any | ||
8 | * warranty of any kind, whether express or implied. | ||
9 | */ | ||
10 | |||
11 | #ifndef __ASM_ARM_ARCH_IO_H | ||
12 | #define __ASM_ARM_ARCH_IO_H | ||
13 | |||
14 | #include "orion.h" | ||
15 | |||
16 | #define IO_SPACE_LIMIT 0xffffffff | ||
17 | #define IO_SPACE_REMAP ORION_PCI_SYS_IO_BASE | ||
18 | |||
19 | static inline void __iomem *__io(unsigned long addr) | ||
20 | { | ||
21 | return (void __iomem *)addr; | ||
22 | } | ||
23 | |||
24 | #define __io(a) __io(a) | ||
25 | #define __mem_pci(a) (a) | ||
26 | |||
27 | #endif | ||
diff --git a/include/asm-arm/arch-orion/irqs.h b/include/asm-arm/arch-orion/irqs.h deleted file mode 100644 index eea65ca6076a..000000000000 --- a/include/asm-arm/arch-orion/irqs.h +++ /dev/null | |||
@@ -1,61 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-arm/arch-orion/irqs.h | ||
3 | * | ||
4 | * IRQ definitions for Orion SoC | ||
5 | * | ||
6 | * Maintainer: Tzachi Perelstein <tzachi@marvell.com> | ||
7 | * | ||
8 | * This file is licensed under the terms of the GNU General Public | ||
9 | * License version 2. This program is licensed "as is" without any | ||
10 | * warranty of any kind, whether express or implied. | ||
11 | */ | ||
12 | |||
13 | #ifndef __ASM_ARCH_IRQS_H__ | ||
14 | #define __ASM_ARCH_IRQS_H__ | ||
15 | |||
16 | #include "orion.h" /* need GPIO_MAX */ | ||
17 | |||
18 | /* | ||
19 | * Orion Main Interrupt Controller | ||
20 | */ | ||
21 | #define IRQ_ORION_BRIDGE 0 | ||
22 | #define IRQ_ORION_DOORBELL_H2C 1 | ||
23 | #define IRQ_ORION_DOORBELL_C2H 2 | ||
24 | #define IRQ_ORION_UART0 3 | ||
25 | #define IRQ_ORION_UART1 4 | ||
26 | #define IRQ_ORION_I2C 5 | ||
27 | #define IRQ_ORION_GPIO_0_7 6 | ||
28 | #define IRQ_ORION_GPIO_8_15 7 | ||
29 | #define IRQ_ORION_GPIO_16_23 8 | ||
30 | #define IRQ_ORION_GPIO_24_31 9 | ||
31 | #define IRQ_ORION_PCIE0_ERR 10 | ||
32 | #define IRQ_ORION_PCIE0_INT 11 | ||
33 | #define IRQ_ORION_USB1_CTRL 12 | ||
34 | #define IRQ_ORION_DEV_BUS_ERR 14 | ||
35 | #define IRQ_ORION_PCI_ERR 15 | ||
36 | #define IRQ_ORION_USB_BR_ERR 16 | ||
37 | #define IRQ_ORION_USB0_CTRL 17 | ||
38 | #define IRQ_ORION_ETH_RX 18 | ||
39 | #define IRQ_ORION_ETH_TX 19 | ||
40 | #define IRQ_ORION_ETH_MISC 20 | ||
41 | #define IRQ_ORION_ETH_SUM 21 | ||
42 | #define IRQ_ORION_ETH_ERR 22 | ||
43 | #define IRQ_ORION_IDMA_ERR 23 | ||
44 | #define IRQ_ORION_IDMA_0 24 | ||
45 | #define IRQ_ORION_IDMA_1 25 | ||
46 | #define IRQ_ORION_IDMA_2 26 | ||
47 | #define IRQ_ORION_IDMA_3 27 | ||
48 | #define IRQ_ORION_CESA 28 | ||
49 | #define IRQ_ORION_SATA 29 | ||
50 | #define IRQ_ORION_XOR0 30 | ||
51 | #define IRQ_ORION_XOR1 31 | ||
52 | |||
53 | /* | ||
54 | * Orion General Purpose Pins | ||
55 | */ | ||
56 | #define IRQ_ORION_GPIO_START 32 | ||
57 | #define NR_GPIO_IRQS GPIO_MAX | ||
58 | |||
59 | #define NR_IRQS (IRQ_ORION_GPIO_START + NR_GPIO_IRQS) | ||
60 | |||
61 | #endif /* __ASM_ARCH_IRQS_H__ */ | ||
diff --git a/include/asm-arm/arch-orion/memory.h b/include/asm-arm/arch-orion/memory.h deleted file mode 100644 index d954dba87ced..000000000000 --- a/include/asm-arm/arch-orion/memory.h +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-arm/arch-orion/memory.h | ||
3 | * | ||
4 | * Marvell Orion memory definitions | ||
5 | */ | ||
6 | |||
7 | #ifndef __ASM_ARCH_MMU_H | ||
8 | #define __ASM_ARCH_MMU_H | ||
9 | |||
10 | #define PHYS_OFFSET UL(0x00000000) | ||
11 | |||
12 | #define __virt_to_bus(x) __virt_to_phys(x) | ||
13 | #define __bus_to_virt(x) __phys_to_virt(x) | ||
14 | |||
15 | #endif | ||
diff --git a/include/asm-arm/arch-orion/orion.h b/include/asm-arm/arch-orion/orion.h deleted file mode 100644 index 673a418a7419..000000000000 --- a/include/asm-arm/arch-orion/orion.h +++ /dev/null | |||
@@ -1,165 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-arm/arch-orion/orion.h | ||
3 | * | ||
4 | * Generic definitions of Orion SoC flavors: | ||
5 | * Orion-1, Orion-NAS, Orion-VoIP, and Orion-2. | ||
6 | * | ||
7 | * Maintainer: Tzachi Perelstein <tzachi@marvell.com> | ||
8 | * | ||
9 | * This file is licensed under the terms of the GNU General Public | ||
10 | * License version 2. This program is licensed "as is" without any | ||
11 | * warranty of any kind, whether express or implied. | ||
12 | */ | ||
13 | |||
14 | #ifndef __ASM_ARCH_ORION_H__ | ||
15 | #define __ASM_ARCH_ORION_H__ | ||
16 | |||
17 | /***************************************************************************** | ||
18 | * Orion Address Map | ||
19 | * | ||
20 | * virt phys size | ||
21 | * fdd00000 f1000000 1M on-chip peripheral registers | ||
22 | * fde00000 f2000000 1M PCIe I/O space | ||
23 | * fdf00000 f2100000 1M PCI I/O space | ||
24 | * fe000000 f0000000 16M PCIe WA space (Orion-NAS only) | ||
25 | ****************************************************************************/ | ||
26 | #define ORION_REGS_PHYS_BASE 0xf1000000 | ||
27 | #define ORION_REGS_VIRT_BASE 0xfdd00000 | ||
28 | #define ORION_REGS_SIZE SZ_1M | ||
29 | |||
30 | #define ORION_PCIE_IO_PHYS_BASE 0xf2000000 | ||
31 | #define ORION_PCIE_IO_VIRT_BASE 0xfde00000 | ||
32 | #define ORION_PCIE_IO_BUS_BASE 0x00000000 | ||
33 | #define ORION_PCIE_IO_SIZE SZ_1M | ||
34 | |||
35 | #define ORION_PCI_IO_PHYS_BASE 0xf2100000 | ||
36 | #define ORION_PCI_IO_VIRT_BASE 0xfdf00000 | ||
37 | #define ORION_PCI_IO_BUS_BASE 0x00100000 | ||
38 | #define ORION_PCI_IO_SIZE SZ_1M | ||
39 | |||
40 | /* Relevant only for Orion-NAS */ | ||
41 | #define ORION_PCIE_WA_PHYS_BASE 0xf0000000 | ||
42 | #define ORION_PCIE_WA_VIRT_BASE 0xfe000000 | ||
43 | #define ORION_PCIE_WA_SIZE SZ_16M | ||
44 | |||
45 | #define ORION_PCIE_MEM_PHYS_BASE 0xe0000000 | ||
46 | #define ORION_PCIE_MEM_SIZE SZ_128M | ||
47 | |||
48 | #define ORION_PCI_MEM_PHYS_BASE 0xe8000000 | ||
49 | #define ORION_PCI_MEM_SIZE SZ_128M | ||
50 | |||
51 | /******************************************************************************* | ||
52 | * Supported Devices & Revisions | ||
53 | ******************************************************************************/ | ||
54 | /* Orion-1 (88F5181) */ | ||
55 | #define MV88F5181_DEV_ID 0x5181 | ||
56 | #define MV88F5181_REV_B1 3 | ||
57 | /* Orion-NAS (88F5182) */ | ||
58 | #define MV88F5182_DEV_ID 0x5182 | ||
59 | #define MV88F5182_REV_A2 2 | ||
60 | /* Orion-2 (88F5281) */ | ||
61 | #define MV88F5281_DEV_ID 0x5281 | ||
62 | #define MV88F5281_REV_D1 5 | ||
63 | #define MV88F5281_REV_D2 6 | ||
64 | |||
65 | /******************************************************************************* | ||
66 | * Orion Registers Map | ||
67 | ******************************************************************************/ | ||
68 | #define ORION_DDR_VIRT_BASE (ORION_REGS_VIRT_BASE | 0x00000) | ||
69 | #define ORION_DDR_REG(x) (ORION_DDR_VIRT_BASE | (x)) | ||
70 | |||
71 | #define ORION_DEV_BUS_PHYS_BASE (ORION_REGS_PHYS_BASE | 0x10000) | ||
72 | #define ORION_DEV_BUS_VIRT_BASE (ORION_REGS_VIRT_BASE | 0x10000) | ||
73 | #define ORION_DEV_BUS_REG(x) (ORION_DEV_BUS_VIRT_BASE | (x)) | ||
74 | #define I2C_PHYS_BASE (ORION_DEV_BUS_PHYS_BASE | 0x1000) | ||
75 | #define UART0_PHYS_BASE (ORION_DEV_BUS_PHYS_BASE | 0x2000) | ||
76 | #define UART0_VIRT_BASE (ORION_DEV_BUS_VIRT_BASE | 0x2000) | ||
77 | #define UART1_PHYS_BASE (ORION_DEV_BUS_PHYS_BASE | 0x2100) | ||
78 | #define UART1_VIRT_BASE (ORION_DEV_BUS_VIRT_BASE | 0x2100) | ||
79 | |||
80 | #define ORION_BRIDGE_VIRT_BASE (ORION_REGS_VIRT_BASE | 0x20000) | ||
81 | #define ORION_BRIDGE_REG(x) (ORION_BRIDGE_VIRT_BASE | (x)) | ||
82 | |||
83 | #define ORION_PCI_VIRT_BASE (ORION_REGS_VIRT_BASE | 0x30000) | ||
84 | #define ORION_PCI_REG(x) (ORION_PCI_VIRT_BASE | (x)) | ||
85 | |||
86 | #define ORION_PCIE_VIRT_BASE (ORION_REGS_VIRT_BASE | 0x40000) | ||
87 | #define ORION_PCIE_REG(x) (ORION_PCIE_VIRT_BASE | (x)) | ||
88 | |||
89 | #define ORION_USB0_PHYS_BASE (ORION_REGS_PHYS_BASE | 0x50000) | ||
90 | #define ORION_USB0_VIRT_BASE (ORION_REGS_VIRT_BASE | 0x50000) | ||
91 | #define ORION_USB0_REG(x) (ORION_USB0_VIRT_BASE | (x)) | ||
92 | |||
93 | #define ORION_ETH_PHYS_BASE (ORION_REGS_PHYS_BASE | 0x70000) | ||
94 | #define ORION_ETH_VIRT_BASE (ORION_REGS_VIRT_BASE | 0x70000) | ||
95 | #define ORION_ETH_REG(x) (ORION_ETH_VIRT_BASE | (x)) | ||
96 | |||
97 | #define ORION_SATA_PHYS_BASE (ORION_REGS_PHYS_BASE | 0x80000) | ||
98 | #define ORION_SATA_VIRT_BASE (ORION_REGS_VIRT_BASE | 0x80000) | ||
99 | #define ORION_SATA_REG(x) (ORION_SATA_VIRT_BASE | (x)) | ||
100 | |||
101 | #define ORION_USB1_PHYS_BASE (ORION_REGS_PHYS_BASE | 0xa0000) | ||
102 | #define ORION_USB1_VIRT_BASE (ORION_REGS_VIRT_BASE | 0xa0000) | ||
103 | #define ORION_USB1_REG(x) (ORION_USB1_VIRT_BASE | (x)) | ||
104 | |||
105 | /******************************************************************************* | ||
106 | * Device Bus Registers | ||
107 | ******************************************************************************/ | ||
108 | #define MPP_0_7_CTRL ORION_DEV_BUS_REG(0x000) | ||
109 | #define MPP_8_15_CTRL ORION_DEV_BUS_REG(0x004) | ||
110 | #define MPP_16_19_CTRL ORION_DEV_BUS_REG(0x050) | ||
111 | #define MPP_DEV_CTRL ORION_DEV_BUS_REG(0x008) | ||
112 | #define MPP_RESET_SAMPLE ORION_DEV_BUS_REG(0x010) | ||
113 | #define GPIO_OUT ORION_DEV_BUS_REG(0x100) | ||
114 | #define GPIO_IO_CONF ORION_DEV_BUS_REG(0x104) | ||
115 | #define GPIO_BLINK_EN ORION_DEV_BUS_REG(0x108) | ||
116 | #define GPIO_IN_POL ORION_DEV_BUS_REG(0x10c) | ||
117 | #define GPIO_DATA_IN ORION_DEV_BUS_REG(0x110) | ||
118 | #define GPIO_EDGE_CAUSE ORION_DEV_BUS_REG(0x114) | ||
119 | #define GPIO_EDGE_MASK ORION_DEV_BUS_REG(0x118) | ||
120 | #define GPIO_LEVEL_MASK ORION_DEV_BUS_REG(0x11c) | ||
121 | #define DEV_BANK_0_PARAM ORION_DEV_BUS_REG(0x45c) | ||
122 | #define DEV_BANK_1_PARAM ORION_DEV_BUS_REG(0x460) | ||
123 | #define DEV_BANK_2_PARAM ORION_DEV_BUS_REG(0x464) | ||
124 | #define DEV_BANK_BOOT_PARAM ORION_DEV_BUS_REG(0x46c) | ||
125 | #define DEV_BUS_CTRL ORION_DEV_BUS_REG(0x4c0) | ||
126 | #define DEV_BUS_INT_CAUSE ORION_DEV_BUS_REG(0x4d0) | ||
127 | #define DEV_BUS_INT_MASK ORION_DEV_BUS_REG(0x4d4) | ||
128 | #define GPIO_MAX 32 | ||
129 | |||
130 | /*************************************************************************** | ||
131 | * Orion CPU Bridge Registers | ||
132 | **************************************************************************/ | ||
133 | #define CPU_CONF ORION_BRIDGE_REG(0x100) | ||
134 | #define CPU_CTRL ORION_BRIDGE_REG(0x104) | ||
135 | #define CPU_RESET_MASK ORION_BRIDGE_REG(0x108) | ||
136 | #define CPU_SOFT_RESET ORION_BRIDGE_REG(0x10c) | ||
137 | #define POWER_MNG_CTRL_REG ORION_BRIDGE_REG(0x11C) | ||
138 | #define BRIDGE_CAUSE ORION_BRIDGE_REG(0x110) | ||
139 | #define BRIDGE_MASK ORION_BRIDGE_REG(0x114) | ||
140 | #define MAIN_IRQ_CAUSE ORION_BRIDGE_REG(0x200) | ||
141 | #define MAIN_IRQ_MASK ORION_BRIDGE_REG(0x204) | ||
142 | #define TIMER_CTRL ORION_BRIDGE_REG(0x300) | ||
143 | #define TIMER_VAL(x) ORION_BRIDGE_REG(0x314 + ((x) * 8)) | ||
144 | #define TIMER_VAL_RELOAD(x) ORION_BRIDGE_REG(0x310 + ((x) * 8)) | ||
145 | |||
146 | #ifndef __ASSEMBLY__ | ||
147 | |||
148 | /******************************************************************************* | ||
149 | * Helpers to access Orion registers | ||
150 | ******************************************************************************/ | ||
151 | #include <asm/types.h> | ||
152 | #include <asm/io.h> | ||
153 | |||
154 | #define orion_read(r) __raw_readl(r) | ||
155 | #define orion_write(r, val) __raw_writel(val, r) | ||
156 | |||
157 | /* | ||
158 | * These are not preempt safe. Locks, if needed, must be taken care by caller. | ||
159 | */ | ||
160 | #define orion_setbits(r, mask) orion_write((r), orion_read(r) | (mask)) | ||
161 | #define orion_clrbits(r, mask) orion_write((r), orion_read(r) & ~(mask)) | ||
162 | |||
163 | #endif /* __ASSEMBLY__ */ | ||
164 | |||
165 | #endif /* __ASM_ARCH_ORION_H__ */ | ||
diff --git a/include/asm-arm/arch-orion/platform.h b/include/asm-arm/arch-orion/platform.h deleted file mode 100644 index 143c38e2fa0b..000000000000 --- a/include/asm-arm/arch-orion/platform.h +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | /* | ||
2 | * asm-arm/arch-orion/platform.h | ||
3 | * | ||
4 | * Tzachi Perelstein <tzachi@marvell.com> | ||
5 | * | ||
6 | * This file is licensed under the terms of the GNU General Public | ||
7 | * License version 2. This program is licensed "as is" without any | ||
8 | * warranty of any kind, whether express or implied. | ||
9 | */ | ||
10 | |||
11 | #ifndef __ASM_ARCH_PLATFORM_H__ | ||
12 | #define __ASM_ARCH_PLATFORM_H__ | ||
13 | |||
14 | /* | ||
15 | * Device bus NAND private data | ||
16 | */ | ||
17 | struct orion_nand_data { | ||
18 | struct mtd_partition *parts; | ||
19 | u32 nr_parts; | ||
20 | u8 ale; /* address line number connected to ALE */ | ||
21 | u8 cle; /* address line number connected to CLE */ | ||
22 | u8 width; /* buswidth */ | ||
23 | }; | ||
24 | |||
25 | #endif | ||
diff --git a/include/asm-arm/arch-orion/system.h b/include/asm-arm/arch-orion/system.h deleted file mode 100644 index 17704c68f90e..000000000000 --- a/include/asm-arm/arch-orion/system.h +++ /dev/null | |||
@@ -1,31 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-arm/arch-orion/system.h | ||
3 | * | ||
4 | * Tzachi Perelstein <tzachi@marvell.com> | ||
5 | * | ||
6 | * This file is licensed under the terms of the GNU General Public | ||
7 | * License version 2. This program is licensed "as is" without any | ||
8 | * warranty of any kind, whether express or implied. | ||
9 | */ | ||
10 | |||
11 | #ifndef __ASM_ARCH_SYSTEM_H | ||
12 | #define __ASM_ARCH_SYSTEM_H | ||
13 | |||
14 | #include <asm/arch/hardware.h> | ||
15 | #include <asm/arch/orion.h> | ||
16 | |||
17 | static inline void arch_idle(void) | ||
18 | { | ||
19 | cpu_do_idle(); | ||
20 | } | ||
21 | |||
22 | static inline void arch_reset(char mode) | ||
23 | { | ||
24 | /* | ||
25 | * Enable and issue soft reset | ||
26 | */ | ||
27 | orion_setbits(CPU_RESET_MASK, (1 << 2)); | ||
28 | orion_setbits(CPU_SOFT_RESET, 1); | ||
29 | } | ||
30 | |||
31 | #endif | ||
diff --git a/include/asm-arm/arch-orion/timex.h b/include/asm-arm/arch-orion/timex.h deleted file mode 100644 index 26c2c91eecf0..000000000000 --- a/include/asm-arm/arch-orion/timex.h +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-arm/arch-orion/timex.h | ||
3 | * | ||
4 | * Tzachi Perelstein <tzachi@marvell.com> | ||
5 | * | ||
6 | * This file is licensed under the terms of the GNU General Public | ||
7 | * License version 2. This program is licensed "as is" without any | ||
8 | * warranty of any kind, whether express or implied. | ||
9 | */ | ||
10 | |||
11 | #define ORION_TCLK 166666667 | ||
12 | #define CLOCK_TICK_RATE ORION_TCLK | ||
diff --git a/include/asm-arm/arch-orion/uncompress.h b/include/asm-arm/arch-orion/uncompress.h deleted file mode 100644 index 59f44039909a..000000000000 --- a/include/asm-arm/arch-orion/uncompress.h +++ /dev/null | |||
@@ -1,34 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-arm/arch-orion/uncompress.h | ||
3 | * | ||
4 | * Tzachi Perelstein <tzachi@marvell.com> | ||
5 | * | ||
6 | * This file is licensed under the terms of the GNU General Public | ||
7 | * License version 2. This program is licensed "as is" without any | ||
8 | * warranty of any kind, whether express or implied. | ||
9 | */ | ||
10 | |||
11 | #include <asm/arch/orion.h> | ||
12 | |||
13 | #define MV_UART_THR ((volatile unsigned char *)(UART0_PHYS_BASE + 0x0)) | ||
14 | #define MV_UART_LSR ((volatile unsigned char *)(UART0_PHYS_BASE + 0x14)) | ||
15 | |||
16 | #define LSR_THRE 0x20 | ||
17 | |||
18 | static void putc(const char c) | ||
19 | { | ||
20 | int j = 0x1000; | ||
21 | while (--j && !(*MV_UART_LSR & LSR_THRE)) | ||
22 | barrier(); | ||
23 | *MV_UART_THR = c; | ||
24 | } | ||
25 | |||
26 | static void flush(void) | ||
27 | { | ||
28 | } | ||
29 | |||
30 | /* | ||
31 | * nothing to do | ||
32 | */ | ||
33 | #define arch_decomp_setup() | ||
34 | #define arch_decomp_wdog() | ||
diff --git a/include/asm-arm/arch-orion/vmalloc.h b/include/asm-arm/arch-orion/vmalloc.h deleted file mode 100644 index 9d580278d2bc..000000000000 --- a/include/asm-arm/arch-orion/vmalloc.h +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-arm/arch-orion/vmalloc.h | ||
3 | */ | ||
4 | |||
5 | #define VMALLOC_END 0xfd800000 | ||