diff options
Diffstat (limited to 'arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c')
-rw-r--r-- | arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c index f8f33e16c6b..c8ce204abd2 100644 --- a/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c +++ b/arch/powerpc/platforms/embedded6xx/mpc7448_hpc2.c | |||
@@ -102,7 +102,6 @@ static void __init mpc7448_hpc2_setup_arch(void) | |||
102 | static void __init mpc7448_hpc2_init_IRQ(void) | 102 | static void __init mpc7448_hpc2_init_IRQ(void) |
103 | { | 103 | { |
104 | struct mpic *mpic; | 104 | struct mpic *mpic; |
105 | phys_addr_t mpic_paddr = 0; | ||
106 | struct device_node *tsi_pic; | 105 | struct device_node *tsi_pic; |
107 | #ifdef CONFIG_PCI | 106 | #ifdef CONFIG_PCI |
108 | unsigned int cascade_pci_irq; | 107 | unsigned int cascade_pci_irq; |
@@ -111,21 +110,12 @@ static void __init mpc7448_hpc2_init_IRQ(void) | |||
111 | #endif | 110 | #endif |
112 | 111 | ||
113 | tsi_pic = of_find_node_by_type(NULL, "open-pic"); | 112 | tsi_pic = of_find_node_by_type(NULL, "open-pic"); |
114 | if (tsi_pic) { | 113 | if (!tsi_pic) { |
115 | unsigned int size; | ||
116 | const void *prop = of_get_property(tsi_pic, "reg", &size); | ||
117 | mpic_paddr = of_translate_address(tsi_pic, prop); | ||
118 | } | ||
119 | |||
120 | if (mpic_paddr == 0) { | ||
121 | printk("%s: No tsi108 PIC found !\n", __func__); | 114 | printk("%s: No tsi108 PIC found !\n", __func__); |
122 | return; | 115 | return; |
123 | } | 116 | } |
124 | 117 | ||
125 | DBG("%s: tsi108 pic phys_addr = 0x%x\n", __func__, | 118 | mpic = mpic_alloc(tsi_pic, 0, |
126 | (u32) mpic_paddr); | ||
127 | |||
128 | mpic = mpic_alloc(tsi_pic, mpic_paddr, | ||
129 | MPIC_PRIMARY | MPIC_BIG_ENDIAN | MPIC_WANTS_RESET | | 119 | MPIC_PRIMARY | MPIC_BIG_ENDIAN | MPIC_WANTS_RESET | |
130 | MPIC_SPV_EOI | MPIC_NO_PTHROU_DIS | MPIC_REGSET_TSI108, | 120 | MPIC_SPV_EOI | MPIC_NO_PTHROU_DIS | MPIC_REGSET_TSI108, |
131 | 24, | 121 | 24, |
@@ -134,7 +124,7 @@ static void __init mpc7448_hpc2_init_IRQ(void) | |||
134 | 124 | ||
135 | BUG_ON(mpic == NULL); | 125 | BUG_ON(mpic == NULL); |
136 | 126 | ||
137 | mpic_assign_isu(mpic, 0, mpic_paddr + 0x100); | 127 | mpic_assign_isu(mpic, 0, mpic->paddr + 0x100); |
138 | 128 | ||
139 | mpic_init(mpic); | 129 | mpic_init(mpic); |
140 | 130 | ||