Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit be680c71 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'next-footbridge' of git://aeryn.fluff.org.uk/bjdooks/linux

parents d8f2f180 0dc6c490

arch/arm/kernel/isa.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/fs.h>

#include <linux/sysctl.h>

#include <linux/init.h>

#include <linux/io.h>



static unsigned int isa_membase, isa_portbase, isa_portshift;

arch/arm/mach-footbridge/common.c

+0 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 


#include "common.h"



extern void __init isa_init_irq(unsigned int irq);



unsigned int mem_fclk_21285 = 50000000;



EXPORT_SYMBOL(mem_fclk_21285);

arch/arm/mach-footbridge/common.h

+1 −0
Original line number Diff line number Diff line
@@ -7,3 +7,4 @@ extern void isa_rtc_init(void); 
extern void footbridge_map_io(void);

extern void footbridge_init_irq(void);



extern void isa_init_irq(unsigned int irq);

arch/arm/mach-footbridge/dc21285.c

+13 −10
Original line number Diff line number Diff line
@@ -287,6 +287,9 @@ struct pci_bus * __init dc21285_scan_bus(int nr, struct pci_sys_data *sys) 
	return pci_scan_bus(0, &dc21285_ops, sys);

}



#define dc21285_request_irq(_a, _b, _c, _d, _e) \

	WARN_ON(request_irq(_a, _b, _c, _d, _e) < 0)



void __init dc21285_preinit(void)

{

	unsigned int mem_size, mem_mask;
@@ -335,15 +338,15 @@ void __init dc21285_preinit(void) 
	/*

	 * We don't care if these fail.

	 */

	request_irq(IRQ_PCI_SERR, dc21285_serr_irq, IRQF_DISABLED,

	dc21285_request_irq(IRQ_PCI_SERR, dc21285_serr_irq, IRQF_DISABLED,

			    "PCI system error", &serr_timer);

	request_irq(IRQ_PCI_PERR, dc21285_parity_irq, IRQF_DISABLED,

	dc21285_request_irq(IRQ_PCI_PERR, dc21285_parity_irq, IRQF_DISABLED,

			    "PCI parity error", &perr_timer);

	request_irq(IRQ_PCI_ABORT, dc21285_abort_irq, IRQF_DISABLED,

	dc21285_request_irq(IRQ_PCI_ABORT, dc21285_abort_irq, IRQF_DISABLED,

			    "PCI abort", NULL);

	request_irq(IRQ_DISCARD_TIMER, dc21285_discard_irq, IRQF_DISABLED,

	dc21285_request_irq(IRQ_DISCARD_TIMER, dc21285_discard_irq, IRQF_DISABLED,

			    "Discard timer", NULL);

	request_irq(IRQ_PCI_DPERR, dc21285_dparity_irq, IRQF_DISABLED,

	dc21285_request_irq(IRQ_PCI_DPERR, dc21285_dparity_irq, IRQF_DISABLED,

			    "PCI data parity", NULL);



	if (cfn_mode) {

arch/arm/mach-footbridge/isa-irq.c

+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ 
#include <asm/irq.h>

#include <asm/mach-types.h>



#include "common.h"



static void isa_mask_pic_lo_irq(unsigned int irq)

{

	unsigned int mask = 1 << (irq & 7);