Commit aed886ce 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: (69 commits)
  davinci: Initial support for Neuros OSD2 platform.
  davinci: remove unused variable in arch/arm/mach-davinci/board-sffsdr.c
  davinci: fix section mismatch warning in arch/arm/mach-davinci/board-dm646x-evm.c
  DaVinci: DM365: Enable DaVinci RTC support for DM365 EVM
  DA8xx/OMAP-L1xx: Add high speed SD/MMC capabilities
  davinci: DA8XX/OMAP-L1XX: enable cpuidle and regulator in defconfig
  davinci: DA850/OMAP-L138: avoid using separate initcall for initializing regulator
  davinci: DA850/OMAP-L138 EVM: register for cpuidle support
  davinci: DA8XX/OMAP-L1XX: add support for cpuidle driver register
  davinci: add CPU idle driver
  davinci: DA8XX/OMAP-L1XX: fix compiler warning
  davinci: DA850/OMAP-L138: eliminate static function declaration
  davinci: DA850/OMAP-L138 EVM: simplify configuration of emac in MII/RMII mode
  davinci: DA850/OMAP-L138 EVM: get rid of DA850_UI_EXP config option
  davinci: DA850/OMAP-L138 EVM: implement autodetect of RMII PHY
  davinci: DA830/OMAP-L137 EVM: do not configure NAND on UI card when MMC/SD is selected
  davinci: DA830/OMAP-L137 EVM: use runtime detection for UI card
  davinci: DA830/OMAP-L137 EVM: remove ifdefs inside da830_evm_init()
  davinci: DA830/OMAP-L137 EVM: fix warning with default config
  davinci: Add NAND support for DA830/OMAP-L137 EVM platform
  ...
parents 67dd2f5a c16fe267

arch/arm/configs/da830_omapl137_defconfig

deleted100644 → 0
+0 −1254

File deleted.

Preview size limit exceeded, changes collapsed.

arch/arm/configs/da850_omapl138_defconfig→arch/arm/configs/da8xx_omapl_defconfig

+180 −77
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.30-davinci1

# Mon Jun 29 07:54:15 2009

# Linux kernel version: 2.6.32-rc5

# Thu Oct 22 12:19:19 2009

#

CONFIG_ARM=y

CONFIG_SYS_SUPPORTS_APM_EMULATION=y

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 +16,14 @@ 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_ARCH_HAS_CPUFREQ=y

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
@@ -48,11 +46,12 @@ CONFIG_POSIX_MQUEUE_SYSCTL=y 
#

# RCU Subsystem

#

CONFIG_CLASSIC_RCU=y

# CONFIG_TREE_RCU is not set

# CONFIG_PREEMPT_RCU is not set

CONFIG_TREE_RCU=y

# CONFIG_TREE_PREEMPT_RCU is not set

# CONFIG_RCU_TRACE is not set

CONFIG_RCU_FANOUT=32

# CONFIG_RCU_FANOUT_EXACT is not set

# CONFIG_TREE_RCU_TRACE is not set

# CONFIG_PREEMPT_RCU_TRACE is not set

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14
@@ -62,8 +61,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 +78,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,6 +90,10 @@ CONFIG_TIMERFD=y 
CONFIG_EVENTFD=y

CONFIG_SHMEM=y

CONFIG_AIO=y



#

# Kernel Performance Events And Counters

#

CONFIG_VM_EVENT_COUNTERS=y

CONFIG_SLUB_DEBUG=y

CONFIG_COMPAT_BRK=y
@@ -100,12 +101,16 @@ CONFIG_COMPAT_BRK=y 
CONFIG_SLUB=y

# CONFIG_SLOB is not set

# CONFIG_PROFILING is not set

# CONFIG_MARKERS is not set

CONFIG_HAVE_OPROFILE=y

# CONFIG_KPROBES is not set

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 +123,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
@@ -139,19 +144,22 @@ CONFIG_DEFAULT_IOSCHED="anticipatory" 
#

# System Type

#

CONFIG_MMU=y

# CONFIG_ARCH_AAEC2000 is not set

# CONFIG_ARCH_INTEGRATOR is not set

# CONFIG_ARCH_REALVIEW is not set

# 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_NOMADIK is not set

# CONFIG_ARCH_IOP13XX is not set

# CONFIG_ARCH_IOP32X is not set

