From patchwork Thu Jun 26 21:38:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Felipe Balbi X-Patchwork-Id: 32600 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yk0-f200.google.com (mail-yk0-f200.google.com [209.85.160.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 23F282066E for ; Thu, 26 Jun 2014 21:38:32 +0000 (UTC) Received: by mail-yk0-f200.google.com with SMTP id 20sf5878123yks.3 for ; Thu, 26 Jun 2014 14:38:31 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id :mime-version:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:sender:errors-to :x-original-sender:x-original-authentication-results:mailing-list :content-type:content-transfer-encoding; bh=8l0/8ljnjnU+uJrK6Vja4mWDqKydp8dp42Hoqu2J6s0=; b=jpJhUyMjHvyMmBl/Jd4tf2LqYXrL7de2j8twFW/hVXMkrnpj99rqJlZ8ybGEtleAW6 S0M9j+Lsq+QHapwUdimnoqGJ4TkooObndhn6fzgJPop2o4BjXp0lNpx7dz43+Qqa7zhF iOK9iTuZS3wmZpPgH2N0Bu99zRzrQxlAU2jFKwM8j0OcnbdtzHguTKBxvZvGE+ml+f5V PW6GE2XSpO2veKRgYna7wNBdqiBgU1JW2yF4R6HbovdtSfa8aYBb6yzWJ9iIV1ylaPsc +srgOGjQpTVqbLfWg3RayWlxH00n7IP0YZzAZ9+8o+14xkV0l7En3HzUij38hZdfqYCc iFVQ== X-Gm-Message-State: ALoCoQkjuM3zjWKSxlOpDodR01DqJDkNbCqSJdTQI+vOgPC8G4NXb/NLQCamwsgUVnNDNe+UBNfT X-Received: by 10.58.172.5 with SMTP id ay5mr9829976vec.37.1403818711846; Thu, 26 Jun 2014 14:38:31 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.93.117 with SMTP id c108ls412036qge.67.gmail; Thu, 26 Jun 2014 14:38:31 -0700 (PDT) X-Received: by 10.220.103.141 with SMTP id k13mr16053176vco.25.1403818711755; Thu, 26 Jun 2014 14:38:31 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id gv1si5350385vdb.27.2014.06.26.14.38.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Jun 2014 14:38:31 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.175 as permitted sender) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id jx11so4385329veb.20 for ; Thu, 26 Jun 2014 14:38:31 -0700 (PDT) X-Received: by 10.58.228.74 with SMTP id sg10mr15652604vec.6.1403818711509; Thu, 26 Jun 2014 14:38:31 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp60399vcb; Thu, 26 Jun 2014 14:38:31 -0700 (PDT) X-Received: by 10.194.238.6 with SMTP id vg6mr18568130wjc.24.1403818710594; Thu, 26 Jun 2014 14:38:30 -0700 (PDT) Received: from theia.denx.de (theia.denx.de. [85.214.87.163]) by mx.google.com with ESMTP id er6si7737151wib.22.2014.06.26.14.38.29 for ; Thu, 26 Jun 2014 14:38:30 -0700 (PDT) Received-SPF: none (google.com: u-boot-bounces@lists.denx.de does not designate permitted sender hosts) client-ip=85.214.87.163; Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 231A1A7776; Thu, 26 Jun 2014 23:38:29 +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 OeMKGsnNsYr9; Thu, 26 Jun 2014 23:38:28 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 08C15A776B; Thu, 26 Jun 2014 23:38:26 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 99069A776B for ; Thu, 26 Jun 2014 23:38:20 +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 DhiPG9z-sqR9 for ; Thu, 26 Jun 2014 23:38:17 +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 comal.ext.ti.com (comal.ext.ti.com [198.47.26.152]) by theia.denx.de (Postfix) with ESMTPS id 66416A776A for ; Thu, 26 Jun 2014 23:38:13 +0200 (CEST) Received: from dlelxv90.itg.ti.com ([172.17.2.17]) by comal.ext.ti.com (8.13.7/8.13.7) with ESMTP id s5QLcBW4031519 for ; Thu, 26 Jun 2014 16:38:11 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv90.itg.ti.com (8.14.3/8.13.8) with ESMTP id s5QLcBTP003062 for ; Thu, 26 Jun 2014 16:38:11 -0500 Received: from dlep33.itg.ti.com (157.170.170.75) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.3.174.1; Thu, 26 Jun 2014 16:38:10 -0500 Received: from localhost (ileax41-snat.itg.ti.com [10.172.224.153]) by dlep33.itg.ti.com (8.14.3/8.13.8) with ESMTP id s5QLcAiE000550; Thu, 26 Jun 2014 16:38:10 -0500 From: Felipe Balbi To: Tom Rini Date: Thu, 26 Jun 2014 16:38:05 -0500 Message-ID: <1403818685-22541-1-git-send-email-balbi@ti.com> X-Mailer: git-send-email 2.0.0.390.gcb682f8 MIME-Version: 1.0 Cc: Steven Kipisz , u-boot@lists.denx.de, "Franklin Cooper Jr." Subject: [U-Boot] [PATCH] board: ti: dra7xx: add mux data for UART3 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: 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 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: balbi@ti.com X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 J6 EVM can be built with UART3 as console, but currently there's nothing muxing UART3 correctly. Likely this only works because, based on commit log, author was only testing with UART3 boot and - I assume - ROM code leave UART3 correctly muxed in that case. If we want to boot from MMC and still use UART3 as console, then we need to mux those signals correctly. Signed-off-by: Felipe Balbi --- board/ti/dra7xx/mux_data.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/board/ti/dra7xx/mux_data.h b/board/ti/dra7xx/mux_data.h index 38de9d5..c9e202a 100644 --- a/board/ti/dra7xx/mux_data.h +++ b/board/ti/dra7xx/mux_data.h @@ -31,10 +31,15 @@ const struct pad_conf_entry core_padconf_array_essential[] = { {GPMC_A26, (IEN | PTU | PDIS | M1)}, /* mmc2_dat2 */ {GPMC_A27, (IEN | PTU | PDIS | M1)}, /* mmc2_dat3 */ {GPMC_CS1, (IEN | PTU | PDIS | M1)}, /* mmm2_cmd */ +#if (CONFIG_CONS_INDEX == 1) {UART1_RXD, (FSC | IEN | PTU | PDIS | M0)}, /* UART1_RXD */ {UART1_TXD, (FSC | IEN | PTU | PDIS | M0)}, /* UART1_TXD */ {UART1_CTSN, (IEN | PTU | PDIS | M3)}, /* UART1_CTSN */ {UART1_RTSN, (IEN | PTU | PDIS | M3)}, /* UART1_RTSN */ +#elif (CONFIG_CONS_INDEX == 3) + {UART3_RXD, (FSC | IEN | PTU | PDIS | M0)}, /* UART3_RXD */ + {UART3_TXD, (FSC | IEN | PTU | PDIS | M0)}, /* UART3_TXD */ +#endif {I2C1_SDA, (IEN | PTU | PDIS | M0)}, /* I2C1_SDA */ {I2C1_SCL, (IEN | PTU | PDIS | M0)}, /* I2C1_SCL */ {MDIO_MCLK, (PTU | PEN | M0)}, /* MDIO_MCLK */