summaryrefslogtreecommitdiff
path: root/arch/arm/cpu/pxa
diff options
context:
space:
mode:
authorMarek Vasut <marek.vasut@gmail.com>2009-11-28 13:57:43 +0100
committerMarek Vasut <marek.vasut@gmail.com>2010-07-14 22:41:39 +0200
commit8c35d0c570e8776d316cfca92e42d14de1ab77d9 (patch)
tree19b059500cdeaa0663993dd6b673402a285f2afe /arch/arm/cpu/pxa
parentd6f324d03d7829a1da1dee8b60f91b173a3976f0 (diff)
downloadu-boot-imx-8c35d0c570e8776d316cfca92e42d14de1ab77d9.zip
u-boot-imx-8c35d0c570e8776d316cfca92e42d14de1ab77d9.tar.gz
u-boot-imx-8c35d0c570e8776d316cfca92e42d14de1ab77d9.tar.bz2
Enable PXAFB for PXA27X and PXA3XX
Diffstat (limited to 'arch/arm/cpu/pxa')
-rw-r--r--arch/arm/cpu/pxa/pxafb.c9
1 files changed, 8 insertions, 1 deletions
diff --git a/arch/arm/cpu/pxa/pxafb.c b/arch/arm/cpu/pxa/pxafb.c
index d56c5f0..1cb78f0 100644
--- a/arch/arm/cpu/pxa/pxafb.c
+++ b/arch/arm/cpu/pxa/pxafb.c
@@ -292,7 +292,9 @@ static int pxafb_init_mem (void *lcdbase, vidinfo_t *vid)
return 0;
}
-
+#ifdef CONFIG_CPU_MONAHANS
+static inline void pxafb_setup_gpio (vidinfo_t *vid) {}
+#else
static void pxafb_setup_gpio (vidinfo_t *vid)
{
u_long lccr0;
@@ -349,6 +351,7 @@ static void pxafb_setup_gpio (vidinfo_t *vid)
printf("pxafb_setup_gpio: unable to determine bits per pixel\n");
}
}
+#endif
static void pxafb_enable_controller (vidinfo_t *vid)
{
@@ -363,7 +366,11 @@ static void pxafb_enable_controller (vidinfo_t *vid)
FDADR1 = vid->pxa.fdadr1;
LCCR0 |= LCCR0_ENB;
+#ifdef CONFIG_CPU_MONAHANS
+ CKENA |= CKENA_1_LCD;
+#else
CKEN |= CKEN16_LCD;
+#endif
debug("FDADR0 = 0x%08x\n", (unsigned int)FDADR0);
debug("FDADR1 = 0x%08x\n", (unsigned int)FDADR1);