diff options
Diffstat (limited to 'arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c')
| -rw-r--r-- | arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 24 | 
1 files changed, 3 insertions, 21 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c index f8f33e16c6b..f3350d786f5 100644 --- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c +++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c @@ -102,31 +102,14 @@ static void __init mpc7448_hpc2_setup_arch(void)  static void __init mpc7448_hpc2_init_IRQ(void)  {  	struct mpic *mpic; -	phys_addr_t mpic_paddr = 0; -	struct device_node *tsi_pic;  #ifdef CONFIG_PCI  	unsigned int cascade_pci_irq;  	struct device_node *tsi_pci;  	struct device_node *cascade_node = NULL;  #endif -	tsi_pic = of_find_node_by_type(NULL, "open-pic"); -	if (tsi_pic) { -		unsigned int size; -		const void *prop = of_get_property(tsi_pic, "reg", &size); -		mpic_paddr = of_translate_address(tsi_pic, prop); -	} - -	if (mpic_paddr == 0) { -		printk("%s: No tsi108 PIC found !\n", __func__); -		return; -	} - -	DBG("%s: tsi108 pic phys_addr = 0x%x\n", __func__, -	    (u32) mpic_paddr); - -	mpic = mpic_alloc(tsi_pic, mpic_paddr, -			MPIC_PRIMARY | MPIC_BIG_ENDIAN | MPIC_WANTS_RESET | +	mpic = mpic_alloc(NULL, 0, +			MPIC_BIG_ENDIAN | MPIC_WANTS_RESET |  			MPIC_SPV_EOI | MPIC_NO_PTHROU_DIS | MPIC_REGSET_TSI108,  			24,  			NR_IRQS-4, /* num_sources used */ @@ -134,7 +117,7 @@ static void __init mpc7448_hpc2_init_IRQ(void)  	BUG_ON(mpic == NULL); -	mpic_assign_isu(mpic, 0, mpic_paddr + 0x100); +	mpic_assign_isu(mpic, 0, mpic->paddr + 0x100);  	mpic_init(mpic); @@ -159,7 +142,6 @@ static void __init mpc7448_hpc2_init_IRQ(void)  #endif  	/* Configure MPIC outputs to CPU0 */  	tsi108_write_reg(TSI108_MPIC_OFFSET + 0x30c, 0); -	of_node_put(tsi_pic);  }  void mpc7448_hpc2_show_cpuinfo(struct seq_file *m)  |