# CONFIG_ARCH_IOP33X is not set
@@ -160,25 +168,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_S5PC1XX 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_ARCH_BCMRING is not set

CONFIG_CP_INTC=y



#
@@ -191,7 +201,7 @@ CONFIG_CP_INTC=y 
# CONFIG_ARCH_DAVINCI_DM644x is not set

# CONFIG_ARCH_DAVINCI_DM355 is not set

# CONFIG_ARCH_DAVINCI_DM646x is not set

# CONFIG_ARCH_DAVINCI_DA830 is not set

CONFIG_ARCH_DAVINCI_DA830=y

CONFIG_ARCH_DAVINCI_DA850=y

CONFIG_ARCH_DAVINCI_DA8XX=y

# CONFIG_ARCH_DAVINCI_DM365 is not set
@@ -199,7 +209,14 @@ CONFIG_ARCH_DAVINCI_DA8XX=y 
#

# DaVinci Board Type

#

CONFIG_MACH_DAVINCI_DA830_EVM=y

CONFIG_DA830_UI=y

CONFIG_DA830_UI_LCD=y

# CONFIG_DA830_UI_NAND is not set

CONFIG_MACH_DAVINCI_DA850_EVM=y

CONFIG_DA850_UI_EXP=y

CONFIG_DA850_UI_NONE=y

# CONFIG_DA850_UI_RMII is not set

CONFIG_DAVINCI_MUX=y

# CONFIG_DAVINCI_MUX_DEBUG is not set

# CONFIG_DAVINCI_MUX_WARNINGS is not set
@@ -212,7 +229,7 @@ CONFIG_CPU_32=y 
CONFIG_CPU_ARM926T=y

CONFIG_CPU_32v5=y

CONFIG_CPU_ABRT_EV5TJ=y

CONFIG_CPU_PABRT_NOIFAR=y

CONFIG_CPU_PABRT_LEGACY=y

CONFIG_CPU_CACHE_VIVT=y

CONFIG_CPU_COPY_V4WB=y

CONFIG_CPU_TLB_V4WBI=y
@@ -225,9 +242,9 @@ CONFIG_CPU_CP15_MMU=y 
CONFIG_ARM_THUMB=y

# CONFIG_CPU_ICACHE_DISABLE is not set

# CONFIG_CPU_DCACHE_DISABLE is not set

# CONFIG_CPU_DCACHE_WRITETHROUGH is not set

CONFIG_CPU_DCACHE_WRITETHROUGH=y

# CONFIG_CPU_CACHE_ROUND_ROBIN is not set

# CONFIG_OUTER_CACHE is not set

CONFIG_ARM_L1_CACHE_SHIFT=5

CONFIG_COMMON_CLKDEV=y



#
@@ -248,11 +265,12 @@ CONFIG_VMSPLIT_3G=y 
# CONFIG_VMSPLIT_2G is not set

# CONFIG_VMSPLIT_1G is not set

CONFIG_PAGE_OFFSET=0xC0000000

# CONFIG_PREEMPT_NONE is not set

# CONFIG_PREEMPT_VOLUNTARY is not set

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 +286,14 @@ 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_KSM is not set

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
@@ -287,7 +307,24 @@ CONFIG_CMDLINE="" 
#

# CPU Power Management

#

# CONFIG_CPU_IDLE is not set

CONFIG_CPU_FREQ=y

CONFIG_CPU_FREQ_TABLE=y

# CONFIG_CPU_FREQ_DEBUG is not set

CONFIG_CPU_FREQ_STAT=y

# CONFIG_CPU_FREQ_STAT_DETAILS is not set

# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set

# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set

CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE=y

# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set

# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set

CONFIG_CPU_FREQ_GOV_PERFORMANCE=m

CONFIG_CPU_FREQ_GOV_POWERSAVE=m

CONFIG_CPU_FREQ_GOV_USERSPACE=y

CONFIG_CPU_FREQ_GOV_ONDEMAND=m

# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set

CONFIG_CPU_IDLE=y

CONFIG_CPU_IDLE_GOV_LADDER=y

CONFIG_CPU_IDLE_GOV_MENU=y



#

# Floating point emulation
@@ -401,6 +438,7 @@ CONFIG_NETFILTER_ADVANCED=y 
# CONFIG_IP6_NF_IPTABLES is not set

# CONFIG_IP_DCCP is not set

# CONFIG_IP_SCTP is not set

# CONFIG_RDS is not set

