Commit 6f128fa3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'davinci-for-linus' of... 

Merge branch 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci

* 'davinci-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: (62 commits)
  DaVinci: DM646x - platform changes for vpif capture and display drivers
  davinci: DM355 - platform changes for vpfe capture
  davinci: DM644x platform changes for vpfe capture
  davinci: audio: move tlv320aic33 i2c setup into board files
  DaVinci: EDMA: Adding 2 new APIs for allocating/freeing PARAMs
  DaVinci: DM365: Adding entries for DM365 IRQ's
  DaVinci: DM355: Adding PINMUX entries for DM355 Display
  davinci: Handle pinmux conflict between mmc/sd and nor flash
  davinci: Add NOR flash support for da850/omap-l138
  davinci: Add NAND flash support for DA850/OMAP-L138
  davinci: Add MMC/SD support for da850/omap-l138
  davinci: Add platform support for da850/omap-l138 GLCD
  davinci: Macro to convert GPIO signal to GPIO pin number
  davinci: Audio support for DA850/OMAP-L138 EVM
  davinci: Audio support for DA830 EVM
  davinci: Correct the number of GPIO pins for da850/omap-l138
  davinci: Configure MDIO pins for EMAC
  DaVinci: DM365: Add Support for new Revision of silicon
  DaVinci: DM365: Fix Compilation issue due to PINMUX entry
  DaVinci: EDMA: Updating default queue handling
  ...
