From patchwork Thu Sep 16 09:01:10 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Miao X-Patchwork-Id: 64955 X-Patchwork-Delegate: brad.figg@canonical.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 76568B6EEE for ; Thu, 16 Sep 2010 19:01:52 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OwALa-0002vS-9w; Thu, 16 Sep 2010 10:01:38 +0100 Received: from mail-qy0-f177.google.com ([209.85.216.177]) by chlorine.canonical.com with esmtp (Exim 4.69) (envelope-from ) id 1OwALV-0002uk-5h for kernel-team@lists.ubuntu.com; Thu, 16 Sep 2010 10:01:33 +0100 Received: by qyk34 with SMTP id 34so1100455qyk.8 for ; Thu, 16 Sep 2010 02:01:32 -0700 (PDT) Received: by 10.224.95.4 with SMTP id b4mr1946910qan.338.1284627692074; Thu, 16 Sep 2010 02:01:32 -0700 (PDT) MIME-Version: 1.0 Received: by 10.229.214.82 with HTTP; Thu, 16 Sep 2010 02:01:10 -0700 (PDT) From: Eric Miao Date: Thu, 16 Sep 2010 17:01:10 +0800 X-Google-Sender-Auth: Dg6MwCpfV8jL-0HaDag8j6Hof5k Message-ID: Subject: [Lucid][GIT PULL] mvl-dove branch sync'ed to Marvell Dove LSP 5.3.4 To: kernel-team@lists.ubuntu.com Cc: Saeed Bishara X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com OK, here comes the LSP 5.3.4 sync patches. A total of 36 patches, mostly are fixing patches. I've made them as attachments for easy review. The following changes since commit 573a98c59341cbbb45ea54dfcf294f8f3ad603e1: Brad Figg (1): UBUNTU: Ubuntu-2.6.32-210.26 are available in the git repository at: git://kernel.ubuntu.com/ycmiao/ubuntu-lucid.git mvl-dove Eric Miao (1): UBUNTU: Sync config with LSP 5.3.4 Green Wan (10): Update new dummy EDID data to support more VESA standard timings. LCD dovefb: Support extension dummy EDID. 2. Add more video mode into extension EDID. LCD dovefb: refine configure ref clk and lcd internal divider flow and give detailed comments. LCD dovefb: Refine data structure for reference clock selection LCD dovefb: Separate accurate and inaccurate mode clock by add a new clk structure. 1. default set lcd0 uses ext refclk0 and lcd1 uses internal refclk. 2. auto turn on accurate mode. Refine LCD refclk bootargs comments and update dove_defconfig. Refine the bootargs usage mechanism and update all board setup files. fix lcd backward compatibility for clk source selection Fix code logic of function, is_clksrc_pll() Marcel Chang (2): fix I2C wait event timeout issue LCD dovefb: move the clock setting part in dovefb_gfx.c to clock.c Peter Liao (4): Fix invalidate I$ all Add CPU errata 4574 and 4731 SWFIX Add missed isb and dsb Marvell CPU errata 4315 S/W FIX Saeed Bishara (19): idt: add platform data to set the clocks configuration dove: provide idt platform data to set the clock's configuration dove lcd: make lcd's clock setting via cmdline to be applicable for all boards. sound: update the RT655 codec kcontrols dove: disable the KG2 display driver dovefb: add board option for disabling the edid polling giga hal: set phy address to 1 dove: tune pcei phy to pass electrical testing dove: enable USB gadget file storage testing option dove: support using gpio-i2c driver for the i2c bus of the VGA dove: update the LCD internal clock accurate mode setting sound: add Record Gain Capture Switch to the rt655 codec dove: enable CPU (PJ4) work arounds 4574,4731,4315 CS42l51 codec: unmute codec on system resume LCD dovefb: set edid data when edid paramete disabled. dove: use DOVE_PCIE0/1_IO_BUS_BASE for PCI bus addresses dove: provide phy address for old dove db boards sound orion i2s: clear pause, spdif and i2s mute fields on playback dove: sync dove_defconfig file with ac97 codec changes arch/arm/configs/dove_defconfig | 19 +- arch/arm/include/asm/cacheflush.h | 8 + arch/arm/include/asm/tlbflush.h | 18 +- arch/arm/mach-dove/Kconfig | 10 + arch/arm/mach-dove/clcd.c | 150 ++++++- arch/arm/mach-dove/clock.c | 171 +++++++- arch/arm/mach-dove/common.c | 21 + arch/arm/mach-dove/common.h | 1 + arch/arm/mach-dove/dove-db-setup.c | 126 ++---- arch/arm/mach-dove/dove-front-panel-common.c | 18 +- arch/arm/mach-dove/dove-rd-avng-setup.c | 17 +- arch/arm/mach-dove/dove-videoplug-setup.c | 30 +- arch/arm/mach-dove/idt5v49ee503.c | 97 ++++- arch/arm/mach-dove/idt5v49ee503.h | 67 +--- arch/arm/mach-dove/mv_hal_support/mvKW_HAL_glue.c | 2 + arch/arm/mach-dove/pcie.c | 29 ++- arch/arm/mm/Kconfig | 15 + arch/arm/mm/cache-v7.S | 8 + arch/arm/mm/proc-v7.S | 6 + arch/arm/mm/tlb-v7.S | 17 + .../mv_hal_drivers/mv_hal/audio/mvAudio.c | 3 +- .../mv_hal_drivers/mv_hal/pmu/mvPmu_asm.S | 13 +- debian.mvl-dove/config/config.common.ubuntu | 13 +- drivers/i2c/busses/i2c-mv64xxx.c | 7 +- drivers/video/marvell/Kconfig | 18 +- drivers/video/marvell/dovefb_base.c | 10 +- drivers/video/marvell/dovefb_gfx.c | 458 +++++++------------- drivers/video/marvell/dovefb_ovly.c | 1 - include/video/dovefb.h | 20 +- sound/soc/codecs/cs42l51.c | 4 + sound/soc/codecs/rt655.c | 29 +- 31 files changed, 832 insertions(+), 574 deletions(-) From 0c9b131983483eae503c124a388f4d6301a6e6ef Mon Sep 17 00:00:00 2001 From: Eric Miao Date: Thu, 16 Sep 2010 10:51:46 +0800 Subject: [PATCH 36/36] UBUNTU: Sync config with LSP 5.3.4 BugLink: http://bugs.launchpad.net/bugs/633862 Signed-off-by: Eric Miao --- debian.mvl-dove/config/config.common.ubuntu | 13 ++++++------- 1 files changed, 6 insertions(+), 7 deletions(-) diff --git a/debian.mvl-dove/config/config.common.ubuntu b/debian.mvl-dove/config/config.common.ubuntu index 147703b..d881c74 100644 --- a/debian.mvl-dove/config/config.common.ubuntu +++ b/debian.mvl-dove/config/config.common.ubuntu @@ -455,15 +455,14 @@ CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y CONFIG_CPU_IDLE_GOV_USER=y -# CONFIG_CPU_L1WAONLY_ENABLE is not set CONFIG_CPU_PABRT_V7=y CONFIG_CPU_PJ4=y +CONFIG_CPU_PJ4_ERRATA_4574_4731=y +CONFIG_CPU_PJ4_ERRATA_4315=y CONFIG_CPU_PJ4_PMC_ACCESS_IN_USERMODE=y CONFIG_CPU_TLB_V7=y # CONFIG_CPU_V6 is not set CONFIG_CPU_V7=y -CONFIG_CPU_WA_DISABLE=y -# CONFIG_CPU_WA_ENABLE is not set CONFIG_CPU_WRITECO_CYCLE=3 CONFIG_CRAMFS=y CONFIG_CRC16=y @@ -855,7 +854,6 @@ CONFIG_FB_DOVE_CLCD_DEFAULT_OPTION="lcd0:1280x768-24@60,lcd1:1024x768-16@60" CONFIG_FB_DOVE_CLCD_EDID=y # CONFIG_FB_DOVE_CLCD_FLAREON_GV is not set CONFIG_FB_DOVE_CLCD_SCLK_VALUE=1000 -CONFIG_FB_DOVE_CLCD_USE_PLL_CLK=y CONFIG_FB_DOVE_CONSISTENT_DMA_SIZE=14 CONFIG_FB_DOVE_DCON=y # CONFIG_FB_FOREIGN_ENDIAN is not set @@ -1423,7 +1421,7 @@ CONFIG_KEYBOARD_SUNKBD=m CONFIG_KEYBOARD_XTKBD=m CONFIG_KEYS=y # CONFIG_KEYS_DEBUG_PROC_KEYS is not set -CONFIG_KG2_ANX7150=y +# CONFIG_KG2_ANX7150 is not set CONFIG_KGDB=y CONFIG_KGDB_SERIAL_CONSOLE=y # CONFIG_KGDB_TESTS is not set @@ -1541,6 +1539,7 @@ CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y CONFIG_MAC80211_RC_MINSTREL=y CONFIG_MACH_DOVE_DB=y CONFIG_MACH_DOVE_DB_B=y +# CONFIG_DOVE_DB_USE_GPIO_I2C is not set # CONFIG_MACH_DOVE_RD is not set CONFIG_MACH_DOVE_RD_AVNG=y CONFIG_MACH_DOVE_VIDEOPLUG=y @@ -2755,11 +2754,11 @@ CONFIG_SND_SOC=y CONFIG_SND_SOC_AC97_BUS=y CONFIG_SND_SOC_AD1980=y # CONFIG_SND_SOC_ALL_CODECS is not set +CONFIG_SND_SOC_AC97_CODEC=y CONFIG_SND_SOC_CS42L51=y CONFIG_SND_SOC_I2C_AND_SPI=y CONFIG_SND_SOC_RT5610=y CONFIG_SND_SOC_RT5630=y -CONFIG_SND_SOC_RT655=y # CONFIG_SND_SONICVIBES is not set CONFIG_SND_SPI=y CONFIG_SND_SUPPORT_OLD_API=y @@ -3026,7 +3025,7 @@ CONFIG_USB_ETH=m CONFIG_USB_ETH_RNDIS=y CONFIG_USB_EZUSB=y CONFIG_USB_FILE_STORAGE=m -# CONFIG_USB_FILE_STORAGE_TEST is not set +CONFIG_USB_FILE_STORAGE_TEST=y CONFIG_USB_FTDI_ELAN=m CONFIG_USB_GADGET=y CONFIG_USB_GADGETFS=m -- 1.7.0.4