From patchwork Tue Jul 17 21:02:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Nelson X-Patchwork-Id: 945367 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=nelint.com Authentication-Results: ozlabs.org; dkim=fail reason="key not found in DNS" (0-bit key; secure) header.d=nelint.com header.i=@nelint.com header.b="IypBJ+95"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 41VXpw2fqXz9s0n for ; Wed, 18 Jul 2018 07:04:54 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id ADA78C21E53; Tue, 17 Jul 2018 21:04:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id D2528C21C27; Tue, 17 Jul 2018 21:04:48 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 6B66DC21C3F; Tue, 17 Jul 2018 21:04:47 +0000 (UTC) Received: from mail-pf0-f193.google.com (mail-pf0-f193.google.com [209.85.192.193]) by lists.denx.de (Postfix) with ESMTPS id C056FC21BE5 for ; Tue, 17 Jul 2018 21:04:46 +0000 (UTC) Received: by mail-pf0-f193.google.com with SMTP id i26-v6so1081509pfo.12 for ; Tue, 17 Jul 2018 14:04:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nelint.com; s=google; h=from:to:cc:subject:date:message-id; bh=EECpG6X9D28VwDg9KnUZ07jjVrlC/icub2KWNWZymA0=; b=IypBJ+95KjDIM96vJRsqFYpK1hoSaLIbJDeOiwBBjgtiQASNMSF/5LCpW//28Y3jlc xHjyszoNpdW9pb++lIp2lbMofUBUdjIYIXfzUKkOLzMBwyZ8BgTa45sDladEajiBFc9c h39rhRWOHOUN5hb+wazxvfHJwE1Ua6YfkR3j8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=EECpG6X9D28VwDg9KnUZ07jjVrlC/icub2KWNWZymA0=; b=uN3HaGF7GkVD7ZF6NxKPQZQM26b/17E2Ka7E1zDYcxulXcPr+EHUDwACDUwFNQije0 D2FG4q4UZczr6knrLyLe2fP5Bl8hXMV0bM6Pr7ng97a7PwvnEdaxfcJxQlkho3x29+t4 0HmtOhUiQ+5WCWlocjN1jsXKf/DVEPhEfElaJMlrdxKejCgq995Q2M+2ZbQd3z7EKmPy +Gg1Q7UUFl3z+ZNoV9ru357wxTJj/kJR4y8Y4E6h6ELRWqm1ktnU8deOiDs56zAIptKj UoUmLwLdvDbEVc4Wd0Fos36eNFgbUDDV5jfnFF8pqjG4gLUFJVSPRkUPmy++oDw8OnTZ 7XOw== X-Gm-Message-State: AOUpUlFgfBcEP8JUvByWJfJ1anY82lY4Rxx39h9ZaLKTyzuVJtEu8MGV N9tuzqgn1oJBbdeKJUa5DEgefszh X-Google-Smtp-Source: AAOMgpeKb2/FnFvm61Am+WPZz6GyZILOVpWBKkTvXYxRP/BhlBVaZ44i3G36uwcD1l4DLZQwgy28fA== X-Received: by 2002:a62:3856:: with SMTP id f83-v6mr2333496pfa.48.1531861484777; Tue, 17 Jul 2018 14:04:44 -0700 (PDT) Received: from localhost.localdomain ([2600:8800:1301:2190:2445:6d:fdc7:a55d]) by smtp.gmail.com with ESMTPSA id n12-v6sm4067896pfh.146.2018.07.17.14.04.42 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 17 Jul 2018 14:04:44 -0700 (PDT) From: Eric Nelson To: u-boot@lists.denx.de Date: Tue, 17 Jul 2018 14:02:24 -0700 Message-Id: <1531861344-19316-1-git-send-email-eric@nelint.com> X-Mailer: git-send-email 2.7.4 Cc: fabio.estevam@nxp.com Subject: [U-Boot] [PATCH] imx: iomux-v3: fix IOMUX_PADS for single-CPU variant X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" When compiling for a single CPU variant (e.g. MX6Q or MX6DL), the IOMUX constants are named MX6_PAD_blah, not MX6Q_PAD_blah. Fix the macros IOMUX_PADS and SETUP_IOMUX_PAD to reflect this. Signed-off-by: Eric Nelson --- arch/arm/include/asm/mach-imx/iomux-v3.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/mach-imx/iomux-v3.h b/arch/arm/include/asm/mach-imx/iomux-v3.h index bb93058..4be1c53 100644 --- a/arch/arm/include/asm/mach-imx/iomux-v3.h +++ b/arch/arm/include/asm/mach-imx/iomux-v3.h @@ -267,9 +267,9 @@ if (is_mx6dq() || is_mx6dqp()) { \ #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 IOMUX_PADS(x) MX6_##x #define SETUP_IOMUX_PAD(def) \ - imx_iomux_v3_setup_pad(MX6Q_##def); + imx_iomux_v3_setup_pad(MX6_##def); #define SETUP_IOMUX_PADS(x) \ imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x)) #elif defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL)