Skip to content

Commit

Permalink
MIPS: Alchemy: Only build AU1000 INTC code for compatible cpus
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Manuel Lauss authored and Ralf Baechle committed Feb 27, 2010
1 parent 70f82f2 commit 5d400f5
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 10 deletions.
14 changes: 7 additions & 7 deletions arch/mips/alchemy/Kconfig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# au1000-style gpio
config ALCHEMY_GPIO_AU1000
# au1000-style gpio and interrupt controllers
config ALCHEMY_GPIOINT_AU1000
bool

# select this in your board config if you don't want to use the gpio
Expand Down Expand Up @@ -133,27 +133,27 @@ endchoice
config SOC_AU1000
bool
select SOC_AU1X00
select ALCHEMY_GPIO_AU1000
select ALCHEMY_GPIOINT_AU1000

config SOC_AU1100
bool
select SOC_AU1X00
select ALCHEMY_GPIO_AU1000
select ALCHEMY_GPIOINT_AU1000

config SOC_AU1500
bool
select SOC_AU1X00
select ALCHEMY_GPIO_AU1000
select ALCHEMY_GPIOINT_AU1000

config SOC_AU1550
bool
select SOC_AU1X00
select ALCHEMY_GPIO_AU1000
select ALCHEMY_GPIOINT_AU1000

config SOC_AU1200
bool
select SOC_AU1X00
select ALCHEMY_GPIO_AU1000
select ALCHEMY_GPIOINT_AU1000

config SOC_AU1X00
bool
Expand Down
6 changes: 4 additions & 2 deletions arch/mips/alchemy/common/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,16 @@
# Makefile for the Alchemy Au1xx0 CPUs, generic files.
#

obj-y += prom.o irq.o time.o reset.o \
obj-y += prom.o time.o reset.o \
clocks.o platform.o power.o setup.o \
sleeper.o dma.o dbdma.o

obj-$(CONFIG_ALCHEMY_GPIOINT_AU1000) += irq.o

# optional gpiolib support
ifeq ($(CONFIG_ALCHEMY_GPIO_INDIRECT),)
ifeq ($(CONFIG_GPIOLIB),y)
obj-$(CONFIG_ALCHEMY_GPIO_AU1000) += gpiolib-au1000.o
obj-$(CONFIG_ALCHEMY_GPIOINT_AU1000) += gpiolib-au1000.o
endif
endif

Expand Down
2 changes: 1 addition & 1 deletion arch/mips/include/asm/mach-au1x00/gpio.h
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#ifndef _ALCHEMY_GPIO_H_
#define _ALCHEMY_GPIO_H_

#if defined(CONFIG_ALCHEMY_GPIO_AU1000)
#if defined(CONFIG_ALCHEMY_GPIOINT_AU1000)

#include <asm/mach-au1x00/gpio-au1000.h>

Expand Down

0 comments on commit 5d400f5

Please sign in to comment.