diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2005-09-03 18:56:19 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-05 03:06:07 -0400 |
commit | 4ce588cd563e6b817adb0c7d03b3ed9c74cadc27 (patch) | |
tree | a20158d65f21e9fcf2ef9a7c50462905adfec248 /arch | |
parent | 42a3b4f25af8f8d77feddf27f839fa0628dbff1a (diff) |
[PATCH] mips: fix coherency configuration
Fix the MIPS coherency configuration such that we always keep the mapping
state in <asm/pci.h> when we need to on non-coherent platforms.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
32 files changed, 42 insertions, 3 deletions
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig index d892a23fa978..60ba382ea7f3 100644 --- a/arch/mips/Kconfig +++ b/arch/mips/Kconfig | |||
@@ -951,13 +951,21 @@ config ARC | |||
951 | depends on SNI_RM200_PCI || SGI_IP32 || SGI_IP27 || SGI_IP22 || MIPS_MAGNUM_4000 || OLIVETTI_M700 || ACER_PICA_61 | 951 | depends on SNI_RM200_PCI || SGI_IP32 || SGI_IP27 || SGI_IP22 || MIPS_MAGNUM_4000 || OLIVETTI_M700 || ACER_PICA_61 |
952 | default y | 952 | default y |
953 | 953 | ||
954 | config DMA_COHERENT | 954 | config DMA_COHERENT |
955 | bool | 955 | bool |
956 | 956 | ||
957 | config DMA_IP27 | 957 | config DMA_IP27 |
958 | bool | 958 | bool |
959 | 959 | ||
960 | config DMA_NONCOHERENT | 960 | config DMA_IP32 |
961 | bool | ||
962 | select DMA_NEED_PCI_MAP_STATE | ||
963 | |||
964 | config DMA_NONCOHERENT | ||
965 | bool | ||
966 | select DMA_NEED_PCI_MAP_STATE | ||
967 | |||
968 | config DMA_NEED_PCI_MAP_STATE | ||
961 | bool | 969 | bool |
962 | 970 | ||
963 | config EARLY_PRINTK | 971 | config EARLY_PRINTK |
diff --git a/arch/mips/configs/atlas_defconfig b/arch/mips/configs/atlas_defconfig index 4084ca3a7581..3120a02b8670 100644 --- a/arch/mips/configs/atlas_defconfig +++ b/arch/mips/configs/atlas_defconfig | |||
@@ -88,6 +88,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
88 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 88 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
89 | CONFIG_HAVE_DEC_LOCK=y | 89 | CONFIG_HAVE_DEC_LOCK=y |
90 | CONFIG_DMA_NONCOHERENT=y | 90 | CONFIG_DMA_NONCOHERENT=y |
91 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
91 | CONFIG_MIPS_BONITO64=y | 92 | CONFIG_MIPS_BONITO64=y |
92 | CONFIG_MIPS_MSC=y | 93 | CONFIG_MIPS_MSC=y |
93 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 94 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
diff --git a/arch/mips/configs/capcella_defconfig b/arch/mips/configs/capcella_defconfig index 9abdcbc20a9e..158e7165f4e3 100644 --- a/arch/mips/configs/capcella_defconfig +++ b/arch/mips/configs/capcella_defconfig | |||
@@ -97,6 +97,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
97 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 97 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
98 | CONFIG_HAVE_DEC_LOCK=y | 98 | CONFIG_HAVE_DEC_LOCK=y |
99 | CONFIG_DMA_NONCOHERENT=y | 99 | CONFIG_DMA_NONCOHERENT=y |
100 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
100 | CONFIG_CPU_LITTLE_ENDIAN=y | 101 | CONFIG_CPU_LITTLE_ENDIAN=y |
101 | CONFIG_IRQ_CPU=y | 102 | CONFIG_IRQ_CPU=y |
102 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 103 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
diff --git a/arch/mips/configs/cobalt_defconfig b/arch/mips/configs/cobalt_defconfig index ddcfcfbe098a..4302c6f914f5 100644 --- a/arch/mips/configs/cobalt_defconfig +++ b/arch/mips/configs/cobalt_defconfig | |||
@@ -82,6 +82,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
82 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 82 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
83 | CONFIG_HAVE_DEC_LOCK=y | 83 | CONFIG_HAVE_DEC_LOCK=y |
84 | CONFIG_DMA_NONCOHERENT=y | 84 | CONFIG_DMA_NONCOHERENT=y |
85 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
85 | CONFIG_I8259=y | 86 | CONFIG_I8259=y |
86 | CONFIG_CPU_LITTLE_ENDIAN=y | 87 | CONFIG_CPU_LITTLE_ENDIAN=y |
87 | CONFIG_IRQ_CPU=y | 88 | CONFIG_IRQ_CPU=y |
diff --git a/arch/mips/configs/db1000_defconfig b/arch/mips/configs/db1000_defconfig index 05905dfec1e6..962fc14b58c2 100644 --- a/arch/mips/configs/db1000_defconfig +++ b/arch/mips/configs/db1000_defconfig | |||
@@ -104,6 +104,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
104 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 104 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
105 | CONFIG_HAVE_DEC_LOCK=y | 105 | CONFIG_HAVE_DEC_LOCK=y |
106 | CONFIG_DMA_NONCOHERENT=y | 106 | CONFIG_DMA_NONCOHERENT=y |
107 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
107 | CONFIG_CPU_LITTLE_ENDIAN=y | 108 | CONFIG_CPU_LITTLE_ENDIAN=y |
108 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 109 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
109 | 110 | ||
diff --git a/arch/mips/configs/db1100_defconfig b/arch/mips/configs/db1100_defconfig index 610ff73a6706..6a528d479d70 100644 --- a/arch/mips/configs/db1100_defconfig +++ b/arch/mips/configs/db1100_defconfig | |||
@@ -104,6 +104,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
104 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 104 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
105 | CONFIG_HAVE_DEC_LOCK=y | 105 | CONFIG_HAVE_DEC_LOCK=y |
106 | CONFIG_DMA_NONCOHERENT=y | 106 | CONFIG_DMA_NONCOHERENT=y |
107 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
107 | CONFIG_CPU_LITTLE_ENDIAN=y | 108 | CONFIG_CPU_LITTLE_ENDIAN=y |
108 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 109 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
109 | 110 | ||
diff --git a/arch/mips/configs/ddb5476_defconfig b/arch/mips/configs/ddb5476_defconfig index 345cc8b078fc..70addc73f699 100644 --- a/arch/mips/configs/ddb5476_defconfig +++ b/arch/mips/configs/ddb5476_defconfig | |||
@@ -82,6 +82,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
82 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 82 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
83 | CONFIG_HAVE_DEC_LOCK=y | 83 | CONFIG_HAVE_DEC_LOCK=y |
84 | CONFIG_DMA_NONCOHERENT=y | 84 | CONFIG_DMA_NONCOHERENT=y |
85 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
85 | CONFIG_I8259=y | 86 | CONFIG_I8259=y |
86 | CONFIG_CPU_LITTLE_ENDIAN=y | 87 | CONFIG_CPU_LITTLE_ENDIAN=y |
87 | CONFIG_IRQ_CPU=y | 88 | CONFIG_IRQ_CPU=y |
diff --git a/arch/mips/configs/ddb5477_defconfig b/arch/mips/configs/ddb5477_defconfig index 4acb9e48d24e..60292808b384 100644 --- a/arch/mips/configs/ddb5477_defconfig +++ b/arch/mips/configs/ddb5477_defconfig | |||
@@ -83,6 +83,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
83 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 83 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
84 | CONFIG_HAVE_DEC_LOCK=y | 84 | CONFIG_HAVE_DEC_LOCK=y |
85 | CONFIG_DMA_NONCOHERENT=y | 85 | CONFIG_DMA_NONCOHERENT=y |
86 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
86 | CONFIG_I8259=y | 87 | CONFIG_I8259=y |
87 | CONFIG_CPU_LITTLE_ENDIAN=y | 88 | CONFIG_CPU_LITTLE_ENDIAN=y |
88 | CONFIG_IRQ_CPU=y | 89 | CONFIG_IRQ_CPU=y |
diff --git a/arch/mips/configs/decstation_defconfig b/arch/mips/configs/decstation_defconfig index 27b21fb4f13a..66ec1f41d122 100644 --- a/arch/mips/configs/decstation_defconfig +++ b/arch/mips/configs/decstation_defconfig | |||
@@ -88,6 +88,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
88 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 88 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
89 | CONFIG_HAVE_DEC_LOCK=y | 89 | CONFIG_HAVE_DEC_LOCK=y |
90 | CONFIG_DMA_NONCOHERENT=y | 90 | CONFIG_DMA_NONCOHERENT=y |
91 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
91 | CONFIG_EARLY_PRINTK=y | 92 | CONFIG_EARLY_PRINTK=y |
92 | CONFIG_CPU_LITTLE_ENDIAN=y | 93 | CONFIG_CPU_LITTLE_ENDIAN=y |
93 | CONFIG_IRQ_CPU=y | 94 | CONFIG_IRQ_CPU=y |
diff --git a/arch/mips/configs/e55_defconfig b/arch/mips/configs/e55_defconfig index 3812e5f10c9b..ba2ec01defb1 100644 --- a/arch/mips/configs/e55_defconfig +++ b/arch/mips/configs/e55_defconfig | |||
@@ -96,6 +96,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
96 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 96 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
97 | CONFIG_HAVE_DEC_LOCK=y | 97 | CONFIG_HAVE_DEC_LOCK=y |
98 | CONFIG_DMA_NONCOHERENT=y | 98 | CONFIG_DMA_NONCOHERENT=y |
99 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
99 | CONFIG_CPU_LITTLE_ENDIAN=y | 100 | CONFIG_CPU_LITTLE_ENDIAN=y |
100 | CONFIG_IRQ_CPU=y | 101 | CONFIG_IRQ_CPU=y |
101 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 102 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
diff --git a/arch/mips/configs/ev64120_defconfig b/arch/mips/configs/ev64120_defconfig index 705cdbd682d6..17e87f70f602 100644 --- a/arch/mips/configs/ev64120_defconfig +++ b/arch/mips/configs/ev64120_defconfig | |||
@@ -89,6 +89,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
89 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 89 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
90 | CONFIG_HAVE_DEC_LOCK=y | 90 | CONFIG_HAVE_DEC_LOCK=y |
91 | CONFIG_DMA_NONCOHERENT=y | 91 | CONFIG_DMA_NONCOHERENT=y |
92 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
92 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 93 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
93 | CONFIG_MIPS_GT64120=y | 94 | CONFIG_MIPS_GT64120=y |
94 | # CONFIG_SYSCLK_75 is not set | 95 | # CONFIG_SYSCLK_75 is not set |
diff --git a/arch/mips/configs/ev96100_defconfig b/arch/mips/configs/ev96100_defconfig index 4c89dfef8e78..9da4140eae00 100644 --- a/arch/mips/configs/ev96100_defconfig +++ b/arch/mips/configs/ev96100_defconfig | |||
@@ -88,6 +88,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
88 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 88 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
89 | CONFIG_HAVE_DEC_LOCK=y | 89 | CONFIG_HAVE_DEC_LOCK=y |
90 | CONFIG_DMA_NONCOHERENT=y | 90 | CONFIG_DMA_NONCOHERENT=y |
91 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
91 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 92 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
92 | CONFIG_IRQ_CPU=y | 93 | CONFIG_IRQ_CPU=y |
93 | CONFIG_MIPS_GT64120=y | 94 | CONFIG_MIPS_GT64120=y |
diff --git a/arch/mips/configs/ip22_defconfig b/arch/mips/configs/ip22_defconfig index 2990802899da..17fa5c4e3ad1 100644 --- a/arch/mips/configs/ip22_defconfig +++ b/arch/mips/configs/ip22_defconfig | |||
@@ -90,6 +90,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y | |||
90 | CONFIG_HAVE_DEC_LOCK=y | 90 | CONFIG_HAVE_DEC_LOCK=y |
91 | CONFIG_ARC=y | 91 | CONFIG_ARC=y |
92 | CONFIG_DMA_NONCOHERENT=y | 92 | CONFIG_DMA_NONCOHERENT=y |
93 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
93 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 94 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
94 | CONFIG_IRQ_CPU=y | 95 | CONFIG_IRQ_CPU=y |
95 | CONFIG_SWAP_IO_SPACE=y | 96 | CONFIG_SWAP_IO_SPACE=y |
diff --git a/arch/mips/configs/ip32_defconfig b/arch/mips/configs/ip32_defconfig index 2759162f173b..b26e1173365d 100644 --- a/arch/mips/configs/ip32_defconfig +++ b/arch/mips/configs/ip32_defconfig | |||
@@ -84,6 +84,7 @@ CONFIG_ARC=y | |||
84 | CONFIG_DMA_IP32=y | 84 | CONFIG_DMA_IP32=y |
85 | CONFIG_OWN_DMA=y | 85 | CONFIG_OWN_DMA=y |
86 | CONFIG_DMA_NONCOHERENT=y | 86 | CONFIG_DMA_NONCOHERENT=y |
87 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
87 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 88 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
88 | CONFIG_ARC32=y | 89 | CONFIG_ARC32=y |
89 | CONFIG_BOOT_ELF32=y | 90 | CONFIG_BOOT_ELF32=y |
diff --git a/arch/mips/configs/it8172_defconfig b/arch/mips/configs/it8172_defconfig index 09c83a01dd92..08bd3ad64761 100644 --- a/arch/mips/configs/it8172_defconfig +++ b/arch/mips/configs/it8172_defconfig | |||
@@ -90,6 +90,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
90 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 90 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
91 | CONFIG_HAVE_DEC_LOCK=y | 91 | CONFIG_HAVE_DEC_LOCK=y |
92 | CONFIG_DMA_NONCOHERENT=y | 92 | CONFIG_DMA_NONCOHERENT=y |
93 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
93 | CONFIG_CPU_LITTLE_ENDIAN=y | 94 | CONFIG_CPU_LITTLE_ENDIAN=y |
94 | CONFIG_ITE_BOARD_GEN=y | 95 | CONFIG_ITE_BOARD_GEN=y |
95 | CONFIG_IT8172_CIR=y | 96 | CONFIG_IT8172_CIR=y |
diff --git a/arch/mips/configs/ivr_defconfig b/arch/mips/configs/ivr_defconfig index 121d0c029c5d..583ef5c5b1cd 100644 --- a/arch/mips/configs/ivr_defconfig +++ b/arch/mips/configs/ivr_defconfig | |||
@@ -89,6 +89,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
89 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 89 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
90 | CONFIG_HAVE_DEC_LOCK=y | 90 | CONFIG_HAVE_DEC_LOCK=y |
91 | CONFIG_DMA_NONCOHERENT=y | 91 | CONFIG_DMA_NONCOHERENT=y |
92 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
92 | CONFIG_CPU_LITTLE_ENDIAN=y | 93 | CONFIG_CPU_LITTLE_ENDIAN=y |
93 | CONFIG_ITE_BOARD_GEN=y | 94 | CONFIG_ITE_BOARD_GEN=y |
94 | CONFIG_IT8172_CIR=y | 95 | CONFIG_IT8172_CIR=y |
diff --git a/arch/mips/configs/jaguar-atx_defconfig b/arch/mips/configs/jaguar-atx_defconfig index d4e19da57d70..8abb5a0c6c12 100644 --- a/arch/mips/configs/jaguar-atx_defconfig +++ b/arch/mips/configs/jaguar-atx_defconfig | |||
@@ -81,6 +81,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
81 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 81 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
82 | CONFIG_HAVE_DEC_LOCK=y | 82 | CONFIG_HAVE_DEC_LOCK=y |
83 | CONFIG_DMA_NONCOHERENT=y | 83 | CONFIG_DMA_NONCOHERENT=y |
84 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
84 | CONFIG_LIMITED_DMA=y | 85 | CONFIG_LIMITED_DMA=y |
85 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 86 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
86 | CONFIG_IRQ_CPU=y | 87 | CONFIG_IRQ_CPU=y |
diff --git a/arch/mips/configs/jmr3927_defconfig b/arch/mips/configs/jmr3927_defconfig index c95e52a9d8bb..da5d9ee2ecce 100644 --- a/arch/mips/configs/jmr3927_defconfig +++ b/arch/mips/configs/jmr3927_defconfig | |||
@@ -82,6 +82,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
82 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 82 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
83 | CONFIG_HAVE_DEC_LOCK=y | 83 | CONFIG_HAVE_DEC_LOCK=y |
84 | CONFIG_DMA_NONCOHERENT=y | 84 | CONFIG_DMA_NONCOHERENT=y |
85 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
85 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 86 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
86 | CONFIG_MIPS_TX3927=y | 87 | CONFIG_MIPS_TX3927=y |
87 | CONFIG_SWAP_IO_SPACE=y | 88 | CONFIG_SWAP_IO_SPACE=y |
diff --git a/arch/mips/configs/lasat200_defconfig b/arch/mips/configs/lasat200_defconfig index 3b4d7e6afac4..8d600ae890f4 100644 --- a/arch/mips/configs/lasat200_defconfig +++ b/arch/mips/configs/lasat200_defconfig | |||
@@ -92,6 +92,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
92 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 92 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
93 | CONFIG_HAVE_DEC_LOCK=y | 93 | CONFIG_HAVE_DEC_LOCK=y |
94 | CONFIG_DMA_NONCOHERENT=y | 94 | CONFIG_DMA_NONCOHERENT=y |
95 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
95 | CONFIG_MIPS_NILE4=y | 96 | CONFIG_MIPS_NILE4=y |
96 | CONFIG_CPU_LITTLE_ENDIAN=y | 97 | CONFIG_CPU_LITTLE_ENDIAN=y |
97 | CONFIG_MIPS_GT64120=y | 98 | CONFIG_MIPS_GT64120=y |
diff --git a/arch/mips/configs/malta_defconfig b/arch/mips/configs/malta_defconfig index 33e6bb62f2ea..79519ac5af4a 100644 --- a/arch/mips/configs/malta_defconfig +++ b/arch/mips/configs/malta_defconfig | |||
@@ -88,6 +88,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
88 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 88 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
89 | CONFIG_HAVE_DEC_LOCK=y | 89 | CONFIG_HAVE_DEC_LOCK=y |
90 | CONFIG_DMA_NONCOHERENT=y | 90 | CONFIG_DMA_NONCOHERENT=y |
91 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
91 | CONFIG_GENERIC_ISA_DMA=y | 92 | CONFIG_GENERIC_ISA_DMA=y |
92 | CONFIG_I8259=y | 93 | CONFIG_I8259=y |
93 | CONFIG_MIPS_BONITO64=y | 94 | CONFIG_MIPS_BONITO64=y |
diff --git a/arch/mips/configs/mpc30x_defconfig b/arch/mips/configs/mpc30x_defconfig index ed44a1a660f7..0fea57ef18f2 100644 --- a/arch/mips/configs/mpc30x_defconfig +++ b/arch/mips/configs/mpc30x_defconfig | |||
@@ -97,6 +97,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
97 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 97 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
98 | CONFIG_HAVE_DEC_LOCK=y | 98 | CONFIG_HAVE_DEC_LOCK=y |
99 | CONFIG_DMA_NONCOHERENT=y | 99 | CONFIG_DMA_NONCOHERENT=y |
100 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
100 | CONFIG_CPU_LITTLE_ENDIAN=y | 101 | CONFIG_CPU_LITTLE_ENDIAN=y |
101 | CONFIG_IRQ_CPU=y | 102 | CONFIG_IRQ_CPU=y |
102 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 103 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
diff --git a/arch/mips/configs/ocelot_3_defconfig b/arch/mips/configs/ocelot_3_defconfig index daa5b8828f57..b4cf97a732bc 100644 --- a/arch/mips/configs/ocelot_3_defconfig +++ b/arch/mips/configs/ocelot_3_defconfig | |||
@@ -89,6 +89,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
89 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 89 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
90 | CONFIG_HAVE_DEC_LOCK=y | 90 | CONFIG_HAVE_DEC_LOCK=y |
91 | CONFIG_DMA_NONCOHERENT=y | 91 | CONFIG_DMA_NONCOHERENT=y |
92 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
92 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 93 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
93 | CONFIG_IRQ_CPU=y | 94 | CONFIG_IRQ_CPU=y |
94 | CONFIG_IRQ_CPU_RM7K=y | 95 | CONFIG_IRQ_CPU_RM7K=y |
diff --git a/arch/mips/configs/ocelot_c_defconfig b/arch/mips/configs/ocelot_c_defconfig index bdefd4f1310a..a38903db85a0 100644 --- a/arch/mips/configs/ocelot_c_defconfig +++ b/arch/mips/configs/ocelot_c_defconfig | |||
@@ -80,6 +80,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
80 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 80 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
81 | CONFIG_HAVE_DEC_LOCK=y | 81 | CONFIG_HAVE_DEC_LOCK=y |
82 | CONFIG_DMA_NONCOHERENT=y | 82 | CONFIG_DMA_NONCOHERENT=y |
83 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
83 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 84 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
84 | CONFIG_IRQ_CPU=y | 85 | CONFIG_IRQ_CPU=y |
85 | CONFIG_IRQ_MV64340=y | 86 | CONFIG_IRQ_MV64340=y |
diff --git a/arch/mips/configs/ocelot_defconfig b/arch/mips/configs/ocelot_defconfig index 7526b4748dfe..920d59b56a4e 100644 --- a/arch/mips/configs/ocelot_defconfig +++ b/arch/mips/configs/ocelot_defconfig | |||
@@ -82,6 +82,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
82 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 82 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
83 | CONFIG_HAVE_DEC_LOCK=y | 83 | CONFIG_HAVE_DEC_LOCK=y |
84 | CONFIG_DMA_NONCOHERENT=y | 84 | CONFIG_DMA_NONCOHERENT=y |
85 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
85 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 86 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
86 | CONFIG_IRQ_CPU=y | 87 | CONFIG_IRQ_CPU=y |
87 | CONFIG_IRQ_CPU_RM7K=y | 88 | CONFIG_IRQ_CPU_RM7K=y |
diff --git a/arch/mips/configs/ocelot_g_defconfig b/arch/mips/configs/ocelot_g_defconfig index f372508bc25b..ef5ea50893d1 100644 --- a/arch/mips/configs/ocelot_g_defconfig +++ b/arch/mips/configs/ocelot_g_defconfig | |||
@@ -80,6 +80,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
80 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 80 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
81 | CONFIG_HAVE_DEC_LOCK=y | 81 | CONFIG_HAVE_DEC_LOCK=y |
82 | CONFIG_DMA_NONCOHERENT=y | 82 | CONFIG_DMA_NONCOHERENT=y |
83 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
83 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 84 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
84 | CONFIG_IRQ_CPU=y | 85 | CONFIG_IRQ_CPU=y |
85 | CONFIG_IRQ_CPU_RM7K=y | 86 | CONFIG_IRQ_CPU_RM7K=y |
diff --git a/arch/mips/configs/pb1100_defconfig b/arch/mips/configs/pb1100_defconfig index b7b95789fefb..813e3a8b480b 100644 --- a/arch/mips/configs/pb1100_defconfig +++ b/arch/mips/configs/pb1100_defconfig | |||
@@ -104,6 +104,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
104 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 104 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
105 | CONFIG_HAVE_DEC_LOCK=y | 105 | CONFIG_HAVE_DEC_LOCK=y |
106 | CONFIG_DMA_NONCOHERENT=y | 106 | CONFIG_DMA_NONCOHERENT=y |
107 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
107 | CONFIG_CPU_LITTLE_ENDIAN=y | 108 | CONFIG_CPU_LITTLE_ENDIAN=y |
108 | CONFIG_SWAP_IO_SPACE=y | 109 | CONFIG_SWAP_IO_SPACE=y |
109 | # CONFIG_AU1X00_USB_DEVICE is not set | 110 | # CONFIG_AU1X00_USB_DEVICE is not set |
diff --git a/arch/mips/configs/rm200_defconfig b/arch/mips/configs/rm200_defconfig index 021cfe38371a..17d4fce6c4c6 100644 --- a/arch/mips/configs/rm200_defconfig +++ b/arch/mips/configs/rm200_defconfig | |||
@@ -91,6 +91,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y | |||
91 | CONFIG_HAVE_DEC_LOCK=y | 91 | CONFIG_HAVE_DEC_LOCK=y |
92 | CONFIG_ARC=y | 92 | CONFIG_ARC=y |
93 | CONFIG_DMA_NONCOHERENT=y | 93 | CONFIG_DMA_NONCOHERENT=y |
94 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
94 | CONFIG_GENERIC_ISA_DMA=y | 95 | CONFIG_GENERIC_ISA_DMA=y |
95 | CONFIG_I8259=y | 96 | CONFIG_I8259=y |
96 | CONFIG_CPU_LITTLE_ENDIAN=y | 97 | CONFIG_CPU_LITTLE_ENDIAN=y |
diff --git a/arch/mips/configs/sead_defconfig b/arch/mips/configs/sead_defconfig index 4d2fde827f01..dd07e866b128 100644 --- a/arch/mips/configs/sead_defconfig +++ b/arch/mips/configs/sead_defconfig | |||
@@ -80,6 +80,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
80 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 80 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
81 | CONFIG_HAVE_DEC_LOCK=y | 81 | CONFIG_HAVE_DEC_LOCK=y |
82 | CONFIG_DMA_NONCOHERENT=y | 82 | CONFIG_DMA_NONCOHERENT=y |
83 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
83 | CONFIG_CPU_LITTLE_ENDIAN=y | 84 | CONFIG_CPU_LITTLE_ENDIAN=y |
84 | CONFIG_IRQ_CPU=y | 85 | CONFIG_IRQ_CPU=y |
85 | CONFIG_MIPS_BOARDS_GEN=y | 86 | CONFIG_MIPS_BOARDS_GEN=y |
diff --git a/arch/mips/configs/tb0226_defconfig b/arch/mips/configs/tb0226_defconfig index 53e3d4adf1dd..c9d3f83caf0f 100644 --- a/arch/mips/configs/tb0226_defconfig +++ b/arch/mips/configs/tb0226_defconfig | |||
@@ -95,6 +95,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
95 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 95 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
96 | CONFIG_HAVE_DEC_LOCK=y | 96 | CONFIG_HAVE_DEC_LOCK=y |
97 | CONFIG_DMA_NONCOHERENT=y | 97 | CONFIG_DMA_NONCOHERENT=y |
98 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
98 | CONFIG_CPU_LITTLE_ENDIAN=y | 99 | CONFIG_CPU_LITTLE_ENDIAN=y |
99 | CONFIG_IRQ_CPU=y | 100 | CONFIG_IRQ_CPU=y |
100 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 101 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
diff --git a/arch/mips/configs/tb0229_defconfig b/arch/mips/configs/tb0229_defconfig index 0fe7f505226e..2cb669188aa9 100644 --- a/arch/mips/configs/tb0229_defconfig +++ b/arch/mips/configs/tb0229_defconfig | |||
@@ -98,6 +98,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
98 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 98 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
99 | CONFIG_HAVE_DEC_LOCK=y | 99 | CONFIG_HAVE_DEC_LOCK=y |
100 | CONFIG_DMA_NONCOHERENT=y | 100 | CONFIG_DMA_NONCOHERENT=y |
101 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
101 | CONFIG_CPU_LITTLE_ENDIAN=y | 102 | CONFIG_CPU_LITTLE_ENDIAN=y |
102 | CONFIG_IRQ_CPU=y | 103 | CONFIG_IRQ_CPU=y |
103 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 104 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
diff --git a/arch/mips/configs/workpad_defconfig b/arch/mips/configs/workpad_defconfig index d793616effbb..16e07fca446f 100644 --- a/arch/mips/configs/workpad_defconfig +++ b/arch/mips/configs/workpad_defconfig | |||
@@ -96,6 +96,7 @@ CONFIG_RWSEM_GENERIC_SPINLOCK=y | |||
96 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 96 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
97 | CONFIG_HAVE_DEC_LOCK=y | 97 | CONFIG_HAVE_DEC_LOCK=y |
98 | CONFIG_DMA_NONCOHERENT=y | 98 | CONFIG_DMA_NONCOHERENT=y |
99 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
99 | CONFIG_CPU_LITTLE_ENDIAN=y | 100 | CONFIG_CPU_LITTLE_ENDIAN=y |
100 | CONFIG_IRQ_CPU=y | 101 | CONFIG_IRQ_CPU=y |
101 | CONFIG_MIPS_L1_CACHE_SHIFT=5 | 102 | CONFIG_MIPS_L1_CACHE_SHIFT=5 |
diff --git a/arch/mips/defconfig b/arch/mips/defconfig index 2081583daabc..20f84b119b4c 100644 --- a/arch/mips/defconfig +++ b/arch/mips/defconfig | |||
@@ -90,6 +90,7 @@ CONFIG_GENERIC_CALIBRATE_DELAY=y | |||
90 | CONFIG_HAVE_DEC_LOCK=y | 90 | CONFIG_HAVE_DEC_LOCK=y |
91 | CONFIG_ARC=y | 91 | CONFIG_ARC=y |
92 | CONFIG_DMA_NONCOHERENT=y | 92 | CONFIG_DMA_NONCOHERENT=y |
93 | CONFIG_DMA_NEED_PCI_MAP_STATE=y | ||
93 | # CONFIG_CPU_LITTLE_ENDIAN is not set | 94 | # CONFIG_CPU_LITTLE_ENDIAN is not set |
94 | CONFIG_IRQ_CPU=y | 95 | CONFIG_IRQ_CPU=y |
95 | CONFIG_SWAP_IO_SPACE=y | 96 | CONFIG_SWAP_IO_SPACE=y |