diff options
-rw-r--r-- | arch/arm/mach-pxa/corgi.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/devices.h | 11 | ||||
-rw-r--r-- | arch/arm/mach-pxa/generic.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/generic.h | 11 | ||||
-rw-r--r-- | arch/arm/mach-pxa/idp.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/lpd270.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/lubbock.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/mainstone.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/poodle.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/pxa25x.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/pxa27x.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/spitz.c | 1 | ||||
-rw-r--r-- | arch/arm/mach-pxa/tosa.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-pxa/trizeps4.c | 1 |
14 files changed, 23 insertions, 12 deletions
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c index a12eb18391b1..aab27297b3c6 100644 --- a/arch/arm/mach-pxa/corgi.c +++ b/arch/arm/mach-pxa/corgi.c | |||
@@ -44,6 +44,7 @@ | |||
44 | #include <asm/hardware/scoop.h> | 44 | #include <asm/hardware/scoop.h> |
45 | 45 | ||
46 | #include "generic.h" | 46 | #include "generic.h" |
47 | #include "devices.h" | ||
47 | #include "sharpsl.h" | 48 | #include "sharpsl.h" |
48 | 49 | ||
49 | 50 | ||
diff --git a/arch/arm/mach-pxa/devices.h b/arch/arm/mach-pxa/devices.h new file mode 100644 index 000000000000..9a6faff8e5a7 --- /dev/null +++ b/arch/arm/mach-pxa/devices.h | |||
@@ -0,0 +1,11 @@ | |||
1 | extern struct platform_device pxamci_device; | ||
2 | extern struct platform_device pxaudc_device; | ||
3 | extern struct platform_device pxafb_device; | ||
4 | extern struct platform_device ffuart_device; | ||
5 | extern struct platform_device btuart_device; | ||
6 | extern struct platform_device stuart_device; | ||
7 | extern struct platform_device hwuart_device; | ||
8 | extern struct platform_device pxai2c_device; | ||
9 | extern struct platform_device pxai2s_device; | ||
10 | extern struct platform_device pxaficp_device; | ||
11 | extern struct platform_device pxartc_device; | ||
diff --git a/arch/arm/mach-pxa/generic.c b/arch/arm/mach-pxa/generic.c index a496e498ef57..296539b6359c 100644 --- a/arch/arm/mach-pxa/generic.c +++ b/arch/arm/mach-pxa/generic.c | |||
@@ -43,6 +43,7 @@ | |||
43 | #include <asm/arch/irda.h> | 43 | #include <asm/arch/irda.h> |
44 | #include <asm/arch/i2c.h> | 44 | #include <asm/arch/i2c.h> |
45 | 45 | ||
46 | #include "devices.h" | ||
46 | #include "generic.h" | 47 | #include "generic.h" |
47 | 48 | ||
48 | /* | 49 | /* |
diff --git a/arch/arm/mach-pxa/generic.h b/arch/arm/mach-pxa/generic.h index b9b96ec4b9bc..91ab2ad8b34b 100644 --- a/arch/arm/mach-pxa/generic.h +++ b/arch/arm/mach-pxa/generic.h | |||
@@ -26,14 +26,3 @@ extern unsigned int get_clk_frequency_khz(int info); | |||
26 | mi->bank[__nr].size = (__size), \ | 26 | mi->bank[__nr].size = (__size), \ |
27 | mi->bank[__nr].node = (((unsigned)(__start) - PHYS_OFFSET) >> 27) | 27 | mi->bank[__nr].node = (((unsigned)(__start) - PHYS_OFFSET) >> 27) |
28 | 28 | ||
29 | extern struct platform_device pxamci_device; | ||
30 | extern struct platform_device pxaudc_device; | ||
31 | extern struct platform_device pxafb_device; | ||
32 | extern struct platform_device ffuart_device; | ||
33 | extern struct platform_device btuart_device; | ||
34 | extern struct platform_device stuart_device; | ||
35 | extern struct platform_device hwuart_device; | ||
36 | extern struct platform_device pxai2c_device; | ||
37 | extern struct platform_device pxai2s_device; | ||
38 | extern struct platform_device pxaficp_device; | ||
39 | extern struct platform_device pxartc_device; | ||
diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c index ffa73fae3d8d..465108da2851 100644 --- a/arch/arm/mach-pxa/idp.c +++ b/arch/arm/mach-pxa/idp.c | |||
@@ -38,6 +38,7 @@ | |||
38 | #include <asm/arch/mmc.h> | 38 | #include <asm/arch/mmc.h> |
39 | 39 | ||
40 | #include "generic.h" | 40 | #include "generic.h" |
41 | #include "devices.h" | ||
41 | 42 | ||
42 | /* TODO: | 43 | /* TODO: |
43 | * - add pxa2xx_audio_ops_t device structure | 44 | * - add pxa2xx_audio_ops_t device structure |
diff --git a/arch/arm/mach-pxa/lpd270.c b/arch/arm/mach-pxa/lpd270.c index 7949f60d7d7f..26116440a7c9 100644 --- a/arch/arm/mach-pxa/lpd270.c +++ b/arch/arm/mach-pxa/lpd270.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include <asm/arch/ohci.h> | 46 | #include <asm/arch/ohci.h> |
47 | 47 | ||
48 | #include "generic.h" | 48 | #include "generic.h" |
49 | #include "devices.h" | ||
49 | 50 | ||
50 | 51 | ||
51 | static unsigned int lpd270_irq_enabled; | 52 | static unsigned int lpd270_irq_enabled; |
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c index 45a3c7e635b5..e70048fd00a5 100644 --- a/arch/arm/mach-pxa/lubbock.c +++ b/arch/arm/mach-pxa/lubbock.c | |||
@@ -48,6 +48,7 @@ | |||
48 | #include <asm/arch/mmc.h> | 48 | #include <asm/arch/mmc.h> |
49 | 49 | ||
50 | #include "generic.h" | 50 | #include "generic.h" |
51 | #include "devices.h" | ||
51 | 52 | ||
52 | 53 | ||
53 | #define LUB_MISC_WR __LUB_REG(LUBBOCK_FPGA_PHYS + 0x080) | 54 | #define LUB_MISC_WR __LUB_REG(LUBBOCK_FPGA_PHYS + 0x080) |
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index 086b4e2f5bef..b02c79c7e6a3 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c | |||
@@ -46,6 +46,7 @@ | |||
46 | #include <asm/arch/ohci.h> | 46 | #include <asm/arch/ohci.h> |
47 | 47 | ||
48 | #include "generic.h" | 48 | #include "generic.h" |
49 | #include "devices.h" | ||
49 | 50 | ||
50 | 51 | ||
51 | static unsigned long mainstone_irq_enabled; | 52 | static unsigned long mainstone_irq_enabled; |
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c index 53eaccfd6da7..655668d4d0e9 100644 --- a/arch/arm/mach-pxa/poodle.c +++ b/arch/arm/mach-pxa/poodle.c | |||
@@ -45,6 +45,7 @@ | |||
45 | #include <asm/mach/sharpsl_param.h> | 45 | #include <asm/mach/sharpsl_param.h> |
46 | 46 | ||
47 | #include "generic.h" | 47 | #include "generic.h" |
48 | #include "devices.h" | ||
48 | #include "sharpsl.h" | 49 | #include "sharpsl.h" |
49 | 50 | ||
50 | static struct resource poodle_scoop_resources[] = { | 51 | static struct resource poodle_scoop_resources[] = { |
diff --git a/arch/arm/mach-pxa/pxa25x.c b/arch/arm/mach-pxa/pxa25x.c index 72b949bdf658..f36ca448338e 100644 --- a/arch/arm/mach-pxa/pxa25x.c +++ b/arch/arm/mach-pxa/pxa25x.c | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <asm/arch/dma.h> | 29 | #include <asm/arch/dma.h> |
30 | 30 | ||
31 | #include "generic.h" | 31 | #include "generic.h" |
32 | #include "devices.h" | ||
32 | 33 | ||
33 | /* | 34 | /* |
34 | * Various clock factors driven by the CCCR register. | 35 | * Various clock factors driven by the CCCR register. |
diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c index 27fd2fa56eaf..aa5bb02c897b 100644 --- a/arch/arm/mach-pxa/pxa27x.c +++ b/arch/arm/mach-pxa/pxa27x.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include <asm/arch/dma.h> | 26 | #include <asm/arch/dma.h> |
27 | 27 | ||
28 | #include "generic.h" | 28 | #include "generic.h" |
29 | #include "devices.h" | ||
29 | 30 | ||
30 | /* Crystal clock: 13MHz */ | 31 | /* Crystal clock: 13MHz */ |
31 | #define BASE_CLK 13000000 | 32 | #define BASE_CLK 13000000 |
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c index 838b73d159e3..bae47e145de8 100644 --- a/arch/arm/mach-pxa/spitz.c +++ b/arch/arm/mach-pxa/spitz.c | |||
@@ -48,6 +48,7 @@ | |||
48 | #include <asm/hardware/scoop.h> | 48 | #include <asm/hardware/scoop.h> |
49 | 49 | ||
50 | #include "generic.h" | 50 | #include "generic.h" |
51 | #include "devices.h" | ||
51 | #include "sharpsl.h" | 52 | #include "sharpsl.h" |
52 | 53 | ||
53 | /* | 54 | /* |
diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c index 017253466005..240fd042083d 100644 --- a/arch/arm/mach-pxa/tosa.c +++ b/arch/arm/mach-pxa/tosa.c | |||
@@ -42,7 +42,7 @@ | |||
42 | #include <asm/mach/sharpsl_param.h> | 42 | #include <asm/mach/sharpsl_param.h> |
43 | 43 | ||
44 | #include "generic.h" | 44 | #include "generic.h" |
45 | 45 | #include "devices.h" | |
46 | 46 | ||
47 | /* | 47 | /* |
48 | * SCOOP Device | 48 | * SCOOP Device |
diff --git a/arch/arm/mach-pxa/trizeps4.c b/arch/arm/mach-pxa/trizeps4.c index 47a1f7ee2bbb..e4ba43bdf85d 100644 --- a/arch/arm/mach-pxa/trizeps4.c +++ b/arch/arm/mach-pxa/trizeps4.c | |||
@@ -49,6 +49,7 @@ | |||
49 | #include <asm/arch/ohci.h> | 49 | #include <asm/arch/ohci.h> |
50 | 50 | ||
51 | #include "generic.h" | 51 | #include "generic.h" |
52 | #include "devices.h" | ||
52 | 53 | ||
53 | /******************************************************************************************** | 54 | /******************************************************************************************** |
54 | * ONBOARD FLASH | 55 | * ONBOARD FLASH |