git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
arm
/
mach-pxa
/
lubbock.c
diff --git
a/arch/arm/mach-pxa/lubbock.c
b/arch/arm/mach-pxa/lubbock.c
index
4a5cf96
..
28c9677
100644
(file)
--- a/
arch/arm/mach-pxa/lubbock.c
+++ b/
arch/arm/mach-pxa/lubbock.c
@@
-11,11
+11,12
@@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
+#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/device.h>
#include <linux/major.h>
#include <linux/kernel.h>
#include <linux/init.h>
#include <linux/device.h>
#include <linux/major.h>
-#include <linux/f
s
.h>
+#include <linux/f
b
.h>
#include <linux/interrupt.h>
#include <asm/setup.h>
#include <linux/interrupt.h>
#include <asm/setup.h>
@@
-28,12
+29,24
@@
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
#include <asm/mach/map.h>
#include <asm/mach/irq.h>
+#include <asm/arch/lubbock.h>
#include <asm/arch/udc.h>
#include <asm/arch/udc.h>
+#include <asm/arch/pxafb.h>
#include <asm/hardware/sa1111.h>
#include "generic.h"
#include <asm/hardware/sa1111.h>
#include "generic.h"
+void lubbock_set_misc_wr(unsigned int mask, unsigned int set)
+{
+ unsigned long flags;
+
+ local_irq_save(flags);
+ LUB_MISC_WR = (LUB_MISC_WR & ~mask) | (set & mask);
+ local_irq_restore(flags);
+}
+EXPORT_SYMBOL(lubbock_set_misc_wr);
+
static unsigned long lubbock_irq_enabled;
static void lubbock_mask_irq(unsigned int irq)
static unsigned long lubbock_irq_enabled;
static void lubbock_mask_irq(unsigned int irq)
@@
-113,7
+126,7
@@
static struct resource sa1111_resources[] = {
static struct platform_device sa1111_device = {
.name = "sa1111",
static struct platform_device sa1111_device = {
.name = "sa1111",
- .id =
0
,
+ .id =
-1
,
.num_resources = ARRAY_SIZE(sa1111_resources),
.resource = sa1111_resources,
};
.num_resources = ARRAY_SIZE(sa1111_resources),
.resource = sa1111_resources,
};
@@
-138,7
+151,7
@@
static struct resource smc91x_resources[] = {
static struct platform_device smc91x_device = {
.name = "smc91x",
static struct platform_device smc91x_device = {
.name = "smc91x",
- .id =
0
,
+ .id =
-1
,
.num_resources = ARRAY_SIZE(smc91x_resources),
.resource = smc91x_resources,
};
.num_resources = ARRAY_SIZE(smc91x_resources),
.resource = smc91x_resources,
};
@@
-148,9
+161,29
@@
static struct platform_device *devices[] __initdata = {
&smc91x_device,
};
&smc91x_device,
};
+static struct pxafb_mach_info sharp_lm8v31 __initdata = {
+ .pixclock = 270000,
+ .xres = 640,
+ .yres = 480,
+ .bpp = 16,
+ .hsync_len = 1,
+ .left_margin = 3,
+ .right_margin = 3,
+ .vsync_len = 1,
+ .upper_margin = 0,
+ .lower_margin = 0,
+ .sync = FB_SYNC_HOR_HIGH_ACT | FB_SYNC_VERT_HIGH_ACT,
+ .cmap_greyscale = 0,
+ .cmap_inverse = 0,
+ .cmap_static = 0,
+ .lccr0 = LCCR0_SDS,
+ .lccr3 = LCCR3_PCP | LCCR3_Acb(255),
+};
+
static void __init lubbock_init(void)
{
pxa_set_udc_info(&udc_info);
static void __init lubbock_init(void)
{
pxa_set_udc_info(&udc_info);
+ set_pxa_fb_info(&sharp_lm8v31);
(void) platform_add_devices(devices, ARRAY_SIZE(devices));
}
(void) platform_add_devices(devices, ARRAY_SIZE(devices));
}
@@
-187,5
+220,6
@@
MACHINE_START(LUBBOCK, "Intel DBPXA250 Development Platform (aka Lubbock)")
BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
MAPIO(lubbock_map_io)
INITIRQ(lubbock_init_irq)
BOOT_MEM(0xa0000000, 0x40000000, io_p2v(0x40000000))
MAPIO(lubbock_map_io)
INITIRQ(lubbock_init_irq)
+ INITTIME(pxa_init_time)
INIT_MACHINE(lubbock_init)
MACHINE_END
INIT_MACHINE(lubbock_init)
MACHINE_END