Commit ba293fff authored by Michael Ellerman's avatar Michael Ellerman Committed by Stephen Rothwell

ppc46 iSeries: Make some generic irq code compile for iSeries

In order to call finish_device_tree() on iSeries we need to define
virt_irq_create_mapping(). We also need to set ppc64_interrupt_controller to
something other than zero. If we want to do interrupt setup via the device
tree on iSeries this code will need some serious work, but it's harmless to
have it there as long as the nodes in the iSeries device tree don't cause
it to be invoked.
Signed-off-by: default avatarMichael Ellerman <michael@ellerman.id.au>
Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent 9f497581
...@@ -351,3 +351,16 @@ int __init iSeries_allocate_IRQ(HvBusNumber busNumber, ...@@ -351,3 +351,16 @@ int __init iSeries_allocate_IRQ(HvBusNumber busNumber,
irq_desc[virtirq].handler = &iSeries_IRQ_handler; irq_desc[virtirq].handler = &iSeries_IRQ_handler;
return virtirq; return virtirq;
} }
int virt_irq_create_mapping(unsigned int real_irq)
{
BUG(); /* Don't call this on iSeries, yet */
return 0;
}
void virt_irq_init(void)
{
return;
}
...@@ -321,6 +321,8 @@ static void __init iSeries_init_early(void) ...@@ -321,6 +321,8 @@ static void __init iSeries_init_early(void)
ppcdbg_initialize(); ppcdbg_initialize();
ppc64_interrupt_controller = IC_ISERIES;
#if defined(CONFIG_BLK_DEV_INITRD) #if defined(CONFIG_BLK_DEV_INITRD)
/* /*
* If the init RAM disk has been configured and there is * If the init RAM disk has been configured and there is
......
...@@ -291,6 +291,7 @@ ...@@ -291,6 +291,7 @@
#define IC_OPEN_PIC 1 #define IC_OPEN_PIC 1
#define IC_PPC_XIC 2 #define IC_PPC_XIC 2
#define IC_BPA_IIC 3 #define IC_BPA_IIC 3
#define IC_ISERIES 4
#define XGLUE(a,b) a##b #define XGLUE(a,b) a##b
#define GLUE(a,b) XGLUE(a,b) #define GLUE(a,b) XGLUE(a,b)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment