git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...
[pandora-kernel.git]
/
arch
/
arm
/
mach-pxa
/
mainstone.c
diff --git
a/arch/arm/mach-pxa/mainstone.c
b/arch/arm/mach-pxa/mainstone.c
index
b307f11
..
8c30197
100644
(file)
--- a/
arch/arm/mach-pxa/mainstone.c
+++ b/
arch/arm/mach-pxa/mainstone.c
@@
-64,14
+64,14
@@
static void mainstone_unmask_irq(unsigned int irq)
MST_INTMSKENA = (mainstone_irq_enabled |= (1 << mainstone_irq));
}
MST_INTMSKENA = (mainstone_irq_enabled |= (1 << mainstone_irq));
}
-static struct irqchip mainstone_irq_chip = {
+static struct irq_chip mainstone_irq_chip = {
+ .name = "FPGA",
.ack = mainstone_mask_irq,
.mask = mainstone_mask_irq,
.unmask = mainstone_unmask_irq,
};
.ack = mainstone_mask_irq,
.mask = mainstone_mask_irq,
.unmask = mainstone_unmask_irq,
};
-static void mainstone_irq_handler(unsigned int irq, struct irqdesc *desc,
- struct pt_regs *regs)
+static void mainstone_irq_handler(unsigned int irq, struct irqdesc *desc)
{
unsigned long pending = MST_INTSETCLR & mainstone_irq_enabled;
do {
{
unsigned long pending = MST_INTSETCLR & mainstone_irq_enabled;
do {
@@
-79,7
+79,7
@@
static void mainstone_irq_handler(unsigned int irq, struct irqdesc *desc,
if (likely(pending)) {
irq = MAINSTONE_IRQ(0) + __ffs(pending);
desc = irq_desc + irq;
if (likely(pending)) {
irq = MAINSTONE_IRQ(0) + __ffs(pending);
desc = irq_desc + irq;
- desc_handle_irq(irq, desc
, regs
);
+ desc_handle_irq(irq, desc);
}
pending = MST_INTSETCLR & mainstone_irq_enabled;
} while (pending);
}
pending = MST_INTSETCLR & mainstone_irq_enabled;
} while (pending);
@@
-278,7
+278,7
@@
static void mainstone_backlight_power(int on)
}
}
}
}
-static struct pxafb_m
ach_info toshiba_ltm04c380k __initdata
= {
+static struct pxafb_m
ode_info toshiba_ltm04c380k_mode
= {
.pixclock = 50000,
.xres = 640,
.yres = 480,
.pixclock = 50000,
.xres = 640,
.yres = 480,
@@
-290,12
+290,9
@@
static struct pxafb_mach_info toshiba_ltm04c380k __initdata = {
.upper_margin = 0,
.lower_margin = 0,
.sync = FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT,
.upper_margin = 0,
.lower_margin = 0,
.sync = FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT,
- .lccr0 = LCCR0_Act,
- .lccr3 = LCCR3_PCP,
- .pxafb_backlight_power = mainstone_backlight_power,
};
};
-static struct pxafb_m
ach_info toshiba_ltm035a776c __initdata
= {
+static struct pxafb_m
ode_info toshiba_ltm035a776c_mode
= {
.pixclock = 110000,
.xres = 240,
.yres = 320,
.pixclock = 110000,
.xres = 240,
.yres = 320,
@@
-307,12
+304,16
@@
static struct pxafb_mach_info toshiba_ltm035a776c __initdata = {
.upper_margin = 1,
.lower_margin = 10,
.sync = FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT,
.upper_margin = 1,
.lower_margin = 10,
.sync = FB_SYNC_HOR_HIGH_ACT|FB_SYNC_VERT_HIGH_ACT,
+};
+
+static struct pxafb_mach_info mainstone_pxafb_info = {
+ .num_modes = 1,
.lccr0 = LCCR0_Act,
.lccr3 = LCCR3_PCP,
.pxafb_backlight_power = mainstone_backlight_power,
};
.lccr0 = LCCR0_Act,
.lccr3 = LCCR3_PCP,
.pxafb_backlight_power = mainstone_backlight_power,
};
-static int mainstone_mci_init(struct device *dev, irqreturn_t (*mstone_detect_int)(int, void *
, struct pt_regs *
), void *data)
+static int mainstone_mci_init(struct device *dev, irqreturn_t (*mstone_detect_int)(int, void *), void *data)
{
int err;
{
int err;
@@
-331,7
+332,7
@@
static int mainstone_mci_init(struct device *dev, irqreturn_t (*mstone_detect_in
*/
MST_MSCWR1 &= ~MST_MSCWR1_MS_SEL;
*/
MST_MSCWR1 &= ~MST_MSCWR1_MS_SEL;
- err = request_irq(MAINSTONE_MMC_IRQ, mstone_detect_int,
SA_INTERRUPT
,
+ err = request_irq(MAINSTONE_MMC_IRQ, mstone_detect_int,
IRQF_DISABLED
,
"MMC card detect", data);
if (err) {
printk(KERN_ERR "mainstone_mci_init: MMC/SD: can't request MMC card detect IRQ\n");
"MMC card detect", data);
if (err) {
printk(KERN_ERR "mainstone_mci_init: MMC/SD: can't request MMC card detect IRQ\n");
@@
-447,9
+448,11
@@
static void __init mainstone_init(void)
/* reading Mainstone's "Virtual Configuration Register"
might be handy to select LCD type here */
if (0)
/* reading Mainstone's "Virtual Configuration Register"
might be handy to select LCD type here */
if (0)
-
set_pxa_fb_info(&toshiba_ltm04c380k)
;
+
mainstone_pxafb_info.modes = &toshiba_ltm04c380k_mode
;
else
else
- set_pxa_fb_info(&toshiba_ltm035a776c);
+ mainstone_pxafb_info.modes = &toshiba_ltm035a776c_mode;
+
+ set_pxa_fb_info(&mainstone_pxafb_info);
pxa_set_mci_info(&mainstone_mci_platform_data);
pxa_set_ficp_info(&mainstone_ficp_platform_data);
pxa_set_mci_info(&mainstone_mci_platform_data);
pxa_set_ficp_info(&mainstone_ficp_platform_data);