# CONFIG_TIPC is not set

# CONFIG_ATM is not set

# CONFIG_BRIDGE is not set
@@ -415,6 +453,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
@@ -440,6 +479,7 @@ CONFIG_NETFILTER_ADVANCED=y 
# Generic Driver Options

#

CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

# CONFIG_DEVTMPFS is not set

CONFIG_STANDALONE=y

CONFIG_PREVENT_FIRMWARE_BUILD=y

# CONFIG_FW_LOADER is not set
@@ -460,6 +500,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
@@ -471,6 +512,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 is not set
@@ -494,10 +536,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
@@ -522,7 +560,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
@@ -553,7 +590,7 @@ CONFIG_NET_ETHERNET=y 
CONFIG_MII=y

# CONFIG_AX88796 is not set

# CONFIG_SMC91X is not set

# CONFIG_TI_DAVINCI_EMAC is not set

CONFIG_TI_DAVINCI_EMAC=y

# CONFIG_DM9000 is not set

# CONFIG_ETHOC is not set

# CONFIG_SMC911X is not set
@@ -567,12 +604,11 @@ CONFIG_MII=y 
# 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_KS8851_MLL is not set

# CONFIG_NETDEV_1000 is not set

# CONFIG_NETDEV_10000 is not set



#

# Wireless LAN

#

CONFIG_WLAN=y

# CONFIG_WLAN_PRE80211 is not set

# CONFIG_WLAN_80211 is not set
@@ -588,6 +624,7 @@ CONFIG_NETPOLL=y 
CONFIG_NETPOLL_TRAP=y

CONFIG_NET_POLL_CONTROLLER=y

# CONFIG_ISDN is not set

# CONFIG_PHONE is not set



#

# Input device support
@@ -611,23 +648,30 @@ CONFIG_INPUT_EVBUG=m 
# Input Device Drivers

#

CONFIG_INPUT_KEYBOARD=y

# CONFIG_KEYBOARD_ADP5588 is not set

CONFIG_KEYBOARD_ATKBD=m

# CONFIG_KEYBOARD_SUNKBD is not set

# CONFIG_QT2160 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_MAX7359 is not set

# CONFIG_KEYBOARD_NEWTON is not set

# CONFIG_KEYBOARD_OPENCORES 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

# CONFIG_TOUCHSCREEN_WACOM_W8001 is not set

# CONFIG_TOUCHSCREEN_MCS5000 is not set

# CONFIG_TOUCHSCREEN_MTOUCH is not set

# CONFIG_TOUCHSCREEN_INEXIO is not set

# CONFIG_TOUCHSCREEN_MK712 is not set
@@ -636,6 +680,7 @@ CONFIG_INPUT_TOUCHSCREEN=y 
# CONFIG_TOUCHSCREEN_TOUCHWIN 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



#
@@ -684,6 +729,7 @@ CONFIG_HW_RANDOM=m 
# CONFIG_TCG_TPM is not set

CONFIG_I2C=y

CONFIG_I2C_BOARDINFO=y

CONFIG_I2C_COMPAT=y

CONFIG_I2C_CHARDEV=y

CONFIG_I2C_HELPER_AUTO=y
@@ -695,6 +741,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
@@ -715,14 +762,17 @@ CONFIG_I2C_DAVINCI=y 
# Miscellaneous I2C Chip support

#

# 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

# CONFIG_I2C_DEBUG_BUS is not set

# CONFIG_I2C_DEBUG_CHIP is not set

# CONFIG_SPI is not set



#

# PPS support

#

# CONFIG_PPS is not set

CONFIG_ARCH_REQUIRE_GPIOLIB=y

CONFIG_GPIOLIB=y

# CONFIG_DEBUG_GPIO is not set
@@ -736,8 +786,8 @@ CONFIG_GPIOLIB=y 
# I2C GPIO expanders:

#

# CONFIG_GPIO_MAX732X is not set

# CONFIG_GPIO_PCA953X is not set

CONFIG_GPIO_PCF857X=m

CONFIG_GPIO_PCA953X=y

CONFIG_GPIO_PCF857X=y



#

# PCI GPIO expanders:
@@ -746,11 +796,14 @@ CONFIG_GPIO_PCF857X=m 
#

# SPI GPIO expanders:

#



#

# AC97 GPIO expanders:

#

# CONFIG_W1 is not set

# CONFIG_POWER_SUPPLY is not set

