From patchwork Fri Dec 5 09:23:38 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre Aubert X-Patchwork-Id: 418042 X-Patchwork-Delegate: sbabic@denx.de 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 F21711400E7 for ; Fri, 5 Dec 2014 20:25:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 5FB684B617; Fri, 5 Dec 2014 10:25:01 +0100 (CET) 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 7h6D079ti5zl; Fri, 5 Dec 2014 10:25:01 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 9D6984B60B; Fri, 5 Dec 2014 10:25:00 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 574224B60B for ; Fri, 5 Dec 2014 10:24:56 +0100 (CET) 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 DuubE8As1B5I for ; Fri, 5 Dec 2014 10:24:56 +0100 (CET) X-Greylist: delayed 301 seconds by postgrey-1.32 at theia; Fri, 05 Dec 2014 10:24:56 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 esa1.staubli.c3s2.iphmx.com (esa1.staubli.c3s2.iphmx.com [68.232.133.30]) by theia.denx.de (Postfix) with ESMTPS id 14A524B609 for ; Fri, 5 Dec 2014 10:24:55 +0100 (CET) X-IronPort-AV: E=Sophos;i="5.07,521,1413237600"; d="scan'208";a="13850645" Received: from unknown (HELO fav03not.staubli.pri) ([217.109.88.35]) by esa1.staubli.c3s2.iphmx.com with ESMTP; 05 Dec 2014 10:23:22 +0100 Received: from favd8744.staubli.pri ([10.10.100.28]) by fav03not.staubli.pri (Lotus Domino Release 8.5.3FP5) with ESMTP id 2014120510234713-35844 ; Fri, 5 Dec 2014 10:23:47 +0100 Received: from favd8744.staubli.pri (localhost [127.0.0.1]) by favd8744.staubli.pri (8.14.5/8.14.5) with ESMTP id sB59NlTw005634; Fri, 5 Dec 2014 10:23:47 +0100 Received: (from aubert@localhost) by favd8744.staubli.pri (8.14.5/8.14.5/Submit) id sB59NkXN005633; Fri, 5 Dec 2014 10:23:46 +0100 From: Pierre Aubert To: u-boot@lists.denx.de Date: Fri, 5 Dec 2014 10:23:38 +0100 Message-Id: <1417771418-5598-1-git-send-email-p.aubert@staubli.com> X-Mailer: git-send-email 1.7.6.5 X-MIMETrack: Itemize by SMTP Server on FAV03NOT/FAVERGES/STAUBLI(Release 8.5.3FP5|July 31, 2013) at 05/12/2014 10:23:47, Serialize by Router on FAV03NOT/FAVERGES/STAUBLI(Release 8.5.3FP5|July 31, 2013) at 05/12/2014 10:23:47, Serialize complete at 05/12/2014 10:23:47 Cc: Pierre Aubert Subject: [U-Boot] [PATCH] imx: fix IOMUX_PADS and SETUP_IOMUX_PAD macros definitions. X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.13 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 When CONFIG_MX6QDL is undefined, these definitions must be coherent with those in mx6-pins.h. The prefix is MX6 regardless of the type of SoC. Cc: Tim Harvey Cc: Stefano Babic Signed-off-by: Pierre Aubert --- arch/arm/include/asm/imx-common/iomux-v3.h | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h index e0a49be..a1004b5 100644 --- a/arch/arm/include/asm/imx-common/iomux-v3.h +++ b/arch/arm/include/asm/imx-common/iomux-v3.h @@ -199,16 +199,10 @@ if (is_cpu_type(MXC_CPU_MX6Q)) { \ } #define SETUP_IOMUX_PADS(x) \ imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x)/2) -#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D) -#define IOMUX_PADS(x) MX6Q_##x -#define SETUP_IOMUX_PAD(def) \ - imx_iomux_v3_setup_pad(MX6Q_##def); -#define SETUP_IOMUX_PADS(x) \ - imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x)) #else -#define IOMUX_PADS(x) MX6DL_##x +#define IOMUX_PADS(x) MX6_##x #define SETUP_IOMUX_PAD(def) \ - imx_iomux_v3_setup_pad(MX6DL_##def); + imx_iomux_v3_setup_pad(MX6_##def); #define SETUP_IOMUX_PADS(x) \ imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x)) #endif