From 8929bf6bb0a6fa145bb781e3ce1c49a007369ff8 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 12 Jan 2010 15:53:58 +0100 Subject: linux-omap-psp 2.6.32: disable mmc debug spew and fix omap3evm sound --- .../linux/linux-omap-psp-2.6.32/no-mmc-spew.patch | 23 +++++++++++++ .../linux/linux-omap-psp-2.6.32/omap3evm/defconfig | 40 ++++++++++++++++++---- recipes/linux/linux-omap-psp_2.6.32.bb | 1 + 3 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 recipes/linux/linux-omap-psp-2.6.32/no-mmc-spew.patch (limited to 'recipes/linux') diff --git a/recipes/linux/linux-omap-psp-2.6.32/no-mmc-spew.patch b/recipes/linux/linux-omap-psp-2.6.32/no-mmc-spew.patch new file mode 100644 index 0000000000..fbdbaf6fe6 --- /dev/null +++ b/recipes/linux/linux-omap-psp-2.6.32/no-mmc-spew.patch @@ -0,0 +1,23 @@ +From: Steve Sakoman +Date: Mon, 4 Jan 2010 19:20:25 +0000 (-0800) +Subject: mmc: don't display single block read console messages +X-Git-Url: http://www.sakoman.com/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=38cc380db66d9ac5ef25f25c9f7ef6bf094347b5 + +mmc: don't display single block read console messages +--- + +diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c +index 85f0e8c..05492e9 100644 +--- a/drivers/mmc/card/block.c ++++ b/drivers/mmc/card/block.c +@@ -338,8 +338,8 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req) + if (brq.cmd.error || brq.data.error || brq.stop.error) { + if (brq.data.blocks > 1 && rq_data_dir(req) == READ) { + /* Redo read one sector at a time */ +- printk(KERN_WARNING "%s: retrying using single " +- "block read\n", req->rq_disk->disk_name); ++ /* printk(KERN_WARNING "%s: retrying using single " ++ "block read\n", req->rq_disk->disk_name); */ + disable_multi = 1; + continue; + } diff --git a/recipes/linux/linux-omap-psp-2.6.32/omap3evm/defconfig b/recipes/linux/linux-omap-psp-2.6.32/omap3evm/defconfig index 1148e91e9e..b4cde0951c 100644 --- a/recipes/linux/linux-omap-psp-2.6.32/omap3evm/defconfig +++ b/recipes/linux/linux-omap-psp-2.6.32/omap3evm/defconfig @@ -1,7 +1,7 @@ # # Automatically generated make config: don't edit # Linux kernel version: 2.6.32 -# Wed Jan 6 15:47:30 2010 +# Tue Jan 12 15:43:33 2010 # CONFIG_ARM=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y @@ -238,7 +238,7 @@ CONFIG_OMAP_RESET_CLOCKS=y CONFIG_OMAP_MUX=y # CONFIG_OMAP_MUX_DEBUG is not set CONFIG_OMAP_MUX_WARNINGS=y -# CONFIG_OMAP_MCBSP is not set +CONFIG_OMAP_MCBSP=y # CONFIG_OMAP_MBOX_FWK is not set CONFIG_OMAP_IOMMU=y # CONFIG_OMAP_MPU_TIMER is not set @@ -335,6 +335,7 @@ CONFIG_HZ=128 # CONFIG_THUMB2_KERNEL is not set CONFIG_AEABI=y # CONFIG_OABI_COMPAT is not set +CONFIG_ARCH_HAS_HOLES_MEMORYMODEL=y # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set # CONFIG_HIGHMEM is not set @@ -368,8 +369,24 @@ CONFIG_ATAGS_PROC=y # # CPU Power Management # -# CONFIG_CPU_FREQ is not set -# 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=y +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y +# CONFIG_CPU_FREQ_DEFAULT_GOV_POWERSAVE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_USERSPACE is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND is not set +# CONFIG_CPU_FREQ_DEFAULT_GOV_CONSERVATIVE is not set +CONFIG_CPU_FREQ_GOV_PERFORMANCE=y +CONFIG_CPU_FREQ_GOV_POWERSAVE=y +CONFIG_CPU_FREQ_GOV_USERSPACE=y +CONFIG_CPU_FREQ_GOV_ONDEMAND=y +CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y # # Floating point emulation @@ -827,6 +844,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_DM9000 is not set # CONFIG_ENC28J60 is not set # CONFIG_ETHOC is not set @@ -1184,7 +1202,7 @@ CONFIG_SSB_SDIOHOST_POSSIBLE=y # # Multifunction device drivers # -# CONFIG_MFD_CORE is not set +CONFIG_MFD_CORE=y # CONFIG_MFD_SM501 is not set # CONFIG_MFD_ASIC3 is not set # CONFIG_HTC_EGPIO is not set @@ -1192,7 +1210,7 @@ CONFIG_SSB_SDIOHOST_POSSIBLE=y # CONFIG_TPS65010 is not set CONFIG_TWL4030_CORE=y # CONFIG_TWL4030_POWER is not set -# CONFIG_TWL4030_CODEC is not set +CONFIG_TWL4030_CODEC=y # CONFIG_MFD_TMIO is not set # CONFIG_MFD_T7L66XB is not set # CONFIG_MFD_TC6387XB is not set @@ -1490,6 +1508,7 @@ CONFIG_FB_CFB_IMAGEBLIT=y # # CONFIG_FB_UVESA is not set # CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_TMIO is not set # CONFIG_FB_VIRTUAL is not set # CONFIG_FB_METRONOME is not set # CONFIG_FB_MB862XX is not set @@ -1549,6 +1568,7 @@ CONFIG_SND_TIMER=y CONFIG_SND_PCM=y CONFIG_SND_HWDEP=y CONFIG_SND_RAWMIDI=y +CONFIG_SND_JACK=y # CONFIG_SND_SEQUENCER is not set # CONFIG_SND_MIXER_OSS is not set # CONFIG_SND_PCM_OSS is not set @@ -1570,7 +1590,13 @@ CONFIG_SND_USB=y CONFIG_SND_USB_AUDIO=y CONFIG_SND_USB_CAIAQ=m CONFIG_SND_USB_CAIAQ_INPUT=y -# CONFIG_SND_SOC is not set +CONFIG_SND_SOC=y +CONFIG_SND_OMAP_SOC=y +CONFIG_SND_OMAP_SOC_MCBSP=y +CONFIG_SND_OMAP_SOC_OMAP3EVM=y +CONFIG_SND_SOC_I2C_AND_SPI=y +# CONFIG_SND_SOC_ALL_CODECS is not set +CONFIG_SND_SOC_TWL4030=y # CONFIG_SOUND_PRIME is not set CONFIG_HID_SUPPORT=y CONFIG_HID=y diff --git a/recipes/linux/linux-omap-psp_2.6.32.bb b/recipes/linux/linux-omap-psp_2.6.32.bb index 43857cf191..9340242804 100644 --- a/recipes/linux/linux-omap-psp_2.6.32.bb +++ b/recipes/linux/linux-omap-psp_2.6.32.bb @@ -18,6 +18,7 @@ SRC_URI = "git://arago-project.org/git/people/sriram/ti-psp-omap.git;protocol=gi file://dss2/0015-OMAP-DSS-Add-DSS2-support-for-Beagle.patch;patch=1 \ file://dss2/0016-video-add-timings-for-hd720.patch;patch=1 \ file://holes.patch;patch=1 \ + file://no-mmc-spew.patch;patch=1 \ file://defconfig" SRC_URI_append_beagleboard = " file://logo_linux_clut224.ppm \ -- cgit 1.2.3-korg