diff mbox

[v2,4/4] davinci: dm646x: Makefile/Kconfig updates to add support for PCI host

Message ID 1249304360-16522-1-git-send-email-hemantp@ti.com (mailing list archive)
State Changes Requested
Headers show

Commit Message

Hemant Pedanekar Aug. 3, 2009, 12:59 p.m. UTC
Signed-off-by: Hemant Pedanekar <hemantp@ti.com>
---
 arch/arm/Kconfig               |    2 +-
 arch/arm/mach-davinci/Kconfig  |    1 +
 arch/arm/mach-davinci/Makefile |    6 ++++++
 3 files changed, 8 insertions(+), 1 deletions(-)
diff mbox

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index aef63c8..67ea4c7 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -846,7 +846,7 @@  config ISA_DMA_API
 	bool
 
 config PCI
-	bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 || MACH_ARMCORE
+	bool "PCI support" if ARCH_INTEGRATOR_AP || ARCH_VERSATILE_PB || ARCH_IXP4XX || ARCH_KS8695 || MACH_ARMCORE || ARCH_DAVINCI_DM646x
 	help
 	  Find out whether you have a PCI motherboard. PCI is the name of a
 	  bus system, i.e. the way the CPU talks to the other stuff inside
diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig
index 40866c6..a17e545 100644
--- a/arch/arm/mach-davinci/Kconfig
+++ b/arch/arm/mach-davinci/Kconfig
@@ -27,6 +27,7 @@  config ARCH_DAVINCI_DM646x
         bool "DaVinci 646x based system"
 	select AINTC
 	select ARCH_DAVINCI_DMx
+	select DAVINCI_MUX if PCI
 
 config ARCH_DAVINCI_DA830
         bool "DA830/OMAP-L137 based system"
diff --git a/arch/arm/mach-davinci/Makefile b/arch/arm/mach-davinci/Makefile
index 2e11e84..c24f73c 100644
--- a/arch/arm/mach-davinci/Makefile
+++ b/arch/arm/mach-davinci/Makefile
@@ -8,6 +8,7 @@  obj-y 			:= time.o clock.o serial.o io.o psc.o \
 			   gpio.o dma.o usb.o common.o sram.o
 
 obj-$(CONFIG_DAVINCI_MUX)		+= mux.o
+obj-$(CONFIG_PCI)			+= pci-generic.o
 
 # Chip specific
 obj-$(CONFIG_ARCH_DAVINCI_DM644x)       += dm644x.o devices.o
@@ -17,6 +18,11 @@  obj-$(CONFIG_ARCH_DAVINCI_DM365)	+= dm365.o devices.o
 obj-$(CONFIG_ARCH_DAVINCI_DA830)        += da830.o devices-da8xx.o
 obj-$(CONFIG_ARCH_DAVINCI_DA850)        += da850.o devices-da8xx.o
 
+# PCI - Chip specific
+ifeq ($(CONFIG_PCI), y)
+obj-$(CONFIG_ARCH_DAVINCI_DM646x)	+= pci-dm646x.o
+endif
+
 obj-$(CONFIG_AINTC)			+= irq.o
 obj-$(CONFIG_CP_INTC)			+= cp_intc.o