Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 39ef6340 authored by Shawn Guo's avatar Shawn Guo
Browse files

ARM: imx: include ulpi.h rather than mach/ulpi.h 



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: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent c045e3f1

arch/arm/mach-imx/mach-armadillo5x0.c

+1 −2
Original line number Diff line number Diff line
@@ -48,12 +48,11 @@ 
#include <asm/memory.h>

#include <asm/mach/map.h>



#include <mach/ulpi.h>



#include "common.h"

#include "devices-imx31.h"

#include "crmregs-imx3.h"

#include "iomux-mx3.h"

#include "ulpi.h"



static int armadillo5x0_pins[] = {

	/* UART1 */

arch/arm/mach-imx/mach-cpuimx27.c

+1 −1
Original line number Diff line number Diff line
@@ -35,12 +35,12 @@ 
#include <asm/mach/map.h>



#include <mach/hardware.h>

#include <mach/ulpi.h>



#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 */

arch/arm/mach-imx/mach-mx27_3ds.c

+1 −1
Original line number Diff line number Diff line
@@ -37,12 +37,12 @@ 
#include <asm/mach/arch.h>

#include <asm/mach/time.h>

#include <mach/hardware.h>

#include <mach/ulpi.h>



#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)

arch/arm/mach-imx/mach-mx31_3ds.c

+1 −1
Original line number Diff line number Diff line
@@ -37,12 +37,12 @@ 
#include <asm/memory.h>

#include <asm/mach/map.h>

#include <asm/memblock.h>

#include <mach/ulpi.h>



#include "3ds_debugboard.h"

#include "common.h"

#include "devices-imx31.h"

#include "iomux-mx3.h"

#include "ulpi.h"



static int mx31_3ds_pins[] = {

	/* UART1 */

arch/arm/mach-imx/mach-mx31lilly.c

+1 −1
Original line number Diff line number Diff line
@@ -43,12 +43,12 @@ 
#include <asm/mach/map.h>



#include <mach/hardware.h>

#include <mach/ulpi.h>



#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.