Sekhar Nori <[email protected]> writes:
> The defconfig has also been updated to enable cpuidle driver
> by default. The rest of the changes in the defconfig are because
> of kernel version change.
>
> Signed-off-by: Sekhar Nori <[email protected]>
Looks fine, but defconfig change should be rebased on current master
branch.
Kevin
> ---
> arch/arm/configs/da850_omapl138_defconfig | 108
> +++++++++++++++--------------
> arch/arm/mach-davinci/board-da850-evm.c | 5 ++
> 2 files changed, 60 insertions(+), 53 deletions(-)
>
> diff --git a/arch/arm/configs/da850_omapl138_defconfig
> b/arch/arm/configs/da850_omapl138_defconfig
> index a1ffa4f..c7ffd63 100644
> --- a/arch/arm/configs/da850_omapl138_defconfig
> +++ b/arch/arm/configs/da850_omapl138_defconfig
> @@ -1,7 +1,7 @@
> #
> # 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.31-davinci1
> +# Thu Sep 24 16:34:33 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,7 +60,6 @@ CONFIG_FAIR_GROUP_SCHED=y
> CONFIG_USER_SCHED=y
> # CONFIG_CGROUP_SCHED is not set
> # CONFIG_CGROUPS is not set
> -# CONFIG_SYSFS_DEPRECATED is not set
> # CONFIG_SYSFS_DEPRECATED_V2 is not set
> # CONFIG_RELAY is not set
> # CONFIG_NAMESPACES is not set
> @@ -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,25 +167,25 @@ 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_CP_INTC=y
>
> #
> @@ -227,7 +234,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 +258,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 +273,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
> @@ -287,7 +293,9 @@ CONFIG_CMDLINE=""
> #
> # CPU Power Management
> #
> -# CONFIG_CPU_IDLE is not set
> +CONFIG_CPU_IDLE=y
> +CONFIG_CPU_IDLE_GOV_LADDER=y
> +CONFIG_CPU_IDLE_GOV_MENU=y
>
> #
> # Floating point emulation
> @@ -415,6 +423,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
>
> @@ -460,6 +469,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 +481,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 +505,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 +529,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
> @@ -567,6 +573,7 @@ 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_NETDEV_1000 is not set
> # CONFIG_NETDEV_10000 is not set
>
> @@ -612,18 +619,20 @@ 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_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
> @@ -636,6 +645,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
>
> #
> @@ -695,6 +705,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
> @@ -716,7 +727,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
> @@ -784,22 +794,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 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_MEDIA_SUPPORT is not set
>
> #
> # Graphics support
> @@ -834,6 +830,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
> @@ -877,14 +878,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
> @@ -1056,6 +1059,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
> @@ -1087,18 +1091,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
> diff --git a/arch/arm/mach-davinci/board-da850-evm.c
> b/arch/arm/mach-davinci/board-da850-evm.c
> index 25ae007..54a6aa0 100644
> --- a/arch/arm/mach-davinci/board-da850-evm.c
> +++ b/arch/arm/mach-davinci/board-da850-evm.c
> @@ -397,6 +397,11 @@ static __init void da850_evm_init(void)
> ret = da8xx_register_rtc();
> if (ret)
> pr_warning("da850_evm_init: rtc setup failed: %d\n", ret);
> +
> + ret = da8xx_register_cpuidle();
> + if (ret)
> + pr_warning("da850_evm_init: cpuidle registration failed: %d\n",
> + ret);
> }
>
> #ifdef CONFIG_SERIAL_8250_CONSOLE
> --
> 1.6.2.4
>
> _______________________________________________
> Davinci-linux-open-source mailing list
> [email protected]
> http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
_______________________________________________
Davinci-linux-open-source mailing list
[email protected]
http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