parents 73c583e4 85609c1c

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -4653,6 +4653,12 @@ F: arch/arm/mach-s3c2410/ 
F:	drivers/*/*s3c2410*

F:	drivers/*/*/*s3c2410*



TI DAVINCI MACHINE SUPPORT

P:	Kevin Hilman

M:	davinci-linux-open-source@linux.davincidsp.com

S:	Supported

F:	arch/arm/mach-davinci



SIS 190 ETHERNET DRIVER

M:	Francois Romieu <romieu@fr.zoreil.com>

L:	netdev@vger.kernel.org

arch/arm/configs/da830_omapl137_defconfig

0 → 100644
+1254 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/da850_omapl138_defconfig

0 → 100644
+1229 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/davinci_all_defconfig

+81 −92
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.30-rc7

# Tue May 26 07:24:28 2009

# Linux kernel version: 2.6.31-rc3-davinci1

# Fri Jul 17 08:26:52 2009

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -9,7 +9,6 @@ CONFIG_GENERIC_GPIO=y 
CONFIG_GENERIC_TIME=y

CONFIG_GENERIC_CLOCKEVENTS=y

CONFIG_MMU=y

# CONFIG_NO_IOPORT is not set

CONFIG_GENERIC_HARDIRQS=y

CONFIG_STACKTRACE_SUPPORT=y

CONFIG_HAVE_LATENCYTOP_SUPPORT=y
@@ -18,14 +17,13 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y 
CONFIG_HARDIRQS_SW_RESEND=y

CONFIG_GENERIC_IRQ_PROBE=y

CONFIG_RWSEM_GENERIC_SPINLOCK=y

# CONFIG_ARCH_HAS_ILOG2_U32 is not set

# CONFIG_ARCH_HAS_ILOG2_U64 is not set

CONFIG_GENERIC_HWEIGHT=y

CONFIG_GENERIC_CALIBRATE_DELAY=y

CONFIG_ZONE_DMA=y

CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y

CONFIG_VECTORS_BASE=0xffff0000

CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"

CONFIG_CONSTRUCTORS=y



#

# General setup
@@ -62,8 +60,7 @@ CONFIG_FAIR_GROUP_SCHED=y 
CONFIG_USER_SCHED=y

# CONFIG_CGROUP_SCHED is not set

# CONFIG_CGROUPS is not set

CONFIG_SYSFS_DEPRECATED=y

CONFIG_SYSFS_DEPRECATED_V2=y

# CONFIG_SYSFS_DEPRECATED_V2 is not set

# CONFIG_RELAY is not set

# CONFIG_NAMESPACES is not set

CONFIG_BLK_DEV_INITRD=y
@@ -80,7 +77,6 @@ CONFIG_SYSCTL_SYSCALL=y 
CONFIG_KALLSYMS=y

# CONFIG_KALLSYMS_ALL is not set

# CONFIG_KALLSYMS_EXTRA_PASS is not set

# CONFIG_STRIP_ASM_SYMS is not set

CONFIG_HOTPLUG=y

CONFIG_PRINTK=y

CONFIG_BUG=y
@@ -93,8 +89,13 @@ CONFIG_TIMERFD=y 
CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_AIO=y



#

# Performance Counters

#

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_SLUB_DEBUG=y

# CONFIG_STRIP_ASM_SYMS is not set

CONFIG_COMPAT_BRK=y

# CONFIG_SLAB is not set

CONFIG_SLUB=y
@@ -106,6 +107,11 @@ CONFIG_HAVE_OPROFILE=y 
CONFIG_HAVE_KPROBES=y

CONFIG_HAVE_KRETPROBES=y

CONFIG_HAVE_CLK=y



#

# GCOV-based kernel profiling

#

# CONFIG_GCOV_KERNEL is not set

# CONFIG_SLOW_WORK is not set

CONFIG_HAVE_GENERIC_DMA_COHERENT=y

CONFIG_SLABINFO=y
@@ -118,7 +124,7 @@ CONFIG_MODULE_FORCE_UNLOAD=y 
CONFIG_MODVERSIONS=y

# CONFIG_MODULE_SRCVERSION_ALL is not set

CONFIG_BLOCK=y

# CONFIG_LBD is not set

CONFIG_LBDAF=y

# CONFIG_BLK_DEV_BSG is not set

# CONFIG_BLK_DEV_INTEGRITY is not set
@@ -145,13 +151,14 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
# CONFIG_ARCH_VERSATILE is not set

# CONFIG_ARCH_AT91 is not set

# CONFIG_ARCH_CLPS711X is not set

# CONFIG_ARCH_GEMINI is not set

# CONFIG_ARCH_EBSA110 is not set

# CONFIG_ARCH_EP93XX is not set

# CONFIG_ARCH_GEMINI is not set

# CONFIG_ARCH_FOOTBRIDGE is not set

# CONFIG_ARCH_MXC is not set

# CONFIG_ARCH_STMP3XXX is not set

# CONFIG_ARCH_NETX is not set

# CONFIG_ARCH_H720X is not set

# CONFIG_ARCH_IMX is not set

# CONFIG_ARCH_IOP13XX is not set

# CONFIG_ARCH_IOP32X is not set

# CONFIG_ARCH_IOP33X is not set
@@ -160,26 +167,27 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
# CONFIG_ARCH_IXP4XX is not set

# CONFIG_ARCH_L7200 is not set

# CONFIG_ARCH_KIRKWOOD is not set

# CONFIG_ARCH_KS8695 is not set

# CONFIG_ARCH_NS9XXX is not set

# CONFIG_ARCH_LOKI is not set

# CONFIG_ARCH_MV78XX0 is not set

# CONFIG_ARCH_MXC is not set

# CONFIG_ARCH_ORION5X is not set

# CONFIG_ARCH_MMP is not set

# CONFIG_ARCH_KS8695 is not set

# CONFIG_ARCH_NS9XXX is not set

# CONFIG_ARCH_W90X900 is not set

# CONFIG_ARCH_PNX4008 is not set

# CONFIG_ARCH_PXA is not set

# CONFIG_ARCH_MMP is not set

# CONFIG_ARCH_MSM is not set

# CONFIG_ARCH_RPC is not set

# CONFIG_ARCH_SA1100 is not set

# CONFIG_ARCH_S3C2410 is not set

# CONFIG_ARCH_S3C64XX is not set

# CONFIG_ARCH_SHARK is not set

# CONFIG_ARCH_LH7A40X is not set

# CONFIG_ARCH_U300 is not set

CONFIG_ARCH_DAVINCI=y

# CONFIG_ARCH_OMAP is not set

# CONFIG_ARCH_MSM is not set

# CONFIG_ARCH_W90X900 is not set

CONFIG_AINTC=y

CONFIG_ARCH_DAVINCI_DMx=y



#

# TI DaVinci Implementations
@@ -191,6 +199,9 @@ CONFIG_AINTC=y 
CONFIG_ARCH_DAVINCI_DM644x=y

CONFIG_ARCH_DAVINCI_DM355=y

CONFIG_ARCH_DAVINCI_DM646x=y

# CONFIG_ARCH_DAVINCI_DA830 is not set

# CONFIG_ARCH_DAVINCI_DA850 is not set

CONFIG_ARCH_DAVINCI_DM365=y



#

# DaVinci Board Type
@@ -200,6 +211,7 @@ CONFIG_MACH_SFFSDR=y 
CONFIG_MACH_DAVINCI_DM355_EVM=y

CONFIG_MACH_DM355_LEOPARD=y

CONFIG_MACH_DAVINCI_DM6467_EVM=y

CONFIG_MACH_DAVINCI_DM365_EVM=y

CONFIG_DAVINCI_MUX=y

CONFIG_DAVINCI_MUX_DEBUG=y

CONFIG_DAVINCI_MUX_WARNINGS=y
@@ -227,7 +239,6 @@ CONFIG_ARM_THUMB=y 
# CONFIG_CPU_DCACHE_DISABLE is not set

# CONFIG_CPU_DCACHE_WRITETHROUGH is not set

# CONFIG_CPU_CACHE_ROUND_ROBIN is not set

# CONFIG_OUTER_CACHE is not set

CONFIG_COMMON_CLKDEV=y



#
@@ -252,7 +263,6 @@ CONFIG_PREEMPT=y 
CONFIG_HZ=100

CONFIG_AEABI=y

# CONFIG_OABI_COMPAT is not set

# CONFIG_ARCH_HAS_HOLES_MEMORYMODEL is not set

# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set

# CONFIG_ARCH_SELECT_MEMORY_MODEL is not set

# CONFIG_HIGHMEM is not set
@@ -268,12 +278,13 @@ CONFIG_SPLIT_PTLOCK_CPUS=4096 
CONFIG_ZONE_DMA_FLAG=1

CONFIG_BOUNCE=y

CONFIG_VIRT_TO_BUS=y

CONFIG_UNEVICTABLE_LRU=y

CONFIG_HAVE_MLOCK=y

CONFIG_HAVE_MLOCKED_PAGE_BIT=y

CONFIG_DEFAULT_MMAP_MIN_ADDR=4096

CONFIG_LEDS=y

# CONFIG_LEDS_CPU is not set

CONFIG_ALIGNMENT_TRAP=y

# CONFIG_UACCESS_WITH_MEMCPY is not set



#

# Boot options
@@ -415,6 +426,7 @@ CONFIG_NETFILTER_ADVANCED=y 
# CONFIG_ECONET is not set

# CONFIG_WAN_ROUTER is not set

# CONFIG_PHONET is not set

# CONFIG_IEEE802154 is not set

# CONFIG_NET_SCHED is not set

# CONFIG_DCB is not set
@@ -553,6 +565,7 @@ CONFIG_BLK_DEV_RAM_SIZE=32768 
# CONFIG_BLK_DEV_XIP is not set

# CONFIG_CDROM_PKTCDVD is not set

# CONFIG_ATA_OVER_ETH is not set

# CONFIG_MG_DISK is not set

CONFIG_MISC_DEVICES=y

# CONFIG_ICS932S401 is not set

# CONFIG_ENCLOSURE_SERVICES is not set
@@ -564,6 +577,7 @@ CONFIG_MISC_DEVICES=y 
#

CONFIG_EEPROM_AT24=y

# CONFIG_EEPROM_LEGACY is not set

# CONFIG_EEPROM_MAX6875 is not set

# CONFIG_EEPROM_93CX6 is not set

CONFIG_HAVE_IDE=y

CONFIG_IDE=m
@@ -609,10 +623,6 @@ CONFIG_BLK_DEV_SD=m 
# CONFIG_BLK_DEV_SR is not set

# CONFIG_CHR_DEV_SG is not set

# CONFIG_CHR_DEV_SCH is not set



#

# Some SCSI devices (e.g. CD jukebox) support multiple LUNs

#

# CONFIG_SCSI_MULTI_LUN is not set

# CONFIG_SCSI_CONSTANTS is not set

# CONFIG_SCSI_LOGGING is not set
@@ -637,7 +647,6 @@ CONFIG_SCSI_LOWLEVEL=y 
# CONFIG_ATA is not set

# CONFIG_MD is not set

CONFIG_NETDEVICES=y

CONFIG_COMPAT_NET_DEV_OPS=y

# CONFIG_DUMMY is not set

# CONFIG_BONDING is not set

# CONFIG_MACVLAN is not set
@@ -684,6 +693,7 @@ CONFIG_DM9000_DEBUGLEVEL=4 
# CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set

# CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set

# CONFIG_B44 is not set

# CONFIG_KS8842 is not set

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set
@@ -748,18 +758,21 @@ CONFIG_INPUT_EVBUG=m 
#

CONFIG_INPUT_KEYBOARD=y

CONFIG_KEYBOARD_ATKBD=m

# CONFIG_KEYBOARD_SUNKBD is not set

# CONFIG_KEYBOARD_LKKBD is not set

CONFIG_KEYBOARD_XTKBD=m

CONFIG_KEYBOARD_GPIO=y

# CONFIG_KEYBOARD_MATRIX is not set

# CONFIG_KEYBOARD_LM8323 is not set

# CONFIG_KEYBOARD_NEWTON is not set

# CONFIG_KEYBOARD_STOWAWAY is not set

CONFIG_KEYBOARD_GPIO=y

# CONFIG_KEYBOARD_SUNKBD is not set

CONFIG_KEYBOARD_XTKBD=m

# CONFIG_INPUT_MOUSE is not set

# CONFIG_INPUT_JOYSTICK is not set

# CONFIG_INPUT_TABLET is not set

CONFIG_INPUT_TOUCHSCREEN=y

# CONFIG_TOUCHSCREEN_AD7879_I2C is not set

# CONFIG_TOUCHSCREEN_AD7879 is not set

# CONFIG_TOUCHSCREEN_EETI is not set

# CONFIG_TOUCHSCREEN_FUJITSU is not set

# CONFIG_TOUCHSCREEN_GUNZE is not set

# CONFIG_TOUCHSCREEN_ELO is not set
@@ -773,6 +786,7 @@ CONFIG_INPUT_TOUCHSCREEN=y 
# CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set

# CONFIG_TOUCHSCREEN_TOUCHIT213 is not set

# CONFIG_TOUCHSCREEN_TSC2007 is not set

# CONFIG_TOUCHSCREEN_W90X900 is not set

# CONFIG_INPUT_MISC is not set



#
@@ -832,6 +846,7 @@ CONFIG_I2C_HELPER_AUTO=y 
# I2C system bus drivers (mostly embedded / system-on-chip)

#

CONFIG_I2C_DAVINCI=y

# CONFIG_I2C_DESIGNWARE is not set

# CONFIG_I2C_GPIO is not set

# CONFIG_I2C_OCORES is not set

# CONFIG_I2C_SIMTEC is not set
@@ -854,7 +869,6 @@ CONFIG_I2C_DAVINCI=y 
#

# CONFIG_DS1682 is not set

# CONFIG_SENSORS_PCA9539 is not set

# CONFIG_SENSORS_MAX6875 is not set

# CONFIG_SENSORS_TSL2550 is not set

# CONFIG_I2C_DEBUG_CORE is not set

# CONFIG_I2C_DEBUG_ALGO is not set
@@ -935,6 +949,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_SMSC47B397 is not set

# CONFIG_SENSORS_ADS7828 is not set

# CONFIG_SENSORS_THMC50 is not set

# CONFIG_SENSORS_TMP401 is not set

# CONFIG_SENSORS_VT1211 is not set

# CONFIG_SENSORS_W83781D is not set

# CONFIG_SENSORS_W83791D is not set
@@ -986,52 +1001,8 @@ CONFIG_SSB_POSSIBLE=y 
# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM8350_I2C is not set

# CONFIG_MFD_PCF50633 is not set



#

# Multimedia devices

#



#

# Multimedia core support

#

CONFIG_VIDEO_DEV=y

CONFIG_VIDEO_V4L2_COMMON=y

CONFIG_VIDEO_ALLOW_V4L1=y

CONFIG_VIDEO_V4L1_COMPAT=y

# CONFIG_DVB_CORE is not set

CONFIG_VIDEO_MEDIA=y



#

# Multimedia drivers

#

# CONFIG_MEDIA_ATTACH is not set

CONFIG_MEDIA_TUNER=y

# CONFIG_MEDIA_TUNER_CUSTOMISE is not set

CONFIG_MEDIA_TUNER_SIMPLE=y

CONFIG_MEDIA_TUNER_TDA8290=y

CONFIG_MEDIA_TUNER_TDA9887=y

CONFIG_MEDIA_TUNER_TEA5761=y

CONFIG_MEDIA_TUNER_TEA5767=y

CONFIG_MEDIA_TUNER_MT20XX=y

CONFIG_MEDIA_TUNER_XC2028=y

CONFIG_MEDIA_TUNER_XC5000=y

CONFIG_MEDIA_TUNER_MC44S803=y

CONFIG_VIDEO_V4L2=y

CONFIG_VIDEO_V4L1=y

CONFIG_VIDEO_CAPTURE_DRIVERS=y

# CONFIG_VIDEO_ADV_DEBUG is not set

# CONFIG_VIDEO_FIXED_MINOR_RANGES is not set

CONFIG_VIDEO_HELPER_CHIPS_AUTO=y

# CONFIG_VIDEO_VIVI is not set

# CONFIG_VIDEO_CPIA is not set

# CONFIG_VIDEO_CPIA2 is not set

# CONFIG_VIDEO_SAA5246A is not set

# CONFIG_VIDEO_SAA5249 is not set

# CONFIG_SOC_CAMERA is not set

# CONFIG_V4L_USB_DRIVERS is not set

# CONFIG_RADIO_ADAPTERS is not set

CONFIG_DAB=y

# CONFIG_USB_DABUSB is not set

# CONFIG_AB3100_CORE is not set

# CONFIG_MEDIA_SUPPORT is not set



#

# Graphics support
@@ -1102,6 +1073,11 @@ CONFIG_SND_SUPPORT_OLD_API=y 
CONFIG_SND_VERBOSE_PROCFS=y

# CONFIG_SND_VERBOSE_PRINTK is not set

# CONFIG_SND_DEBUG is not set

# CONFIG_SND_RAWMIDI_SEQ is not set

# CONFIG_SND_OPL3_LIB_SEQ is not set

# CONFIG_SND_OPL4_LIB_SEQ is not set

# CONFIG_SND_SBAWE_SEQ is not set

# CONFIG_SND_EMU10K1_SEQ is not set

CONFIG_SND_DRIVERS=y

# CONFIG_SND_DUMMY is not set

# CONFIG_SND_MTPAV is not set
@@ -1112,9 +1088,16 @@ CONFIG_SND_USB=y 
# CONFIG_SND_USB_AUDIO is not set

# CONFIG_SND_USB_CAIAQ is not set

CONFIG_SND_SOC=m

# CONFIG_SND_DAVINCI_SOC is not set

CONFIG_SND_DAVINCI_SOC=m

CONFIG_SND_DAVINCI_SOC_I2S=m

CONFIG_SND_DAVINCI_SOC_MCASP=m

CONFIG_SND_DAVINCI_SOC_EVM=m

CONFIG_SND_DM6467_SOC_EVM=m

# CONFIG_SND_DAVINCI_SOC_SFFSDR is not set

CONFIG_SND_SOC_I2C_AND_SPI=m

# CONFIG_SND_SOC_ALL_CODECS is not set

CONFIG_SND_SOC_SPDIF=m

CONFIG_SND_SOC_TLV320AIC3X=m

# CONFIG_SOUND_PRIME is not set

CONFIG_HID_SUPPORT=y

CONFIG_HID=m
@@ -1143,7 +1126,7 @@ CONFIG_HID_BELKIN=m 
CONFIG_HID_CHERRY=m

CONFIG_HID_CHICONY=m

CONFIG_HID_CYPRESS=m

# CONFIG_DRAGONRISE_FF is not set

# CONFIG_HID_DRAGONRISE is not set

CONFIG_HID_EZKEY=m

# CONFIG_HID_KYE is not set

CONFIG_HID_GYRATION=m
@@ -1160,10 +1143,11 @@ CONFIG_HID_PETALYNX=m 
CONFIG_HID_SAMSUNG=m

CONFIG_HID_SONY=m

CONFIG_HID_SUNPLUS=m

# CONFIG_GREENASIA_FF is not set

# CONFIG_HID_GREENASIA is not set

# CONFIG_HID_SMARTJOYPLUS is not set

# CONFIG_HID_TOPSEED is not set

# CONFIG_THRUSTMASTER_FF is not set

# CONFIG_ZEROPLUS_FF is not set

# CONFIG_HID_THRUSTMASTER is not set

# CONFIG_HID_ZEROPLUS is not set

CONFIG_USB_SUPPORT=y

CONFIG_USB_ARCH_HAS_HCD=y

# CONFIG_USB_ARCH_HAS_OHCI is not set
@@ -1266,6 +1250,7 @@ CONFIG_USB_STORAGE=m 
# CONFIG_USB_IDMOUSE is not set

# CONFIG_USB_FTDI_ELAN is not set

# CONFIG_USB_APPLEDISPLAY is not set

# CONFIG_USB_SISUSBVGA is not set

# CONFIG_USB_LD is not set

# CONFIG_USB_TRANCEVIBRATOR is not set

# CONFIG_USB_IOWARRIOR is not set
@@ -1285,17 +1270,20 @@ CONFIG_USB_GADGET_SELECTED=y 
# CONFIG_USB_GADGET_OMAP is not set

# CONFIG_USB_GADGET_PXA25X is not set

# CONFIG_USB_GADGET_PXA27X is not set

# CONFIG_USB_GADGET_S3C2410 is not set

# CONFIG_USB_GADGET_S3C_HSOTG is not set

# CONFIG_USB_GADGET_IMX is not set

# CONFIG_USB_GADGET_S3C2410 is not set

# CONFIG_USB_GADGET_M66592 is not set

# CONFIG_USB_GADGET_AMD5536UDC is not set

# CONFIG_USB_GADGET_FSL_QE is not set

# CONFIG_USB_GADGET_CI13XXX is not set

# CONFIG_USB_GADGET_NET2280 is not set

# CONFIG_USB_GADGET_GOKU is not set

# CONFIG_USB_GADGET_LANGWELL is not set

# CONFIG_USB_GADGET_DUMMY_HCD is not set

CONFIG_USB_GADGET_DUALSPEED=y

CONFIG_USB_ZERO=m

# CONFIG_USB_AUDIO is not set

CONFIG_USB_ETH=m

CONFIG_USB_ETH_RNDIS=y

CONFIG_USB_GADGETFS=m
@@ -1311,7 +1299,7 @@ CONFIG_USB_CDC_COMPOSITE=m 
#

CONFIG_USB_OTG_UTILS=y

# CONFIG_USB_GPIO_VBUS is not set

# CONFIG_NOP_USB_XCEIV is not set

CONFIG_NOP_USB_XCEIV=m

CONFIG_MMC=m

# CONFIG_MMC_DEBUG is not set

# CONFIG_MMC_UNSAFE_RESUME is not set
@@ -1328,7 +1316,6 @@ CONFIG_MMC_BLOCK=m 
# MMC/SD/SDIO Host Controller Drivers

#

# CONFIG_MMC_SDHCI is not set

# CONFIG_MMC_DAVINCI is not set

# CONFIG_MEMSTICK is not set

# CONFIG_ACCESSIBILITY is not set

CONFIG_NEW_LEDS=y
@@ -1340,7 +1327,7 @@ CONFIG_LEDS_CLASS=m 
# CONFIG_LEDS_PCA9532 is not set

CONFIG_LEDS_GPIO=m

CONFIG_LEDS_GPIO_PLATFORM=y

# CONFIG_LEDS_LP5521 is not set

# CONFIG_LEDS_LP3944 is not set

# CONFIG_LEDS_PCA955X is not set

# CONFIG_LEDS_BD2802 is not set
@@ -1386,6 +1373,7 @@ CONFIG_RTC_INTF_DEV=y 
# CONFIG_RTC_DRV_S35390A is not set

# CONFIG_RTC_DRV_FM3130 is not set

# CONFIG_RTC_DRV_RX8581 is not set

# CONFIG_RTC_DRV_RX8025 is not set



#

# SPI RTC drivers
@@ -1433,14 +1421,16 @@ CONFIG_FS_MBCACHE=y 
# CONFIG_REISERFS_FS is not set

# CONFIG_JFS_FS is not set

# CONFIG_FS_POSIX_ACL is not set

CONFIG_FILE_LOCKING=y

CONFIG_XFS_FS=m

# CONFIG_XFS_QUOTA is not set

# CONFIG_XFS_POSIX_ACL is not set

# CONFIG_XFS_RT is not set

# CONFIG_XFS_DEBUG is not set

# CONFIG_GFS2_FS is not set

# CONFIG_OCFS2_FS is not set

# CONFIG_BTRFS_FS is not set

CONFIG_FILE_LOCKING=y

CONFIG_FSNOTIFY=y

CONFIG_DNOTIFY=y

CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y
@@ -1623,6 +1613,7 @@ CONFIG_TIMER_STATS=y 
# CONFIG_DEBUG_OBJECTS is not set

# CONFIG_SLUB_DEBUG_ON is not set

# CONFIG_SLUB_STATS is not set

# CONFIG_DEBUG_KMEMLEAK is not set

CONFIG_DEBUG_PREEMPT=y

CONFIG_DEBUG_RT_MUTEXES=y

CONFIG_DEBUG_PI_LIST=y
@@ -1654,18 +1645,16 @@ CONFIG_DEBUG_BUGVERBOSE=y 
# CONFIG_PAGE_POISONING is not set

CONFIG_HAVE_FUNCTION_TRACER=y

CONFIG_TRACING_SUPPORT=y



#

# Tracers

#

CONFIG_FTRACE=y

# CONFIG_FUNCTION_TRACER is not set

# CONFIG_IRQSOFF_TRACER is not set

# CONFIG_PREEMPT_TRACER is not set

# CONFIG_SCHED_TRACER is not set

# CONFIG_CONTEXT_SWITCH_TRACER is not set

# CONFIG_EVENT_TRACER is not set

# CONFIG_ENABLE_DEFAULT_TRACERS is not set

# CONFIG_BOOT_TRACER is not set

# CONFIG_TRACE_BRANCH_PROFILING is not set

CONFIG_BRANCH_PROFILE_NONE=y

# CONFIG_PROFILE_ANNOTATED_BRANCHES is not set

# CONFIG_PROFILE_ALL_BRANCHES is not set

# CONFIG_STACK_TRACER is not set

# CONFIG_KMEMTRACE is not set

# CONFIG_WORKQUEUE_TRACER is not set

arch/arm/mach-davinci/Kconfig

+48 −1
Original line number Diff line number Diff line
@@ -6,6 +6,9 @@ config AINTC 
config CP_INTC

	bool



config ARCH_DAVINCI_DMx

	bool



menu "TI DaVinci Implementations"



comment "DaVinci Core Type"
@@ -13,20 +16,41 @@ comment "DaVinci Core Type" 
config ARCH_DAVINCI_DM644x

	bool "DaVinci 644x based system"

	select AINTC

	select ARCH_DAVINCI_DMx



config ARCH_DAVINCI_DM355

        bool "DaVinci 355 based system"

	select AINTC

	select ARCH_DAVINCI_DMx



config ARCH_DAVINCI_DM646x

        bool "DaVinci 646x based system"

	select AINTC

	select ARCH_DAVINCI_DMx



config ARCH_DAVINCI_DA830

        bool "DA830/OMAP-L137 based system"

	select CP_INTC

	select ARCH_DAVINCI_DA8XX



config ARCH_DAVINCI_DA850

	bool "DA850/OMAP-L138 based system"

	select CP_INTC

	select ARCH_DAVINCI_DA8XX



config ARCH_DAVINCI_DA8XX

	bool



config ARCH_DAVINCI_DM365

	bool "DaVinci 365 based system"

	select AINTC

	select ARCH_DAVINCI_DMx



comment "DaVinci Board Type"



config MACH_DAVINCI_EVM

	bool "TI DM644x EVM"

	default y

	default ARCH_DAVINCI_DM644x

	depends on ARCH_DAVINCI_DM644x

	help

	  Configure this option to specify the whether the board used
@@ -41,6 +65,7 @@ config MACH_SFFSDR 


config MACH_DAVINCI_DM355_EVM

	bool "TI DM355 EVM"

	default ARCH_DAVINCI_DM355

	depends on ARCH_DAVINCI_DM355

	help

	  Configure this option to specify the whether the board used
@@ -55,11 +80,33 @@ config MACH_DM355_LEOPARD 


config MACH_DAVINCI_DM6467_EVM

	bool "TI DM6467 EVM"

	default ARCH_DAVINCI_DM646x

	depends on ARCH_DAVINCI_DM646x

	help

	  Configure this option to specify the whether the board used

	  for development is a DM6467 EVM



config MACH_DAVINCI_DM365_EVM

	bool "TI DM365 EVM"

	default ARCH_DAVINCI_DM365

	depends on ARCH_DAVINCI_DM365

	help

	  Configure this option to specify whether the board used

	  for development is a DM365 EVM



config MACH_DAVINCI_DA830_EVM

	bool "TI DA830/OMAP-L137 Reference Platform"

	default ARCH_DAVINCI_DA830

	depends on ARCH_DAVINCI_DA830

	help

	  Say Y here to select the TI DA830/OMAP-L137 Evaluation Module.



config MACH_DAVINCI_DA850_EVM

	bool "TI DA850/OMAP-L138 Reference Platform"

	default ARCH_DAVINCI_DA850

	depends on ARCH_DAVINCI_DA850

	help

	  Say Y here to select the TI DA850/OMAP-L138 Evaluation Module.



config DAVINCI_MUX

	bool "DAVINCI multiplexing support"

CRA Git | Maintained and supported by SUSTech CRA and CCSE