# CONFIG_HWMON is not set

# CONFIG_THERMAL is not set

# CONFIG_THERMAL_HWMON is not set

CONFIG_WATCHDOG=y

# CONFIG_WATCHDOG_NOWAYOUT is not set
@@ -782,31 +835,56 @@ CONFIG_SSB_POSSIBLE=y 
# CONFIG_MFD_TC6393XB is not set

# CONFIG_PMIC_DA903X is not set

# CONFIG_MFD_WM8400 is not set

# CONFIG_MFD_WM831X is not set

# CONFIG_MFD_WM8350_I2C is not set

# CONFIG_MFD_PCF50633 is not set



#

# Multimedia devices

#



#

# Multimedia core support

#

# CONFIG_VIDEO_DEV is not set

# CONFIG_DVB_CORE is not set

# CONFIG_VIDEO_MEDIA is not set



#

# Multimedia drivers

#

# CONFIG_DAB is not set

# CONFIG_AB3100_CORE is not set

CONFIG_REGULATOR=y

# CONFIG_REGULATOR_DEBUG is not set

# CONFIG_REGULATOR_FIXED_VOLTAGE is not set

# CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set

# CONFIG_REGULATOR_USERSPACE_CONSUMER is not set

# CONFIG_REGULATOR_BQ24022 is not set

# CONFIG_REGULATOR_MAX1586 is not set

# CONFIG_REGULATOR_LP3971 is not set

# CONFIG_REGULATOR_TPS65023 is not set

CONFIG_REGULATOR_TPS6507X=y

# CONFIG_MEDIA_SUPPORT is not set



#

# Graphics support

#

# CONFIG_VGASTATE is not set

# CONFIG_VIDEO_OUTPUT_CONTROL is not set

# CONFIG_FB is not set

CONFIG_FB=y

# CONFIG_FIRMWARE_EDID is not set

# CONFIG_FB_DDC is not set

# CONFIG_FB_BOOT_VESA_SUPPORT is not set

CONFIG_FB_CFB_FILLRECT=y

CONFIG_FB_CFB_COPYAREA=y

CONFIG_FB_CFB_IMAGEBLIT=y

# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set

# CONFIG_FB_SYS_FILLRECT is not set

# CONFIG_FB_SYS_COPYAREA is not set

# CONFIG_FB_SYS_IMAGEBLIT is not set

# CONFIG_FB_FOREIGN_ENDIAN is not set

# CONFIG_FB_SYS_FOPS is not set

# CONFIG_FB_SVGALIB is not set

# CONFIG_FB_MACMODES is not set

# CONFIG_FB_BACKLIGHT is not set

# CONFIG_FB_MODE_HELPERS is not set

# CONFIG_FB_TILEBLITTING is not set



#

# Frame buffer hardware drivers

#

# CONFIG_FB_S1D13XXX is not set

# CONFIG_FB_DAVINCI is not set

# CONFIG_FB_VIRTUAL is not set

CONFIG_FB_DA8XX=y

# CONFIG_FB_METRONOME is not set

# CONFIG_FB_MB862XX is not set

# CONFIG_FB_BROADSHEET is not set

# CONFIG_BACKLIGHT_LCD_SUPPORT is not set



#
@@ -819,6 +897,16 @@ CONFIG_SSB_POSSIBLE=y 
#

# CONFIG_VGA_CONSOLE is not set

CONFIG_DUMMY_CONSOLE=y

CONFIG_FRAMEBUFFER_CONSOLE=y

# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set

# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set

# CONFIG_FONTS is not set

CONFIG_FONT_8x8=y

CONFIG_FONT_8x16=y

CONFIG_LOGO=y

CONFIG_LOGO_LINUX_MONO=y

CONFIG_LOGO_LINUX_VGA16=y

CONFIG_LOGO_LINUX_CLUT224=y

CONFIG_SOUND=m

# CONFIG_SOUND_OSS_CORE is not set

CONFIG_SND=m
@@ -834,6 +922,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
@@ -842,6 +935,8 @@ CONFIG_SND_DRIVERS=y 
CONFIG_SND_ARM=y

CONFIG_SND_SOC=m

CONFIG_SND_DAVINCI_SOC=m

# CONFIG_SND_DA830_SOC_EVM is not set

# CONFIG_SND_DA850_SOC_EVM is not set

CONFIG_SND_SOC_I2C_AND_SPI=m

