# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1249941536 18000
# Node ID 2877414aa82740011e8d3a11b90938fed376ef8c
# Parent  48c9887b1b48ab01c0def46031031ccc0079fbcd
imported patch comcerto-config

diff -r 48c9887b1b48 -r 2877414aa827 arch/arm/Kconfig
--- a/arch/arm/Kconfig	Mon Aug 10 16:58:46 2009 -0500
+++ b/arch/arm/Kconfig	Mon Aug 10 16:58:56 2009 -0500
@@ -277,6 +277,15 @@
 	help
 	  This enables support for the Cirrus EP93xx series of CPUs.
 
+config ARCH_COMCERTO
+      bool "Mindspeed Comcerto"
+      select ZONE_DMA
+      help
+        This enables support for Mindspeed's M825xx-1/M825xx-2/m828xx 
+	development boards.
+        If you would like to build your kernel to run on one of these boards
+        then you must say 'Y' here. Otherwise say 'N'    
+
 config ARCH_GEMINI
 	bool "Cortina Systems Gemini"
 	select CPU_FA526
@@ -285,6 +294,7 @@
 	help
 	  Support for the Cortina Systems Gemini family SoCs
 
+
 config ARCH_FOOTBRIDGE
 	bool "FootBridge"
 	select CPU_SA110
@@ -620,6 +630,8 @@
 
 endchoice
 
+source "arch/arm/mach-comcerto/Kconfig"
+
 source "arch/arm/mach-clps711x/Kconfig"
 
 source "arch/arm/mach-ep93xx/Kconfig"
@@ -825,7 +837,7 @@
 	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 || MACH_COMCERTO
 	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
@@ -1073,7 +1085,7 @@
 	  will overrule the CPU usage LED.
 
 config ALIGNMENT_TRAP
-	bool
+	bool  "Alignment trap"
 	depends on CPU_CP15_MMU
 	default y if !ARCH_EBSA110
 	help
@@ -1329,7 +1341,7 @@
 
 source "drivers/connector/Kconfig"
 
-if ALIGNMENT_TRAP || !CPU_CP15_MMU
+if ALIGNMENT_TRAP || !CPU_CP15_MMU || ARCH_COMCERTO
 source "drivers/mtd/Kconfig"
 endif
 
diff -r 48c9887b1b48 -r 2877414aa827 arch/arm/mach-comcerto/Kconfig
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/arch/arm/mach-comcerto/Kconfig	Mon Aug 10 16:58:56 2009 -0500
@@ -0,0 +1,133 @@
+if ARCH_COMCERTO
+
+menu "Comcerto Implementation Options"
+
+choice
+	prompt "Comcerto System Type"
+	default ARCH_M828XX
+
+config ARCH_M821XX
+	bool "M821xx"
+	help
+	  Say Y here if you intend to run this kernel with a Dali device.
+
+config ARCH_M822XX
+	bool "M822xx"
+	help
+	  Say Y here if you intend to run this kernel with a Dali-C50 device.
+
+config ARCH_M825XX1
+	bool "M825xx(1) (M82505, M82510, M82520, M82524, M82530)"
+	help
+	  Say Y here if you intend to run this kernel with a Chagall device.
+
+config ARCH_M825XX2
+	bool "M825xx(2) (M82501, M82506, M82511, M82514, M82515)"
+	help
+	  Say Y here if you intend to run this kernel with a Chagall 2 device.
+
+config ARCH_M828XX
+	bool "M828xx"
+	help
+	  Say Y here if you intend to run this kernel with a Monet device.
+
+config ARCH_M829XX
+	bool "M829xx"
+	help
+	  Say Y here if you intend to run this kernel with a Matisse device.
+endchoice
+
+choice
+	prompt "Comcerto Board type"
+	default EVM_MALINDI
+
+config EVM_MOMBASA
+	bool "Mombasa"
+	depends on ARCH_M825XX1
+	help
+	  Say Y here if you intend to run this kernel with a Mombasa EVM board.
+
+config EVM_MALINDI
+	bool "Malindi"
+	depends on ARCH_M828XX
+	help
+	  Say Y here if you intend to run this kernel with a Malindi EVM board.
+
+config EVM_VIKING
+	bool "Viking"
+	depends on ARCH_M828XX
+	help
+	  Say Y here if you intend to run this kernel with a Viking EVM board.
+	  	  
+config EVM_SUPERMOMBASA
+	bool "Super Mombasa"
+	depends on ARCH_M828XX || ARCH_M825XX2 || ARCH_M829XX
+	help
+	  Say Y here if you intend to run this kernel with a SuperMombasa board.
+
+config EVM_ASIC
+	bool "Asic"
+	depends on ARCH_M821XX
+	help
+	  Say Y here if you intend to run this kernel with a Asic board.
+
+config EVM_ROUTER
+	bool "Router"
+	depends on ARCH_M821XX || ARCH_M822XX
+	help
+	  Say Y here if you intend to run this kernel with a Router board.
+
+config EVM_PACKET_IAD
+	bool "Packet IAD"
+	depends on ARCH_M821XX || ARCH_M822XX
+	help
+	  Say Y here if you intend to run this kernel with a Packet IAD board.
+
+config EVM_FEROUTER
+	bool "FE Router"
+	depends on ARCH_M821XX
+	help
+	  Say Y here if you intend to run this kernel with a FastEthernet Router board.
+
+endchoice
+
+config COMCERTO_PCI_USE_APBB
+	bool "PCI Direct access through APBB"
+	depends on PCI && ARCH_M821XX || ARCH_M822XX
+	default n
+
+config COMCERTO_PCI_TX_DMA_ARAM
+	bool "PCI TX DMA from ARAM"
+	depends on PCI && ARCH_M821XX || ARCH_M822XX
+	default n
+	help
+	  Say Y if you want data to be copied to ARAM before the PCI device does Tx DMA.
+	  This will modify the pci_map_single()/pci_unmap_single API's to try to allocate
+	  a block of free ARAM memory and copy the data inside.
+
+config COMCERTO_PCI_SINGLE_ACCESS_TYPE
+	bool "HOST PCI does only Memory access through APBB"
+	depends on COMCERTO_PCI_USE_APBB
+	default n
+	help
+	  This is highly experimental. The idea is to configure the PCI
+	  in direct access mode and for one access type (ie memory access).
+	  This setting remove all the write/read and io_remap redirection done 
+	  in io.h file. In order to use this mode, the PCI driver MUST only do 
+	  memory accesses.
+	  If your are not sure just say no.
+ 
+config COMCERTO_PCI_DEBUG
+	bool "PCI Debugging"
+	depends on PCI
+	default n
+
+config COMCERTO_TDM_CLOCK
+        bool "Comcerto device TDM clock and frame sync control through sysfs"
+	default y
+	help
+	  Say Y if you intend to run M821XX TDM and have opportunity 
+	  to change different parameters	
+endmenu
+
+endif
