diff options
author | Manuel Lauss <manuel.lauss@googlemail.com> | 2009-11-23 14:40:01 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2010-02-27 06:53:02 -0500 |
commit | 5d400f5c59df3ed2c3682a7409c8e81a7c4e650c (patch) | |
tree | c501fe5a419532d10cc39dae3f1ce044716e25b4 | |
parent | 70f82f2c59be86fad915a2ee62673fe1aad6c2bd (diff) |
MIPS: Alchemy: Only build AU1000 INTC code for compatible cpus
Use the GPIO config symbol to only build Au1000 interrupt code on chips with
compatible hw.
Signed-off-by: Manuel Lauss <manuel.lauss@gmail.com>
Cc: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/670/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/alchemy/Kconfig | 14 | ||||
-rw-r--r-- | arch/mips/alchemy/common/Makefile | 6 | ||||
-rw-r--r-- | arch/mips/include/asm/mach-au1x00/gpio.h | 2 |
3 files changed, 12 insertions, 10 deletions
diff --git a/arch/mips/alchemy/Kconfig b/arch/mips/alchemy/Kconfig index 22f4ff5103c1..df3b1a7eb15d 100644 --- a/arch/mips/alchemy/Kconfig +++ b/arch/mips/alchemy/Kconfig | |||
@@ -1,5 +1,5 @@ | |||
1 | # au1000-style gpio | 1 | # au1000-style gpio and interrupt controllers |
2 | config ALCHEMY_GPIO_AU1000 | 2 | config ALCHEMY_GPIOINT_AU1000 |
3 | bool | 3 | bool |
4 | 4 | ||
5 | # select this in your board config if you don't want to use the gpio | 5 | # select this in your board config if you don't want to use the gpio |
@@ -133,27 +133,27 @@ endchoice | |||
133 | config SOC_AU1000 | 133 | config SOC_AU1000 |
134 | bool | 134 | bool |
135 | select SOC_AU1X00 | 135 | select SOC_AU1X00 |
136 | select ALCHEMY_GPIO_AU1000 | 136 | select ALCHEMY_GPIOINT_AU1000 |
137 | 137 | ||
138 | config SOC_AU1100 | 138 | config SOC_AU1100 |
139 | bool | 139 | bool |
140 | select SOC_AU1X00 | 140 | select SOC_AU1X00 |
141 | select ALCHEMY_GPIO_AU1000 | 141 | select ALCHEMY_GPIOINT_AU1000 |
142 | 142 | ||
143 | config SOC_AU1500 | 143 | config SOC_AU1500 |
144 | bool | 144 | bool |
145 | select SOC_AU1X00 | 145 | select SOC_AU1X00 |
146 | select ALCHEMY_GPIO_AU1000 | 146 | select ALCHEMY_GPIOINT_AU1000 |
147 | 147 | ||
148 | config SOC_AU1550 | 148 | config SOC_AU1550 |
149 | bool | 149 | bool |
150 | select SOC_AU1X00 | 150 | select SOC_AU1X00 |
151 | select ALCHEMY_GPIO_AU1000 | 151 | select ALCHEMY_GPIOINT_AU1000 |
152 | 152 | ||
153 | config SOC_AU1200 | 153 | config SOC_AU1200 |
154 | bool | 154 | bool |
155 | select SOC_AU1X00 | 155 | select SOC_AU1X00 |
156 | select ALCHEMY_GPIO_AU1000 | 156 | select ALCHEMY_GPIOINT_AU1000 |
157 | 157 | ||
158 | config SOC_AU1X00 | 158 | config SOC_AU1X00 |
159 | bool | 159 | bool |
diff --git a/arch/mips/alchemy/common/Makefile b/arch/mips/alchemy/common/Makefile index abf0eb19051e..f46b351a961d 100644 --- a/arch/mips/alchemy/common/Makefile +++ b/arch/mips/alchemy/common/Makefile | |||
@@ -5,14 +5,16 @@ | |||
5 | # Makefile for the Alchemy Au1xx0 CPUs, generic files. | 5 | # Makefile for the Alchemy Au1xx0 CPUs, generic files. |
6 | # | 6 | # |
7 | 7 | ||
8 | obj-y += prom.o irq.o time.o reset.o \ | 8 | obj-y += prom.o time.o reset.o \ |
9 | clocks.o platform.o power.o setup.o \ | 9 | clocks.o platform.o power.o setup.o \ |
10 | sleeper.o dma.o dbdma.o | 10 | sleeper.o dma.o dbdma.o |
11 | 11 | ||
12 | obj-$(CONFIG_ALCHEMY_GPIOINT_AU1000) += irq.o | ||
13 | |||
12 | # optional gpiolib support | 14 | # optional gpiolib support |
13 | ifeq ($(CONFIG_ALCHEMY_GPIO_INDIRECT),) | 15 | ifeq ($(CONFIG_ALCHEMY_GPIO_INDIRECT),) |
14 | ifeq ($(CONFIG_GPIOLIB),y) | 16 | ifeq ($(CONFIG_GPIOLIB),y) |
15 | obj-$(CONFIG_ALCHEMY_GPIO_AU1000) += gpiolib-au1000.o | 17 | obj-$(CONFIG_ALCHEMY_GPIOINT_AU1000) += gpiolib-au1000.o |
16 | endif | 18 | endif |
17 | endif | 19 | endif |
18 | 20 | ||
diff --git a/arch/mips/include/asm/mach-au1x00/gpio.h b/arch/mips/include/asm/mach-au1x00/gpio.h index f9b7d41c659a..c3f60cdc3203 100644 --- a/arch/mips/include/asm/mach-au1x00/gpio.h +++ b/arch/mips/include/asm/mach-au1x00/gpio.h | |||
@@ -1,7 +1,7 @@ | |||
1 | #ifndef _ALCHEMY_GPIO_H_ | 1 | #ifndef _ALCHEMY_GPIO_H_ |
2 | #define _ALCHEMY_GPIO_H_ | 2 | #define _ALCHEMY_GPIO_H_ |
3 | 3 | ||
4 | #if defined(CONFIG_ALCHEMY_GPIO_AU1000) | 4 | #if defined(CONFIG_ALCHEMY_GPIOINT_AU1000) |
5 | 5 | ||
6 | #include <asm/mach-au1x00/gpio-au1000.h> | 6 | #include <asm/mach-au1x00/gpio-au1000.h> |
7 | 7 | ||