From patchwork Thu Jul 19 18:18:22 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Troy Kisky X-Patchwork-Id: 172022 X-Patchwork-Delegate: hs@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 1ACA12C00C3 for ; Fri, 20 Jul 2012 04:30:40 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 116E02815E; Thu, 19 Jul 2012 20:30:38 +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 eN8ioayfq-7L; Thu, 19 Jul 2012 20:30:37 +0200 (CEST) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 1D7C228181; Thu, 19 Jul 2012 20:30:06 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 352032811E for ; Thu, 19 Jul 2012 20:30:04 +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 8JLlOXGcrqeM for ; Thu, 19 Jul 2012 20:30:03 +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-pb0-f44.google.com (mail-pb0-f44.google.com [209.85.160.44]) by theia.denx.de (Postfix) with ESMTPS id B2E9E280E9 for ; Thu, 19 Jul 2012 20:29:35 +0200 (CEST) Received: by mail-pb0-f44.google.com with SMTP id wy7so4631547pbc.3 for ; Thu, 19 Jul 2012 11:29:35 -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=CGVRxU2s69oUnAWqiMHniaYOJKqbYOl1b3lDaIXmsn8=; b=i7CqsHHJSObJ/AoVkT2OL05nJdkaimO9jRdsY8Nh2pEqC/YIxFhO89njPRjUbOrZvx HVneUOXtM7HzJfb9GG2jkV/yY+4zw0SxE683o0dxzQVTSWf3/lgAgnc5+hchIY4P7fSi vQAlNtGOChLVuWiKkEJSeazK5Y+Tv+xC2xYyhSXGtusC0GvNO2cBkWmApPtoM4RUrASw 9EYHVegq7W+c9bt1ZrAhgWoVlRh57J/3OfnBCLqCupHEEdvt6T/hgVGOhqwdYZAITc28 jOE4+VffOXX3F9mDY7LdpJYFP8E+aJpEZj0L1flhX6Ff6NguVuLcjJZPjcPpimF1q35D vV+A== Received: by 10.68.217.100 with SMTP id ox4mr7336361pbc.87.1342722575229; Thu, 19 Jul 2012 11:29:35 -0700 (PDT) Received: from officeserver-2 ([70.96.116.236]) by mx.google.com with ESMTPS id qd2sm2238515pbb.29.2012.07.19.11.29.33 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 19 Jul 2012 11:29:34 -0700 (PDT) Received: from tkisky by officeserver-2 with local (Exim 4.76) (envelope-from ) id 1SrvJ1-0002CC-Mv; Thu, 19 Jul 2012 11:18:31 -0700 From: Troy Kisky To: u-boot@lists.denx.de, Heiko Schocher , sbabic@denx.de Date: Thu, 19 Jul 2012 11:18:22 -0700 Message-Id: <1342721906-8332-21-git-send-email-troy.kisky@boundarydevices.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1342721906-8332-1-git-send-email-troy.kisky@boundarydevices.com> References: <1342721906-8332-1-git-send-email-troy.kisky@boundarydevices.com> X-Gm-Message-State: ALoCoQk2PnECNfc+36dVB+uDsWXZVfi+0fUTtg9wnxsmowGMYw1bjXwWxlZz7QoQkKDSnDr2DNfT Cc: r49496@freescale.com Subject: [U-Boot] [PATCH V3 21/25] i.mx: iomux-v3.h: move to imx-common include directory 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 Signed-off-by: Troy Kisky --- v2: no change --- arch/arm/cpu/armv7/mx6/iomux-v3.c | 2 +- arch/arm/include/asm/arch-mx6/mx6x_pins.h | 2 +- .../asm/{arch-mx6 => imx-common}/iomux-v3.h | 0 board/freescale/mx6qarm2/mx6qarm2.c | 2 +- board/freescale/mx6qsabrelite/mx6qsabrelite.c | 4 ++-- drivers/usb/host/ehci-mx6.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) rename arch/arm/include/asm/{arch-mx6 => imx-common}/iomux-v3.h (100%) diff --git a/arch/arm/cpu/armv7/mx6/iomux-v3.c b/arch/arm/cpu/armv7/mx6/iomux-v3.c index a0c4b15..da093fb 100644 --- a/arch/arm/cpu/armv7/mx6/iomux-v3.c +++ b/arch/arm/cpu/armv7/mx6/iomux-v3.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include static void *base = (void *)IOMUXC_BASE_ADDR; diff --git a/arch/arm/include/asm/arch-mx6/mx6x_pins.h b/arch/arm/include/asm/arch-mx6/mx6x_pins.h index cf9103c..3d66d64 100644 --- a/arch/arm/include/asm/arch-mx6/mx6x_pins.h +++ b/arch/arm/include/asm/arch-mx6/mx6x_pins.h @@ -22,7 +22,7 @@ #ifndef __ASM_ARCH_MX6_MX6X_PINS_H__ #define __ASM_ARCH_MX6_MX6X_PINS_H__ -#include +#include /* Use to set PAD control */ #define PAD_CTL_HYS (1 << 16) diff --git a/arch/arm/include/asm/arch-mx6/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h similarity index 100% rename from arch/arm/include/asm/arch-mx6/iomux-v3.h rename to arch/arm/include/asm/imx-common/iomux-v3.h diff --git a/board/freescale/mx6qarm2/mx6qarm2.c b/board/freescale/mx6qarm2/mx6qarm2.c index 1367b88..340c4c4 100644 --- a/board/freescale/mx6qarm2/mx6qarm2.c +++ b/board/freescale/mx6qarm2/mx6qarm2.c @@ -24,9 +24,9 @@ #include #include #include -#include #include #include +#include #include #include #include diff --git a/board/freescale/mx6qsabrelite/mx6qsabrelite.c b/board/freescale/mx6qsabrelite/mx6qsabrelite.c index 0eae96d..34f65e9 100644 --- a/board/freescale/mx6qsabrelite/mx6qsabrelite.c +++ b/board/freescale/mx6qsabrelite/mx6qsabrelite.c @@ -22,12 +22,12 @@ #include #include +#include #include #include -#include -#include #include #include +#include #include #include #include diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 42c77fe..0280242 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include "ehci.h" #include "ehci-core.h"