From patchwork Mon Nov 19 17:12:52 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Warren X-Patchwork-Id: 200051 X-Patchwork-Delegate: albert.aribaud@free.fr Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id D12592C007E for ; Tue, 20 Nov 2012 04:13:07 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 14DC84A03C; Mon, 19 Nov 2012 18:13:04 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8mvL0uwu8tYo; Mon, 19 Nov 2012 18:13:03 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id BF1874A03E; Mon, 19 Nov 2012 18:13:01 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id D57274A03E for ; Mon, 19 Nov 2012 18:12:58 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Wsidm6EkNDhl for ; Mon, 19 Nov 2012 18:12:55 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail-la0-f44.google.com (mail-la0-f44.google.com [209.85.215.44]) by theia.denx.de (Postfix) with ESMTPS id 90DE64A03C for ; Mon, 19 Nov 2012 18:12:53 +0100 (CET) Received: by mail-la0-f44.google.com with SMTP id d3so4196055lah.3 for ; Mon, 19 Nov 2012 09:12:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=0wYjXZzlxkVtqWigfmBR0BLSujkUzxgnSY/gwcDZJdA=; b=Stt3eCorkkYOmtH73htqdjDoeudwyEQCE4rQ9SlKj5L6Noji1jckbaRRzN0PNPN/Xb 0cToT6Iu+Lchjl1CK+ckW1ZwveLKSjf/ZGtMMQQFL0hFbFPTJw+bv5CaZl2Ig0R+uWc0 Ee3rKAnyfjeLfnfp5iDvBSBDgDU5WcPyLNLLIS58nmNxyCLvsADEThn/ijSEBE6ypzLB PyXDdvSrHYXxjcV4iczGeoTuxlMRGvg2Ij48PJxCgA52dBm6d4LWIhip5vkVgfHQvx9O TQE3kV0vaE6LPRnz8Evwx6Ye3+qBTJlq63YGAaAWpDQxWBV/L2FPLG5QGwOqQ5MSN+wj oPPg== MIME-Version: 1.0 Received: by 10.112.83.71 with SMTP id o7mr5112302lby.60.1353345172471; Mon, 19 Nov 2012 09:12:52 -0800 (PST) Received: by 10.114.29.103 with HTTP; Mon, 19 Nov 2012 09:12:52 -0800 (PST) In-Reply-To: References: <20121116222724.3e3050c2@lilith> <20121117003317.210abc8a@lilith> <20121117011240.7a7971b2@lilith> Date: Mon, 19 Nov 2012 10:12:52 -0700 Message-ID: From: Tom Warren To: Albert ARIBAUD Cc: Stephen Warren , "u-boot@lists.denx.de" , Tom Warren Subject: Re: [U-Boot] pull request for u-boot-tegra/master into ARM/master X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Albert, please pull u-boot-tegra/master into ARM/master. Thanks! 'pxa' patch moved to before Simon's LCD patchset; MAKEALL -a arm AOK. The following changes since commit 7a5337732e3e05b2b0de1b592fa031b2c7b4f632: Rajeshwari Shinde (1): EXYNOS5: Enable SPI booting. are available in the git repository at: git://git.denx.de/u-boot-tegra master Allen Martin (1): tegra: add CONSOLE_MUX support to tegra-kbc Mayuresh Kulkarni (1): tegra: Enable display/lcd support on Seaboard Simon Glass (17): pxa: Disable dcache on palmld, palmtc, zipitz2 tegra: Use const for pinmux_config_pingroup/table() tegra: Add display support to funcmux tegra: fdt: Add pwm binding and node tegra: fdt: Add LCD definitions for Tegra tegra: Add support for PWM tegra: Add LCD driver tegra: Add LCD support to Nvidia boards arm: Add control over cachability of memory regions lcd: Add CONFIG_LCD_ALIGNMENT to select frame buffer alignment lcd: Add support for flushing LCD fb from dcache after update tegra: Align LCD frame buffer to section boundary tegra: Support control of cache settings for LCD tegra: fdt: Add LCD definitions for Seaboard lcd: Add CONFIG_CONSOLE_SCROLL_LINES option to speed console tegra: Remove unnecessary CONFIG_SYS_NAND_BASE tegra: config: seaboard: Move tegra-common-post to correct place Stephen Warren (4): ARM: tegra: TrimSlice: add support for USB1 port mmc: tegra: support 4-bit operation too on 8-bit slots ARM: tegra: enable 8-bit SD slots in board files tegra: use generic fs commands in BOOTCOMMAND Wei Ni (1): tegra: Add SOC support for display/lcd README | 16 + arch/arm/cpu/armv7/cache_v7.c | 11 + arch/arm/cpu/armv7/tegra20/Makefile | 2 + arch/arm/cpu/armv7/tegra20/display.c | 409 ++++++++++++++++++ arch/arm/cpu/armv7/tegra20/pwm.c | 101 +++++ arch/arm/cpu/tegra20-common/funcmux.c | 37 ++ arch/arm/cpu/tegra20-common/pinmux.c | 4 +- arch/arm/dts/tegra20.dtsi | 105 +++++ arch/arm/include/asm/arch-tegra20/dc.h | 545 ++++++++++++++++++++++++ arch/arm/include/asm/arch-tegra20/display.h | 152 +++++++ arch/arm/include/asm/arch-tegra20/pinmux.h | 4 +- arch/arm/include/asm/arch-tegra20/pwm.h | 75 ++++ arch/arm/include/asm/system.h | 31 ++ arch/arm/lib/cache-cp15.c | 51 ++- board/compal/paz00/paz00.c | 5 +- board/compulab/dts/tegra20-trimslice.dts | 3 +- board/compulab/trimslice/trimslice.c | 8 + board/nvidia/common/board.c | 24 + board/nvidia/dts/tegra20-seaboard.dts | 33 ++ board/nvidia/harmony/harmony.c | 5 +- board/nvidia/seaboard/seaboard.c | 5 +- common/lcd.c | 89 ++++- common/main.c | 12 +- doc/device-tree-bindings/pwm/tegra20-pwm.txt | 18 + doc/device-tree-bindings/video/displaymode.txt | 42 ++ doc/device-tree-bindings/video/tegra20-dc.txt | 85 ++++ drivers/input/tegra-kbc.c | 18 +- drivers/mmc/tegra_mmc.c | 7 +- drivers/video/Makefile | 1 + drivers/video/tegra.c | 379 ++++++++++++++++ include/configs/harmony.h | 4 +- include/configs/palmld.h | 3 + include/configs/palmtc.h | 3 + include/configs/paz00.h | 3 + include/configs/seaboard.h | 20 +- include/configs/tec.h | 1 - include/configs/tegra-common-post.h | 39 +- include/configs/tegra20-common.h | 3 + include/configs/trimslice.h | 4 + include/configs/ventana.h | 3 + include/configs/whistler.h | 3 + include/configs/zipitz2.h | 3 + include/fdtdec.h | 2 + include/lcd.h | 11 + lib/fdtdec.c | 2 + 45 files changed, 2303 insertions(+), 78 deletions(-) create mode 100644 arch/arm/cpu/armv7/tegra20/display.c create mode 100644 arch/arm/cpu/armv7/tegra20/pwm.c create mode 100644 arch/arm/include/asm/arch-tegra20/dc.h create mode 100644 arch/arm/include/asm/arch-tegra20/display.h create mode 100644 arch/arm/include/asm/arch-tegra20/pwm.h create mode 100644 doc/device-tree-bindings/pwm/tegra20-pwm.txt create mode 100644 doc/device-tree-bindings/video/displaymode.txt create mode 100644 doc/device-tree-bindings/video/tegra20-dc.txt create mode 100644 drivers/video/tegra.c On Mon, Nov 19, 2012 at 8:39 AM, Tom Warren wrote: > That makes perfect sense - should have thought it through myself. > > I moved the pxa patch to before Simon's LCD patchset. Testing MAKEALL > -a arm now; should have a new pull request in a few hours. > > Thanks, > > Tom > > On Fri, Nov 16, 2012 at 5:12 PM, Albert ARIBAUD > wrote: >> Hi Tom, >> >> On Fri, 16 Nov 2012 16:42:49 -0700, Tom Warren >> wrote: >> >>> Albert, >>> >>> Please pull u-boot-tegra/master into ARM/master. The previously >>> failing pxa boards are fixed with 'pxa: Disable dcache on palmld, >>> palmtc, zipitz2'. >> >> Sorry to be a nuisance, but what I meant that I wanted all commits in >> the tegra pull req to succeed building if possible; with the added >> "disable cache" commit, the branch succeeds, but not all of its >> commits, which can hamper git bisects. Can the dcache disable patch >> actually appear before Simon's LCD commit? >> >> Amicalement, >> -- >> Albert.