# CONFIG_SND_SOC_ALL_CODECS is not set

# CONFIG_SOUND_PRIME is not set
@@ -849,14 +944,17 @@ CONFIG_SND_SOC_I2C_AND_SPI=m 
# CONFIG_USB_SUPPORT is not set

# CONFIG_MMC is not set

# CONFIG_MEMSTICK is not set

# CONFIG_ACCESSIBILITY is not set

# CONFIG_NEW_LEDS is not set

# CONFIG_ACCESSIBILITY is not set

CONFIG_RTC_LIB=y

# CONFIG_RTC_CLASS is not set

# CONFIG_DMADEVICES is not set

# CONFIG_AUXDISPLAY is not set

# CONFIG_REGULATOR is not set

# CONFIG_UIO is not set



#

# TI VLYNQ

#

# CONFIG_STAGING is not set



#
@@ -877,14 +975,17 @@ 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_NILFS2_FS is not set

CONFIG_FILE_LOCKING=y

CONFIG_FSNOTIFY=y

CONFIG_DNOTIFY=y

CONFIG_INOTIFY=y

CONFIG_INOTIFY_USER=y
@@ -943,7 +1044,6 @@ CONFIG_MINIX_FS=m 
# CONFIG_ROMFS_FS is not set

# CONFIG_SYSV_FS is not set

# CONFIG_UFS_FS is not set

# CONFIG_NILFS2_FS is not set

CONFIG_NETWORK_FILESYSTEMS=y

CONFIG_NFS_FS=y

CONFIG_NFS_V3=y
@@ -1039,6 +1139,7 @@ CONFIG_ENABLE_WARN_DEPRECATED=y 
CONFIG_ENABLE_MUST_CHECK=y

CONFIG_FRAME_WARN=1024

# CONFIG_MAGIC_SYSRQ is not set

# CONFIG_STRIP_ASM_SYMS is not set

# CONFIG_UNUSED_SYMBOLS is not set

CONFIG_DEBUG_FS=y

# CONFIG_HEADERS_CHECK is not set
@@ -1056,6 +1157,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
@@ -1076,29 +1178,29 @@ CONFIG_DEBUG_BUGVERBOSE=y 
# CONFIG_DEBUG_LIST is not set

# CONFIG_DEBUG_SG is not set

# CONFIG_DEBUG_NOTIFIERS is not set

# CONFIG_DEBUG_CREDENTIALS is not set

# CONFIG_BOOT_PRINTK_DELAY is not set

# CONFIG_RCU_TORTURE_TEST is not set

# CONFIG_RCU_CPU_STALL_DETECTOR is not set

# CONFIG_BACKTRACE_SELF_TEST is not set

# CONFIG_DEBUG_BLOCK_EXT_DEVT is not set

# CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set

# CONFIG_FAULT_INJECTION is not set

# CONFIG_LATENCYTOP is not set

# CONFIG_SYSCTL_SYSCALL_CHECK is not set

# 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
@@ -1125,7 +1227,6 @@ CONFIG_CRYPTO=y 
#

# Crypto core or helper

#

# CONFIG_CRYPTO_FIPS is not set

# CONFIG_CRYPTO_MANAGER is not set

# CONFIG_CRYPTO_MANAGER2 is not set

# CONFIG_CRYPTO_GF128MUL is not set
@@ -1157,11 +1258,13 @@ CONFIG_CRYPTO=y 
#

# CONFIG_CRYPTO_HMAC is not set

# CONFIG_CRYPTO_XCBC is not set

# CONFIG_CRYPTO_VMAC is not set



#

# Digest

#

# CONFIG_CRYPTO_CRC32C is not set

# CONFIG_CRYPTO_GHASH is not set

# CONFIG_CRYPTO_MD4 is not set

# CONFIG_CRYPTO_MD5 is not set

# CONFIG_CRYPTO_MICHAEL_MIC is not set

arch/arm/configs/davinci_all_defconfig

+88 −38

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm/mach-davinci/Kconfig

+59 −0
Original line number Diff line number Diff line
@@ -32,11 +32,13 @@ config ARCH_DAVINCI_DA830 
        bool "DA830/OMAP-L137 based system"

	select CP_INTC

	select ARCH_DAVINCI_DA8XX

	select CPU_DCACHE_WRITETHROUGH # needed on silicon revs 1.0, 1.1



