diff options
author | Shawn Guo <shawn.guo@linaro.org> | 2012-09-13 09:46:09 -0400 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2012-10-14 22:03:11 -0400 |
commit | 39ef6340c702ea734ef5a9a38858e96e05b4b5cc (patch) | |
tree | f69eb463507547a80a97cfc2aa782b9842a6f591 /arch/arm/mach-imx | |
parent | c045e3f137362fa34b337cdca66d3f6000a3b094 (diff) |
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: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-imx')
-rw-r--r-- | arch/arm/mach-imx/mach-armadillo5x0.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-cpuimx27.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx27_3ds.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx31_3ds.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx31lilly.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx31lite.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-mx31moboard.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-pca100.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-pcm037.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-pcm038.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mach-pcm043.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mx31moboard-devboard.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mx31moboard-marxbot.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/mx31moboard-smartbot.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/ulpi.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-imx/ulpi.h (renamed from arch/arm/mach-imx/include/mach/ulpi.h) | 0 |
16 files changed, 15 insertions, 16 deletions
diff --git a/arch/arm/mach-imx/mach-armadillo5x0.c b/arch/arm/mach-imx/mach-armadillo5x0.c index d05b63fbeef1..afa991b7d66b 100644 --- a/arch/arm/mach-imx/mach-armadillo5x0.c +++ b/arch/arm/mach-imx/mach-armadillo5x0.c | |||
@@ -48,12 +48,11 @@ | |||
48 | #include <asm/memory.h> | 48 | #include <asm/memory.h> |
49 | #include <asm/mach/map.h> | 49 | #include <asm/mach/map.h> |
50 | 50 | ||
51 | #include <mach/ulpi.h> | ||
52 | |||
53 | #include "common.h" | 51 | #include "common.h" |
54 | #include "devices-imx31.h" | 52 | #include "devices-imx31.h" |
55 | #include "crmregs-imx3.h" | 53 | #include "crmregs-imx3.h" |
56 | #include "iomux-mx3.h" | 54 | #include "iomux-mx3.h" |
55 | #include "ulpi.h" | ||
57 | 56 | ||
58 | static int armadillo5x0_pins[] = { | 57 | static int armadillo5x0_pins[] = { |
59 | /* UART1 */ | 58 | /* UART1 */ |
diff --git a/arch/arm/mach-imx/mach-cpuimx27.c b/arch/arm/mach-imx/mach-cpuimx27.c index 271528b1d9ab..37571f304c5d 100644 --- a/arch/arm/mach-imx/mach-cpuimx27.c +++ b/arch/arm/mach-imx/mach-cpuimx27.c | |||
@@ -35,12 +35,12 @@ | |||
35 | #include <asm/mach/map.h> | 35 | #include <asm/mach/map.h> |
36 | 36 | ||
37 | #include <mach/hardware.h> | 37 | #include <mach/hardware.h> |
38 | #include <mach/ulpi.h> | ||
39 | 38 | ||
40 | #include "common.h" | 39 | #include "common.h" |
41 | #include "devices-imx27.h" | 40 | #include "devices-imx27.h" |
42 | #include "eukrea-baseboards.h" | 41 | #include "eukrea-baseboards.h" |
43 | #include "iomux-mx27.h" | 42 | #include "iomux-mx27.h" |
43 | #include "ulpi.h" | ||
44 | 44 | ||
45 | static const int eukrea_cpuimx27_pins[] __initconst = { | 45 | static const int eukrea_cpuimx27_pins[] __initconst = { |
46 | /* UART1 */ | 46 | /* UART1 */ |
diff --git a/arch/arm/mach-imx/mach-mx27_3ds.c b/arch/arm/mach-imx/mach-mx27_3ds.c index 5f78bb2dc84c..a54df771c23c 100644 --- a/arch/arm/mach-imx/mach-mx27_3ds.c +++ b/arch/arm/mach-imx/mach-mx27_3ds.c | |||
@@ -37,12 +37,12 @@ | |||
37 | #include <asm/mach/arch.h> | 37 | #include <asm/mach/arch.h> |
38 | #include <asm/mach/time.h> | 38 | #include <asm/mach/time.h> |
39 | #include <mach/hardware.h> | 39 | #include <mach/hardware.h> |
40 | #include <mach/ulpi.h> | ||
41 | 40 | ||
42 | #include "3ds_debugboard.h" | 41 | #include "3ds_debugboard.h" |
43 | #include "common.h" | 42 | #include "common.h" |
44 | #include "devices-imx27.h" | 43 | #include "devices-imx27.h" |
45 | #include "iomux-mx27.h" | 44 | #include "iomux-mx27.h" |
45 | #include "ulpi.h" | ||
46 | 46 | ||
47 | #define SD1_EN_GPIO IMX_GPIO_NR(2, 25) | 47 | #define SD1_EN_GPIO IMX_GPIO_NR(2, 25) |
48 | #define OTG_PHY_RESET_GPIO IMX_GPIO_NR(2, 23) | 48 | #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 ee6a3f300a1e..5377c88c9ceb 100644 --- a/arch/arm/mach-imx/mach-mx31_3ds.c +++ b/arch/arm/mach-imx/mach-mx31_3ds.c | |||
@@ -37,12 +37,12 @@ | |||
37 | #include <asm/memory.h> | 37 | #include <asm/memory.h> |
38 | #include <asm/mach/map.h> | 38 | #include <asm/mach/map.h> |
39 | #include <asm/memblock.h> | 39 | #include <asm/memblock.h> |
40 | #include <mach/ulpi.h> | ||
41 | 40 | ||
42 | #include "3ds_debugboard.h" | 41 | #include "3ds_debugboard.h" |
43 | #include "common.h" | 42 | #include "common.h" |
44 | #include "devices-imx31.h" | 43 | #include "devices-imx31.h" |
45 | #include "iomux-mx3.h" | 44 | #include "iomux-mx3.h" |
45 | #include "ulpi.h" | ||
46 | 46 | ||
47 | static int mx31_3ds_pins[] = { | 47 | static int mx31_3ds_pins[] = { |
48 | /* UART1 */ | 48 | /* UART1 */ |
diff --git a/arch/arm/mach-imx/mach-mx31lilly.c b/arch/arm/mach-imx/mach-mx31lilly.c index 15d26a0390d2..74b5fa9bc667 100644 --- a/arch/arm/mach-imx/mach-mx31lilly.c +++ b/arch/arm/mach-imx/mach-mx31lilly.c | |||
@@ -43,12 +43,12 @@ | |||
43 | #include <asm/mach/map.h> | 43 | #include <asm/mach/map.h> |
44 | 44 | ||
45 | #include <mach/hardware.h> | 45 | #include <mach/hardware.h> |
46 | #include <mach/ulpi.h> | ||
47 | 46 | ||
48 | #include "board-mx31lilly.h" | 47 | #include "board-mx31lilly.h" |
49 | #include "common.h" | 48 | #include "common.h" |
50 | #include "devices-imx31.h" | 49 | #include "devices-imx31.h" |
51 | #include "iomux-mx3.h" | 50 | #include "iomux-mx3.h" |
51 | #include "ulpi.h" | ||
52 | 52 | ||
53 | /* | 53 | /* |
54 | * This file contains module-specific initialization routines for LILLY-1131. | 54 | * 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 ef8d28f6b29d..6d6b69854033 100644 --- a/arch/arm/mach-imx/mach-mx31lite.c +++ b/arch/arm/mach-imx/mach-mx31lite.c | |||
@@ -40,12 +40,12 @@ | |||
40 | #include <asm/setup.h> | 40 | #include <asm/setup.h> |
41 | 41 | ||
42 | #include <mach/hardware.h> | 42 | #include <mach/hardware.h> |
43 | #include <mach/ulpi.h> | ||
44 | 43 | ||
45 | #include "board-mx31lite.h" | 44 | #include "board-mx31lite.h" |
46 | #include "common.h" | 45 | #include "common.h" |
47 | #include "devices-imx31.h" | 46 | #include "devices-imx31.h" |
48 | #include "iomux-mx3.h" | 47 | #include "iomux-mx3.h" |
48 | #include "ulpi.h" | ||
49 | 49 | ||
50 | /* | 50 | /* |
51 | * This file contains the module-specific initialization routines. | 51 | * 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 955275bbbc8a..e719c767bf68 100644 --- a/arch/arm/mach-imx/mach-mx31moboard.c +++ b/arch/arm/mach-imx/mach-mx31moboard.c | |||
@@ -43,13 +43,13 @@ | |||
43 | #include <asm/mach/map.h> | 43 | #include <asm/mach/map.h> |
44 | #include <asm/memblock.h> | 44 | #include <asm/memblock.h> |
45 | #include <mach/hardware.h> | 45 | #include <mach/hardware.h> |
46 | #include <mach/ulpi.h> | ||
47 | #include <linux/platform_data/asoc-imx-ssi.h> | 46 | #include <linux/platform_data/asoc-imx-ssi.h> |
48 | 47 | ||
49 | #include "board-mx31moboard.h" | 48 | #include "board-mx31moboard.h" |
50 | #include "common.h" | 49 | #include "common.h" |
51 | #include "devices-imx31.h" | 50 | #include "devices-imx31.h" |
52 | #include "iomux-mx3.h" | 51 | #include "iomux-mx3.h" |
52 | #include "ulpi.h" | ||
53 | 53 | ||
54 | static unsigned int moboard_pins[] = { | 54 | static unsigned int moboard_pins[] = { |
55 | /* UART0 */ | 55 | /* UART0 */ |
diff --git a/arch/arm/mach-imx/mach-pca100.c b/arch/arm/mach-imx/mach-pca100.c index 826d326bdcd2..743d7e94f53b 100644 --- a/arch/arm/mach-imx/mach-pca100.c +++ b/arch/arm/mach-imx/mach-pca100.c | |||
@@ -34,11 +34,11 @@ | |||
34 | #include <asm/mach-types.h> | 34 | #include <asm/mach-types.h> |
35 | #include <mach/hardware.h> | 35 | #include <mach/hardware.h> |
36 | #include <asm/mach/time.h> | 36 | #include <asm/mach/time.h> |
37 | #include <mach/ulpi.h> | ||
38 | 37 | ||
39 | #include "common.h" | 38 | #include "common.h" |
40 | #include "devices-imx27.h" | 39 | #include "devices-imx27.h" |
41 | #include "iomux-mx27.h" | 40 | #include "iomux-mx27.h" |
41 | #include "ulpi.h" | ||
42 | 42 | ||
43 | #define OTG_PHY_CS_GPIO (GPIO_PORTB + 23) | 43 | #define OTG_PHY_CS_GPIO (GPIO_PORTB + 23) |
44 | #define USBH2_PHY_CS_GPIO (GPIO_PORTB + 24) | 44 | #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 59d227470d52..525f057a11a5 100644 --- a/arch/arm/mach-imx/mach-pcm037.c +++ b/arch/arm/mach-imx/mach-pcm037.c | |||
@@ -43,12 +43,12 @@ | |||
43 | #include <asm/mach/map.h> | 43 | #include <asm/mach/map.h> |
44 | #include <asm/memblock.h> | 44 | #include <asm/memblock.h> |
45 | #include <mach/hardware.h> | 45 | #include <mach/hardware.h> |
46 | #include <mach/ulpi.h> | ||
47 | 46 | ||
48 | #include "common.h" | 47 | #include "common.h" |
49 | #include "devices-imx31.h" | 48 | #include "devices-imx31.h" |
50 | #include "iomux-mx3.h" | 49 | #include "iomux-mx3.h" |
51 | #include "pcm037.h" | 50 | #include "pcm037.h" |
51 | #include "ulpi.h" | ||
52 | 52 | ||
53 | static enum pcm037_board_variant pcm037_instance = PCM037_PCM970; | 53 | static enum pcm037_board_variant pcm037_instance = PCM037_PCM970; |
54 | 54 | ||
diff --git a/arch/arm/mach-imx/mach-pcm038.c b/arch/arm/mach-imx/mach-pcm038.c index 9ebc248791ef..4a5234003f39 100644 --- a/arch/arm/mach-imx/mach-pcm038.c +++ b/arch/arm/mach-imx/mach-pcm038.c | |||
@@ -34,12 +34,12 @@ | |||
34 | #include <asm/mach/time.h> | 34 | #include <asm/mach/time.h> |
35 | 35 | ||
36 | #include <mach/hardware.h> | 36 | #include <mach/hardware.h> |
37 | #include <mach/ulpi.h> | ||
38 | 37 | ||
39 | #include "board-pcm038.h" | 38 | #include "board-pcm038.h" |
40 | #include "common.h" | 39 | #include "common.h" |
41 | #include "devices-imx27.h" | 40 | #include "devices-imx27.h" |
42 | #include "iomux-mx27.h" | 41 | #include "iomux-mx27.h" |
42 | #include "ulpi.h" | ||
43 | 43 | ||
44 | static const int pcm038_pins[] __initconst = { | 44 | static const int pcm038_pins[] __initconst = { |
45 | /* UART1 */ | 45 | /* UART1 */ |
diff --git a/arch/arm/mach-imx/mach-pcm043.c b/arch/arm/mach-imx/mach-pcm043.c index 285ac8bbb609..54ac94770b7d 100644 --- a/arch/arm/mach-imx/mach-pcm043.c +++ b/arch/arm/mach-imx/mach-pcm043.c | |||
@@ -34,11 +34,11 @@ | |||
34 | #include <asm/mach/map.h> | 34 | #include <asm/mach/map.h> |
35 | 35 | ||
36 | #include <mach/hardware.h> | 36 | #include <mach/hardware.h> |
37 | #include <mach/ulpi.h> | ||
38 | 37 | ||
39 | #include "common.h" | 38 | #include "common.h" |
40 | #include "devices-imx35.h" | 39 | #include "devices-imx35.h" |
41 | #include "iomux-mx35.h" | 40 | #include "iomux-mx35.h" |
41 | #include "ulpi.h" | ||
42 | 42 | ||
43 | static const struct fb_videomode fb_modedb[] = { | 43 | static const struct fb_videomode fb_modedb[] = { |
44 | { | 44 | { |
diff --git a/arch/arm/mach-imx/mx31moboard-devboard.c b/arch/arm/mach-imx/mx31moboard-devboard.c index 527f1739b0a7..6489afc85de8 100644 --- a/arch/arm/mach-imx/mx31moboard-devboard.c +++ b/arch/arm/mach-imx/mx31moboard-devboard.c | |||
@@ -23,11 +23,11 @@ | |||
23 | #include <linux/usb/otg.h> | 23 | #include <linux/usb/otg.h> |
24 | 24 | ||
25 | #include <mach/hardware.h> | 25 | #include <mach/hardware.h> |
26 | #include <mach/ulpi.h> | ||
27 | 26 | ||
28 | #include "common.h" | 27 | #include "common.h" |
29 | #include "devices-imx31.h" | 28 | #include "devices-imx31.h" |
30 | #include "iomux-mx3.h" | 29 | #include "iomux-mx3.h" |
30 | #include "ulpi.h" | ||
31 | 31 | ||
32 | static unsigned int devboard_pins[] = { | 32 | static unsigned int devboard_pins[] = { |
33 | /* UART1 */ | 33 | /* UART1 */ |
diff --git a/arch/arm/mach-imx/mx31moboard-marxbot.c b/arch/arm/mach-imx/mx31moboard-marxbot.c index 4679309c2ab9..ea973c46f8e1 100644 --- a/arch/arm/mach-imx/mx31moboard-marxbot.c +++ b/arch/arm/mach-imx/mx31moboard-marxbot.c | |||
@@ -25,13 +25,13 @@ | |||
25 | #include <linux/usb/otg.h> | 25 | #include <linux/usb/otg.h> |
26 | 26 | ||
27 | #include <mach/hardware.h> | 27 | #include <mach/hardware.h> |
28 | #include <mach/ulpi.h> | ||
29 | 28 | ||
30 | #include <media/soc_camera.h> | 29 | #include <media/soc_camera.h> |
31 | 30 | ||
32 | #include "common.h" | 31 | #include "common.h" |
33 | #include "devices-imx31.h" | 32 | #include "devices-imx31.h" |
34 | #include "iomux-mx3.h" | 33 | #include "iomux-mx3.h" |
34 | #include "ulpi.h" | ||
35 | 35 | ||
36 | static unsigned int marxbot_pins[] = { | 36 | static unsigned int marxbot_pins[] = { |
37 | /* SDHC2 */ | 37 | /* SDHC2 */ |
diff --git a/arch/arm/mach-imx/mx31moboard-smartbot.c b/arch/arm/mach-imx/mx31moboard-smartbot.c index afb4d054fb08..807e88274e13 100644 --- a/arch/arm/mach-imx/mx31moboard-smartbot.c +++ b/arch/arm/mach-imx/mx31moboard-smartbot.c | |||
@@ -24,7 +24,6 @@ | |||
24 | #include <linux/usb/ulpi.h> | 24 | #include <linux/usb/ulpi.h> |
25 | 25 | ||
26 | #include <mach/hardware.h> | 26 | #include <mach/hardware.h> |
27 | #include <mach/ulpi.h> | ||
28 | 27 | ||
29 | #include <media/soc_camera.h> | 28 | #include <media/soc_camera.h> |
30 | 29 | ||
@@ -32,6 +31,7 @@ | |||
32 | #include "common.h" | 31 | #include "common.h" |
33 | #include "devices-imx31.h" | 32 | #include "devices-imx31.h" |
34 | #include "iomux-mx3.h" | 33 | #include "iomux-mx3.h" |
34 | #include "ulpi.h" | ||
35 | 35 | ||
36 | static unsigned int smartbot_pins[] = { | 36 | static unsigned int smartbot_pins[] = { |
37 | /* UART1 */ | 37 | /* UART1 */ |
diff --git a/arch/arm/mach-imx/ulpi.c b/arch/arm/mach-imx/ulpi.c index d2963427184f..0f051957d10c 100644 --- a/arch/arm/mach-imx/ulpi.c +++ b/arch/arm/mach-imx/ulpi.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #include <linux/usb/otg.h> | 24 | #include <linux/usb/otg.h> |
25 | #include <linux/usb/ulpi.h> | 25 | #include <linux/usb/ulpi.h> |
26 | 26 | ||
27 | #include <mach/ulpi.h> | 27 | #include "ulpi.h" |
28 | 28 | ||
29 | /* ULPIVIEW register bits */ | 29 | /* ULPIVIEW register bits */ |
30 | #define ULPIVW_WU (1 << 31) /* Wakeup */ | 30 | #define ULPIVW_WU (1 << 31) /* Wakeup */ |
diff --git a/arch/arm/mach-imx/include/mach/ulpi.h b/arch/arm/mach-imx/ulpi.h index 42bdaca6d7d9..42bdaca6d7d9 100644 --- a/arch/arm/mach-imx/include/mach/ulpi.h +++ b/arch/arm/mach-imx/ulpi.h | |||