diff options
Diffstat (limited to 'include/asm-mips')
42 files changed, 1717 insertions, 703 deletions
diff --git a/include/asm-mips/bitops.h b/include/asm-mips/bitops.h index 9a7274ba6a0b..49df8c4c9d25 100644 --- a/include/asm-mips/bitops.h +++ b/include/asm-mips/bitops.h | |||
@@ -82,7 +82,7 @@ static inline void set_bit(unsigned long nr, volatile unsigned long *addr) | |||
82 | "2: b 1b \n" | 82 | "2: b 1b \n" |
83 | " .previous \n" | 83 | " .previous \n" |
84 | : "=&r" (temp), "=m" (*m) | 84 | : "=&r" (temp), "=m" (*m) |
85 | : "i" (bit), "m" (*m), "r" (~0)); | 85 | : "ir" (bit), "m" (*m), "r" (~0)); |
86 | #endif /* CONFIG_CPU_MIPSR2 */ | 86 | #endif /* CONFIG_CPU_MIPSR2 */ |
87 | } else if (cpu_has_llsc) { | 87 | } else if (cpu_has_llsc) { |
88 | __asm__ __volatile__( | 88 | __asm__ __volatile__( |
@@ -147,7 +147,7 @@ static inline void clear_bit(unsigned long nr, volatile unsigned long *addr) | |||
147 | "2: b 1b \n" | 147 | "2: b 1b \n" |
148 | " .previous \n" | 148 | " .previous \n" |
149 | : "=&r" (temp), "=m" (*m) | 149 | : "=&r" (temp), "=m" (*m) |
150 | : "i" (bit), "m" (*m)); | 150 | : "ir" (bit), "m" (*m)); |
151 | #endif /* CONFIG_CPU_MIPSR2 */ | 151 | #endif /* CONFIG_CPU_MIPSR2 */ |
152 | } else if (cpu_has_llsc) { | 152 | } else if (cpu_has_llsc) { |
153 | __asm__ __volatile__( | 153 | __asm__ __volatile__( |
@@ -428,7 +428,7 @@ static inline int test_and_clear_bit(unsigned long nr, | |||
428 | "2: b 1b \n" | 428 | "2: b 1b \n" |
429 | " .previous \n" | 429 | " .previous \n" |
430 | : "=&r" (temp), "=m" (*m), "=&r" (res) | 430 | : "=&r" (temp), "=m" (*m), "=&r" (res) |
431 | : "i" (bit), "m" (*m) | 431 | : "ir" (bit), "m" (*m) |
432 | : "memory"); | 432 | : "memory"); |
433 | #endif | 433 | #endif |
434 | } else if (cpu_has_llsc) { | 434 | } else if (cpu_has_llsc) { |
diff --git a/include/asm-mips/bootinfo.h b/include/asm-mips/bootinfo.h index d39e143b4a3c..610fe3af7a03 100644 --- a/include/asm-mips/bootinfo.h +++ b/include/asm-mips/bootinfo.h | |||
@@ -51,6 +51,12 @@ | |||
51 | #define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */ | 51 | #define MACH_MSP7120_FPGA 5 /* PMC-Sierra MSP7120 Emulation */ |
52 | #define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */ | 52 | #define MACH_MSP_OTHER 255 /* PMC-Sierra unknown board type */ |
53 | 53 | ||
54 | /* | ||
55 | * Valid machtype for group Mikrotik | ||
56 | */ | ||
57 | #define MACH_MIKROTIK_RB532 0 /* Mikrotik RouterBoard 532 */ | ||
58 | #define MACH_MIKROTIK_RB532A 1 /* Mikrotik RouterBoard 532A */ | ||
59 | |||
54 | #define CL_SIZE COMMAND_LINE_SIZE | 60 | #define CL_SIZE COMMAND_LINE_SIZE |
55 | 61 | ||
56 | extern char *system_type; | 62 | extern char *system_type; |
diff --git a/include/asm-mips/dma-mapping.h b/include/asm-mips/dma-mapping.h index 230b3f1b69b1..c64afb40cd06 100644 --- a/include/asm-mips/dma-mapping.h +++ b/include/asm-mips/dma-mapping.h | |||
@@ -42,7 +42,7 @@ extern void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, | |||
42 | int nelems, enum dma_data_direction direction); | 42 | int nelems, enum dma_data_direction direction); |
43 | extern void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, | 43 | extern void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, |
44 | int nelems, enum dma_data_direction direction); | 44 | int nelems, enum dma_data_direction direction); |
45 | extern int dma_mapping_error(dma_addr_t dma_addr); | 45 | extern int dma_mapping_error(struct device *dev, dma_addr_t dma_addr); |
46 | extern int dma_supported(struct device *dev, u64 mask); | 46 | extern int dma_supported(struct device *dev, u64 mask); |
47 | 47 | ||
48 | static inline int | 48 | static inline int |
diff --git a/include/asm-mips/fpu.h b/include/asm-mips/fpu.h index e59d4c039661..8a3ef247659a 100644 --- a/include/asm-mips/fpu.h +++ b/include/asm-mips/fpu.h | |||
@@ -35,6 +35,8 @@ extern asmlinkage int (*save_fp_context32)(struct sigcontext32 __user *sc); | |||
35 | extern asmlinkage int (*restore_fp_context32)(struct sigcontext32 __user *sc); | 35 | extern asmlinkage int (*restore_fp_context32)(struct sigcontext32 __user *sc); |
36 | 36 | ||
37 | extern void fpu_emulator_init_fpu(void); | 37 | extern void fpu_emulator_init_fpu(void); |
38 | extern int fpu_emulator_save_context(struct sigcontext __user *sc); | ||
39 | extern int fpu_emulator_restore_context(struct sigcontext __user *sc); | ||
38 | extern void _init_fpu(void); | 40 | extern void _init_fpu(void); |
39 | extern void _save_fp(struct task_struct *); | 41 | extern void _save_fp(struct task_struct *); |
40 | extern void _restore_fp(struct task_struct *); | 42 | extern void _restore_fp(struct task_struct *); |
diff --git a/include/asm-mips/kvm.h b/include/asm-mips/kvm.h deleted file mode 100644 index 093a5b7f796b..000000000000 --- a/include/asm-mips/kvm.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __LINUX_KVM_MIPS_H | ||
2 | #define __LINUX_KVM_MIPS_H | ||
3 | |||
4 | /* mips does not support KVM */ | ||
5 | |||
6 | #endif | ||
diff --git a/include/asm-mips/mach-au1x00/au1550_spi.h b/include/asm-mips/mach-au1x00/au1550_spi.h index 40e6c489833a..08e1958e9410 100644 --- a/include/asm-mips/mach-au1x00/au1550_spi.h +++ b/include/asm-mips/mach-au1x00/au1550_spi.h | |||
@@ -6,7 +6,6 @@ | |||
6 | #define _AU1550_SPI_H_ | 6 | #define _AU1550_SPI_H_ |
7 | 7 | ||
8 | struct au1550_spi_info { | 8 | struct au1550_spi_info { |
9 | s16 bus_num; /* defines which PSC and IRQ to use */ | ||
10 | u32 mainclk_hz; /* main input clock frequency of PSC */ | 9 | u32 mainclk_hz; /* main input clock frequency of PSC */ |
11 | u16 num_chipselect; /* number of chipselects supported */ | 10 | u16 num_chipselect; /* number of chipselects supported */ |
12 | void (*activate_cs)(struct au1550_spi_info *spi, int cs, int polarity); | 11 | void (*activate_cs)(struct au1550_spi_info *spi, int cs, int polarity); |
diff --git a/include/asm-mips/mach-generic/gpio.h b/include/asm-mips/mach-generic/gpio.h index e6b376bd9d06..b4e70208da64 100644 --- a/include/asm-mips/mach-generic/gpio.h +++ b/include/asm-mips/mach-generic/gpio.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef __ASM_MACH_GENERIC_GPIO_H | 1 | #ifndef __ASM_MACH_GENERIC_GPIO_H |
2 | #define __ASM_MACH_GENERIC_GPIO_H | 2 | #define __ASM_MACH_GENERIC_GPIO_H |
3 | 3 | ||
4 | #ifdef CONFIG_HAVE_GPIO_LIB | 4 | #ifdef CONFIG_GPIOLIB |
5 | #define gpio_get_value __gpio_get_value | 5 | #define gpio_get_value __gpio_get_value |
6 | #define gpio_set_value __gpio_set_value | 6 | #define gpio_set_value __gpio_set_value |
7 | #define gpio_cansleep __gpio_cansleep | 7 | #define gpio_cansleep __gpio_cansleep |
diff --git a/include/asm-mips/mach-generic/ide.h b/include/asm-mips/mach-generic/ide.h index 0f6c251f5fec..73008f7bdc93 100644 --- a/include/asm-mips/mach-generic/ide.h +++ b/include/asm-mips/mach-generic/ide.h | |||
@@ -19,14 +19,6 @@ | |||
19 | #include <linux/stddef.h> | 19 | #include <linux/stddef.h> |
20 | #include <asm/processor.h> | 20 | #include <asm/processor.h> |
21 | 21 | ||
22 | #ifndef MAX_HWIFS | ||
23 | # ifdef CONFIG_BLK_DEV_IDEPCI | ||
24 | #define MAX_HWIFS 10 | ||
25 | # else | ||
26 | #define MAX_HWIFS 6 | ||
27 | # endif | ||
28 | #endif | ||
29 | |||
30 | static __inline__ int ide_probe_legacy(void) | 22 | static __inline__ int ide_probe_legacy(void) |
31 | { | 23 | { |
32 | #ifdef CONFIG_PCI | 24 | #ifdef CONFIG_PCI |
@@ -56,46 +48,6 @@ found: | |||
56 | #endif | 48 | #endif |
57 | } | 49 | } |
58 | 50 | ||
59 | static __inline__ int ide_default_irq(unsigned long base) | ||
60 | { | ||
61 | switch (base) { | ||
62 | case 0x1f0: return 14; | ||
63 | case 0x170: return 15; | ||
64 | case 0x1e8: return 11; | ||
65 | case 0x168: return 10; | ||
66 | case 0x1e0: return 8; | ||
67 | case 0x160: return 12; | ||
68 | default: | ||
69 | return 0; | ||
70 | } | ||
71 | } | ||
72 | |||
73 | static __inline__ unsigned long ide_default_io_base(int index) | ||
74 | { | ||
75 | if (!ide_probe_legacy()) | ||
76 | return 0; | ||
77 | /* | ||
78 | * If PCI is present then it is not safe to poke around | ||
79 | * the other legacy IDE ports. Only 0x1f0 and 0x170 are | ||
80 | * defined compatibility mode ports for PCI. A user can | ||
81 | * override this using ide= but we must default safe. | ||
82 | */ | ||
83 | if (no_pci_devices()) { | ||
84 | switch (index) { | ||
85 | case 2: return 0x1e8; | ||
86 | case 3: return 0x168; | ||
87 | case 4: return 0x1e0; | ||
88 | case 5: return 0x160; | ||
89 | } | ||
90 | } | ||
91 | switch (index) { | ||
92 | case 0: return 0x1f0; | ||
93 | case 1: return 0x170; | ||
94 | default: | ||
95 | return 0; | ||
96 | } | ||
97 | } | ||
98 | |||
99 | /* MIPS port and memory-mapped I/O string operations. */ | 51 | /* MIPS port and memory-mapped I/O string operations. */ |
100 | static inline void __ide_flush_prologue(void) | 52 | static inline void __ide_flush_prologue(void) |
101 | { | 53 | { |
diff --git a/include/asm-mips/mach-rc32434/cpu-feature-overrides.h b/include/asm-mips/mach-rc32434/cpu-feature-overrides.h new file mode 100644 index 000000000000..f3bc7efa2608 --- /dev/null +++ b/include/asm-mips/mach-rc32434/cpu-feature-overrides.h | |||
@@ -0,0 +1,81 @@ | |||
1 | /* | ||
2 | * IDT RC32434 specific CPU feature overrides | ||
3 | * | ||
4 | * Copyright (C) 2008 Florian Fainelli <florian@openwrt.org> | ||
5 | * | ||
6 | * This file was derived from: include/asm-mips/cpu-features.h | ||
7 | * Copyright (C) 2003, 2004 Ralf Baechle | ||
8 | * Copyright (C) 2004 Maciej W. Rozycki | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or | ||
11 | * modify it under the terms of the GNU General Public License | ||
12 | * as published by the Free Software Foundation; either version 2 | ||
13 | * of the License, or (at your option) any later version. | ||
14 | * | ||
15 | * This program is distributed in the hope that it will be useful, | ||
16 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
17 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
18 | * GNU General Public License for more details. | ||
19 | * | ||
20 | * You should have received a copy of the GNU General Public License | ||
21 | * along with this program; if not, write to the | ||
22 | * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
23 | * Boston, MA 02110-1301, USA. | ||
24 | */ | ||
25 | #ifndef __ASM_MACH_RC32434_CPU_FEATURE_OVERRIDES_H | ||
26 | #define __ASM_MACH_RC32434_CPU_FEATURE_OVERRIDES_H | ||
27 | |||
28 | /* | ||
29 | * The IDT RC32434 SOC has a built-in MIPS 4Kc core. | ||
30 | */ | ||
31 | #define cpu_has_tlb 1 | ||
32 | #define cpu_has_4kex 1 | ||
33 | #define cpu_has_3k_cache 0 | ||
34 | #define cpu_has_4k_cache 1 | ||
35 | #define cpu_has_tx39_cache 0 | ||
36 | #define cpu_has_sb1_cache 0 | ||
37 | #define cpu_has_fpu 0 | ||
38 | #define cpu_has_32fpr 0 | ||
39 | #define cpu_has_counter 1 | ||
40 | #define cpu_has_watch 1 | ||
41 | #define cpu_has_divec 1 | ||
42 | #define cpu_has_vce 0 | ||
43 | #define cpu_has_cache_cdex_p 0 | ||
44 | #define cpu_has_cache_cdex_s 0 | ||
45 | #define cpu_has_prefetch 1 | ||
46 | #define cpu_has_mcheck 1 | ||
47 | #define cpu_has_ejtag 1 | ||
48 | #define cpu_has_llsc 1 | ||
49 | |||
50 | #define cpu_has_mips16 0 | ||
51 | #define cpu_has_mdmx 0 | ||
52 | #define cpu_has_mips3d 0 | ||
53 | #define cpu_has_smartmips 0 | ||
54 | |||
55 | #define cpu_has_vtag_icache 0 | ||
56 | /* #define cpu_has_dc_aliases ? */ | ||
57 | /* #define cpu_has_ic_fills_f_dc ? */ | ||
58 | /* #define cpu_has_pindexed_dcache ? */ | ||
59 | |||
60 | /* #define cpu_icache_snoops_remote_store ? */ | ||
61 | |||
62 | #define cpu_has_mips32r1 1 | ||
63 | #define cpu_has_mips32r2 0 | ||
64 | #define cpu_has_mips64r1 0 | ||
65 | #define cpu_has_mips64r2 0 | ||
66 | |||
67 | #define cpu_has_dsp 0 | ||
68 | #define cpu_has_mipsmt 0 | ||
69 | |||
70 | /* #define cpu_has_nofpuex ? */ | ||
71 | #define cpu_has_64bits 0 | ||
72 | #define cpu_has_64bit_zero_reg 0 | ||
73 | #define cpu_has_64bit_gp_regs 0 | ||
74 | #define cpu_has_64bit_addresses 0 | ||
75 | |||
76 | #define cpu_has_inclusive_pcaches 0 | ||
77 | |||
78 | #define cpu_dcache_line_size() 16 | ||
79 | #define cpu_icache_line_size() 16 | ||
80 | |||
81 | #endif /* __ASM_MACH_RC32434_CPU_FEATURE_OVERRIDES_H */ | ||
diff --git a/include/asm-mips/mach-rc32434/ddr.h b/include/asm-mips/mach-rc32434/ddr.h new file mode 100644 index 000000000000..291e2cf9dde0 --- /dev/null +++ b/include/asm-mips/mach-rc32434/ddr.h | |||
@@ -0,0 +1,141 @@ | |||
1 | /* | ||
2 | * Definitions for the DDR registers | ||
3 | * | ||
4 | * Copyright 2002 Ryan Holm <ryan.holmQVist@idt.com> | ||
5 | * Copyright 2008 Florian Fainelli <florian@openwrt.org> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify it | ||
8 | * under the terms of the GNU General Public License as published by the | ||
9 | * Free Software Foundation; either version 2 of the License, or (at your | ||
10 | * option) any later version. | ||
11 | * | ||
12 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED | ||
13 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
14 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
15 | * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
16 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
17 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
18 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
19 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
20 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
21 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
22 | * | ||
23 | * You should have received a copy of the GNU General Public License along | ||
24 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
25 | * 675 Mass Ave, Cambridge, MA 02139, USA. | ||
26 | * | ||
27 | */ | ||
28 | |||
29 | #ifndef _ASM_RC32434_DDR_H_ | ||
30 | #define _ASM_RC32434_DDR_H_ | ||
31 | |||
32 | #include <asm/mach-rc32434/rb.h> | ||
33 | |||
34 | /* DDR register structure */ | ||
35 | struct ddr_ram { | ||
36 | u32 ddrbase; | ||
37 | u32 ddrmask; | ||
38 | u32 res1; | ||
39 | u32 res2; | ||
40 | u32 ddrc; | ||
41 | u32 ddrabase; | ||
42 | u32 ddramask; | ||
43 | u32 ddramap; | ||
44 | u32 ddrcust; | ||
45 | u32 ddrrdc; | ||
46 | u32 ddrspare; | ||
47 | }; | ||
48 | |||
49 | #define DDR0_PHYS_ADDR 0x18018000 | ||
50 | |||
51 | /* DDR banks masks */ | ||
52 | #define DDR_MASK 0xffff0000 | ||
53 | #define DDR0_BASE_MSK DDR_MASK | ||
54 | #define DDR1_BASE_MSK DDR_MASK | ||
55 | |||
56 | /* DDR bank0 registers */ | ||
57 | #define RC32434_DDR0_ATA_BIT 5 | ||
58 | #define RC32434_DDR0_ATA_MSK 0x000000E0 | ||
59 | #define RC32434_DDR0_DBW_BIT 8 | ||
60 | #define RC32434_DDR0_DBW_MSK 0x00000100 | ||
61 | #define RC32434_DDR0_WR_BIT 9 | ||
62 | #define RC32434_DDR0_WR_MSK 0x00000600 | ||
63 | #define RC32434_DDR0_PS_BIT 11 | ||
64 | #define RC32434_DDR0_PS_MSK 0x00001800 | ||
65 | #define RC32434_DDR0_DTYPE_BIT 13 | ||
66 | #define RC32434_DDR0_DTYPE_MSK 0x0000e000 | ||
67 | #define RC32434_DDR0_RFC_BIT 16 | ||
68 | #define RC32434_DDR0_RFC_MSK 0x000f0000 | ||
69 | #define RC32434_DDR0_RP_BIT 20 | ||
70 | #define RC32434_DDR0_RP_MSK 0x00300000 | ||
71 | #define RC32434_DDR0_AP_BIT 22 | ||
72 | #define RC32434_DDR0_AP_MSK 0x00400000 | ||
73 | #define RC32434_DDR0_RCD_BIT 23 | ||
74 | #define RC32434_DDR0_RCD_MSK 0x01800000 | ||
75 | #define RC32434_DDR0_CL_BIT 25 | ||
76 | #define RC32434_DDR0_CL_MSK 0x06000000 | ||
77 | #define RC32434_DDR0_DBM_BIT 27 | ||
78 | #define RC32434_DDR0_DBM_MSK 0x08000000 | ||
79 | #define RC32434_DDR0_SDS_BIT 28 | ||
80 | #define RC32434_DDR0_SDS_MSK 0x10000000 | ||
81 | #define RC32434_DDR0_ATP_BIT 29 | ||
82 | #define RC32434_DDR0_ATP_MSK 0x60000000 | ||
83 | #define RC32434_DDR0_RE_BIT 31 | ||
84 | #define RC32434_DDR0_RE_MSK 0x80000000 | ||
85 | |||
86 | /* DDR bank C registers */ | ||
87 | #define RC32434_DDRC_MSK(x) BIT_TO_MASK(x) | ||
88 | #define RC32434_DDRC_CES_BIT 0 | ||
89 | #define RC32434_DDRC_ACE_BIT 1 | ||
90 | |||
91 | /* Custom DDR bank registers */ | ||
92 | #define RC32434_DCST_MSK(x) BIT_TO_MASK(x) | ||
93 | #define RC32434_DCST_CS_BIT 0 | ||
94 | #define RC32434_DCST_CS_MSK 0x00000003 | ||
95 | #define RC32434_DCST_WE_BIT 2 | ||
96 | #define RC32434_DCST_RAS_BIT 3 | ||
97 | #define RC32434_DCST_CAS_BIT 4 | ||
98 | #define RC32434_DSCT_CKE_BIT 5 | ||
99 | #define RC32434_DSCT_BA_BIT 6 | ||
100 | #define RC32434_DSCT_BA_MSK 0x000000c0 | ||
101 | |||
102 | /* DDR QSC registers */ | ||
103 | #define RC32434_QSC_DM_BIT 0 | ||
104 | #define RC32434_QSC_DM_MSK 0x00000003 | ||
105 | #define RC32434_QSC_DQSBS_BIT 2 | ||
106 | #define RC32434_QSC_DQSBS_MSK 0x000000fc | ||
107 | #define RC32434_QSC_DB_BIT 8 | ||
108 | #define RC32434_QSC_DB_MSK 0x00000100 | ||
109 | #define RC32434_QSC_DBSP_BIT 9 | ||
110 | #define RC32434_QSC_DBSP_MSK 0x01fffe00 | ||
111 | #define RC32434_QSC_BDP_BIT 25 | ||
112 | #define RC32434_QSC_BDP_MSK 0x7e000000 | ||
113 | |||
114 | /* DDR LLC registers */ | ||
115 | #define RC32434_LLC_EAO_BIT 0 | ||
116 | #define RC32434_LLC_EAO_MSK 0x00000001 | ||
117 | #define RC32434_LLC_EO_BIT 1 | ||
118 | #define RC32434_LLC_EO_MSK 0x0000003e | ||
119 | #define RC32434_LLC_FS_BIT 6 | ||
120 | #define RC32434_LLC_FS_MSK 0x000000c0 | ||
121 | #define RC32434_LLC_AS_BIT 8 | ||
122 | #define RC32434_LLC_AS_MSK 0x00000700 | ||
123 | #define RC32434_LLC_SP_BIT 11 | ||
124 | #define RC32434_LLC_SP_MSK 0x001ff800 | ||
125 | |||
126 | /* DDR LLFC registers */ | ||
127 | #define RC32434_LLFC_MSK(x) BIT_TO_MASK(x) | ||
128 | #define RC32434_LLFC_MEN_BIT 0 | ||
129 | #define RC32434_LLFC_EAN_BIT 1 | ||
130 | #define RC32434_LLFC_FF_BIT 2 | ||
131 | |||
132 | /* DDR DLLTA registers */ | ||
133 | #define RC32434_DLLTA_ADDR_BIT 2 | ||
134 | #define RC32434_DLLTA_ADDR_MSK 0xfffffffc | ||
135 | |||
136 | /* DDR DLLED registers */ | ||
137 | #define RC32434_DLLED_MSK(x) BIT_TO_MASK(x) | ||
138 | #define RC32434_DLLED_DBE_BIT 0 | ||
139 | #define RC32434_DLLED_DTE_BIT 1 | ||
140 | |||
141 | #endif /* _ASM_RC32434_DDR_H_ */ | ||
diff --git a/include/asm-mips/mach-rc32434/dma.h b/include/asm-mips/mach-rc32434/dma.h new file mode 100644 index 000000000000..5f898b5873f7 --- /dev/null +++ b/include/asm-mips/mach-rc32434/dma.h | |||
@@ -0,0 +1,103 @@ | |||
1 | /* | ||
2 | * Copyright 2002 Integrated Device Technology, Inc. | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * DMA register definition. | ||
6 | * | ||
7 | * Author : ryan.holmQVist@idt.com | ||
8 | * Date : 20011005 | ||
9 | */ | ||
10 | |||
11 | #ifndef __ASM_RC32434_DMA_H | ||
12 | #define __ASM_RC32434_DMA_H | ||
13 | |||
14 | #include <asm/mach-rc32434/rb.h> | ||
15 | |||
16 | #define DMA0_BASE_ADDR 0x18040000 | ||
17 | |||
18 | /* | ||
19 | * DMA descriptor (in physical memory). | ||
20 | */ | ||
21 | |||
22 | struct dma_desc { | ||
23 | u32 control; /* Control. use DMAD_* */ | ||
24 | u32 ca; /* Current Address. */ | ||
25 | u32 devcs; /* Device control and status. */ | ||
26 | u32 link; /* Next descriptor in chain. */ | ||
27 | }; | ||
28 | |||
29 | #define DMA_DESC_SIZ sizeof(struct dma_desc) | ||
30 | #define DMA_DESC_COUNT_BIT 0 | ||
31 | #define DMA_DESC_COUNT_MSK 0x0003ffff | ||
32 | #define DMA_DESC_DS_BIT 20 | ||
33 | #define DMA_DESC_DS_MSK 0x00300000 | ||
34 | |||
35 | #define DMA_DESC_DEV_CMD_BIT 22 | ||
36 | #define DMA_DESC_DEV_CMD_MSK 0x01c00000 | ||
37 | |||
38 | /* DMA command sizes */ | ||
39 | #define DMA_DESC_DEV_CMD_BYTE 0 | ||
40 | #define DMA_DESC_DEV_CMD_HLF_WD 1 | ||
41 | #define DMA_DESC_DEV_CMD_WORD 2 | ||
42 | #define DMA_DESC_DEV_CMD_2WORDS 3 | ||
43 | #define DMA_DESC_DEV_CMD_4WORDS 4 | ||
44 | #define DMA_DESC_DEV_CMD_6WORDS 5 | ||
45 | #define DMA_DESC_DEV_CMD_8WORDS 6 | ||
46 | #define DMA_DESC_DEV_CMD_16WORDS 7 | ||
47 | |||
48 | /* DMA descriptors interrupts */ | ||
49 | #define DMA_DESC_COF (1 << 25) /* Chain on finished */ | ||
50 | #define DMA_DESC_COD (1 << 26) /* Chain on done */ | ||
51 | #define DMA_DESC_IOF (1 << 27) /* Interrupt on finished */ | ||
52 | #define DMA_DESC_IOD (1 << 28) /* Interrupt on done */ | ||
53 | #define DMA_DESC_TERM (1 << 29) /* Terminated */ | ||
54 | #define DMA_DESC_DONE (1 << 30) /* Done */ | ||
55 | #define DMA_DESC_FINI (1 << 31) /* Finished */ | ||
56 | |||
57 | /* | ||
58 | * DMA register (within Internal Register Map). | ||
59 | */ | ||
60 | |||
61 | struct dma_reg { | ||
62 | u32 dmac; /* Control. */ | ||
63 | u32 dmas; /* Status. */ | ||
64 | u32 dmasm; /* Mask. */ | ||
65 | u32 dmadptr; /* Descriptor pointer. */ | ||
66 | u32 dmandptr; /* Next descriptor pointer. */ | ||
67 | }; | ||
68 | |||
69 | /* DMA channels specific registers */ | ||
70 | #define DMA_CHAN_RUN_BIT (1 << 0) | ||
71 | #define DMA_CHAN_DONE_BIT (1 << 1) | ||
72 | #define DMA_CHAN_MODE_BIT (1 << 2) | ||
73 | #define DMA_CHAN_MODE_MSK 0x0000000c | ||
74 | #define DMA_CHAN_MODE_AUTO 0 | ||
75 | #define DMA_CHAN_MODE_BURST 1 | ||
76 | #define DMA_CHAN_MODE_XFRT 2 | ||
77 | #define DMA_CHAN_MODE_RSVD 3 | ||
78 | #define DMA_CHAN_ACT_BIT (1 << 4) | ||
79 | |||
80 | /* DMA status registers */ | ||
81 | #define DMA_STAT_FINI (1 << 0) | ||
82 | #define DMA_STAT_DONE (1 << 1) | ||
83 | #define DMA_STAT_CHAIN (1 << 2) | ||
84 | #define DMA_STAT_ERR (1 << 3) | ||
85 | #define DMA_STAT_HALT (1 << 4) | ||
86 | |||
87 | /* | ||
88 | * DMA channel definitions | ||
89 | */ | ||
90 | |||
91 | #define DMA_CHAN_ETH_RCV 0 | ||
92 | #define DMA_CHAN_ETH_XMT 1 | ||
93 | #define DMA_CHAN_MEM_TO_FIFO 2 | ||
94 | #define DMA_CHAN_FIFO_TO_MEM 3 | ||
95 | #define DMA_CHAN_PCI_TO_MEM 4 | ||
96 | #define DMA_CHAN_MEM_TO_PCI 5 | ||
97 | #define DMA_CHAN_COUNT 6 | ||
98 | |||
99 | struct dma_channel { | ||
100 | struct dma_reg ch[DMA_CHAN_COUNT]; | ||
101 | }; | ||
102 | |||
103 | #endif /* __ASM_RC32434_DMA_H */ | ||
diff --git a/include/asm-mips/mach-rc32434/dma_v.h b/include/asm-mips/mach-rc32434/dma_v.h new file mode 100644 index 000000000000..173a9f9146cd --- /dev/null +++ b/include/asm-mips/mach-rc32434/dma_v.h | |||
@@ -0,0 +1,52 @@ | |||
1 | /* | ||
2 | * Copyright 2002 Integrated Device Technology, Inc. | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * DMA register definition. | ||
6 | * | ||
7 | * Author : ryan.holmQVist@idt.com | ||
8 | * Date : 20011005 | ||
9 | */ | ||
10 | |||
11 | #ifndef _ASM_RC32434_DMA_V_H_ | ||
12 | #define _ASM_RC32434_DMA_V_H_ | ||
13 | |||
14 | #include <asm/mach-rc32434/dma.h> | ||
15 | #include <asm/mach-rc32434/rc32434.h> | ||
16 | |||
17 | #define DMA_CHAN_OFFSET 0x14 | ||
18 | #define IS_DMA_USED(X) (((X) & \ | ||
19 | (DMA_DESC_FINI | DMA_DESC_DONE | DMA_DESC_TERM)) \ | ||
20 | != 0) | ||
21 | #define DMA_COUNT(count) ((count) & DMA_DESC_COUNT_MSK) | ||
22 | |||
23 | #define DMA_HALT_TIMEOUT 500 | ||
24 | |||
25 | static inline int rc32434_halt_dma(struct dma_reg *ch) | ||
26 | { | ||
27 | int timeout = 1; | ||
28 | if (__raw_readl(&ch->dmac) & DMA_CHAN_RUN_BIT) { | ||
29 | __raw_writel(0, &ch->dmac); | ||
30 | for (timeout = DMA_HALT_TIMEOUT; timeout > 0; timeout--) { | ||
31 | if (__raw_readl(&ch->dmas) & DMA_STAT_HALT) { | ||
32 | __raw_writel(0, &ch->dmas); | ||
33 | break; | ||
34 | } | ||
35 | } | ||
36 | } | ||
37 | |||
38 | return timeout ? 0 : 1; | ||
39 | } | ||
40 | |||
41 | static inline void rc32434_start_dma(struct dma_reg *ch, u32 dma_addr) | ||
42 | { | ||
43 | __raw_writel(0, &ch->dmandptr); | ||
44 | __raw_writel(dma_addr, &ch->dmadptr); | ||
45 | } | ||
46 | |||
47 | static inline void rc32434_chain_dma(struct dma_reg *ch, u32 dma_addr) | ||
48 | { | ||
49 | __raw_writel(dma_addr, &ch->dmandptr); | ||
50 | } | ||
51 | |||
52 | #endif /* _ASM_RC32434_DMA_V_H_ */ | ||
diff --git a/include/asm-mips/mach-rc32434/eth.h b/include/asm-mips/mach-rc32434/eth.h new file mode 100644 index 000000000000..a25cbc56173d --- /dev/null +++ b/include/asm-mips/mach-rc32434/eth.h | |||
@@ -0,0 +1,220 @@ | |||
1 | /* | ||
2 | * Definitions for the Ethernet registers | ||
3 | * | ||
4 | * Copyright 2002 Allend Stichter <allen.stichter@idt.com> | ||
5 | * Copyright 2008 Florian Fainelli <florian@openwrt.org> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify it | ||
8 | * under the terms of the GNU General Public License as published by the | ||
9 | * Free Software Foundation; either version 2 of the License, or (at your | ||
10 | * option) any later version. | ||
11 | * | ||
12 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED | ||
13 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
14 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
15 | * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
16 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
17 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
18 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
19 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
20 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
21 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
22 | * | ||
23 | * You should have received a copy of the GNU General Public License along | ||
24 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
25 | * 675 Mass Ave, Cambridge, MA 02139, USA. | ||
26 | * | ||
27 | */ | ||
28 | |||
29 | #ifndef __ASM_RC32434_ETH_H | ||
30 | #define __ASM_RC32434_ETH_H | ||
31 | |||
32 | |||
33 | #define ETH0_BASE_ADDR 0x18060000 | ||
34 | |||
35 | struct eth_regs { | ||
36 | u32 ethintfc; | ||
37 | u32 ethfifott; | ||
38 | u32 etharc; | ||
39 | u32 ethhash0; | ||
40 | u32 ethhash1; | ||
41 | u32 ethu0[4]; /* Reserved. */ | ||
42 | u32 ethpfs; | ||
43 | u32 ethmcp; | ||
44 | u32 eth_u1[10]; /* Reserved. */ | ||
45 | u32 ethspare; | ||
46 | u32 eth_u2[42]; /* Reserved. */ | ||
47 | u32 ethsal0; | ||
48 | u32 ethsah0; | ||
49 | u32 ethsal1; | ||
50 | u32 ethsah1; | ||
51 | u32 ethsal2; | ||
52 | u32 ethsah2; | ||
53 | u32 ethsal3; | ||
54 | u32 ethsah3; | ||
55 | u32 ethrbc; | ||
56 | u32 ethrpc; | ||
57 | u32 ethrupc; | ||
58 | u32 ethrfc; | ||
59 | u32 ethtbc; | ||
60 | u32 ethgpf; | ||
61 | u32 eth_u9[50]; /* Reserved. */ | ||
62 | u32 ethmac1; | ||
63 | u32 ethmac2; | ||
64 | u32 ethipgt; | ||
65 | u32 ethipgr; | ||
66 | u32 ethclrt; | ||
67 | u32 ethmaxf; | ||
68 | u32 eth_u10; /* Reserved. */ | ||
69 | u32 ethmtest; | ||
70 | u32 miimcfg; | ||
71 | u32 miimcmd; | ||
72 | u32 miimaddr; | ||
73 | u32 miimwtd; | ||
74 | u32 miimrdd; | ||
75 | u32 miimind; | ||
76 | u32 eth_u11; /* Reserved. */ | ||
77 | u32 eth_u12; /* Reserved. */ | ||
78 | u32 ethcfsa0; | ||
79 | u32 ethcfsa1; | ||
80 | u32 ethcfsa2; | ||
81 | }; | ||
82 | |||
83 | /* Ethernet interrupt registers */ | ||
84 | #define ETH_INT_FC_EN (1 << 0) | ||
85 | #define ETH_INT_FC_ITS (1 << 1) | ||
86 | #define ETH_INT_FC_RIP (1 << 2) | ||
87 | #define ETH_INT_FC_JAM (1 << 3) | ||
88 | #define ETH_INT_FC_OVR (1 << 4) | ||
89 | #define ETH_INT_FC_UND (1 << 5) | ||
90 | #define ETH_INT_FC_IOC 0x000000c0 | ||
91 | |||
92 | /* Ethernet FIFO registers */ | ||
93 | #define ETH_FIFI_TT_TTH_BIT 0 | ||
94 | #define ETH_FIFO_TT_TTH 0x0000007f | ||
95 | |||
96 | /* Ethernet ARC/multicast registers */ | ||
97 | #define ETH_ARC_PRO (1 << 0) | ||
98 | #define ETH_ARC_AM (1 << 1) | ||
99 | #define ETH_ARC_AFM (1 << 2) | ||
100 | #define ETH_ARC_AB (1 << 3) | ||
101 | |||
102 | /* Ethernet SAL registers */ | ||
103 | #define ETH_SAL_BYTE_5 0x000000ff | ||
104 | #define ETH_SAL_BYTE_4 0x0000ff00 | ||
105 | #define ETH_SAL_BYTE_3 0x00ff0000 | ||
106 | #define ETH_SAL_BYTE_2 0xff000000 | ||
107 | |||
108 | /* Ethernet SAH registers */ | ||
109 | #define ETH_SAH_BYTE1 0x000000ff | ||
110 | #define ETH_SAH_BYTE0 0x0000ff00 | ||
111 | |||
112 | /* Ethernet GPF register */ | ||
113 | #define ETH_GPF_PTV 0x0000ffff | ||
114 | |||
115 | /* Ethernet PFG register */ | ||
116 | #define ETH_PFS_PFD (1 << 0) | ||
117 | |||
118 | /* Ethernet CFSA[0-3] registers */ | ||
119 | #define ETH_CFSA0_CFSA4 0x000000ff | ||
120 | #define ETH_CFSA0_CFSA5 0x0000ff00 | ||
121 | #define ETH_CFSA1_CFSA2 0x000000ff | ||
122 | #define ETH_CFSA1_CFSA3 0x0000ff00 | ||
123 | #define ETH_CFSA1_CFSA0 0x000000ff | ||
124 | #define ETH_CFSA1_CFSA1 0x0000ff00 | ||
125 | |||
126 | /* Ethernet MAC1 registers */ | ||
127 | #define ETH_MAC1_RE (1 << 0) | ||
128 | #define ETH_MAC1_PAF (1 << 1) | ||
129 | #define ETH_MAC1_RFC (1 << 2) | ||
130 | #define ETH_MAC1_TFC (1 << 3) | ||
131 | #define ETH_MAC1_LB (1 << 4) | ||
132 | #define ETH_MAC1_MR (1 << 31) | ||
133 | |||
134 | /* Ethernet MAC2 registers */ | ||
135 | #define ETH_MAC2_FD (1 << 0) | ||
136 | #define ETH_MAC2_FLC (1 << 1) | ||
137 | #define ETH_MAC2_HFE (1 << 2) | ||
138 | #define ETH_MAC2_DC (1 << 3) | ||
139 | #define ETH_MAC2_CEN (1 << 4) | ||
140 | #define ETH_MAC2_PE (1 << 5) | ||
141 | #define ETH_MAC2_VPE (1 << 6) | ||
142 | #define ETH_MAC2_APE (1 << 7) | ||
143 | #define ETH_MAC2_PPE (1 << 8) | ||
144 | #define ETH_MAC2_LPE (1 << 9) | ||
145 | #define ETH_MAC2_NB (1 << 12) | ||
146 | #define ETH_MAC2_BP (1 << 13) | ||
147 | #define ETH_MAC2_ED (1 << 14) | ||
148 | |||
149 | /* Ethernet IPGT register */ | ||
150 | #define ETH_IPGT 0x0000007f | ||
151 | |||
152 | /* Ethernet IPGR registers */ | ||
153 | #define ETH_IPGR_IPGR2 0x0000007f | ||
154 | #define ETH_IPGR_IPGR1 0x00007f00 | ||
155 | |||
156 | /* Ethernet CLRT registers */ | ||
157 | #define ETH_CLRT_MAX_RET 0x0000000f | ||
158 | #define ETH_CLRT_COL_WIN 0x00003f00 | ||
159 | |||
160 | /* Ethernet MAXF register */ | ||
161 | #define ETH_MAXF 0x0000ffff | ||
162 | |||
163 | /* Ethernet test registers */ | ||
164 | #define ETH_TEST_REG (1 << 2) | ||
165 | #define ETH_MCP_DIV 0x000000ff | ||
166 | |||
167 | /* MII registers */ | ||
168 | #define ETH_MII_CFG_RSVD 0x0000000c | ||
169 | #define ETH_MII_CMD_RD (1 << 0) | ||
170 | #define ETH_MII_CMD_SCN (1 << 1) | ||
171 | #define ETH_MII_REG_ADDR 0x0000001f | ||
172 | #define ETH_MII_PHY_ADDR 0x00001f00 | ||
173 | #define ETH_MII_WTD_DATA 0x0000ffff | ||
174 | #define ETH_MII_RDD_DATA 0x0000ffff | ||
175 | #define ETH_MII_IND_BSY (1 << 0) | ||
176 | #define ETH_MII_IND_SCN (1 << 1) | ||
177 | #define ETH_MII_IND_NV (1 << 2) | ||
178 | |||
179 | /* | ||
180 | * Values for the DEVCS field of the Ethernet DMA Rx and Tx descriptors. | ||
181 | */ | ||
182 | |||
183 | #define ETH_RX_FD (1 << 0) | ||
184 | #define ETH_RX_LD (1 << 1) | ||
185 | #define ETH_RX_ROK (1 << 2) | ||
186 | #define ETH_RX_FM (1 << 3) | ||
187 | #define ETH_RX_MP (1 << 4) | ||
188 | #define ETH_RX_BP (1 << 5) | ||
189 | #define ETH_RX_VLT (1 << 6) | ||
190 | #define ETH_RX_CF (1 << 7) | ||
191 | #define ETH_RX_OVR (1 << 8) | ||
192 | #define ETH_RX_CRC (1 << 9) | ||
193 | #define ETH_RX_CV (1 << 10) | ||
194 | #define ETH_RX_DB (1 << 11) | ||
195 | #define ETH_RX_LE (1 << 12) | ||
196 | #define ETH_RX_LOR (1 << 13) | ||
197 | #define ETH_RX_CES (1 << 14) | ||
198 | #define ETH_RX_LEN_BIT 16 | ||
199 | #define ETH_RX_LEN 0xffff0000 | ||
200 | |||
201 | #define ETH_TX_FD (1 << 0) | ||
202 | #define ETH_TX_LD (1 << 1) | ||
203 | #define ETH_TX_OEN (1 << 2) | ||
204 | #define ETH_TX_PEN (1 << 3) | ||
205 | #define ETH_TX_CEN (1 << 4) | ||
206 | #define ETH_TX_HEN (1 << 5) | ||
207 | #define ETH_TX_TOK (1 << 6) | ||
208 | #define ETH_TX_MP (1 << 7) | ||
209 | #define ETH_TX_BP (1 << 8) | ||
210 | #define ETH_TX_UND (1 << 9) | ||
211 | #define ETH_TX_OF (1 << 10) | ||
212 | #define ETH_TX_ED (1 << 11) | ||
213 | #define ETH_TX_EC (1 << 12) | ||
214 | #define ETH_TX_LC (1 << 13) | ||
215 | #define ETH_TX_TD (1 << 14) | ||
216 | #define ETH_TX_CRC (1 << 15) | ||
217 | #define ETH_TX_LE (1 << 16) | ||
218 | #define ETH_TX_CC 0x001E0000 | ||
219 | |||
220 | #endif /* __ASM_RC32434_ETH_H */ | ||
diff --git a/include/asm-mips/mach-rc32434/gpio.h b/include/asm-mips/mach-rc32434/gpio.h new file mode 100644 index 000000000000..f946f5f45bbb --- /dev/null +++ b/include/asm-mips/mach-rc32434/gpio.h | |||
@@ -0,0 +1,126 @@ | |||
1 | /* | ||
2 | * Copyright 2002 Integrated Device Technology, Inc. | ||
3 | * All rights reserved. | ||
4 | * | ||
5 | * GPIO register definition. | ||
6 | * | ||
7 | * Author : ryan.holmQVist@idt.com | ||
8 | * Date : 20011005 | ||
9 | * Copyright (C) 2001, 2002 Ryan Holm <ryan.holmQVist@idt.com> | ||
10 | * Copyright (C) 2008 Florian Fainelli <florian@openwrt.org> | ||
11 | */ | ||
12 | |||
13 | #ifndef _RC32434_GPIO_H_ | ||
14 | #define _RC32434_GPIO_H_ | ||
15 | |||
16 | #include <linux/types.h> | ||
17 | |||
18 | struct rb532_gpio_reg { | ||
19 | u32 gpiofunc; /* GPIO Function Register | ||
20 | * gpiofunc[x]==0 bit = gpio | ||
21 | * func[x]==1 bit = altfunc | ||
22 | */ | ||
23 | u32 gpiocfg; /* GPIO Configuration Register | ||
24 | * gpiocfg[x]==0 bit = input | ||
25 | * gpiocfg[x]==1 bit = output | ||
26 | */ | ||
27 | u32 gpiod; /* GPIO Data Register | ||
28 | * gpiod[x] read/write gpio pinX status | ||
29 | */ | ||
30 | u32 gpioilevel; /* GPIO Interrupt Status Register | ||
31 | * interrupt level (see gpioistat) | ||
32 | */ | ||
33 | u32 gpioistat; /* Gpio Interrupt Status Register | ||
34 | * istat[x] = (gpiod[x] == level[x]) | ||
35 | * cleared in ISR (STICKY bits) | ||
36 | */ | ||
37 | u32 gpionmien; /* GPIO Non-maskable Interrupt Enable Register */ | ||
38 | }; | ||
39 | |||
40 | /* UART GPIO signals */ | ||
41 | #define RC32434_UART0_SOUT (1 << 0) | ||
42 | #define RC32434_UART0_SIN (1 << 1) | ||
43 | #define RC32434_UART0_RTS (1 << 2) | ||
44 | #define RC32434_UART0_CTS (1 << 3) | ||
45 | |||
46 | /* M & P bus GPIO signals */ | ||
47 | #define RC32434_MP_BIT_22 (1 << 4) | ||
48 | #define RC32434_MP_BIT_23 (1 << 5) | ||
49 | #define RC32434_MP_BIT_24 (1 << 6) | ||
50 | #define RC32434_MP_BIT_25 (1 << 7) | ||
51 | |||
52 | /* CPU GPIO signals */ | ||
53 | #define RC32434_CPU_GPIO (1 << 8) | ||
54 | |||
55 | /* Reserved GPIO signals */ | ||
56 | #define RC32434_AF_SPARE_6 (1 << 9) | ||
57 | #define RC32434_AF_SPARE_4 (1 << 10) | ||
58 | #define RC32434_AF_SPARE_3 (1 << 11) | ||
59 | #define RC32434_AF_SPARE_2 (1 << 12) | ||
60 | |||
61 | /* PCI messaging unit */ | ||
62 | #define RC32434_PCI_MSU_GPIO (1 << 13) | ||
63 | |||
64 | |||
65 | extern void set_434_reg(unsigned reg_offs, unsigned bit, unsigned len, unsigned val); | ||
66 | extern unsigned get_434_reg(unsigned reg_offs); | ||
67 | extern void set_latch_u5(unsigned char or_mask, unsigned char nand_mask); | ||
68 | extern unsigned char get_latch_u5(void); | ||
69 | |||
70 | extern int rb532_gpio_get_value(unsigned gpio); | ||
71 | extern void rb532_gpio_set_value(unsigned gpio, int value); | ||
72 | extern int rb532_gpio_direction_input(unsigned gpio); | ||
73 | extern int rb532_gpio_direction_output(unsigned gpio, int value); | ||
74 | extern void rb532_gpio_set_int_level(unsigned gpio, int value); | ||
75 | extern int rb532_gpio_get_int_level(unsigned gpio); | ||
76 | extern void rb532_gpio_set_int_status(unsigned gpio, int value); | ||
77 | extern int rb532_gpio_get_int_status(unsigned gpio); | ||
78 | |||
79 | |||
80 | /* Wrappers for the arch-neutral GPIO API */ | ||
81 | |||
82 | static inline int gpio_request(unsigned gpio, const char *label) | ||
83 | { | ||
84 | /* Not yet implemented */ | ||
85 | return 0; | ||
86 | } | ||
87 | |||
88 | static inline void gpio_free(unsigned gpio) | ||
89 | { | ||
90 | /* Not yet implemented */ | ||
91 | } | ||
92 | |||
93 | static inline int gpio_direction_input(unsigned gpio) | ||
94 | { | ||
95 | return rb532_gpio_direction_input(gpio); | ||
96 | } | ||
97 | |||
98 | static inline int gpio_direction_output(unsigned gpio, int value) | ||
99 | { | ||
100 | return rb532_gpio_direction_output(gpio, value); | ||
101 | } | ||
102 | |||
103 | static inline int gpio_get_value(unsigned gpio) | ||
104 | { | ||
105 | return rb532_gpio_get_value(gpio); | ||
106 | } | ||
107 | |||
108 | static inline void gpio_set_value(unsigned gpio, int value) | ||
109 | { | ||
110 | rb532_gpio_set_value(gpio, value); | ||
111 | } | ||
112 | |||
113 | static inline int gpio_to_irq(unsigned gpio) | ||
114 | { | ||
115 | return gpio; | ||
116 | } | ||
117 | |||
118 | static inline int irq_to_gpio(unsigned irq) | ||
119 | { | ||
120 | return irq; | ||
121 | } | ||
122 | |||
123 | /* For cansleep */ | ||
124 | #include <asm-generic/gpio.h> | ||
125 | |||
126 | #endif /* _RC32434_GPIO_H_ */ | ||
diff --git a/include/asm-mips/mach-rc32434/integ.h b/include/asm-mips/mach-rc32434/integ.h new file mode 100644 index 000000000000..fa65bc3d8807 --- /dev/null +++ b/include/asm-mips/mach-rc32434/integ.h | |||
@@ -0,0 +1,59 @@ | |||
1 | /* | ||
2 | * Definitions for the Watchdog registers | ||
3 | * | ||
4 | * Copyright 2002 Ryan Holm <ryan.holmQVist@idt.com> | ||
5 | * Copyright 2008 Florian Fainelli <florian@openwrt.org> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify it | ||
8 | * under the terms of the GNU General Public License as published by the | ||
9 | * Free Software Foundation; either version 2 of the License, or (at your | ||
10 | * option) any later version. | ||
11 | * | ||
12 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED | ||
13 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
14 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
15 | * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
16 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
17 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
18 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
19 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
20 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
21 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
22 | * | ||
23 | * You should have received a copy of the GNU General Public License along | ||
24 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
25 | * 675 Mass Ave, Cambridge, MA 02139, USA. | ||
26 | * | ||
27 | */ | ||
28 | |||
29 | #ifndef __RC32434_INTEG_H__ | ||
30 | #define __RC32434_INTEG_H__ | ||
31 | |||
32 | #include <asm/mach-rc32434/rb.h> | ||
33 | |||
34 | #define INTEG0_BASE_ADDR 0x18030030 | ||
35 | |||
36 | struct integ { | ||
37 | u32 errcs; /* sticky use ERRCS_ */ | ||
38 | u32 wtcount; /* Watchdog timer count reg. */ | ||
39 | u32 wtcompare; /* Watchdog timer timeout value. */ | ||
40 | u32 wtc; /* Watchdog timer control. use WTC_ */ | ||
41 | }; | ||
42 | |||
43 | /* Error counters */ | ||
44 | #define RC32434_ERR_WTO 0 | ||
45 | #define RC32434_ERR_WNE 1 | ||
46 | #define RC32434_ERR_UCW 2 | ||
47 | #define RC32434_ERR_UCR 3 | ||
48 | #define RC32434_ERR_UPW 4 | ||
49 | #define RC32434_ERR_UPR 5 | ||
50 | #define RC32434_ERR_UDW 6 | ||
51 | #define RC32434_ERR_UDR 7 | ||
52 | #define RC32434_ERR_SAE 8 | ||
53 | #define RC32434_ERR_WRE 9 | ||
54 | |||
55 | /* Watchdog control bits */ | ||
56 | #define RC32434_WTC_EN 0 | ||
57 | #define RC32434_WTC_TO 1 | ||
58 | |||
59 | #endif /* __RC32434_INTEG_H__ */ | ||
diff --git a/include/asm-mips/mach-rc32434/irq.h b/include/asm-mips/mach-rc32434/irq.h new file mode 100644 index 000000000000..cb9e4725f5dc --- /dev/null +++ b/include/asm-mips/mach-rc32434/irq.h | |||
@@ -0,0 +1,8 @@ | |||
1 | #ifndef __ASM_RC32434_IRQ_H | ||
2 | #define __ASM_RC32434_IRQ_H | ||
3 | |||
4 | #define NR_IRQS 256 | ||
5 | |||
6 | #include <asm/mach-generic/irq.h> | ||
7 | |||
8 | #endif /* __ASM_RC32434_IRQ_H */ | ||
diff --git a/include/asm-mips/mach-rc32434/pci.h b/include/asm-mips/mach-rc32434/pci.h new file mode 100644 index 000000000000..410638f2af74 --- /dev/null +++ b/include/asm-mips/mach-rc32434/pci.h | |||
@@ -0,0 +1,481 @@ | |||
1 | /* | ||
2 | * This program is free software; you can redistribute it and/or modify it | ||
3 | * under the terms of the GNU General Public License as published by the | ||
4 | * Free Software Foundation; either version 2 of the License, or (at your | ||
5 | * option) any later version. | ||
6 | * | ||
7 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED | ||
8 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
9 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
10 | * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
11 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
12 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
13 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
14 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
15 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
16 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
17 | * | ||
18 | * You should have received a copy of the GNU General Public License along | ||
19 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
20 | * 675 Mass Ave, Cambridge, MA 02139, USA. | ||
21 | * | ||
22 | * Copyright 2004 IDT Inc. (rischelp@idt.com) | ||
23 | * | ||
24 | * Initial Release | ||
25 | */ | ||
26 | |||
27 | #ifndef _ASM_RC32434_PCI_H_ | ||
28 | #define _ASM_RC32434_PCI_H_ | ||
29 | |||
30 | #define epld_mask ((volatile unsigned char *)0xB900000d) | ||
31 | |||
32 | #define PCI0_BASE_ADDR 0x18080000 | ||
33 | #define PCI_LBA_COUNT 4 | ||
34 | |||
35 | struct pci_map { | ||
36 | u32 address; /* Address. */ | ||
37 | u32 control; /* Control. */ | ||
38 | u32 mapping; /* mapping. */ | ||
39 | }; | ||
40 | |||
41 | struct pci_reg { | ||
42 | u32 pcic; | ||
43 | u32 pcis; | ||
44 | u32 pcism; | ||
45 | u32 pcicfga; | ||
46 | u32 pcicfgd; | ||
47 | volatile struct pci_map pcilba[PCI_LBA_COUNT]; | ||
48 | u32 pcidac; | ||
49 | u32 pcidas; | ||
50 | u32 pcidasm; | ||
51 | u32 pcidad; | ||
52 | u32 pcidma8c; | ||
53 | u32 pcidma9c; | ||
54 | u32 pcitc; | ||
55 | }; | ||
56 | |||
57 | #define PCI_MSU_COUNT 2 | ||
58 | |||
59 | struct pci_msu { | ||
60 | u32 pciim[PCI_MSU_COUNT]; | ||
61 | u32 pciom[PCI_MSU_COUNT]; | ||
62 | u32 pciid; | ||
63 | u32 pciiic; | ||
64 | u32 pciiim; | ||
65 | u32 pciiod; | ||
66 | u32 pciioic; | ||
67 | u32 pciioim; | ||
68 | }; | ||
69 | |||
70 | /* | ||
71 | * PCI Control Register | ||
72 | */ | ||
73 | |||
74 | #define PCI_CTL_EN (1 << 0) | ||
75 | #define PCI_CTL_TNR (1 << 1) | ||
76 | #define PCI_CTL_SCE (1 << 2) | ||
77 | #define PCI_CTL_IEN (1 << 3) | ||
78 | #define PCI_CTL_AAA (1 << 4) | ||
79 | #define PCI_CTL_EAP (1 << 5) | ||
80 | #define PCI_CTL_PCIM_BIT 6 | ||
81 | #define PCI_CTL_PCIM 0x000001c0 | ||
82 | |||
83 | #define PCI_CTL_PCIM_DIS 0 | ||
84 | #define PCI_CTL_PCIM_TNR 1 /* Satellite - target not ready */ | ||
85 | #define PCI_CTL_PCIM_SUS 2 /* Satellite - suspended CPU. */ | ||
86 | #define PCI_CTL_PCIM_EXT 3 /* Host - external arbiter. */ | ||
87 | #define PCI_CTL PCIM_PRIO 4 /* Host - fixed priority arb. */ | ||
88 | #define PCI_CTL_PCIM_RR 5 /* Host - round robin priority. */ | ||
89 | #define PCI_CTL_PCIM_RSVD6 6 | ||
90 | #define PCI_CTL_PCIM_RSVD7 7 | ||
91 | |||
92 | #define PCI_CTL_IGM (1 << 9) | ||
93 | |||
94 | /* | ||
95 | * PCI Status Register | ||
96 | */ | ||
97 | |||
98 | #define PCI_STAT_EED (1 << 0) | ||
99 | #define PCI_STAT_WR (1 << 1) | ||
100 | #define PCI_STAT_NMI (1 << 2) | ||
101 | #define PCI_STAT_II (1 << 3) | ||
102 | #define PCI_STAT_CWE (1 << 4) | ||
103 | #define PCI_STAT_CRE (1 << 5) | ||
104 | #define PCI_STAT_MDPE (1 << 6) | ||
105 | #define PCI_STAT_STA (1 << 7) | ||
106 | #define PCI_STAT_RTA (1 << 8) | ||
107 | #define PCI_STAT_RMA (1 << 9) | ||
108 | #define PCI_STAT_SSE (1 << 10) | ||
109 | #define PCI_STAT_OSE (1 << 11) | ||
110 | #define PCI_STAT_PE (1 << 12) | ||
111 | #define PCI_STAT_TAE (1 << 13) | ||
112 | #define PCI_STAT_RLE (1 << 14) | ||
113 | #define PCI_STAT_BME (1 << 15) | ||
114 | #define PCI_STAT_PRD (1 << 16) | ||
115 | #define PCI_STAT_RIP (1 << 17) | ||
116 | |||
117 | /* | ||
118 | * PCI Status Mask Register | ||
119 | */ | ||
120 | |||
121 | #define PCI_STATM_EED PCI_STAT_EED | ||
122 | #define PCI_STATM_WR PCI_STAT_WR | ||
123 | #define PCI_STATM_NMI PCI_STAT_NMI | ||
124 | #define PCI_STATM_II PCI_STAT_II | ||
125 | #define PCI_STATM_CWE PCI_STAT_CWE | ||
126 | #define PCI_STATM_CRE PCI_STAT_CRE | ||
127 | #define PCI_STATM_MDPE PCI_STAT_MDPE | ||
128 | #define PCI_STATM_STA PCI_STAT_STA | ||
129 | #define PCI_STATM_RTA PCI_STAT_RTA | ||
130 | #define PCI_STATM_RMA PCI_STAT_RMA | ||
131 | #define PCI_STATM_SSE PCI_STAT_SSE | ||
132 | #define PCI_STATM_OSE PCI_STAT_OSE | ||
133 | #define PCI_STATM_PE PCI_STAT_PE | ||
134 | #define PCI_STATM_TAE PCI_STAT_TAE | ||
135 | #define PCI_STATM_RLE PCI_STAT_RLE | ||
136 | #define PCI_STATM_BME PCI_STAT_BME | ||
137 | #define PCI_STATM_PRD PCI_STAT_PRD | ||
138 | #define PCI_STATM_RIP PCI_STAT_RIP | ||
139 | |||
140 | /* | ||
141 | * PCI Configuration Address Register | ||
142 | */ | ||
143 | #define PCI_CFGA_REG_BIT 2 | ||
144 | #define PCI_CFGA_REG 0x000000fc | ||
145 | #define PCI_CFGA_REG_ID (0x00 >> 2) /* use PCFGID */ | ||
146 | #define PCI_CFGA_REG_04 (0x04 >> 2) /* use PCFG04_ */ | ||
147 | #define PCI_CFGA_REG_08 (0x08 >> 2) /* use PCFG08_ */ | ||
148 | #define PCI_CFGA_REG_0C (0x0C >> 2) /* use PCFG0C_ */ | ||
149 | #define PCI_CFGA_REG_PBA0 (0x10 >> 2) /* use PCIPBA_ */ | ||
150 | #define PCI_CFGA_REG_PBA1 (0x14 >> 2) /* use PCIPBA_ */ | ||
151 | #define PCI_CFGA_REG_PBA2 (0x18 >> 2) /* use PCIPBA_ */ | ||
152 | #define PCI_CFGA_REG_PBA3 (0x1c >> 2) /* use PCIPBA_ */ | ||
153 | #define PCI_CFGA_REG_SUBSYS (0x2c >> 2) /* use PCFGSS_ */ | ||
154 | #define PCI_CFGA_REG_3C (0x3C >> 2) /* use PCFG3C_ */ | ||
155 | #define PCI_CFGA_REG_PBBA0C (0x44 >> 2) /* use PCIPBAC_ */ | ||
156 | #define PCI_CFGA_REG_PBA0M (0x48 >> 2) | ||
157 | #define PCI_CFGA_REG_PBA1C (0x4c >> 2) /* use PCIPBAC_ */ | ||
158 | #define PCI_CFGA_REG_PBA1M (0x50 >> 2) | ||
159 | #define PCI_CFGA_REG_PBA2C (0x54 >> 2) /* use PCIPBAC_ */ | ||
160 | #define PCI_CFGA_REG_PBA2M (0x58 >> 2) | ||
161 | #define PCI_CFGA_REG_PBA3C (0x5c >> 2) /* use PCIPBAC_ */ | ||
162 | #define PCI_CFGA_REG_PBA3M (0x60 >> 2) | ||
163 | #define PCI_CFGA_REG_PMGT (0x64 >> 2) | ||
164 | #define PCI_CFGA_FUNC_BIT 8 | ||
165 | #define PCI_CFGA_FUNC 0x00000700 | ||
166 | #define PCI_CFGA_DEV_BIT 11 | ||
167 | #define PCI_CFGA_DEV 0x0000f800 | ||
168 | #define PCI_CFGA_DEV_INTERN 0 | ||
169 | #define PCI_CFGA_BUS_BIT 16 | ||
170 | #define PCI CFGA_BUS 0x00ff0000 | ||
171 | #define PCI_CFGA_BUS_TYPE0 0 | ||
172 | #define PCI_CFGA_EN (1 << 31) | ||
173 | |||
174 | /* PCI CFG04 commands */ | ||
175 | #define PCI_CFG04_CMD_IO_ENA (1 << 0) | ||
176 | #define PCI_CFG04_CMD_MEM_ENA (1 << 1) | ||
177 | #define PCI_CFG04_CMD_BM_ENA (1 << 2) | ||
178 | #define PCI_CFG04_CMD_MW_INV (1 << 4) | ||
179 | #define PCI_CFG04_CMD_PAR_ENA (1 << 6) | ||
180 | #define PCI_CFG04_CMD_SER_ENA (1 << 8) | ||
181 | #define PCI_CFG04_CMD_FAST_ENA (1 << 9) | ||
182 | |||
183 | /* PCI CFG04 status fields */ | ||
184 | #define PCI_CFG04_STAT_BIT 16 | ||
185 | #define PCI_CFG04_STAT 0xffff0000 | ||
186 | #define PCI_CFG04_STAT_66_MHZ (1 << 21) | ||
187 | #define PCI_CFG04_STAT_FBB (1 << 23) | ||
188 | #define PCI_CFG04_STAT_MDPE (1 << 24) | ||
189 | #define PCI_CFG04_STAT_DST (1 << 25) | ||
190 | #define PCI_CFG04_STAT_STA (1 << 27) | ||
191 | #define PCI_CFG04_STAT_RTA (1 << 28) | ||
192 | #define PCI_CFG04_STAT_RMA (1 << 29) | ||
193 | #define PCI_CFG04_STAT_SSE (1 << 30) | ||
194 | #define PCI_CFG04_STAT_PE (1 << 31) | ||
195 | |||
196 | #define PCI_PBA_MSI (1 << 0) | ||
197 | #define PCI_PBA_P (1 << 2) | ||
198 | |||
199 | /* PCI PBAC registers */ | ||
200 | #define PCI_PBAC_MSI (1 << 0) | ||
201 | #define PCI_PBAC_P (1 << 1) | ||
202 | #define PCI_PBAC_SIZE_BIT 2 | ||
203 | #define PCI_PBAC_SIZE 0x0000007c | ||
204 | #define PCI_PBAC_SB (1 << 7) | ||
205 | #define PCI_PBAC_PP (1 << 8) | ||
206 | #define PCI_PBAC_MR_BIT 9 | ||
207 | #define PCI_PBAC_MR 0x00000600 | ||
208 | #define PCI_PBAC_MR_RD 0 | ||
209 | #define PCI_PBAC_MR_RD_LINE 1 | ||
210 | #define PCI_PBAC_MR_RD_MULT 2 | ||
211 | #define PCI_PBAC_MRL (1 << 11) | ||
212 | #define PCI_PBAC_MRM (1 << 12) | ||
213 | #define PCI_PBAC_TRP (1 << 13) | ||
214 | |||
215 | #define PCI_CFG40_TRDY_TIM 0x000000ff | ||
216 | #define PCI_CFG40_RET_LIM 0x0000ff00 | ||
217 | |||
218 | /* | ||
219 | * PCI Local Base Address [0|1|2|3] Register | ||
220 | */ | ||
221 | |||
222 | #define PCI_LBA_BADDR_BIT 0 | ||
223 | #define PCI_LBA_BADDR 0xffffff00 | ||
224 | |||
225 | /* | ||
226 | * PCI Local Base Address Control Register | ||
227 | */ | ||
228 | |||
229 | #define PCI_LBAC_MSI (1 << 0) | ||
230 | #define PCI_LBAC_MSI_MEM 0 | ||
231 | #define PCI_LBAC_MSI_IO 1 | ||
232 | #define PCI_LBAC_SIZE_BIT 2 | ||
233 | #define PCI_LBAC_SIZE 0x0000007c | ||
234 | #define PCI_LBAC_SB (1 << 7) | ||
235 | #define PCI_LBAC_RT (1 << 8) | ||
236 | #define PCI_LBAC_RT_NO_PREF 0 | ||
237 | #define PCI_LBAC_RT_PREF 1 | ||
238 | |||
239 | /* | ||
240 | * PCI Local Base Address [0|1|2|3] Mapping Register | ||
241 | */ | ||
242 | #define PCI_LBAM_MADDR_BIT 8 | ||
243 | #define PCI_LBAM_MADDR 0xffffff00 | ||
244 | |||
245 | /* | ||
246 | * PCI Decoupled Access Control Register | ||
247 | */ | ||
248 | #define PCI_DAC_DEN (1 << 0) | ||
249 | |||
250 | /* | ||
251 | * PCI Decoupled Access Status Register | ||
252 | */ | ||
253 | #define PCI_DAS_D (1 << 0) | ||
254 | #define PCI_DAS_B (1 << 1) | ||
255 | #define PCI_DAS_E (1 << 2) | ||
256 | #define PCI_DAS_OFE (1 << 3) | ||
257 | #define PCI_DAS_OFF (1 << 4) | ||
258 | #define PCI_DAS_IFE (1 << 5) | ||
259 | #define PCI_DAS_IFF (1 << 6) | ||
260 | |||
261 | /* | ||
262 | * PCI DMA Channel 8 Configuration Register | ||
263 | */ | ||
264 | #define PCI_DMA8C_MBS_BIT 0 | ||
265 | #define PCI_DMA8C_MBS 0x00000fff /* Maximum Burst Size. */ | ||
266 | #define PCI_DMA8C_OUR (1 << 12) | ||
267 | |||
268 | /* | ||
269 | * PCI DMA Channel 9 Configuration Register | ||
270 | */ | ||
271 | #define PCI_DMA9C_MBS_BIT 0 /* Maximum Burst Size. */ | ||
272 | #define PCI_DMA9C_MBS 0x00000fff | ||
273 | |||
274 | /* | ||
275 | * PCI to Memory(DMA Channel 8) AND Memory to PCI DMA(DMA Channel 9)Descriptors | ||
276 | */ | ||
277 | |||
278 | #define PCI_DMAD_PT_BIT 22 /* in DEVCMD field (descriptor) */ | ||
279 | #define PCI_DMAD_PT 0x00c00000 /* preferred transaction field */ | ||
280 | /* These are for reads (DMA channel 8) */ | ||
281 | #define PCI_DMAD_DEVCMD_MR 0 /* memory read */ | ||
282 | #define PCI_DMAD_DEVCMD_MRL 1 /* memory read line */ | ||
283 | #define PCI_DMAD_DEVCMD_MRM 2 /* memory read multiple */ | ||
284 | #define PCI_DMAD_DEVCMD_IOR 3 /* I/O read */ | ||
285 | /* These are for writes (DMA channel 9) */ | ||
286 | #define PCI_DMAD_DEVCMD_MW 0 /* memory write */ | ||
287 | #define PCI_DMAD_DEVCMD_MWI 1 /* memory write invalidate */ | ||
288 | #define PCI_DMAD_DEVCMD_IOW 3 /* I/O write */ | ||
289 | |||
290 | /* Swap byte field applies to both DMA channel 8 and 9 */ | ||
291 | #define PCI_DMAD_SB (1 << 24) /* swap byte field */ | ||
292 | |||
293 | |||
294 | /* | ||
295 | * PCI Target Control Register | ||
296 | */ | ||
297 | |||
298 | #define PCI_TC_RTIMER_BIT 0 | ||
299 | #define PCI_TC_RTIMER 0x000000ff | ||
300 | #define PCI_TC_DTIMER_BIT 8 | ||
301 | #define PCI_TC_DTIMER 0x0000ff00 | ||
302 | #define PCI_TC_RDR (1 << 18) | ||
303 | #define PCI_TC_DDT (1 << 19) | ||
304 | |||
305 | /* | ||
306 | * PCI messaging unit [applies to both inbound and outbound registers ] | ||
307 | */ | ||
308 | #define PCI_MSU_M0 (1 << 0) | ||
309 | #define PCI_MSU_M1 (1 << 1) | ||
310 | #define PCI_MSU_DB (1 << 2) | ||
311 | |||
312 | #define PCI_MSG_ADDR 0xB8088010 | ||
313 | #define PCI0_ADDR 0xB8080000 | ||
314 | #define rc32434_pci ((struct pci_reg *) PCI0_ADDR) | ||
315 | #define rc32434_pci_msg ((struct pci_msu *) PCI_MSG_ADDR) | ||
316 | |||
317 | #define PCIM_SHFT 0x6 | ||
318 | #define PCIM_BIT_LEN 0x7 | ||
319 | #define PCIM_H_EA 0x3 | ||
320 | #define PCIM_H_IA_FIX 0x4 | ||
321 | #define PCIM_H_IA_RR 0x5 | ||
322 | #if 0 | ||
323 | #define PCI_ADDR_START 0x13000000 | ||
324 | #endif | ||
325 | |||
326 | #define PCI_ADDR_START 0x50000000 | ||
327 | |||
328 | #define CPUTOPCI_MEM_WIN 0x02000000 | ||
329 | #define CPUTOPCI_IO_WIN 0x00100000 | ||
330 | #define PCILBA_SIZE_SHFT 2 | ||
331 | #define PCILBA_SIZE_MASK 0x1F | ||
332 | #define SIZE_256MB 0x1C | ||
333 | #define SIZE_128MB 0x1B | ||
334 | #define SIZE_64MB 0x1A | ||
335 | #define SIZE_32MB 0x19 | ||
336 | #define SIZE_16MB 0x18 | ||
337 | #define SIZE_4MB 0x16 | ||
338 | #define SIZE_2MB 0x15 | ||
339 | #define SIZE_1MB 0x14 | ||
340 | #define KORINA_CONFIG0_ADDR 0x80000000 | ||
341 | #define KORINA_CONFIG1_ADDR 0x80000004 | ||
342 | #define KORINA_CONFIG2_ADDR 0x80000008 | ||
343 | #define KORINA_CONFIG3_ADDR 0x8000000C | ||
344 | #define KORINA_CONFIG4_ADDR 0x80000010 | ||
345 | #define KORINA_CONFIG5_ADDR 0x80000014 | ||
346 | #define KORINA_CONFIG6_ADDR 0x80000018 | ||
347 | #define KORINA_CONFIG7_ADDR 0x8000001C | ||
348 | #define KORINA_CONFIG8_ADDR 0x80000020 | ||
349 | #define KORINA_CONFIG9_ADDR 0x80000024 | ||
350 | #define KORINA_CONFIG10_ADDR 0x80000028 | ||
351 | #define KORINA_CONFIG11_ADDR 0x8000002C | ||
352 | #define KORINA_CONFIG12_ADDR 0x80000030 | ||
353 | #define KORINA_CONFIG13_ADDR 0x80000034 | ||
354 | #define KORINA_CONFIG14_ADDR 0x80000038 | ||
355 | #define KORINA_CONFIG15_ADDR 0x8000003C | ||
356 | #define KORINA_CONFIG16_ADDR 0x80000040 | ||
357 | #define KORINA_CONFIG17_ADDR 0x80000044 | ||
358 | #define KORINA_CONFIG18_ADDR 0x80000048 | ||
359 | #define KORINA_CONFIG19_ADDR 0x8000004C | ||
360 | #define KORINA_CONFIG20_ADDR 0x80000050 | ||
361 | #define KORINA_CONFIG21_ADDR 0x80000054 | ||
362 | #define KORINA_CONFIG22_ADDR 0x80000058 | ||
363 | #define KORINA_CONFIG23_ADDR 0x8000005C | ||
364 | #define KORINA_CONFIG24_ADDR 0x80000060 | ||
365 | #define KORINA_CONFIG25_ADDR 0x80000064 | ||
366 | #define KORINA_CMD (PCI_CFG04_CMD_IO_ENA | \ | ||
367 | PCI_CFG04_CMD_MEM_ENA | \ | ||
368 | PCI_CFG04_CMD_BM_ENA | \ | ||
369 | PCI_CFG04_CMD_MW_INV | \ | ||
370 | PCI_CFG04_CMD_PAR_ENA | \ | ||
371 | PCI_CFG04_CMD_SER_ENA) | ||
372 | |||
373 | #define KORINA_STAT (PCI_CFG04_STAT_MDPE | \ | ||
374 | PCI_CFG04_STAT_STA | \ | ||
375 | PCI_CFG04_STAT_RTA | \ | ||
376 | PCI_CFG04_STAT_RMA | \ | ||
377 | PCI_CFG04_STAT_SSE | \ | ||
378 | PCI_CFG04_STAT_PE) | ||
379 | |||
380 | #define KORINA_CNFG1 ((KORINA_STAT<<16)|KORINA_CMD) | ||
381 | |||
382 | #define KORINA_REVID 0 | ||
383 | #define KORINA_CLASS_CODE 0 | ||
384 | #define KORINA_CNFG2 ((KORINA_CLASS_CODE<<8) | \ | ||
385 | KORINA_REVID) | ||
386 | |||
387 | #define KORINA_CACHE_LINE_SIZE 4 | ||
388 | #define KORINA_MASTER_LAT 0x3c | ||
389 | #define KORINA_HEADER_TYPE 0 | ||
390 | #define KORINA_BIST 0 | ||
391 | |||
392 | #define KORINA_CNFG3 ((KORINA_BIST << 24) | \ | ||
393 | (KORINA_HEADER_TYPE<<16) | \ | ||
394 | (KORINA_MASTER_LAT<<8) | \ | ||
395 | KORINA_CACHE_LINE_SIZE) | ||
396 | |||
397 | #define KORINA_BAR0 0x00000008 /* 128 MB Memory */ | ||
398 | #define KORINA_BAR1 0x18800001 /* 1 MB IO */ | ||
399 | #define KORINA_BAR2 0x18000001 /* 2 MB IO window for Korina | ||
400 | internal Registers */ | ||
401 | #define KORINA_BAR3 0x48000008 /* Spare 128 MB Memory */ | ||
402 | |||
403 | #define KORINA_CNFG4 KORINA_BAR0 | ||
404 | #define KORINA_CNFG5 KORINA_BAR1 | ||
405 | #define KORINA_CNFG6 KORINA_BAR2 | ||
406 | #define KORINA_CNFG7 KORINA_BAR3 | ||
407 | |||
408 | #define KORINA_SUBSYS_VENDOR_ID 0x011d | ||
409 | #define KORINA_SUBSYSTEM_ID 0x0214 | ||
410 | #define KORINA_CNFG8 0 | ||
411 | #define KORINA_CNFG9 0 | ||
412 | #define KORINA_CNFG10 0 | ||
413 | #define KORINA_CNFG11 ((KORINA_SUBSYS_VENDOR_ID<<16) | \ | ||
414 | KORINA_SUBSYSTEM_ID) | ||
415 | #define KORINA_INT_LINE 1 | ||
416 | #define KORINA_INT_PIN 1 | ||
417 | #define KORINA_MIN_GNT 8 | ||
418 | #define KORINA_MAX_LAT 0x38 | ||
419 | #define KORINA_CNFG12 0 | ||
420 | #define KORINA_CNFG13 0 | ||
421 | #define KORINA_CNFG14 0 | ||
422 | #define KORINA_CNFG15 ((KORINA_MAX_LAT<<24) | \ | ||
423 | (KORINA_MIN_GNT<<16) | \ | ||
424 | (KORINA_INT_PIN<<8) | \ | ||
425 | KORINA_INT_LINE) | ||
426 | #define KORINA_RETRY_LIMIT 0x80 | ||
427 | #define KORINA_TRDY_LIMIT 0x80 | ||
428 | #define KORINA_CNFG16 ((KORINA_RETRY_LIMIT<<8) | \ | ||
429 | KORINA_TRDY_LIMIT) | ||
430 | #define PCI_PBAxC_R 0x0 | ||
431 | #define PCI_PBAxC_RL 0x1 | ||
432 | #define PCI_PBAxC_RM 0x2 | ||
433 | #define SIZE_SHFT 2 | ||
434 | |||
435 | #if defined(__MIPSEB__) | ||
436 | #define KORINA_PBA0C (PCI_PBAC_MRL | PCI_PBAC_SB | \ | ||
437 | ((PCI_PBAxC_RM & 0x3) << PCI_PBAC_MR_BIT) | \ | ||
438 | PCI_PBAC_PP | \ | ||
439 | (SIZE_128MB<<SIZE_SHFT) | \ | ||
440 | PCI_PBAC_P) | ||
441 | #else | ||
442 | #define KORINA_PBA0C (PCI_PBAC_MRL | \ | ||
443 | ((PCI_PBAxC_RM & 0x3) << PCI_PBAC_MR_BIT) | \ | ||
444 | PCI_PBAC_PP | \ | ||
445 | (SIZE_128MB<<SIZE_SHFT) | \ | ||
446 | PCI_PBAC_P) | ||
447 | #endif | ||
448 | #define KORINA_CNFG17 KORINA_PBA0C | ||
449 | #define KORINA_PBA0M 0x0 | ||
450 | #define KORINA_CNFG18 KORINA_PBA0M | ||
451 | |||
452 | #if defined(__MIPSEB__) | ||
453 | #define KORINA_PBA1C ((SIZE_1MB<<SIZE_SHFT) | PCI_PBAC_SB | \ | ||
454 | PCI_PBAC_MSI) | ||
455 | #else | ||
456 | #define KORINA_PBA1C ((SIZE_1MB<<SIZE_SHFT) | \ | ||
457 | PCI_PBAC_MSI) | ||
458 | #endif | ||
459 | #define KORINA_CNFG19 KORINA_PBA1C | ||
460 | #define KORINA_PBA1M 0x0 | ||
461 | #define KORINA_CNFG20 KORINA_PBA1M | ||
462 | |||
463 | #if defined(__MIPSEB__) | ||
464 | #define KORINA_PBA2C ((SIZE_2MB<<SIZE_SHFT) | PCI_PBAC_SB | \ | ||
465 | PCI_PBAC_MSI) | ||
466 | #else | ||
467 | #define KORINA_PBA2C ((SIZE_2MB<<SIZE_SHFT) | \ | ||
468 | PCI_PBAC_MSI) | ||
469 | #endif | ||
470 | #define KORINA_CNFG21 KORINA_PBA2C | ||
471 | #define KORINA_PBA2M 0x18000000 | ||
472 | #define KORINA_CNFG22 KORINA_PBA2M | ||
473 | #define KORINA_PBA3C 0 | ||
474 | #define KORINA_CNFG23 KORINA_PBA3C | ||
475 | #define KORINA_PBA3M 0 | ||
476 | #define KORINA_CNFG24 KORINA_PBA3M | ||
477 | |||
478 | #define PCITC_DTIMER_VAL 8 | ||
479 | #define PCITC_RTIMER_VAL 0x10 | ||
480 | |||
481 | #endif /* __ASM_RC32434_PCI_H */ | ||
diff --git a/include/asm-mips/mach-rc32434/prom.h b/include/asm-mips/mach-rc32434/prom.h new file mode 100644 index 000000000000..1d66ddcda89a --- /dev/null +++ b/include/asm-mips/mach-rc32434/prom.h | |||
@@ -0,0 +1,44 @@ | |||
1 | /* | ||
2 | * Definitions for the PROM | ||
3 | * | ||
4 | * Copyright 2002 Ryan Holm <ryan.holmQVist@idt.com> | ||
5 | * Copyright 2008 Florian Fainelli <florian@openwrt.org> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify it | ||
8 | * under the terms of the GNU General Public License as published by the | ||
9 | * Free Software Foundation; either version 2 of the License, or (at your | ||
10 | * option) any later version. | ||
11 | * | ||
12 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED | ||
13 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
14 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
15 | * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
16 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
17 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
18 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
19 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
20 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
21 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
22 | * | ||
23 | * You should have received a copy of the GNU General Public License along | ||
24 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
25 | * 675 Mass Ave, Cambridge, MA 02139, USA. | ||
26 | * | ||
27 | */ | ||
28 | |||
29 | #define PROM_ENTRY(x) (0xbfc00000 + ((x) * 8)) | ||
30 | |||
31 | #define GPIO_INIT_NOBUTTON "" | ||
32 | #define GPIO_INIT_BUTTON " 2" | ||
33 | |||
34 | #define SR_NMI 0x00180000 | ||
35 | #define SERIAL_SPEED_ENTRY 0x00000001 | ||
36 | |||
37 | #define FREQ_TAG "HZ=" | ||
38 | #define GPIO_TAG "gpio=" | ||
39 | #define KMAC_TAG "kmac=" | ||
40 | #define MEM_TAG "mem=" | ||
41 | #define BOARD_TAG "board=" | ||
42 | |||
43 | #define BOARD_RB532 "500" | ||
44 | #define BOARD_RB532A "500r5" | ||
diff --git a/include/asm-mips/mach-rc32434/rb.h b/include/asm-mips/mach-rc32434/rb.h new file mode 100644 index 000000000000..e0a76e3ffea8 --- /dev/null +++ b/include/asm-mips/mach-rc32434/rb.h | |||
@@ -0,0 +1,81 @@ | |||
1 | /* | ||
2 | * This program is free software; you can redistribute it and/or modify | ||
3 | * it under the terms of the GNU General Public License as published by | ||
4 | * the Free Software Foundation; either version 2 of the License, or | ||
5 | * (at your option) any later version. | ||
6 | * | ||
7 | * This program is distributed in the hope that it will be useful, | ||
8 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
9 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
10 | * GNU General Public License for more details. | ||
11 | * | ||
12 | * Copyright (C) 2004 IDT Inc. | ||
13 | * Copyright (C) 2006 Felix Fietkau <nbd@openwrt.org> | ||
14 | */ | ||
15 | #ifndef __ASM_RC32434_RB_H | ||
16 | #define __ASM_RC32434_RB_H | ||
17 | |||
18 | #include <linux/genhd.h> | ||
19 | |||
20 | #define IDT434_REG_BASE ((volatile void *) KSEG1ADDR(0x18000000)) | ||
21 | #define DEV0BASE 0x010000 | ||
22 | #define DEV0MASK 0x010004 | ||
23 | #define DEV0C 0x010008 | ||
24 | #define DEV0T 0x01000C | ||
25 | #define DEV1BASE 0x010010 | ||
26 | #define DEV1MASK 0x010014 | ||
27 | #define DEV1C 0x010018 | ||
28 | #define DEV1TC 0x01001C | ||
29 | #define DEV2BASE 0x010020 | ||
30 | #define DEV2MASK 0x010024 | ||
31 | #define DEV2C 0x010028 | ||
32 | #define DEV2TC 0x01002C | ||
33 | #define DEV3BASE 0x010030 | ||
34 | #define DEV3MASK 0x010034 | ||
35 | #define DEV3C 0x010038 | ||
36 | #define DEV3TC 0x01003C | ||
37 | #define BTCS 0x010040 | ||
38 | #define BTCOMPARE 0x010044 | ||
39 | #define GPIOBASE 0x050000 | ||
40 | #define GPIOCFG 0x050004 | ||
41 | #define GPIOD 0x050008 | ||
42 | #define GPIOILEVEL 0x05000C | ||
43 | #define GPIOISTAT 0x050010 | ||
44 | #define GPIONMIEN 0x050014 | ||
45 | #define IMASK6 0x038038 | ||
46 | #define LO_WPX (1 << 0) | ||
47 | #define LO_ALE (1 << 1) | ||
48 | #define LO_CLE (1 << 2) | ||
49 | #define LO_CEX (1 << 3) | ||
50 | #define LO_FOFF (1 << 5) | ||
51 | #define LO_SPICS (1 << 6) | ||
52 | #define LO_ULED (1 << 7) | ||
53 | |||
54 | #define BIT_TO_MASK(x) (1 << x) | ||
55 | |||
56 | struct dev_reg { | ||
57 | u32 base; | ||
58 | u32 mask; | ||
59 | u32 ctl; | ||
60 | u32 timing; | ||
61 | }; | ||
62 | |||
63 | struct korina_device { | ||
64 | char *name; | ||
65 | unsigned char mac[6]; | ||
66 | struct net_device *dev; | ||
67 | }; | ||
68 | |||
69 | struct cf_device { | ||
70 | int gpio_pin; | ||
71 | void *dev; | ||
72 | struct gendisk *gd; | ||
73 | }; | ||
74 | |||
75 | struct mpmc_device { | ||
76 | unsigned char state; | ||
77 | spinlock_t lock; | ||
78 | void __iomem *base; | ||
79 | }; | ||
80 | |||
81 | #endif /* __ASM_RC32434_RB_H */ | ||
diff --git a/include/asm-mips/mach-rc32434/rc32434.h b/include/asm-mips/mach-rc32434/rc32434.h new file mode 100644 index 000000000000..c4a02145104e --- /dev/null +++ b/include/asm-mips/mach-rc32434/rc32434.h | |||
@@ -0,0 +1,61 @@ | |||
1 | /* | ||
2 | * Definitions for IDT RC323434 CPU. | ||
3 | */ | ||
4 | |||
5 | #ifndef _ASM_RC32434_RC32434_H_ | ||
6 | #define _ASM_RC32434_RC32434_H_ | ||
7 | |||
8 | #include <linux/delay.h> | ||
9 | #include <linux/io.h> | ||
10 | |||
11 | #define RC32434_REG_BASE 0x18000000 | ||
12 | #define RC32434_RST (1 << 15) | ||
13 | |||
14 | #define IDT_CLOCK_MULT 2 | ||
15 | #define MIPS_CPU_TIMER_IRQ 7 | ||
16 | |||
17 | /* Interrupt Controller */ | ||
18 | #define IC_GROUP0_PEND (RC32434_REG_BASE + 0x38000) | ||
19 | #define IC_GROUP0_MASK (RC32434_REG_BASE + 0x38008) | ||
20 | #define IC_GROUP_OFFSET 0x0C | ||
21 | |||
22 | #define NUM_INTR_GROUPS 5 | ||
23 | |||
24 | /* 16550 UARTs */ | ||
25 | #define GROUP0_IRQ_BASE 8 /* GRP2 IRQ numbers start here */ | ||
26 | /* GRP3 IRQ numbers start here */ | ||
27 | #define GROUP1_IRQ_BASE (GROUP0_IRQ_BASE + 32) | ||
28 | /* GRP4 IRQ numbers start here */ | ||
29 | #define GROUP2_IRQ_BASE (GROUP1_IRQ_BASE + 32) | ||
30 | /* GRP5 IRQ numbers start here */ | ||
31 | #define GROUP3_IRQ_BASE (GROUP2_IRQ_BASE + 32) | ||
32 | #define GROUP4_IRQ_BASE (GROUP3_IRQ_BASE + 32) | ||
33 | |||
34 | |||
35 | #ifdef __MIPSEB__ | ||
36 | #define RC32434_UART0_BASE (RC32434_REG_BASE + 0x58003) | ||
37 | #else | ||
38 | #define RC32434_UART0_BASE (RC32434_REG_BASE + 0x58000) | ||
39 | #endif | ||
40 | |||
41 | #define RC32434_UART0_IRQ (GROUP3_IRQ_BASE + 0) | ||
42 | |||
43 | /* cpu pipeline flush */ | ||
44 | static inline void rc32434_sync(void) | ||
45 | { | ||
46 | __asm__ volatile ("sync"); | ||
47 | } | ||
48 | |||
49 | static inline void rc32434_sync_udelay(int us) | ||
50 | { | ||
51 | __asm__ volatile ("sync"); | ||
52 | udelay(us); | ||
53 | } | ||
54 | |||
55 | static inline void rc32434_sync_delay(int ms) | ||
56 | { | ||
57 | __asm__ volatile ("sync"); | ||
58 | mdelay(ms); | ||
59 | } | ||
60 | |||
61 | #endif /* _ASM_RC32434_RC32434_H_ */ | ||
diff --git a/include/asm-mips/mach-rc32434/timer.h b/include/asm-mips/mach-rc32434/timer.h new file mode 100644 index 000000000000..e49b1d57a017 --- /dev/null +++ b/include/asm-mips/mach-rc32434/timer.h | |||
@@ -0,0 +1,65 @@ | |||
1 | /* | ||
2 | * Definitions for timer registers | ||
3 | * | ||
4 | * Copyright 2004 Philip Rischel <rischelp@idt.com> | ||
5 | * Copyright 2008 Florian Fainelli <florian@openwrt.org> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify it | ||
8 | * under the terms of the GNU General Public License as published by the | ||
9 | * Free Software Foundation; either version 2 of the License, or (at your | ||
10 | * option) any later version. | ||
11 | * | ||
12 | * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED | ||
13 | * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
14 | * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN | ||
15 | * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | ||
16 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | ||
17 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF | ||
18 | * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
19 | * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
20 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
21 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
22 | * | ||
23 | * You should have received a copy of the GNU General Public License along | ||
24 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
25 | * 675 Mass Ave, Cambridge, MA 02139, USA. | ||
26 | * | ||
27 | */ | ||
28 | |||
29 | #ifndef __ASM_RC32434_TIMER_H | ||
30 | #define __ASM_RC32434_TIMER_H | ||
31 | |||
32 | #include <asm/mach-rc32434/rb.h> | ||
33 | |||
34 | #define TIMER0_BASE_ADDR 0x18028000 | ||
35 | #define TIMER_COUNT 3 | ||
36 | |||
37 | struct timer_counter { | ||
38 | u32 count; | ||
39 | u32 compare; | ||
40 | u32 ctc; /*use CTC_ */ | ||
41 | }; | ||
42 | |||
43 | struct timer { | ||
44 | struct timer_counter tim[TIMER_COUNT]; | ||
45 | u32 rcount; /* use RCOUNT_ */ | ||
46 | u32 rcompare; /* use RCOMPARE_ */ | ||
47 | u32 rtc; /* use RTC_ */ | ||
48 | }; | ||
49 | |||
50 | #define RC32434_CTC_EN_BIT 0 | ||
51 | #define RC32434_CTC_TO_BIT 1 | ||
52 | |||
53 | /* Real time clock registers */ | ||
54 | #define RC32434_RTC_MSK(x) BIT_TO_MASK(x) | ||
55 | #define RC32434_RTC_CE_BIT 0 | ||
56 | #define RC32434_RTC_TO_BIT 1 | ||
57 | #define RC32434_RTC_RQE_BIT 2 | ||
58 | |||
59 | /* Counter registers */ | ||
60 | #define RC32434_RCOUNT_BIT 0 | ||
61 | #define RC32434_RCOUNT_MSK 0x0000ffff | ||
62 | #define RC32434_RCOMP_BIT 0 | ||
63 | #define RC32434_RCOMP_MSK 0x0000ffff | ||
64 | |||
65 | #endif /* __ASM_RC32434_TIMER_H */ | ||
diff --git a/include/asm-mips/mach-rc32434/war.h b/include/asm-mips/mach-rc32434/war.h new file mode 100644 index 000000000000..3ddf187e98a6 --- /dev/null +++ b/include/asm-mips/mach-rc32434/war.h | |||
@@ -0,0 +1,25 @@ | |||
1 | /* | ||
2 | * This file is subject to the terms and conditions of the GNU General Public | ||
3 | * License. See the file "COPYING" in the main directory of this archive | ||
4 | * for more details. | ||
5 | * | ||
6 | * Copyright (C) 2002, 2004, 2007 by Ralf Baechle <ralf@linux-mips.org> | ||
7 | */ | ||
8 | #ifndef __ASM_MIPS_MACH_MIPS_WAR_H | ||
9 | #define __ASM_MIPS_MACH_MIPS_WAR_H | ||
10 | |||
11 | #define R4600_V1_INDEX_ICACHEOP_WAR 0 | ||
12 | #define R4600_V1_HIT_CACHEOP_WAR 0 | ||
13 | #define R4600_V2_HIT_CACHEOP_WAR 0 | ||
14 | #define R5432_CP0_INTERRUPT_WAR 0 | ||
15 | #define BCM1250_M3_WAR 0 | ||
16 | #define SIBYTE_1956_WAR 0 | ||
17 | #define MIPS4K_ICACHE_REFILL_WAR 1 | ||
18 | #define MIPS_CACHE_SYNC_WAR 0 | ||
19 | #define TX49XX_ICACHE_INDEX_INV_WAR 0 | ||
20 | #define RM9000_CDEX_SMP_WAR 0 | ||
21 | #define ICACHE_REFILLS_WORKAROUND_WAR 0 | ||
22 | #define R10000_LLSC_WAR 0 | ||
23 | #define MIPS34K_MISSED_ITLB_WAR 0 | ||
24 | |||
25 | #endif /* __ASM_MIPS_MACH_MIPS_WAR_H */ | ||
diff --git a/include/asm-mips/mips-boards/atlas.h b/include/asm-mips/mips-boards/atlas.h deleted file mode 100644 index a8ae12d120ee..000000000000 --- a/include/asm-mips/mips-boards/atlas.h +++ /dev/null | |||
@@ -1,80 +0,0 @@ | |||
1 | /* | ||
2 | * Carsten Langgaard, carstenl@mips.com | ||
3 | * Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved. | ||
4 | * | ||
5 | * ######################################################################## | ||
6 | * | ||
7 | * This program is free software; you can distribute it and/or modify it | ||
8 | * under the terms of the GNU General Public License (Version 2) as | ||
9 | * published by the Free Software Foundation. | ||
10 | * | ||
11 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
12 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
13 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
14 | * for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License along | ||
17 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
18 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | ||
19 | * | ||
20 | * ######################################################################## | ||
21 | * | ||
22 | * Defines of the Atlas board specific address-MAP, registers, etc. | ||
23 | * | ||
24 | */ | ||
25 | #ifndef _MIPS_ATLAS_H | ||
26 | #define _MIPS_ATLAS_H | ||
27 | |||
28 | #include <asm/addrspace.h> | ||
29 | |||
30 | /* | ||
31 | * Atlas RTC-device indirect register access. | ||
32 | */ | ||
33 | #define ATLAS_RTC_ADR_REG 0x1f000800 | ||
34 | #define ATLAS_RTC_DAT_REG 0x1f000808 | ||
35 | |||
36 | /* | ||
37 | * Atlas interrupt controller register base. | ||
38 | */ | ||
39 | #define ATLAS_ICTRL_REGS_BASE 0x1f000000 | ||
40 | |||
41 | /* | ||
42 | * Atlas registers are memory mapped on 64-bit aligned boundaries and | ||
43 | * only word access are allowed. | ||
44 | */ | ||
45 | struct atlas_ictrl_regs { | ||
46 | volatile unsigned int intraw; | ||
47 | int dummy1; | ||
48 | volatile unsigned int intseten; | ||
49 | int dummy2; | ||
50 | volatile unsigned int intrsten; | ||
51 | int dummy3; | ||
52 | volatile unsigned int intenable; | ||
53 | int dummy4; | ||
54 | volatile unsigned int intstatus; | ||
55 | int dummy5; | ||
56 | }; | ||
57 | |||
58 | /* | ||
59 | * Atlas UART register base. | ||
60 | */ | ||
61 | #define ATLAS_UART_REGS_BASE 0x1f000900 | ||
62 | #define ATLAS_BASE_BAUD ( 3686400 / 16 ) | ||
63 | |||
64 | /* | ||
65 | * Atlas PSU standby register. | ||
66 | */ | ||
67 | #define ATLAS_PSUSTBY_REG 0x1f000600 | ||
68 | #define ATLAS_GOSTBY 0x4d | ||
69 | |||
70 | /* | ||
71 | * We make a universal assumption about the way the bootloader (YAMON) | ||
72 | * have located the Philips SAA9730 chip. | ||
73 | * This is not ideal, but is needed for setting up remote debugging as | ||
74 | * soon as possible. | ||
75 | */ | ||
76 | #define ATLAS_SAA9730_REG 0x10800000 | ||
77 | |||
78 | #define ATLAS_SAA9730_BAUDCLOCK 3692300 | ||
79 | |||
80 | #endif /* !(_MIPS_ATLAS_H) */ | ||
diff --git a/include/asm-mips/mips-boards/atlasint.h b/include/asm-mips/mips-boards/atlasint.h deleted file mode 100644 index 93ba1c1b2a4f..000000000000 --- a/include/asm-mips/mips-boards/atlasint.h +++ /dev/null | |||
@@ -1,109 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright (C) 1999, 2006 MIPS Technologies, Inc. All rights reserved. | ||
3 | * Authors: Carsten Langgaard <carstenl@mips.com> | ||
4 | * Maciej W. Rozycki <macro@mips.com> | ||
5 | * | ||
6 | * ######################################################################## | ||
7 | * | ||
8 | * This program is free software; you can distribute it and/or modify it | ||
9 | * under the terms of the GNU General Public License (Version 2) as | ||
10 | * published by the Free Software Foundation. | ||
11 | * | ||
12 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
13 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
14 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
15 | * for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License along | ||
18 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
19 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | ||
20 | * | ||
21 | * ######################################################################## | ||
22 | * | ||
23 | * Defines for the Atlas interrupt controller. | ||
24 | * | ||
25 | */ | ||
26 | #ifndef _MIPS_ATLASINT_H | ||
27 | #define _MIPS_ATLASINT_H | ||
28 | |||
29 | #include <irq.h> | ||
30 | |||
31 | /* CPU interrupt offsets */ | ||
32 | #define MIPSCPU_INT_SW0 0 | ||
33 | #define MIPSCPU_INT_SW1 1 | ||
34 | #define MIPSCPU_INT_MB0 2 | ||
35 | #define MIPSCPU_INT_ATLAS MIPSCPU_INT_MB0 | ||
36 | #define MIPSCPU_INT_MB1 3 | ||
37 | #define MIPSCPU_INT_MB2 4 | ||
38 | #define MIPSCPU_INT_MB3 5 | ||
39 | #define MIPSCPU_INT_MB4 6 | ||
40 | |||
41 | /* | ||
42 | * Interrupts 8..39 are used for Atlas interrupt controller interrupts | ||
43 | */ | ||
44 | #define ATLAS_INT_BASE 8 | ||
45 | #define ATLAS_INT_UART (ATLAS_INT_BASE + 0) | ||
46 | #define ATLAS_INT_TIM0 (ATLAS_INT_BASE + 1) | ||
47 | #define ATLAS_INT_RES2 (ATLAS_INT_BASE + 2) | ||
48 | #define ATLAS_INT_RES3 (ATLAS_INT_BASE + 3) | ||
49 | #define ATLAS_INT_RTC (ATLAS_INT_BASE + 4) | ||
50 | #define ATLAS_INT_COREHI (ATLAS_INT_BASE + 5) | ||
51 | #define ATLAS_INT_CORELO (ATLAS_INT_BASE + 6) | ||
52 | #define ATLAS_INT_RES7 (ATLAS_INT_BASE + 7) | ||
53 | #define ATLAS_INT_PCIA (ATLAS_INT_BASE + 8) | ||
54 | #define ATLAS_INT_PCIB (ATLAS_INT_BASE + 9) | ||
55 | #define ATLAS_INT_PCIC (ATLAS_INT_BASE + 10) | ||
56 | #define ATLAS_INT_PCID (ATLAS_INT_BASE + 11) | ||
57 | #define ATLAS_INT_ENUM (ATLAS_INT_BASE + 12) | ||
58 | #define ATLAS_INT_DEG (ATLAS_INT_BASE + 13) | ||
59 | #define ATLAS_INT_ATXFAIL (ATLAS_INT_BASE + 14) | ||
60 | #define ATLAS_INT_INTA (ATLAS_INT_BASE + 15) | ||
61 | #define ATLAS_INT_INTB (ATLAS_INT_BASE + 16) | ||
62 | #define ATLAS_INT_ETH ATLAS_INT_INTB | ||
63 | #define ATLAS_INT_INTC (ATLAS_INT_BASE + 17) | ||
64 | #define ATLAS_INT_SCSI ATLAS_INT_INTC | ||
65 | #define ATLAS_INT_INTD (ATLAS_INT_BASE + 18) | ||
66 | #define ATLAS_INT_SERR (ATLAS_INT_BASE + 19) | ||
67 | #define ATLAS_INT_RES20 (ATLAS_INT_BASE + 20) | ||
68 | #define ATLAS_INT_RES21 (ATLAS_INT_BASE + 21) | ||
69 | #define ATLAS_INT_RES22 (ATLAS_INT_BASE + 22) | ||
70 | #define ATLAS_INT_RES23 (ATLAS_INT_BASE + 23) | ||
71 | #define ATLAS_INT_RES24 (ATLAS_INT_BASE + 24) | ||
72 | #define ATLAS_INT_RES25 (ATLAS_INT_BASE + 25) | ||
73 | #define ATLAS_INT_RES26 (ATLAS_INT_BASE + 26) | ||
74 | #define ATLAS_INT_RES27 (ATLAS_INT_BASE + 27) | ||
75 | #define ATLAS_INT_RES28 (ATLAS_INT_BASE + 28) | ||
76 | #define ATLAS_INT_RES29 (ATLAS_INT_BASE + 29) | ||
77 | #define ATLAS_INT_RES30 (ATLAS_INT_BASE + 30) | ||
78 | #define ATLAS_INT_RES31 (ATLAS_INT_BASE + 31) | ||
79 | #define ATLAS_INT_END (ATLAS_INT_BASE + 31) | ||
80 | |||
81 | /* | ||
82 | * Interrupts 64..127 are used for Soc-it Classic interrupts | ||
83 | */ | ||
84 | #define MSC01C_INT_BASE 64 | ||
85 | |||
86 | /* SOC-it Classic interrupt offsets */ | ||
87 | #define MSC01C_INT_TMR 0 | ||
88 | #define MSC01C_INT_PCI 1 | ||
89 | |||
90 | /* | ||
91 | * Interrupts 64..127 are used for Soc-it EIC interrupts | ||
92 | */ | ||
93 | #define MSC01E_INT_BASE 64 | ||
94 | |||
95 | /* SOC-it EIC interrupt offsets */ | ||
96 | #define MSC01E_INT_SW0 1 | ||
97 | #define MSC01E_INT_SW1 2 | ||
98 | #define MSC01E_INT_MB0 3 | ||
99 | #define MSC01E_INT_ATLAS MSC01E_INT_MB0 | ||
100 | #define MSC01E_INT_MB1 4 | ||
101 | #define MSC01E_INT_MB2 5 | ||
102 | #define MSC01E_INT_MB3 6 | ||
103 | #define MSC01E_INT_MB4 7 | ||
104 | #define MSC01E_INT_TMR 8 | ||
105 | #define MSC01E_INT_PCI 9 | ||
106 | #define MSC01E_INT_PERFCTR 10 | ||
107 | #define MSC01E_INT_CPUCTR 11 | ||
108 | |||
109 | #endif /* !(_MIPS_ATLASINT_H) */ | ||
diff --git a/include/asm-mips/mips-boards/maltasmp.h b/include/asm-mips/mips-boards/maltasmp.h deleted file mode 100644 index 8d7e955d506e..000000000000 --- a/include/asm-mips/mips-boards/maltasmp.h +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | /* | ||
2 | * There are several SMP models supported | ||
3 | * SMTC is mutually exclusive to other options (atm) | ||
4 | */ | ||
5 | #if defined(CONFIG_MIPS_MT_SMTC) | ||
6 | #define malta_smtc 1 | ||
7 | #define malta_cmp 0 | ||
8 | #define malta_smvp 0 | ||
9 | #else | ||
10 | #define malta_smtc 0 | ||
11 | #if defined(CONFIG_MIPS_CMP) | ||
12 | extern int gcmp_present; | ||
13 | #define malta_cmp gcmp_present | ||
14 | #else | ||
15 | #define malta_cmp 0 | ||
16 | #endif | ||
17 | /* FIXME: should become COMFIG_MIPS_MT_SMVP */ | ||
18 | #if defined(CONFIG_MIPS_MT_SMP) | ||
19 | #define malta_smvp 1 | ||
20 | #else | ||
21 | #define malta_smvp 0 | ||
22 | #endif | ||
23 | #endif | ||
24 | |||
25 | #include <asm/mipsregs.h> | ||
26 | #include <asm/mipsmtregs.h> | ||
27 | |||
28 | /* malta_smtc */ | ||
29 | #include <asm/smtc.h> | ||
30 | #include <asm/smtc_ipi.h> | ||
31 | |||
32 | /* malta_cmp */ | ||
33 | #include <asm/cmp.h> | ||
34 | |||
35 | /* malta_smvp */ | ||
36 | #include <asm/smvp.h> | ||
diff --git a/include/asm-mips/mips-boards/saa9730_uart.h b/include/asm-mips/mips-boards/saa9730_uart.h deleted file mode 100644 index c913143d58ec..000000000000 --- a/include/asm-mips/mips-boards/saa9730_uart.h +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | /* | ||
2 | * Carsten Langgaard, carstenl@mips.com | ||
3 | * Copyright (C) 2000 MIPS Technologies, Inc. All rights reserved. | ||
4 | * | ||
5 | * ######################################################################## | ||
6 | * | ||
7 | * This program is free software; you can distribute it and/or modify it | ||
8 | * under the terms of the GNU General Public License (Version 2) as | ||
9 | * published by the Free Software Foundation. | ||
10 | * | ||
11 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
12 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
13 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
14 | * for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License along | ||
17 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
18 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | ||
19 | * | ||
20 | * ######################################################################## | ||
21 | * | ||
22 | * Register definitions for the UART part of the Philips SAA9730 chip. | ||
23 | * | ||
24 | */ | ||
25 | |||
26 | #ifndef SAA9730_UART_H | ||
27 | #define SAA9730_UART_H | ||
28 | |||
29 | /* The SAA9730 UART register map, as seen via the PCI bus */ | ||
30 | |||
31 | #define SAA9730_UART_REGS_ADDR 0x21800 | ||
32 | |||
33 | struct uart_saa9730_regmap { | ||
34 | volatile unsigned char Thr_Rbr; | ||
35 | volatile unsigned char Ier; | ||
36 | volatile unsigned char Iir_Fcr; | ||
37 | volatile unsigned char Lcr; | ||
38 | volatile unsigned char Mcr; | ||
39 | volatile unsigned char Lsr; | ||
40 | volatile unsigned char Msr; | ||
41 | volatile unsigned char Scr; | ||
42 | volatile unsigned char BaudDivLsb; | ||
43 | volatile unsigned char BaudDivMsb; | ||
44 | volatile unsigned char Junk0; | ||
45 | volatile unsigned char Junk1; | ||
46 | volatile unsigned int Config; /* 0x2180c */ | ||
47 | volatile unsigned int TxStart; /* 0x21810 */ | ||
48 | volatile unsigned int TxLength; /* 0x21814 */ | ||
49 | volatile unsigned int TxCounter; /* 0x21818 */ | ||
50 | volatile unsigned int RxStart; /* 0x2181c */ | ||
51 | volatile unsigned int RxLength; /* 0x21820 */ | ||
52 | volatile unsigned int RxCounter; /* 0x21824 */ | ||
53 | }; | ||
54 | typedef volatile struct uart_saa9730_regmap t_uart_saa9730_regmap; | ||
55 | |||
56 | /* | ||
57 | * Only a subset of the UART control bits are defined here, | ||
58 | * enough to make the serial debug port work. | ||
59 | */ | ||
60 | |||
61 | #define SAA9730_LCR_DATA8 0x03 | ||
62 | |||
63 | #define SAA9730_MCR_DTR 0x01 | ||
64 | #define SAA9730_MCR_RTS 0x02 | ||
65 | |||
66 | #define SAA9730_LSR_DR 0x01 | ||
67 | #define SAA9730_LSR_THRE 0x20 | ||
68 | |||
69 | #endif /* !(SAA9730_UART_H) */ | ||
diff --git a/include/asm-mips/mips-boards/sead.h b/include/asm-mips/mips-boards/sead.h deleted file mode 100644 index 68c69de0b66f..000000000000 --- a/include/asm-mips/mips-boards/sead.h +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | /* | ||
2 | * Carsten Langgaard, carstenl@mips.com | ||
3 | * Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved. | ||
4 | * | ||
5 | * ######################################################################## | ||
6 | * | ||
7 | * This program is free software; you can distribute it and/or modify it | ||
8 | * under the terms of the GNU General Public License (Version 2) as | ||
9 | * published by the Free Software Foundation. | ||
10 | * | ||
11 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
12 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
13 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
14 | * for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License along | ||
17 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
18 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | ||
19 | * | ||
20 | * ######################################################################## | ||
21 | * | ||
22 | * Defines of the SEAD board specific address-MAP, registers, etc. | ||
23 | * | ||
24 | */ | ||
25 | #ifndef _MIPS_SEAD_H | ||
26 | #define _MIPS_SEAD_H | ||
27 | |||
28 | #include <asm/addrspace.h> | ||
29 | |||
30 | /* | ||
31 | * SEAD UART register base. | ||
32 | */ | ||
33 | #define SEAD_UART0_REGS_BASE (0x1f000800) | ||
34 | #define SEAD_BASE_BAUD ( 3686400 / 16 ) | ||
35 | |||
36 | #endif /* !(_MIPS_SEAD_H) */ | ||
diff --git a/include/asm-mips/mips-boards/seadint.h b/include/asm-mips/mips-boards/seadint.h deleted file mode 100644 index e710bae07340..000000000000 --- a/include/asm-mips/mips-boards/seadint.h +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | /* | ||
2 | * Carsten Langgaard, carstenl@mips.com | ||
3 | * Copyright (C) 2002 MIPS Technologies, Inc. All rights reserved. | ||
4 | * | ||
5 | * This program is free software; you can distribute it and/or modify it | ||
6 | * under the terms of the GNU General Public License (Version 2) as | ||
7 | * published by the Free Software Foundation. | ||
8 | * | ||
9 | * This program is distributed in the hope it will be useful, but WITHOUT | ||
10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or | ||
11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License | ||
12 | * for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License along | ||
15 | * with this program; if not, write to the Free Software Foundation, Inc., | ||
16 | * 59 Temple Place - Suite 330, Boston MA 02111-1307, USA. | ||
17 | * | ||
18 | * Defines for the SEAD interrupt controller. | ||
19 | */ | ||
20 | #ifndef _MIPS_SEADINT_H | ||
21 | #define _MIPS_SEADINT_H | ||
22 | |||
23 | #include <irq.h> | ||
24 | |||
25 | #define MIPSCPU_INT_UART0 2 | ||
26 | #define MIPSCPU_INT_UART1 3 | ||
27 | |||
28 | #endif /* !(_MIPS_SEADINT_H) */ | ||
diff --git a/include/asm-mips/namei.h b/include/asm-mips/namei.h deleted file mode 100644 index a6605a752469..000000000000 --- a/include/asm-mips/namei.h +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | #ifndef _ASM_NAMEI_H | ||
2 | #define _ASM_NAMEI_H | ||
3 | |||
4 | /* | ||
5 | * This dummy routine maybe changed to something useful | ||
6 | * for /usr/gnemul/ emulation stuff. | ||
7 | */ | ||
8 | |||
9 | #define __emul_prefix() NULL | ||
10 | |||
11 | #endif /* _ASM_NAMEI_H */ | ||
diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h index 8735aa0b8963..fe7a88ea066e 100644 --- a/include/asm-mips/page.h +++ b/include/asm-mips/page.h | |||
@@ -34,6 +34,9 @@ | |||
34 | #include <linux/pfn.h> | 34 | #include <linux/pfn.h> |
35 | #include <asm/io.h> | 35 | #include <asm/io.h> |
36 | 36 | ||
37 | extern void build_clear_page(void); | ||
38 | extern void build_copy_page(void); | ||
39 | |||
37 | /* | 40 | /* |
38 | * It's normally defined only for FLATMEM config but it's | 41 | * It's normally defined only for FLATMEM config but it's |
39 | * used in our early mem init code for all memory models. | 42 | * used in our early mem init code for all memory models. |
@@ -134,9 +137,6 @@ typedef struct { unsigned long pgprot; } pgprot_t; | |||
134 | 137 | ||
135 | #endif /* !__ASSEMBLY__ */ | 138 | #endif /* !__ASSEMBLY__ */ |
136 | 139 | ||
137 | /* to align the pointer to the (next) page boundary */ | ||
138 | #define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK) | ||
139 | |||
140 | /* | 140 | /* |
141 | * __pa()/__va() should be used only during mem init. | 141 | * __pa()/__va() should be used only during mem init. |
142 | */ | 142 | */ |
diff --git a/include/asm-mips/pci.h b/include/asm-mips/pci.h index d3be83436070..c205875d7f31 100644 --- a/include/asm-mips/pci.h +++ b/include/asm-mips/pci.h | |||
@@ -173,6 +173,5 @@ static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel) | |||
173 | } | 173 | } |
174 | 174 | ||
175 | extern int pci_probe_only; | 175 | extern int pci_probe_only; |
176 | extern unsigned int pcibios_max_latency; | ||
177 | 176 | ||
178 | #endif /* _ASM_PCI_H */ | 177 | #endif /* _ASM_PCI_H */ |
diff --git a/include/asm-mips/processor.h b/include/asm-mips/processor.h index 58cbac5a64e4..a1e4453469f9 100644 --- a/include/asm-mips/processor.h +++ b/include/asm-mips/processor.h | |||
@@ -45,7 +45,7 @@ extern unsigned int vced_count, vcei_count; | |||
45 | * This decides where the kernel will search for a free chunk of vm | 45 | * This decides where the kernel will search for a free chunk of vm |
46 | * space during mmap's. | 46 | * space during mmap's. |
47 | */ | 47 | */ |
48 | #define TASK_UNMAPPED_BASE (PAGE_ALIGN(TASK_SIZE / 3)) | 48 | #define TASK_UNMAPPED_BASE ((TASK_SIZE / 3) & ~(PAGE_SIZE)) |
49 | #endif | 49 | #endif |
50 | 50 | ||
51 | #ifdef CONFIG_64BIT | 51 | #ifdef CONFIG_64BIT |
diff --git a/include/asm-mips/semaphore.h b/include/asm-mips/semaphore.h deleted file mode 100644 index d9b2034ed1d2..000000000000 --- a/include/asm-mips/semaphore.h +++ /dev/null | |||
@@ -1 +0,0 @@ | |||
1 | #include <linux/semaphore.h> | ||
diff --git a/include/asm-mips/setup.h b/include/asm-mips/setup.h index 883f59bfa097..e600cedda976 100644 --- a/include/asm-mips/setup.h +++ b/include/asm-mips/setup.h | |||
@@ -3,6 +3,8 @@ | |||
3 | 3 | ||
4 | #define COMMAND_LINE_SIZE 256 | 4 | #define COMMAND_LINE_SIZE 256 |
5 | 5 | ||
6 | #ifdef __KERNEL__ | ||
6 | extern void setup_early_printk(void); | 7 | extern void setup_early_printk(void); |
8 | #endif /* __KERNEL__ */ | ||
7 | 9 | ||
8 | #endif /* __SETUP_H */ | 10 | #endif /* __SETUP_H */ |
diff --git a/include/asm-mips/socket.h b/include/asm-mips/socket.h index 63f60254d308..facc2d7a87ca 100644 --- a/include/asm-mips/socket.h +++ b/include/asm-mips/socket.h | |||
@@ -102,6 +102,13 @@ enum sock_type { | |||
102 | }; | 102 | }; |
103 | 103 | ||
104 | #define SOCK_MAX (SOCK_PACKET + 1) | 104 | #define SOCK_MAX (SOCK_PACKET + 1) |
105 | /* Mask which covers at least up to SOCK_MASK-1. The | ||
106 | * * remaining bits are used as flags. */ | ||
107 | #define SOCK_TYPE_MASK 0xf | ||
108 | |||
109 | /* Flags for socket, socketpair, paccept */ | ||
110 | #define SOCK_CLOEXEC O_CLOEXEC | ||
111 | #define SOCK_NONBLOCK O_NONBLOCK | ||
105 | 112 | ||
106 | #define ARCH_HAS_SOCKET_TYPES 1 | 113 | #define ARCH_HAS_SOCKET_TYPES 1 |
107 | 114 | ||
diff --git a/include/asm-mips/thread_info.h b/include/asm-mips/thread_info.h index b2772df1a1bd..bb3060699df2 100644 --- a/include/asm-mips/thread_info.h +++ b/include/asm-mips/thread_info.h | |||
@@ -82,6 +82,8 @@ register struct thread_info *__current_thread_info __asm__("$28"); | |||
82 | #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER) | 82 | #define THREAD_SIZE (PAGE_SIZE << THREAD_SIZE_ORDER) |
83 | #define THREAD_MASK (THREAD_SIZE - 1UL) | 83 | #define THREAD_MASK (THREAD_SIZE - 1UL) |
84 | 84 | ||
85 | #define __HAVE_ARCH_THREAD_INFO_ALLOCATOR | ||
86 | |||
85 | #ifdef CONFIG_DEBUG_STACK_USAGE | 87 | #ifdef CONFIG_DEBUG_STACK_USAGE |
86 | #define alloc_thread_info(tsk) \ | 88 | #define alloc_thread_info(tsk) \ |
87 | ({ \ | 89 | ({ \ |
diff --git a/include/asm-mips/txx9/generic.h b/include/asm-mips/txx9/generic.h index d8756660523d..cbae37ec3d88 100644 --- a/include/asm-mips/txx9/generic.h +++ b/include/asm-mips/txx9/generic.h | |||
@@ -12,6 +12,8 @@ | |||
12 | #include <linux/ioport.h> /* for struct resource */ | 12 | #include <linux/ioport.h> /* for struct resource */ |
13 | 13 | ||
14 | extern struct resource txx9_ce_res[]; | 14 | extern struct resource txx9_ce_res[]; |
15 | #define TXX9_CE(n) (unsigned long)(txx9_ce_res[(n)].start) | ||
16 | extern unsigned int txx9_pcode; | ||
15 | extern char txx9_pcode_str[8]; | 17 | extern char txx9_pcode_str[8]; |
16 | void txx9_reg_res_init(unsigned int pcode, unsigned long base, | 18 | void txx9_reg_res_init(unsigned int pcode, unsigned long base, |
17 | unsigned long size); | 19 | unsigned long size); |
@@ -19,6 +21,11 @@ void txx9_reg_res_init(unsigned int pcode, unsigned long base, | |||
19 | extern unsigned int txx9_master_clock; | 21 | extern unsigned int txx9_master_clock; |
20 | extern unsigned int txx9_cpu_clock; | 22 | extern unsigned int txx9_cpu_clock; |
21 | extern unsigned int txx9_gbus_clock; | 23 | extern unsigned int txx9_gbus_clock; |
24 | #define TXX9_IMCLK (txx9_gbus_clock / 2) | ||
25 | |||
26 | extern int txx9_ccfg_toeon; | ||
27 | struct uart_port; | ||
28 | int early_serial_txx9_setup(struct uart_port *port); | ||
22 | 29 | ||
23 | struct pci_dev; | 30 | struct pci_dev; |
24 | struct txx9_board_vec { | 31 | struct txx9_board_vec { |
diff --git a/include/asm-mips/txx9/rbtx4927.h b/include/asm-mips/txx9/rbtx4927.h index bf194589216f..6fcec912c143 100644 --- a/include/asm-mips/txx9/rbtx4927.h +++ b/include/asm-mips/txx9/rbtx4927.h | |||
@@ -34,7 +34,23 @@ | |||
34 | #define RBTX4927_PCIIO 0x16000000 | 34 | #define RBTX4927_PCIIO 0x16000000 |
35 | #define RBTX4927_PCIIO_SIZE 0x01000000 | 35 | #define RBTX4927_PCIIO_SIZE 0x01000000 |
36 | 36 | ||
37 | #define rbtx4927_pcireset_addr ((__u8 __iomem *)0xbc00f006UL) | 37 | #define RBTX4927_IMASK_ADDR (IO_BASE + TXX9_CE(2) + 0x00002000) |
38 | #define RBTX4927_IMSTAT_ADDR (IO_BASE + TXX9_CE(2) + 0x00002006) | ||
39 | #define RBTX4927_SOFTRESET_ADDR (IO_BASE + TXX9_CE(2) + 0x0000f000) | ||
40 | #define RBTX4927_SOFTRESETLOCK_ADDR (IO_BASE + TXX9_CE(2) + 0x0000f002) | ||
41 | #define RBTX4927_PCIRESET_ADDR (IO_BASE + TXX9_CE(2) + 0x0000f006) | ||
42 | #define RBTX4927_BRAMRTC_BASE (IO_BASE + TXX9_CE(2) + 0x00010000) | ||
43 | #define RBTX4927_ETHER_BASE (IO_BASE + TXX9_CE(2) + 0x00020000) | ||
44 | |||
45 | /* Ethernet port address */ | ||
46 | #define RBTX4927_ETHER_ADDR (RBTX4927_ETHER_BASE + 0x280) | ||
47 | |||
48 | #define rbtx4927_imask_addr ((__u8 __iomem *)RBTX4927_IMASK_ADDR) | ||
49 | #define rbtx4927_imstat_addr ((__u8 __iomem *)RBTX4927_IMSTAT_ADDR) | ||
50 | #define rbtx4927_softreset_addr ((__u8 __iomem *)RBTX4927_SOFTRESET_ADDR) | ||
51 | #define rbtx4927_softresetlock_addr \ | ||
52 | ((__u8 __iomem *)RBTX4927_SOFTRESETLOCK_ADDR) | ||
53 | #define rbtx4927_pcireset_addr ((__u8 __iomem *)RBTX4927_PCIRESET_ADDR) | ||
38 | 54 | ||
39 | /* bits for ISTAT/IMASK/IMSTAT */ | 55 | /* bits for ISTAT/IMASK/IMSTAT */ |
40 | #define RBTX4927_INTB_PCID 0 | 56 | #define RBTX4927_INTB_PCID 0 |
@@ -62,13 +78,7 @@ | |||
62 | #define RBTX4927_ISA_IO_OFFSET 0 | 78 | #define RBTX4927_ISA_IO_OFFSET 0 |
63 | #endif | 79 | #endif |
64 | 80 | ||
65 | #define RBTX4927_SW_RESET_DO (void __iomem *)0xbc00f000UL | 81 | #define RBTX4927_RTL_8019_BASE (RBTX4927_ETHER_ADDR - mips_io_port_base) |
66 | #define RBTX4927_SW_RESET_DO_SET 0x01 | ||
67 | |||
68 | #define RBTX4927_SW_RESET_ENABLE (void __iomem *)0xbc00f002UL | ||
69 | #define RBTX4927_SW_RESET_ENABLE_SET 0x01 | ||
70 | |||
71 | #define RBTX4927_RTL_8019_BASE (0x1c020280 - RBTX4927_ISA_IO_OFFSET) | ||
72 | #define RBTX4927_RTL_8019_IRQ (TXX9_IRQ_BASE + TX4927_IR_INT(3)) | 82 | #define RBTX4927_RTL_8019_IRQ (TXX9_IRQ_BASE + TX4927_IR_INT(3)) |
73 | 83 | ||
74 | void rbtx4927_prom_init(void); | 84 | void rbtx4927_prom_init(void); |
diff --git a/include/asm-mips/txx9/rbtx4938.h b/include/asm-mips/txx9/rbtx4938.h index 2f5d5e705a41..9f0441a28126 100644 --- a/include/asm-mips/txx9/rbtx4938.h +++ b/include/asm-mips/txx9/rbtx4938.h | |||
@@ -15,35 +15,31 @@ | |||
15 | #include <asm/txx9irq.h> | 15 | #include <asm/txx9irq.h> |
16 | #include <asm/txx9/tx4938.h> | 16 | #include <asm/txx9/tx4938.h> |
17 | 17 | ||
18 | /* CS */ | ||
19 | #define RBTX4938_CE0 0x1c000000 /* 64M */ | ||
20 | #define RBTX4938_CE2 0x17f00000 /* 1M */ | ||
21 | |||
22 | /* Address map */ | 18 | /* Address map */ |
23 | #define RBTX4938_FPGA_REG_ADDR (KSEG1 + RBTX4938_CE2 + 0x00000000) | 19 | #define RBTX4938_FPGA_REG_ADDR (IO_BASE + TXX9_CE(2) + 0x00000000) |
24 | #define RBTX4938_FPGA_REV_ADDR (KSEG1 + RBTX4938_CE2 + 0x00000002) | 20 | #define RBTX4938_FPGA_REV_ADDR (IO_BASE + TXX9_CE(2) + 0x00000002) |
25 | #define RBTX4938_CONFIG1_ADDR (KSEG1 + RBTX4938_CE2 + 0x00000004) | 21 | #define RBTX4938_CONFIG1_ADDR (IO_BASE + TXX9_CE(2) + 0x00000004) |
26 | #define RBTX4938_CONFIG2_ADDR (KSEG1 + RBTX4938_CE2 + 0x00000006) | 22 | #define RBTX4938_CONFIG2_ADDR (IO_BASE + TXX9_CE(2) + 0x00000006) |
27 | #define RBTX4938_CONFIG3_ADDR (KSEG1 + RBTX4938_CE2 + 0x00000008) | 23 | #define RBTX4938_CONFIG3_ADDR (IO_BASE + TXX9_CE(2) + 0x00000008) |
28 | #define RBTX4938_LED_ADDR (KSEG1 + RBTX4938_CE2 + 0x00001000) | 24 | #define RBTX4938_LED_ADDR (IO_BASE + TXX9_CE(2) + 0x00001000) |
29 | #define RBTX4938_DIPSW_ADDR (KSEG1 + RBTX4938_CE2 + 0x00001002) | 25 | #define RBTX4938_DIPSW_ADDR (IO_BASE + TXX9_CE(2) + 0x00001002) |
30 | #define RBTX4938_BDIPSW_ADDR (KSEG1 + RBTX4938_CE2 + 0x00001004) | 26 | #define RBTX4938_BDIPSW_ADDR (IO_BASE + TXX9_CE(2) + 0x00001004) |
31 | #define RBTX4938_IMASK_ADDR (KSEG1 + RBTX4938_CE2 + 0x00002000) | 27 | #define RBTX4938_IMASK_ADDR (IO_BASE + TXX9_CE(2) + 0x00002000) |
32 | #define RBTX4938_IMASK2_ADDR (KSEG1 + RBTX4938_CE2 + 0x00002002) | 28 | #define RBTX4938_IMASK2_ADDR (IO_BASE + TXX9_CE(2) + 0x00002002) |
33 | #define RBTX4938_INTPOL_ADDR (KSEG1 + RBTX4938_CE2 + 0x00002004) | 29 | #define RBTX4938_INTPOL_ADDR (IO_BASE + TXX9_CE(2) + 0x00002004) |
34 | #define RBTX4938_ISTAT_ADDR (KSEG1 + RBTX4938_CE2 + 0x00002006) | 30 | #define RBTX4938_ISTAT_ADDR (IO_BASE + TXX9_CE(2) + 0x00002006) |
35 | #define RBTX4938_ISTAT2_ADDR (KSEG1 + RBTX4938_CE2 + 0x00002008) | 31 | #define RBTX4938_ISTAT2_ADDR (IO_BASE + TXX9_CE(2) + 0x00002008) |
36 | #define RBTX4938_IMSTAT_ADDR (KSEG1 + RBTX4938_CE2 + 0x0000200a) | 32 | #define RBTX4938_IMSTAT_ADDR (IO_BASE + TXX9_CE(2) + 0x0000200a) |
37 | #define RBTX4938_IMSTAT2_ADDR (KSEG1 + RBTX4938_CE2 + 0x0000200c) | 33 | #define RBTX4938_IMSTAT2_ADDR (IO_BASE + TXX9_CE(2) + 0x0000200c) |
38 | #define RBTX4938_SOFTINT_ADDR (KSEG1 + RBTX4938_CE2 + 0x00003000) | 34 | #define RBTX4938_SOFTINT_ADDR (IO_BASE + TXX9_CE(2) + 0x00003000) |
39 | #define RBTX4938_PIOSEL_ADDR (KSEG1 + RBTX4938_CE2 + 0x00005000) | 35 | #define RBTX4938_PIOSEL_ADDR (IO_BASE + TXX9_CE(2) + 0x00005000) |
40 | #define RBTX4938_SPICS_ADDR (KSEG1 + RBTX4938_CE2 + 0x00005002) | 36 | #define RBTX4938_SPICS_ADDR (IO_BASE + TXX9_CE(2) + 0x00005002) |
41 | #define RBTX4938_SFPWR_ADDR (KSEG1 + RBTX4938_CE2 + 0x00005008) | 37 | #define RBTX4938_SFPWR_ADDR (IO_BASE + TXX9_CE(2) + 0x00005008) |
42 | #define RBTX4938_SFVOL_ADDR (KSEG1 + RBTX4938_CE2 + 0x0000500a) | 38 | #define RBTX4938_SFVOL_ADDR (IO_BASE + TXX9_CE(2) + 0x0000500a) |
43 | #define RBTX4938_SOFTRESET_ADDR (KSEG1 + RBTX4938_CE2 + 0x00007000) | 39 | #define RBTX4938_SOFTRESET_ADDR (IO_BASE + TXX9_CE(2) + 0x00007000) |
44 | #define RBTX4938_SOFTRESETLOCK_ADDR (KSEG1 + RBTX4938_CE2 + 0x00007002) | 40 | #define RBTX4938_SOFTRESETLOCK_ADDR (IO_BASE + TXX9_CE(2) + 0x00007002) |
45 | #define RBTX4938_PCIRESET_ADDR (KSEG1 + RBTX4938_CE2 + 0x00007004) | 41 | #define RBTX4938_PCIRESET_ADDR (IO_BASE + TXX9_CE(2) + 0x00007004) |
46 | #define RBTX4938_ETHER_BASE (KSEG1 + RBTX4938_CE2 + 0x00020000) | 42 | #define RBTX4938_ETHER_BASE (IO_BASE + TXX9_CE(2) + 0x00020000) |
47 | 43 | ||
48 | /* Ethernet port address (Jumperless Mode (W12:Open)) */ | 44 | /* Ethernet port address (Jumperless Mode (W12:Open)) */ |
49 | #define RBTX4938_ETHER_ADDR (RBTX4938_ETHER_BASE + 0x280) | 45 | #define RBTX4938_ETHER_ADDR (RBTX4938_ETHER_BASE + 0x280) |
diff --git a/include/asm-mips/txx9/tx3927.h b/include/asm-mips/txx9/tx3927.h index ca414c7624e1..ea79e1b16e71 100644 --- a/include/asm-mips/txx9/tx3927.h +++ b/include/asm-mips/txx9/tx3927.h | |||
@@ -10,17 +10,18 @@ | |||
10 | 10 | ||
11 | #include <asm/txx9/txx927.h> | 11 | #include <asm/txx9/txx927.h> |
12 | 12 | ||
13 | #define TX3927_SDRAMC_REG 0xfffe8000 | 13 | #define TX3927_REG_BASE 0xfffe0000UL |
14 | #define TX3927_ROMC_REG 0xfffe9000 | 14 | #define TX3927_SDRAMC_REG (TX3927_REG_BASE + 0x8000) |
15 | #define TX3927_DMA_REG 0xfffeb000 | 15 | #define TX3927_ROMC_REG (TX3927_REG_BASE + 0x9000) |
16 | #define TX3927_IRC_REG 0xfffec000 | 16 | #define TX3927_DMA_REG (TX3927_REG_BASE + 0xb000) |
17 | #define TX3927_PCIC_REG 0xfffed000 | 17 | #define TX3927_IRC_REG (TX3927_REG_BASE + 0xc000) |
18 | #define TX3927_CCFG_REG 0xfffee000 | 18 | #define TX3927_PCIC_REG (TX3927_REG_BASE + 0xd000) |
19 | #define TX3927_CCFG_REG (TX3927_REG_BASE + 0xe000) | ||
19 | #define TX3927_NR_TMR 3 | 20 | #define TX3927_NR_TMR 3 |
20 | #define TX3927_TMR_REG(ch) (0xfffef000 + (ch) * 0x100) | 21 | #define TX3927_TMR_REG(ch) (TX3927_REG_BASE + 0xf000 + (ch) * 0x100) |
21 | #define TX3927_NR_SIO 2 | 22 | #define TX3927_NR_SIO 2 |
22 | #define TX3927_SIO_REG(ch) (0xfffef300 + (ch) * 0x100) | 23 | #define TX3927_SIO_REG(ch) (TX3927_REG_BASE + 0xf300 + (ch) * 0x100) |
23 | #define TX3927_PIO_REG 0xfffef500 | 24 | #define TX3927_PIO_REG (TX3927_REG_BASE + 0xf500) |
24 | 25 | ||
25 | struct tx3927_sdramc_reg { | 26 | struct tx3927_sdramc_reg { |
26 | volatile unsigned long cr[8]; | 27 | volatile unsigned long cr[8]; |
diff --git a/include/asm-mips/txx9/tx4927.h b/include/asm-mips/txx9/tx4927.h index 46d60afc038b..ceb4b79ff4e3 100644 --- a/include/asm-mips/txx9/tx4927.h +++ b/include/asm-mips/txx9/tx4927.h | |||
@@ -32,32 +32,46 @@ | |||
32 | #include <asm/txx9irq.h> | 32 | #include <asm/txx9irq.h> |
33 | #include <asm/txx9/tx4927pcic.h> | 33 | #include <asm/txx9/tx4927pcic.h> |
34 | 34 | ||
35 | #define TX4927_SDRAMC_REG 0xff1f8000 | 35 | #ifdef CONFIG_64BIT |
36 | #define TX4927_EBUSC_REG 0xff1f9000 | 36 | #define TX4927_REG_BASE 0xffffffffff1f0000UL |
37 | #define TX4927_PCIC_REG 0xff1fd000 | 37 | #else |
38 | #define TX4927_CCFG_REG 0xff1fe000 | 38 | #define TX4927_REG_BASE 0xff1f0000UL |
39 | #define TX4927_IRC_REG 0xff1ff600 | 39 | #endif |
40 | #define TX4927_REG_SIZE 0x00010000 | ||
41 | |||
42 | #define TX4927_SDRAMC_REG (TX4927_REG_BASE + 0x8000) | ||
43 | #define TX4927_EBUSC_REG (TX4927_REG_BASE + 0x9000) | ||
44 | #define TX4927_PCIC_REG (TX4927_REG_BASE + 0xd000) | ||
45 | #define TX4927_CCFG_REG (TX4927_REG_BASE + 0xe000) | ||
46 | #define TX4927_IRC_REG (TX4927_REG_BASE + 0xf600) | ||
40 | #define TX4927_NR_TMR 3 | 47 | #define TX4927_NR_TMR 3 |
41 | #define TX4927_TMR_REG(ch) (0xff1ff000 + (ch) * 0x100) | 48 | #define TX4927_TMR_REG(ch) (TX4927_REG_BASE + 0xf000 + (ch) * 0x100) |
49 | #define TX4927_NR_SIO 2 | ||
50 | #define TX4927_SIO_REG(ch) (TX4927_REG_BASE + 0xf300 + (ch) * 0x100) | ||
51 | #define TX4927_PIO_REG (TX4927_REG_BASE + 0xf500) | ||
42 | 52 | ||
43 | #define TX4927_IR_INT(n) (2 + (n)) | 53 | #define TX4927_IR_INT(n) (2 + (n)) |
44 | #define TX4927_IR_SIO(n) (8 + (n)) | 54 | #define TX4927_IR_SIO(n) (8 + (n)) |
45 | #define TX4927_IR_PCIC 16 | 55 | #define TX4927_IR_PCIC 16 |
56 | #define TX4927_NUM_IR_TMR 3 | ||
57 | #define TX4927_IR_TMR(n) (17 + (n)) | ||
46 | #define TX4927_IR_PCIERR 22 | 58 | #define TX4927_IR_PCIERR 22 |
47 | #define TX4927_NUM_IR 32 | 59 | #define TX4927_NUM_IR 32 |
48 | 60 | ||
49 | #define TX4927_IRC_INT 2 /* IP[2] in Status register */ | 61 | #define TX4927_IRC_INT 2 /* IP[2] in Status register */ |
50 | 62 | ||
63 | #define TX4927_NUM_PIO 16 | ||
64 | |||
51 | struct tx4927_sdramc_reg { | 65 | struct tx4927_sdramc_reg { |
52 | volatile unsigned long long cr[4]; | 66 | u64 cr[4]; |
53 | volatile unsigned long long unused0[4]; | 67 | u64 unused0[4]; |
54 | volatile unsigned long long tr; | 68 | u64 tr; |
55 | volatile unsigned long long unused1[2]; | 69 | u64 unused1[2]; |
56 | volatile unsigned long long cmd; | 70 | u64 cmd; |
57 | }; | 71 | }; |
58 | 72 | ||
59 | struct tx4927_ebusc_reg { | 73 | struct tx4927_ebusc_reg { |
60 | volatile unsigned long long cr[8]; | 74 | u64 cr[8]; |
61 | }; | 75 | }; |
62 | 76 | ||
63 | struct tx4927_ccfg_reg { | 77 | struct tx4927_ccfg_reg { |
@@ -160,12 +174,28 @@ struct tx4927_ccfg_reg { | |||
160 | #define TX4927_CLKCTR_SIO0RST 0x00000002 | 174 | #define TX4927_CLKCTR_SIO0RST 0x00000002 |
161 | #define TX4927_CLKCTR_SIO1RST 0x00000001 | 175 | #define TX4927_CLKCTR_SIO1RST 0x00000001 |
162 | 176 | ||
163 | #define tx4927_sdramcptr ((struct tx4927_sdramc_reg *)TX4927_SDRAMC_REG) | 177 | #define tx4927_sdramcptr \ |
178 | ((struct tx4927_sdramc_reg __iomem *)TX4927_SDRAMC_REG) | ||
164 | #define tx4927_pcicptr \ | 179 | #define tx4927_pcicptr \ |
165 | ((struct tx4927_pcic_reg __iomem *)TX4927_PCIC_REG) | 180 | ((struct tx4927_pcic_reg __iomem *)TX4927_PCIC_REG) |
166 | #define tx4927_ccfgptr \ | 181 | #define tx4927_ccfgptr \ |
167 | ((struct tx4927_ccfg_reg __iomem *)TX4927_CCFG_REG) | 182 | ((struct tx4927_ccfg_reg __iomem *)TX4927_CCFG_REG) |
168 | #define tx4927_ebuscptr ((struct tx4927_ebusc_reg *)TX4927_EBUSC_REG) | 183 | #define tx4927_ebuscptr \ |
184 | ((struct tx4927_ebusc_reg __iomem *)TX4927_EBUSC_REG) | ||
185 | #define tx4927_pioptr ((struct txx9_pio_reg __iomem *)TX4927_PIO_REG) | ||
186 | |||
187 | #define TX4927_REV_PCODE() \ | ||
188 | ((__u32)__raw_readq(&tx4927_ccfgptr->crir) >> 16) | ||
189 | |||
190 | #define TX4927_SDRAMC_CR(ch) __raw_readq(&tx4927_sdramcptr->cr[(ch)]) | ||
191 | #define TX4927_SDRAMC_BA(ch) ((TX4927_SDRAMC_CR(ch) >> 49) << 21) | ||
192 | #define TX4927_SDRAMC_SIZE(ch) \ | ||
193 | ((((TX4927_SDRAMC_CR(ch) >> 33) & 0x7fff) + 1) << 21) | ||
194 | |||
195 | #define TX4927_EBUSC_CR(ch) __raw_readq(&tx4927_ebuscptr->cr[(ch)]) | ||
196 | #define TX4927_EBUSC_BA(ch) ((TX4927_EBUSC_CR(ch) >> 48) << 20) | ||
197 | #define TX4927_EBUSC_SIZE(ch) \ | ||
198 | (0x00100000 << ((unsigned long)(TX4927_EBUSC_CR(ch) >> 8) & 0xf)) | ||
169 | 199 | ||
170 | /* utilities */ | 200 | /* utilities */ |
171 | static inline void txx9_clear64(__u64 __iomem *adr, __u64 bits) | 201 | static inline void txx9_clear64(__u64 __iomem *adr, __u64 bits) |
@@ -212,6 +242,11 @@ static inline void tx4927_ccfg_change(__u64 change, __u64 new) | |||
212 | &tx4927_ccfgptr->ccfg); | 242 | &tx4927_ccfgptr->ccfg); |
213 | } | 243 | } |
214 | 244 | ||
245 | unsigned int tx4927_get_mem_size(void); | ||
246 | void tx4927_wdr_init(void); | ||
247 | void tx4927_setup(void); | ||
248 | void tx4927_time_init(unsigned int tmrnr); | ||
249 | void tx4927_setup_serial(void); | ||
215 | int tx4927_report_pciclk(void); | 250 | int tx4927_report_pciclk(void); |
216 | int tx4927_pciclk66_setup(void); | 251 | int tx4927_pciclk66_setup(void); |
217 | void tx4927_irq_init(void); | 252 | void tx4927_irq_init(void); |
diff --git a/include/asm-mips/txx9/tx4938.h b/include/asm-mips/txx9/tx4938.h index 12de68a4c10a..1ed969d381d6 100644 --- a/include/asm-mips/txx9/tx4938.h +++ b/include/asm-mips/txx9/tx4938.h | |||
@@ -15,20 +15,11 @@ | |||
15 | /* some controllers are compatible with 4927 */ | 15 | /* some controllers are compatible with 4927 */ |
16 | #include <asm/txx9/tx4927.h> | 16 | #include <asm/txx9/tx4927.h> |
17 | 17 | ||
18 | #define tx4938_read_nfmc(addr) (*(volatile unsigned int *)(addr)) | 18 | #ifdef CONFIG_64BIT |
19 | #define tx4938_write_nfmc(b, addr) (*(volatile unsigned int *)(addr)) = (b) | 19 | #define TX4938_REG_BASE 0xffffffffff1f0000UL /* == TX4937_REG_BASE */ |
20 | 20 | #else | |
21 | #define TX4938_PCIIO_0 0x10000000 | 21 | #define TX4938_REG_BASE 0xff1f0000UL /* == TX4937_REG_BASE */ |
22 | #define TX4938_PCIIO_1 0x01010000 | 22 | #endif |
23 | #define TX4938_PCIMEM_0 0x08000000 | ||
24 | #define TX4938_PCIMEM_1 0x11000000 | ||
25 | |||
26 | #define TX4938_PCIIO_SIZE_0 0x01000000 | ||
27 | #define TX4938_PCIIO_SIZE_1 0x00010000 | ||
28 | #define TX4938_PCIMEM_SIZE_0 0x08000000 | ||
29 | #define TX4938_PCIMEM_SIZE_1 0x00010000 | ||
30 | |||
31 | #define TX4938_REG_BASE 0xff1f0000 /* == TX4937_REG_BASE */ | ||
32 | #define TX4938_REG_SIZE 0x00010000 /* == TX4937_REG_SIZE */ | 23 | #define TX4938_REG_SIZE 0x00010000 /* == TX4937_REG_SIZE */ |
33 | 24 | ||
34 | /* NDFMC, SRAMC, PCIC1, SPIC: TX4938 only */ | 25 | /* NDFMC, SRAMC, PCIC1, SPIC: TX4938 only */ |
@@ -49,149 +40,8 @@ | |||
49 | #define TX4938_ACLC_REG (TX4938_REG_BASE + 0xf700) | 40 | #define TX4938_ACLC_REG (TX4938_REG_BASE + 0xf700) |
50 | #define TX4938_SPI_REG (TX4938_REG_BASE + 0xf800) | 41 | #define TX4938_SPI_REG (TX4938_REG_BASE + 0xf800) |
51 | 42 | ||
52 | #define _CONST64(c) c##ull | ||
53 | |||
54 | #include <asm/byteorder.h> | ||
55 | |||
56 | #ifdef __BIG_ENDIAN | ||
57 | #define endian_def_l2(e1, e2) \ | ||
58 | volatile unsigned long e1, e2 | ||
59 | #define endian_def_s2(e1, e2) \ | ||
60 | volatile unsigned short e1, e2 | ||
61 | #define endian_def_sb2(e1, e2, e3) \ | ||
62 | volatile unsigned short e1;volatile unsigned char e2, e3 | ||
63 | #define endian_def_b2s(e1, e2, e3) \ | ||
64 | volatile unsigned char e1, e2;volatile unsigned short e3 | ||
65 | #define endian_def_b4(e1, e2, e3, e4) \ | ||
66 | volatile unsigned char e1, e2, e3, e4 | ||
67 | #else | ||
68 | #define endian_def_l2(e1, e2) \ | ||
69 | volatile unsigned long e2, e1 | ||
70 | #define endian_def_s2(e1, e2) \ | ||
71 | volatile unsigned short e2, e1 | ||
72 | #define endian_def_sb2(e1, e2, e3) \ | ||
73 | volatile unsigned char e3, e2;volatile unsigned short e1 | ||
74 | #define endian_def_b2s(e1, e2, e3) \ | ||
75 | volatile unsigned short e3;volatile unsigned char e2, e1 | ||
76 | #define endian_def_b4(e1, e2, e3, e4) \ | ||
77 | volatile unsigned char e4, e3, e2, e1 | ||
78 | #endif | ||
79 | |||
80 | |||
81 | struct tx4938_sdramc_reg { | ||
82 | volatile unsigned long long cr[4]; | ||
83 | volatile unsigned long long unused0[4]; | ||
84 | volatile unsigned long long tr; | ||
85 | volatile unsigned long long unused1[2]; | ||
86 | volatile unsigned long long cmd; | ||
87 | volatile unsigned long long sfcmd; | ||
88 | }; | ||
89 | |||
90 | struct tx4938_ebusc_reg { | ||
91 | volatile unsigned long long cr[8]; | ||
92 | }; | ||
93 | |||
94 | struct tx4938_dma_reg { | ||
95 | struct tx4938_dma_ch_reg { | ||
96 | volatile unsigned long long cha; | ||
97 | volatile unsigned long long sar; | ||
98 | volatile unsigned long long dar; | ||
99 | endian_def_l2(unused0, cntr); | ||
100 | endian_def_l2(unused1, sair); | ||
101 | endian_def_l2(unused2, dair); | ||
102 | endian_def_l2(unused3, ccr); | ||
103 | endian_def_l2(unused4, csr); | ||
104 | } ch[4]; | ||
105 | volatile unsigned long long dbr[8]; | ||
106 | volatile unsigned long long tdhr; | ||
107 | volatile unsigned long long midr; | ||
108 | endian_def_l2(unused0, mcr); | ||
109 | }; | ||
110 | |||
111 | struct tx4938_aclc_reg { | ||
112 | volatile unsigned long acctlen; | ||
113 | volatile unsigned long acctldis; | ||
114 | volatile unsigned long acregacc; | ||
115 | volatile unsigned long unused0; | ||
116 | volatile unsigned long acintsts; | ||
117 | volatile unsigned long acintmsts; | ||
118 | volatile unsigned long acinten; | ||
119 | volatile unsigned long acintdis; | ||
120 | volatile unsigned long acsemaph; | ||
121 | volatile unsigned long unused1[7]; | ||
122 | volatile unsigned long acgpidat; | ||
123 | volatile unsigned long acgpodat; | ||
124 | volatile unsigned long acslten; | ||
125 | volatile unsigned long acsltdis; | ||
126 | volatile unsigned long acfifosts; | ||
127 | volatile unsigned long unused2[11]; | ||
128 | volatile unsigned long acdmasts; | ||
129 | volatile unsigned long acdmasel; | ||
130 | volatile unsigned long unused3[6]; | ||
131 | volatile unsigned long acaudodat; | ||
132 | volatile unsigned long acsurrdat; | ||
133 | volatile unsigned long accentdat; | ||
134 | volatile unsigned long aclfedat; | ||
135 | volatile unsigned long acaudiat; | ||
136 | volatile unsigned long unused4; | ||
137 | volatile unsigned long acmodoat; | ||
138 | volatile unsigned long acmodidat; | ||
139 | volatile unsigned long unused5[15]; | ||
140 | volatile unsigned long acrevid; | ||
141 | }; | ||
142 | |||
143 | |||
144 | struct tx4938_tmr_reg { | ||
145 | volatile unsigned long tcr; | ||
146 | volatile unsigned long tisr; | ||
147 | volatile unsigned long cpra; | ||
148 | volatile unsigned long cprb; | ||
149 | volatile unsigned long itmr; | ||
150 | volatile unsigned long unused0[3]; | ||
151 | volatile unsigned long ccdr; | ||
152 | volatile unsigned long unused1[3]; | ||
153 | volatile unsigned long pgmr; | ||
154 | volatile unsigned long unused2[3]; | ||
155 | volatile unsigned long wtmr; | ||
156 | volatile unsigned long unused3[43]; | ||
157 | volatile unsigned long trr; | ||
158 | }; | ||
159 | |||
160 | struct tx4938_sio_reg { | ||
161 | volatile unsigned long lcr; | ||
162 | volatile unsigned long dicr; | ||
163 | volatile unsigned long disr; | ||
164 | volatile unsigned long cisr; | ||
165 | volatile unsigned long fcr; | ||
166 | volatile unsigned long flcr; | ||
167 | volatile unsigned long bgr; | ||
168 | volatile unsigned long tfifo; | ||
169 | volatile unsigned long rfifo; | ||
170 | }; | ||
171 | |||
172 | struct tx4938_ndfmc_reg { | ||
173 | endian_def_l2(unused0, dtr); | ||
174 | endian_def_l2(unused1, mcr); | ||
175 | endian_def_l2(unused2, sr); | ||
176 | endian_def_l2(unused3, isr); | ||
177 | endian_def_l2(unused4, imr); | ||
178 | endian_def_l2(unused5, spr); | ||
179 | endian_def_l2(unused6, rstr); | ||
180 | }; | ||
181 | |||
182 | struct tx4938_spi_reg { | ||
183 | volatile unsigned long mcr; | ||
184 | volatile unsigned long cr0; | ||
185 | volatile unsigned long cr1; | ||
186 | volatile unsigned long fs; | ||
187 | volatile unsigned long unused1; | ||
188 | volatile unsigned long sr; | ||
189 | volatile unsigned long dr; | ||
190 | volatile unsigned long unused2; | ||
191 | }; | ||
192 | |||
193 | struct tx4938_sramc_reg { | 43 | struct tx4938_sramc_reg { |
194 | volatile unsigned long long cr; | 44 | u64 cr; |
195 | }; | 45 | }; |
196 | 46 | ||
197 | struct tx4938_ccfg_reg { | 47 | struct tx4938_ccfg_reg { |
@@ -209,34 +59,6 @@ struct tx4938_ccfg_reg { | |||
209 | u64 jmpadr; | 59 | u64 jmpadr; |
210 | }; | 60 | }; |
211 | 61 | ||
212 | #undef endian_def_l2 | ||
213 | #undef endian_def_s2 | ||
214 | #undef endian_def_sb2 | ||
215 | #undef endian_def_b2s | ||
216 | #undef endian_def_b4 | ||
217 | |||
218 | /* | ||
219 | * NDFMC | ||
220 | */ | ||
221 | |||
222 | /* NDFMCR : NDFMC Mode Control */ | ||
223 | #define TX4938_NDFMCR_WE 0x80 | ||
224 | #define TX4938_NDFMCR_ECC_ALL 0x60 | ||
225 | #define TX4938_NDFMCR_ECC_RESET 0x60 | ||
226 | #define TX4938_NDFMCR_ECC_READ 0x40 | ||
227 | #define TX4938_NDFMCR_ECC_ON 0x20 | ||
228 | #define TX4938_NDFMCR_ECC_OFF 0x00 | ||
229 | #define TX4938_NDFMCR_CE 0x10 | ||
230 | #define TX4938_NDFMCR_BSPRT 0x04 | ||
231 | #define TX4938_NDFMCR_ALE 0x02 | ||
232 | #define TX4938_NDFMCR_CLE 0x01 | ||
233 | |||
234 | /* NDFMCR : NDFMC Status */ | ||
235 | #define TX4938_NDFSR_BUSY 0x80 | ||
236 | |||
237 | /* NDFMCR : NDFMC Reset */ | ||
238 | #define TX4938_NDFRSTR_RST 0x01 | ||
239 | |||
240 | /* | 62 | /* |
241 | * IRC | 63 | * IRC |
242 | */ | 64 | */ |
@@ -268,13 +90,15 @@ struct tx4938_ccfg_reg { | |||
268 | 90 | ||
269 | #define TX4938_IRC_INT 2 /* IP[2] in Status register */ | 91 | #define TX4938_IRC_INT 2 /* IP[2] in Status register */ |
270 | 92 | ||
93 | #define TX4938_NUM_PIO 16 | ||
94 | |||
271 | /* | 95 | /* |
272 | * CCFG | 96 | * CCFG |
273 | */ | 97 | */ |
274 | /* CCFG : Chip Configuration */ | 98 | /* CCFG : Chip Configuration */ |
275 | #define TX4938_CCFG_WDRST _CONST64(0x0000020000000000) | 99 | #define TX4938_CCFG_WDRST 0x0000020000000000ULL |
276 | #define TX4938_CCFG_WDREXEN _CONST64(0x0000010000000000) | 100 | #define TX4938_CCFG_WDREXEN 0x0000010000000000ULL |
277 | #define TX4938_CCFG_BCFG_MASK _CONST64(0x000000ff00000000) | 101 | #define TX4938_CCFG_BCFG_MASK 0x000000ff00000000ULL |
278 | #define TX4938_CCFG_TINTDIS 0x01000000 | 102 | #define TX4938_CCFG_TINTDIS 0x01000000 |
279 | #define TX4938_CCFG_PCI66 0x00800000 | 103 | #define TX4938_CCFG_PCI66 0x00800000 |
280 | #define TX4938_CCFG_PCIMODE 0x00400000 | 104 | #define TX4938_CCFG_PCIMODE 0x00400000 |
@@ -310,12 +134,12 @@ struct tx4938_ccfg_reg { | |||
310 | #define TX4938_CCFG_ACEHOLD 0x00000001 | 134 | #define TX4938_CCFG_ACEHOLD 0x00000001 |
311 | 135 | ||
312 | /* PCFG : Pin Configuration */ | 136 | /* PCFG : Pin Configuration */ |
313 | #define TX4938_PCFG_ETH0_SEL _CONST64(0x8000000000000000) | 137 | #define TX4938_PCFG_ETH0_SEL 0x8000000000000000ULL |
314 | #define TX4938_PCFG_ETH1_SEL _CONST64(0x4000000000000000) | 138 | #define TX4938_PCFG_ETH1_SEL 0x4000000000000000ULL |
315 | #define TX4938_PCFG_ATA_SEL _CONST64(0x2000000000000000) | 139 | #define TX4938_PCFG_ATA_SEL 0x2000000000000000ULL |
316 | #define TX4938_PCFG_ISA_SEL _CONST64(0x1000000000000000) | 140 | #define TX4938_PCFG_ISA_SEL 0x1000000000000000ULL |
317 | #define TX4938_PCFG_SPI_SEL _CONST64(0x0800000000000000) | 141 | #define TX4938_PCFG_SPI_SEL 0x0800000000000000ULL |
318 | #define TX4938_PCFG_NDF_SEL _CONST64(0x0400000000000000) | 142 | #define TX4938_PCFG_NDF_SEL 0x0400000000000000ULL |
319 | #define TX4938_PCFG_SDCLKDLY_MASK 0x30000000 | 143 | #define TX4938_PCFG_SDCLKDLY_MASK 0x30000000 |
320 | #define TX4938_PCFG_SDCLKDLY(d) ((d)<<28) | 144 | #define TX4938_PCFG_SDCLKDLY(d) ((d)<<28) |
321 | #define TX4938_PCFG_SYSCLKEN 0x08000000 | 145 | #define TX4938_PCFG_SYSCLKEN 0x08000000 |
@@ -336,8 +160,8 @@ struct tx4938_ccfg_reg { | |||
336 | #define TX4938_PCFG_DMASEL3_SIO0 0x00000008 | 160 | #define TX4938_PCFG_DMASEL3_SIO0 0x00000008 |
337 | 161 | ||
338 | /* CLKCTR : Clock Control */ | 162 | /* CLKCTR : Clock Control */ |
339 | #define TX4938_CLKCTR_NDFCKD _CONST64(0x0001000000000000) | 163 | #define TX4938_CLKCTR_NDFCKD 0x0001000000000000ULL |
340 | #define TX4938_CLKCTR_NDFRST _CONST64(0x0000000100000000) | 164 | #define TX4938_CLKCTR_NDFRST 0x0000000100000000ULL |
341 | #define TX4938_CLKCTR_ETH1CKD 0x80000000 | 165 | #define TX4938_CLKCTR_ETH1CKD 0x80000000 |
342 | #define TX4938_CLKCTR_ETH0CKD 0x40000000 | 166 | #define TX4938_CLKCTR_ETH0CKD 0x40000000 |
343 | #define TX4938_CLKCTR_SPICKD 0x20000000 | 167 | #define TX4938_CLKCTR_SPICKD 0x20000000 |
@@ -424,20 +248,16 @@ struct tx4938_ccfg_reg { | |||
424 | #define TX4938_DMA_CSR_DESERR 0x00000002 | 248 | #define TX4938_DMA_CSR_DESERR 0x00000002 |
425 | #define TX4938_DMA_CSR_SORERR 0x00000001 | 249 | #define TX4938_DMA_CSR_SORERR 0x00000001 |
426 | 250 | ||
427 | #define tx4938_sdramcptr ((struct tx4938_sdramc_reg *)TX4938_SDRAMC_REG) | 251 | #define tx4938_sdramcptr tx4927_sdramcptr |
428 | #define tx4938_ebuscptr ((struct tx4938_ebusc_reg *)TX4938_EBUSC_REG) | 252 | #define tx4938_ebuscptr tx4927_ebuscptr |
429 | #define tx4938_dmaptr(ch) ((struct tx4938_dma_reg *)TX4938_DMA_REG(ch)) | ||
430 | #define tx4938_ndfmcptr ((struct tx4938_ndfmc_reg *)TX4938_NDFMC_REG) | ||
431 | #define tx4938_pcicptr tx4927_pcicptr | 253 | #define tx4938_pcicptr tx4927_pcicptr |
432 | #define tx4938_pcic1ptr \ | 254 | #define tx4938_pcic1ptr \ |
433 | ((struct tx4927_pcic_reg __iomem *)TX4938_PCIC1_REG) | 255 | ((struct tx4927_pcic_reg __iomem *)TX4938_PCIC1_REG) |
434 | #define tx4938_ccfgptr \ | 256 | #define tx4938_ccfgptr \ |
435 | ((struct tx4938_ccfg_reg __iomem *)TX4938_CCFG_REG) | 257 | ((struct tx4938_ccfg_reg __iomem *)TX4938_CCFG_REG) |
436 | #define tx4938_sioptr(ch) ((struct tx4938_sio_reg *)TX4938_SIO_REG(ch)) | ||
437 | #define tx4938_pioptr ((struct txx9_pio_reg __iomem *)TX4938_PIO_REG) | 258 | #define tx4938_pioptr ((struct txx9_pio_reg __iomem *)TX4938_PIO_REG) |
438 | #define tx4938_aclcptr ((struct tx4938_aclc_reg *)TX4938_ACLC_REG) | 259 | #define tx4938_sramcptr \ |
439 | #define tx4938_spiptr ((struct tx4938_spi_reg *)TX4938_SPI_REG) | 260 | ((struct tx4938_sramc_reg __iomem *)TX4938_SRAMC_REG) |
440 | #define tx4938_sramcptr ((struct tx4938_sramc_reg *)TX4938_SRAMC_REG) | ||
441 | 261 | ||
442 | 262 | ||
443 | #define TX4938_REV_PCODE() \ | 263 | #define TX4938_REV_PCODE() \ |
@@ -447,14 +267,19 @@ struct tx4938_ccfg_reg { | |||
447 | #define tx4938_ccfg_set(bits) tx4927_ccfg_set(bits) | 267 | #define tx4938_ccfg_set(bits) tx4927_ccfg_set(bits) |
448 | #define tx4938_ccfg_change(change, new) tx4927_ccfg_change(change, new) | 268 | #define tx4938_ccfg_change(change, new) tx4927_ccfg_change(change, new) |
449 | 269 | ||
450 | #define TX4938_SDRAMC_BA(ch) ((tx4938_sdramcptr->cr[ch] >> 49) << 21) | 270 | #define TX4938_SDRAMC_CR(ch) TX4927_SDRAMC_CR(ch) |
451 | #define TX4938_SDRAMC_SIZE(ch) (((tx4938_sdramcptr->cr[ch] >> 33) + 1) << 21) | 271 | #define TX4938_SDRAMC_BA(ch) TX4927_SDRAMC_BA(ch) |
272 | #define TX4938_SDRAMC_SIZE(ch) TX4927_SDRAMC_SIZE(ch) | ||
452 | 273 | ||
453 | #define TX4938_EBUSC_CR(ch) __raw_readq(&tx4938_ebuscptr->cr[(ch)]) | 274 | #define TX4938_EBUSC_CR(ch) TX4927_EBUSC_CR(ch) |
454 | #define TX4938_EBUSC_BA(ch) ((tx4938_ebuscptr->cr[ch] >> 48) << 20) | 275 | #define TX4938_EBUSC_BA(ch) TX4927_EBUSC_BA(ch) |
455 | #define TX4938_EBUSC_SIZE(ch) \ | 276 | #define TX4938_EBUSC_SIZE(ch) TX4927_EBUSC_SIZE(ch) |
456 | (0x00100000 << ((unsigned long)(tx4938_ebuscptr->cr[ch] >> 8) & 0xf)) | ||
457 | 277 | ||
278 | #define tx4938_get_mem_size() tx4927_get_mem_size() | ||
279 | void tx4938_wdr_init(void); | ||
280 | void tx4938_setup(void); | ||
281 | void tx4938_time_init(unsigned int tmrnr); | ||
282 | void tx4938_setup_serial(void); | ||
458 | int tx4938_report_pciclk(void); | 283 | int tx4938_report_pciclk(void); |
459 | void tx4938_report_pci1clk(void); | 284 | void tx4938_report_pci1clk(void); |
460 | int tx4938_pciclk66_setup(void); | 285 | int tx4938_pciclk66_setup(void); |