From patchwork Tue Mar 5 16:29:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Warren X-Patchwork-Id: 225083 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 709762C0299 for ; Wed, 6 Mar 2013 03:31:33 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 754764A191; Tue, 5 Mar 2013 17:31:24 +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 ms+aesdB+aJo; Tue, 5 Mar 2013 17:31:24 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2309F4A19F; Tue, 5 Mar 2013 17:31:06 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id E13B14A125 for ; Tue, 5 Mar 2013 17:30:55 +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 D7rLN+N7omjO for ; Tue, 5 Mar 2013 17:30:54 +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-da0-f41.google.com (mail-da0-f41.google.com [209.85.210.41]) by theia.denx.de (Postfix) with ESMTPS id 0DD604A18B for ; Tue, 5 Mar 2013 17:30:34 +0100 (CET) Received: by mail-da0-f41.google.com with SMTP id j17so31263dan.0 for ; Tue, 05 Mar 2013 08:30:32 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references:x-nvconfidentiality; bh=M1ctabOxuiG+Bygm4N6MTt93scO0+Bya6oszqvPu8R8=; b=qP7vaGwgv0mn18D2WDxbbemHEvtuDorrDShGEiBZ9GQixRIC1wfYjR4YR2JEIdS7KH 4hlZmqZeamRTlfAQFimq3HovLc8br6DsbcBVxPV5LfK/pSTdvbi26uOxDQ1Xx8GNDwym 005q5CAY1wx8hFpREZjZu/lW3YTbECMTtOnHKRuIzDehr8ZpEb8jYz36aE1u7IS65zhz CBLKrz0z3uwf0E9PTLrAsSiXw2R1mYJoCq/KhNzwtqq/xmh9l3P+3ZWGtAyQFs8wNoHx x9PrEhJIINn1AN/EXYSpvAqjdw4Fd+lCMT96wV7D1k7RfrcjtH3MvPKVGeTYwLAWaQs/ dSGA== X-Received: by 10.68.198.34 with SMTP id iz2mr36089513pbc.148.1362501032226; Tue, 05 Mar 2013 08:30:32 -0800 (PST) Received: from localhost.localdomain (ip68-230-103-25.ph.ph.cox.net. [68.230.103.25]) by mx.google.com with ESMTPS id qp13sm27311372pbb.3.2013.03.05.08.30.29 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 05 Mar 2013 08:30:31 -0800 (PST) From: Tom Warren To: u-boot@lists.denx.de Date: Tue, 5 Mar 2013 09:29:44 -0700 Message-Id: <1362500985-13196-6-git-send-email-twarren@nvidia.com> X-Mailer: git-send-email 1.7.0.4 In-Reply-To: <1362500985-13196-1-git-send-email-twarren@nvidia.com> References: <1362500985-13196-1-git-send-email-twarren@nvidia.com> X-NVConfidentiality: public Cc: swarren@nvidia.com, afleming@freescale.com, Tom Warren , twarren.nvidia@gmail.com Subject: [U-Boot] [PATCH v2 5/6] Tegra30: mmc: Add Tegra30 SDMMC compatible entry to fdtdec & driver 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 Tegra30 SD/MMC controller differs enough from Tegra20 that it needs its own entry in the compat_names/compat_id tables and in the Tegra MMC driver. Signed-off-by: Tom Warren --- v2: new include/fdtdec.h | 3 ++- lib/fdtdec.c | 1 + 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/include/fdtdec.h b/include/fdtdec.h index 32730d2..2189483 100644 --- a/include/fdtdec.h +++ b/include/fdtdec.h @@ -71,7 +71,8 @@ enum fdt_compat_id { COMPAT_NVIDIA_TEGRA20_NAND, /* Tegra2 NAND controller */ COMPAT_NVIDIA_TEGRA20_PWM, /* Tegra 2 PWM controller */ COMPAT_NVIDIA_TEGRA20_DC, /* Tegra 2 Display controller */ - COMPAT_NVIDIA_TEGRA20_SDMMC, /* Tegra SDMMC controller */ + COMPAT_NVIDIA_TEGRA30_SDMMC, /* Tegra30 SDMMC controller */ + COMPAT_NVIDIA_TEGRA20_SDMMC, /* Tegra20 SDMMC controller */ COMPAT_NVIDIA_TEGRA20_SFLASH, /* Tegra 2 SPI flash controller */ COMPAT_NVIDIA_TEGRA20_SLINK, /* Tegra 2 SPI SLINK controller */ COMPAT_SMSC_LAN9215, /* SMSC 10/100 Ethernet LAN9215 */ diff --git a/lib/fdtdec.c b/lib/fdtdec.c index 000130f..43f29f5 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -46,6 +46,7 @@ static const char * const compat_names[COMPAT_COUNT] = { COMPAT(NVIDIA_TEGRA20_NAND, "nvidia,tegra20-nand"), COMPAT(NVIDIA_TEGRA20_PWM, "nvidia,tegra20-pwm"), COMPAT(NVIDIA_TEGRA20_DC, "nvidia,tegra20-dc"), + COMPAT(NVIDIA_TEGRA30_SDMMC, "nvidia,tegra30-sdhci"), COMPAT(NVIDIA_TEGRA20_SDMMC, "nvidia,tegra20-sdhci"), COMPAT(NVIDIA_TEGRA20_SFLASH, "nvidia,tegra20-sflash"), COMPAT(NVIDIA_TEGRA20_SLINK, "nvidia,tegra20-slink"),