aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-pxa/am200epd.c15
-rw-r--r--arch/arm/mach-pxa/gumstix.c7
2 files changed, 15 insertions, 7 deletions
diff --git a/arch/arm/mach-pxa/am200epd.c b/arch/arm/mach-pxa/am200epd.c
index b965085a37b9..3a4f8d855a52 100644
--- a/arch/arm/mach-pxa/am200epd.c
+++ b/arch/arm/mach-pxa/am200epd.c
@@ -30,8 +30,12 @@
30#include <linux/irq.h> 30#include <linux/irq.h>
31#include <linux/gpio.h> 31#include <linux/gpio.h>
32 32
33#include <mach/gumstix.h>
34#include <mach/mfp-pxa25x.h>
33#include <mach/pxafb.h> 35#include <mach/pxafb.h>
34 36
37#include "generic.h"
38
35#include <video/metronomefb.h> 39#include <video/metronomefb.h>
36 40
37static unsigned int panel_type = 6; 41static unsigned int panel_type = 6;
@@ -331,6 +335,15 @@ static struct metronome_board am200_board = {
331 .cleanup = am200_cleanup, 335 .cleanup = am200_cleanup,
332}; 336};
333 337
338static unsigned long am200_pin_config[] __initdata = {
339 GPIO51_GPIO,
340 GPIO49_GPIO,
341 GPIO48_GPIO,
342 GPIO32_GPIO,
343 GPIO17_GPIO,
344 GPIO16_GPIO,
345};
346
334static int __init am200_init(void) 347static int __init am200_init(void)
335{ 348{
336 int ret; 349 int ret;
@@ -339,6 +352,8 @@ static int __init am200_init(void)
339 * creation events */ 352 * creation events */
340 fb_register_client(&am200_fb_notif); 353 fb_register_client(&am200_fb_notif);
341 354
355 pxa2xx_mfp_config(ARRAY_AND_SIZE(am200_pin_config));
356
342 /* request our platform independent driver */ 357 /* request our platform independent driver */
343 request_module("metronomefb"); 358 request_module("metronomefb");
344 359
diff --git a/arch/arm/mach-pxa/gumstix.c b/arch/arm/mach-pxa/gumstix.c
index d8962a0fb98d..06bc6674b015 100644
--- a/arch/arm/mach-pxa/gumstix.c
+++ b/arch/arm/mach-pxa/gumstix.c
@@ -184,13 +184,6 @@ static unsigned long gumstix_pin_config[] __initdata = {
184 GPIO6_MMC_CLK, 184 GPIO6_MMC_CLK,
185 GPIO53_MMC_CLK, 185 GPIO53_MMC_CLK,
186 GPIO8_MMC_CS0, 186 GPIO8_MMC_CS0,
187 /* these are used by AM200EPD */
188 GPIO51_GPIO,
189 GPIO49_GPIO,
190 GPIO48_GPIO,
191 GPIO32_GPIO,
192 GPIO17_GPIO,
193 GPIO16_GPIO,
194}; 187};
195 188
196static void __init gumstix_init(void) 189static void __init gumstix_init(void)