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

Commit 8328255f authored by Zubair Lutfullah Kakakhel's avatar Zubair Lutfullah Kakakhel Committed by Marc Zyngier
Browse files

powerpc/virtex: Use generic xilinx irqchip driver 



The Xilinx interrupt controller driver is now available in drivers/irqchip.
Switch to using that driver.

Acked-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Acked-by: default avatarMichal Simek <michal.simek@xilinx.com>
Signed-off-by: default avatarZubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent 8a11da59

arch/powerpc/include/asm/xilinx_intc.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#ifdef __KERNEL__



extern void __init xilinx_intc_init_tree(void);

extern unsigned int xilinx_intc_get_irq(void);

extern unsigned int xintc_get_irq(void);



#endif /* __KERNEL__ */

#endif /* _ASM_POWERPC_XILINX_INTC_H */

arch/powerpc/platforms/40x/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ config XILINX_VIRTEX_GENERIC_BOARD 
	default n

	select XILINX_VIRTEX_II_PRO

	select XILINX_VIRTEX_4_FX

	select XILINX_INTC

	help

	  This option enables generic support for Xilinx Virtex based boards.

arch/powerpc/platforms/40x/virtex.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ define_machine(virtex) { 
	.probe			= virtex_probe,

	.setup_arch		= xilinx_pci_init,

	.init_IRQ		= xilinx_intc_init_tree,

	.get_irq		= xilinx_intc_get_irq,

	.get_irq		= xintc_get_irq,

	.restart		= ppc4xx_reset_system,

	.calibrate_decr		= generic_calibrate_decr,

};

arch/powerpc/platforms/44x/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -241,6 +241,7 @@ config XILINX_VIRTEX440_GENERIC_BOARD 
	depends on 44x

	default n

	select XILINX_VIRTEX_5_FXT

	select XILINX_INTC

	help

	  This option enables generic support for Xilinx Virtex based boards

	  that use a 440 based processor in the Virtex 5 FXT FPGA architecture.

arch/powerpc/platforms/44x/virtex.c

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ define_machine(virtex) { 
	.probe			= virtex_probe,

	.setup_arch		= xilinx_pci_init,

	.init_IRQ		= xilinx_intc_init_tree,

	.get_irq		= xilinx_intc_get_irq,

	.get_irq		= xintc_get_irq,

	.calibrate_decr		= generic_calibrate_decr,

	.restart		= ppc4xx_reset_system,

};