config ARCH_DAVINCI_DA850

	bool "DA850/OMAP-L138 based system"

	select CP_INTC

	select ARCH_DAVINCI_DA8XX

	select ARCH_HAS_CPUFREQ



config ARCH_DAVINCI_DA8XX

	bool
@@ -63,6 +65,13 @@ config MACH_SFFSDR 
	  Say Y here to select the Lyrtech Small Form Factor

	  Software Defined Radio (SFFSDR) board.



config MACH_NEUROS_OSD2

	bool "Neuros OSD2 Open Television Set Top Box"

	depends on ARCH_DAVINCI_DM644x

	help

	  Configure this option to specify the whether the board used

	  for development is a Neuros OSD2 Open Set Top Box.



config MACH_DAVINCI_DM355_EVM

	bool "TI DM355 EVM"

	default ARCH_DAVINCI_DM355
@@ -98,16 +107,66 @@ config MACH_DAVINCI_DA830_EVM 
	bool "TI DA830/OMAP-L137 Reference Platform"

	default ARCH_DAVINCI_DA830

	depends on ARCH_DAVINCI_DA830

	select GPIO_PCF857X

	help

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



choice

	prompt "Select DA830/OMAP-L137 UI board peripheral"

	depends on MACH_DAVINCI_DA830_EVM

	help

	  The presence of UI card on the DA830/OMAP-L137 EVM is detected

	  automatically based on successful probe of the I2C based GPIO

	  expander on that board. This option selected in this menu has

	  an effect only in case of a successful UI card detection.



config DA830_UI_LCD

	bool "LCD"

	help

	  Say Y here to use the LCD as a framebuffer or simple character

	  display.



config DA830_UI_NAND

	bool "NAND flash"

	help

	  Say Y here to use the NAND flash.  Do not forget to setup

	  the switch correctly.

endchoice



config MACH_DAVINCI_DA850_EVM

	bool "TI DA850/OMAP-L138 Reference Platform"

	default ARCH_DAVINCI_DA850

	depends on ARCH_DAVINCI_DA850

	select GPIO_PCA953X

	help

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



choice

	prompt "Select peripherals connected to expander on UI board"

	depends on MACH_DAVINCI_DA850_EVM

	help

	  The presence of User Interface (UI) card on the DA850/OMAP-L138

	  EVM is detected automatically based on successful probe of the I2C

	  based GPIO expander on that card. This option selected in this

	  menu has an effect only in case of a successful UI card detection.



config DA850_UI_NONE

	bool "No peripheral is enabled"

	help

	  Say Y if you do not want to enable any of the peripherals connected

	  to TCA6416 expander on DA850/OMAP-L138 EVM UI card



config DA850_UI_RMII

	bool "RMII Ethernet PHY"

	help

	  Say Y if you want to use the RMII PHY on the DA850/OMAP-L138 EVM.

	  This PHY is found on the UI daughter card that is supplied with

	  the EVM.

	  NOTE: Please take care while choosing this option, MII PHY will

	  not be functional if RMII mode is selected.



endchoice



config DAVINCI_MUX

	bool "DAVINCI multiplexing support"

	depends on ARCH_DAVINCI

arch/arm/mach-davinci/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -23,9 +23,14 @@ obj-$(CONFIG_CP_INTC) += cp_intc.o 
# Board specific

obj-$(CONFIG_MACH_DAVINCI_EVM)  	+= board-dm644x-evm.o

obj-$(CONFIG_MACH_SFFSDR)		+= board-sffsdr.o

obj-$(CONFIG_MACH_NEUROS_OSD2)		+= board-neuros-osd2.o

obj-$(CONFIG_MACH_DAVINCI_DM355_EVM)	+= board-dm355-evm.o

obj-$(CONFIG_MACH_DM355_LEOPARD)	+= board-dm355-leopard.o

obj-$(CONFIG_MACH_DAVINCI_DM6467_EVM)	+= board-dm646x-evm.o

obj-$(CONFIG_MACH_DAVINCI_DM365_EVM)	+= board-dm365-evm.o

obj-$(CONFIG_MACH_DAVINCI_DA830_EVM)	+= board-da830-evm.o

obj-$(CONFIG_MACH_DAVINCI_DA850_EVM)	+= board-da850-evm.o



# Power Management

obj-$(CONFIG_CPU_FREQ)			+= cpufreq.o

obj-$(CONFIG_CPU_IDLE)			+= cpuidle.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE