From patchwork Mon Sep 17 05:34:40 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Guo X-Patchwork-Id: 184295 Return-Path: X-Original-To: incoming-imx@patchwork.ozlabs.org Delivered-To: patchwork-incoming-imx@bilbo.ozlabs.org Received: from merlin.infradead.org (unknown [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C5E982C007E for ; Mon, 17 Sep 2012 15:43:58 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TDU3C-0003P5-Jn; Mon, 17 Sep 2012 05:39:20 +0000 Received: from mail-pb0-f49.google.com ([209.85.160.49]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1TDTzj-0001e5-Si for linux-arm-kernel@lists.infradead.org; Mon, 17 Sep 2012 05:35:45 +0000 Received: by mail-pb0-f49.google.com with SMTP id rq8so9280584pbb.36 for ; Sun, 16 Sep 2012 22:35:43 -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=3OnDNABLvgVf73lyc+lblHUdfI94xQe+z7IdkL3ku9s=; b=hMLhjof+Nw7o9IuuEUa7PiEeXDhquXatOiZ5EYeQc+PLAtz1uOXFMwsUWWgjHX1lKn t2eIeHKHdv1gpYr6jh5kzI+fTnMPCzVS9otv7LZ/+6HkfAK9fPWUq98v9sUqZAFBRb6a JzBEqgHIED55dLCYIvxiu5xSLlweYBSiVtvsC/wBydLp6dFPy7Umuh7v4umlWvJhYeTW WLTIzCb12c1DE2R+pzRlpE04t5VEH1Yq7wPW987uGIFz1QIOrPcp0mMOeZ3E581H+/QL gjKf3MBY34qGHtsVVrmC7I1NbsGZJLLxYGA+Tzi1wgWnCrIU9axtnN8ouvg8Xok0pYJu JfTw== Received: by 10.66.78.73 with SMTP id z9mr18445137paw.9.1347860143599; Sun, 16 Sep 2012 22:35:43 -0700 (PDT) Received: from S2101-09.ap.freescale.net ([221.225.141.190]) by mx.google.com with ESMTPS id it6sm6386097pbc.14.2012.09.16.22.35.39 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 16 Sep 2012 22:35:42 -0700 (PDT) From: Shawn Guo To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 11/34] ARM: imx: include ulpi.h rather than mach/ulpi.h Date: Mon, 17 Sep 2012 13:34:40 +0800 Message-Id: <1347860103-4141-12-git-send-email-shawn.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347860103-4141-1-git-send-email-shawn.guo@linaro.org> References: <1347860103-4141-1-git-send-email-shawn.guo@linaro.org> X-Gm-Message-State: ALoCoQlaE6AVkcnGZXdtvOCOzv2rubZdblXyTfXMllWTHL6IL1tHtPKDEg/BX7qg9DQI1h5kJ7Xm X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.160.49 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Fabio Estevam , Sascha Hauer , Shawn Guo , Arnd Bergmann , Rob Herring X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+incoming-imx=patchwork.ozlabs.org@lists.infradead.org List-Id: linux-imx-kernel.lists.patchwork.ozlabs.org Rename mach-imx/include/mach/ulpi.h to mach-imx/ulpi.h, and update users to include ulpi.h rather than mach/ulpi.h. Signed-off-by: Shawn Guo --- arch/arm/mach-imx/mach-armadillo5x0.c | 3 +-- arch/arm/mach-imx/mach-cpuimx27.c | 2 +- arch/arm/mach-imx/mach-mx27_3ds.c | 2 +- arch/arm/mach-imx/mach-mx31_3ds.c | 2 +- arch/arm/mach-imx/mach-mx31lilly.c | 2 +- arch/arm/mach-imx/mach-mx31lite.c | 2 +- arch/arm/mach-imx/mach-mx31moboard.c | 2 +- arch/arm/mach-imx/mach-pca100.c | 2 +- arch/arm/mach-imx/mach-pcm037.c | 2 +- arch/arm/mach-imx/mach-pcm038.c | 2 +- arch/arm/mach-imx/mach-pcm043.c | 2 +- arch/arm/mach-imx/mx31moboard-devboard.c | 2 +- arch/arm/mach-imx/mx31moboard-marxbot.c | 2 +- arch/arm/mach-imx/mx31moboard-smartbot.c | 2 +- arch/arm/mach-imx/ulpi.c | 2 +- arch/arm/mach-imx/{include/mach => }/ulpi.h | 0 16 files changed, 15 insertions(+), 16 deletions(-) rename arch/arm/mach-imx/{include/mach => }/ulpi.h (100%) diff --git a/arch/arm/mach-imx/include/mach/ulpi.h b/arch/arm/mach-imx/ulpi.h similarity index 100% rename from arch/arm/mach-imx/include/mach/ulpi.h rename to arch/arm/mach-imx/ulpi.h diff --git a/arch/arm/mach-imx/mach-armadillo5x0.c b/arch/arm/mach-imx/mach-armadillo5x0.c index f8421e9..ea8731f 100644 --- a/arch/arm/mach-imx/mach-armadillo5x0.c +++ b/arch/arm/mach-imx/mach-armadillo5x0.c @@ -48,12 +48,11 @@ #include #include -#include - #include "common.h" #include "devices-imx31.h" #include "crmregs-imx3.h" #include "iomux-mx3.h" +#include "ulpi.h" static int armadillo5x0_pins[] = { /* UART1 */ diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c index 271528b..37571f3 100644 --- a/arch/arm/mach-imx/mach-cpuimx27.c +++ b/arch/arm/mach-imx/mach-cpuimx27.c @@ -35,12 +35,12 @@ #include #include -#include #include "common.h" #include "devices-imx27.h" #include "eukrea-baseboards.h" #include "iomux-mx27.h" +#include "ulpi.h" static const int eukrea_cpuimx27_pins[] __initconst = { /* UART1 */ diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c index 5f78bb2..a54df77 100644 --- a/arch/arm/mach-imx/mach-mx27_3ds.c +++ b/arch/arm/mach-imx/mach-mx27_3ds.c @@ -37,12 +37,12 @@ #include #include #include -#include #include "3ds_debugboard.h" #include "common.h" #include "devices-imx27.h" #include "iomux-mx27.h" +#include "ulpi.h" #define SD1_EN_GPIO IMX_GPIO_NR(2, 25) #define OTG_PHY_RESET_GPIO IMX_GPIO_NR(2, 23) diff --git a/arch/arm/mach-imx/mach-mx31_3ds.c b/arch/arm/mach-imx/mach-mx31_3ds.c index ee6a3f3..5377c88 100644 --- a/arch/arm/mach-imx/mach-mx31_3ds.c +++ b/arch/arm/mach-imx/mach-mx31_3ds.c @@ -37,12 +37,12 @@ #include #include #include -#include #include "3ds_debugboard.h" #include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" +#include "ulpi.h" static int mx31_3ds_pins[] = { /* UART1 */ diff --git a/arch/arm/mach-imx/mach-mx31lilly.c b/arch/arm/mach-imx/mach-mx31lilly.c index 15d26a0..74b5fa9 100644 --- a/arch/arm/mach-imx/mach-mx31lilly.c +++ b/arch/arm/mach-imx/mach-mx31lilly.c @@ -43,12 +43,12 @@ #include #include -#include #include "board-mx31lilly.h" #include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" +#include "ulpi.h" /* * This file contains module-specific initialization routines for LILLY-1131. diff --git a/arch/arm/mach-imx/mach-mx31lite.c b/arch/arm/mach-imx/mach-mx31lite.c index c5f8665..904aa63 100644 --- a/arch/arm/mach-imx/mach-mx31lite.c +++ b/arch/arm/mach-imx/mach-mx31lite.c @@ -40,12 +40,12 @@ #include #include -#include #include "board-mx31lite.h" #include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" +#include "ulpi.h" /* * This file contains the module-specific initialization routines. diff --git a/arch/arm/mach-imx/mach-mx31moboard.c b/arch/arm/mach-imx/mach-mx31moboard.c index 955275b..e719c76 100644 --- a/arch/arm/mach-imx/mach-mx31moboard.c +++ b/arch/arm/mach-imx/mach-mx31moboard.c @@ -43,13 +43,13 @@ #include #include #include -#include #include #include "board-mx31moboard.h" #include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" +#include "ulpi.h" static unsigned int moboard_pins[] = { /* UART0 */ diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c index 826d326bd..743d7e9 100644 --- a/arch/arm/mach-imx/mach-pca100.c +++ b/arch/arm/mach-imx/mach-pca100.c @@ -34,11 +34,11 @@ #include #include #include -#include #include "common.h" #include "devices-imx27.h" #include "iomux-mx27.h" +#include "ulpi.h" #define OTG_PHY_CS_GPIO (GPIO_PORTB + 23) #define USBH2_PHY_CS_GPIO (GPIO_PORTB + 24) diff --git a/arch/arm/mach-imx/mach-pcm037.c b/arch/arm/mach-imx/mach-pcm037.c index 59d2274..525f057 100644 --- a/arch/arm/mach-imx/mach-pcm037.c +++ b/arch/arm/mach-imx/mach-pcm037.c @@ -43,12 +43,12 @@ #include #include #include -#include #include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" #include "pcm037.h" +#include "ulpi.h" static enum pcm037_board_variant pcm037_instance = PCM037_PCM970; diff --git a/arch/arm/mach-imx/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c index 9ebc248..4a52340 100644 --- a/arch/arm/mach-imx/mach-pcm038.c +++ b/arch/arm/mach-imx/mach-pcm038.c @@ -34,12 +34,12 @@ #include #include -#include #include "board-pcm038.h" #include "common.h" #include "devices-imx27.h" #include "iomux-mx27.h" +#include "ulpi.h" static const int pcm038_pins[] __initconst = { /* UART1 */ diff --git a/arch/arm/mach-imx/mach-pcm043.c b/arch/arm/mach-imx/mach-pcm043.c index 285ac8b..54ac947 100644 --- a/arch/arm/mach-imx/mach-pcm043.c +++ b/arch/arm/mach-imx/mach-pcm043.c @@ -34,11 +34,11 @@ #include #include -#include #include "common.h" #include "devices-imx35.h" #include "iomux-mx35.h" +#include "ulpi.h" static const struct fb_videomode fb_modedb[] = { { diff --git a/arch/arm/mach-imx/mx31moboard-devboard.c b/arch/arm/mach-imx/mx31moboard-devboard.c index 527f173..6489afc 100644 --- a/arch/arm/mach-imx/mx31moboard-devboard.c +++ b/arch/arm/mach-imx/mx31moboard-devboard.c @@ -23,11 +23,11 @@ #include #include -#include #include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" +#include "ulpi.h" static unsigned int devboard_pins[] = { /* UART1 */ diff --git a/arch/arm/mach-imx/mx31moboard-marxbot.c b/arch/arm/mach-imx/mx31moboard-marxbot.c index 4679309..ea973c4 100644 --- a/arch/arm/mach-imx/mx31moboard-marxbot.c +++ b/arch/arm/mach-imx/mx31moboard-marxbot.c @@ -25,13 +25,13 @@ #include #include -#include #include #include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" +#include "ulpi.h" static unsigned int marxbot_pins[] = { /* SDHC2 */ diff --git a/arch/arm/mach-imx/mx31moboard-smartbot.c b/arch/arm/mach-imx/mx31moboard-smartbot.c index afb4d05..807e882 100644 --- a/arch/arm/mach-imx/mx31moboard-smartbot.c +++ b/arch/arm/mach-imx/mx31moboard-smartbot.c @@ -24,7 +24,6 @@ #include #include -#include #include @@ -32,6 +31,7 @@ #include "common.h" #include "devices-imx31.h" #include "iomux-mx3.h" +#include "ulpi.h" static unsigned int smartbot_pins[] = { /* UART1 */ diff --git a/arch/arm/mach-imx/ulpi.c b/arch/arm/mach-imx/ulpi.c index d296342..0f05195 100644 --- a/arch/arm/mach-imx/ulpi.c +++ b/arch/arm/mach-imx/ulpi.c @@ -24,7 +24,7 @@ #include #include -#include +#include "ulpi.h" /* ULPIVIEW register bits */ #define ULPIVW_WU (1 << 31) /* Wakeup */