From patchwork Mon Oct 8 21:42:28 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Glass X-Patchwork-Id: 190135 X-Patchwork-Delegate: twarren@nvidia.com 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 A51552C0315 for ; Tue, 9 Oct 2012 08:45:11 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id CE853281B4; Mon, 8 Oct 2012 23:45:09 +0200 (CEST) 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 O6P3U90iAJDm; Mon, 8 Oct 2012 23:45:09 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E772C281B5; Mon, 8 Oct 2012 23:44:17 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DFFFA28188 for ; Mon, 8 Oct 2012 23:44:14 +0200 (CEST) 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 FRUbsZYd-03k for ; Mon, 8 Oct 2012 23:44:13 +0200 (CEST) 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-fa0-f74.google.com (mail-fa0-f74.google.com [209.85.161.74]) by theia.denx.de (Postfix) with ESMTPS id B024F28189 for ; Mon, 8 Oct 2012 23:44:11 +0200 (CEST) Received: by mail-fa0-f74.google.com with SMTP id t1so284208fae.3 for ; Mon, 08 Oct 2012 14:44:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=Ha+uqhFUngBOscSQ/xr13tnWQlytK2xilG+b1ocTaJ0=; b=Hy4zfQqURau4eEeHL3L8ChKZnz6Nn8EIGHB600CUDds+C7KL2GrVz7ltCoP8Z1pKuV eTS/1hk9UwcPWQUVJa9aaRx6zV5asSXOCDtpZtWsxBzXmjMpJlznvDrUX4iEuljHQkNO t1goVRdaOfjg9oFqaJ3uMH/fR9lCiWQWZa3+BaQixXtuM7e/c4ogq/zzbhcmNTb2MBs9 6/f7ZTP2gSPUetztVa/kmuqu2SjRtxu+Mn0sek4zdLfgPOacgmbwhTxpQbffrhGgxTOw OyQHqbZu7hlzPUJJWNpRqfdyWzjDuADOpNIijJl5RUHbZRLHBqQCsk1Dt4d6maPmaDJ+ 8vdQ== Received: by 10.180.73.242 with SMTP id o18mr2730308wiv.0.1349732650911; Mon, 08 Oct 2012 14:44:10 -0700 (PDT) Received: from hpza10.eem.corp.google.com ([74.125.121.33]) by gmr-mx.google.com with ESMTPS id e5si1103739wiw.0.2012.10.08.14.44.10 (version=TLSv1/SSLv3 cipher=AES128-SHA); Mon, 08 Oct 2012 14:44:10 -0700 (PDT) Received: from kaka.mtv.corp.google.com (kaka.mtv.corp.google.com [172.22.73.79]) by hpza10.eem.corp.google.com (Postfix) with ESMTP id 7F13920004E; Mon, 8 Oct 2012 14:44:10 -0700 (PDT) Received: by kaka.mtv.corp.google.com (Postfix, from userid 121222) id C9122162718; Mon, 8 Oct 2012 14:44:09 -0700 (PDT) From: Simon Glass To: U-Boot Mailing List Date: Mon, 8 Oct 2012 14:42:28 -0700 Message-Id: <1349732556-30700-9-git-send-email-sjg@chromium.org> X-Mailer: git-send-email 1.7.7.3 In-Reply-To: <1349732556-30700-1-git-send-email-sjg@chromium.org> References: <1349732556-30700-1-git-send-email-sjg@chromium.org> X-Gm-Message-State: ALoCoQnfxYH7GLNZz2wsfNBFg5raZlJrd7+EzBYwV1UyR9Y6ISFiQdGheSd1jZUaQScyYFxGuPxmfSrko2nABOa/0CV+GxdTmLlhya1VQubdKI4MfBOOLojxdbIxldNnqq6SVD3JX5l8Vmoa6WRibIKq+ffgJ7baBCENwIcaqRxqI6On2LEn8hy7Itg4+mDho61odmliB7yz Cc: Stephen Warren , Tom Warren Subject: [U-Boot] [PATCH v5 08/16] tegra: Add LCD support to Nvidia boards 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: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de Add calls to the LCD driver from Nvidia board code. Signed-off-by: Simon Glass --- Changes in v4: - Change order of LCD init so that PWM comes first Changes in v3: - Add separate call to pwm_init() in board_init() board/nvidia/common/board.c | 21 ++++++++++++++++++++- 1 files changed, 20 insertions(+), 1 deletions(-) diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c index 7a7d55c..17aafb6 100644 --- a/board/nvidia/common/board.c +++ b/board/nvidia/common/board.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -110,6 +111,9 @@ int board_init(void) if (pwm_init(gd->fdt_blob)) debug("%s: Failed to init pwm\n", __func__); #endif +#ifdef CONFIG_LCD + tegra_lcd_check_next_stage(gd->fdt_blob, 0); +#endif /* boot param addr */ gd->bd->bi_boot_params = (NV_PA_SDRAM_BASE + 0x100); @@ -135,6 +139,9 @@ int board_init(void) pin_mux_usb(); board_usb_init(gd->fdt_blob); #endif +#ifdef CONFIG_LCD + tegra_lcd_check_next_stage(gd->fdt_blob, 0); +#endif #ifdef CONFIG_TEGRA_LP0 /* save Sdram params to PMC 2, 4, and 24 for WB0 */ @@ -165,6 +172,18 @@ int board_early_init_f(void) #else gpio_config_uart(); #endif - return 0; +#ifdef CONFIG_LCD + tegra_lcd_early_init(gd->fdt_blob); +#endif +return 0; } #endif /* EARLY_INIT */ + +int board_late_init(void) +{ +#ifdef CONFIG_LCD + /* Make sure we finish initing the LCD */ + tegra_lcd_check_next_stage(gd->fdt_blob, 1); +#endif + return 0; +}