diff options
author | Kyle Moffett <Kyle.D.Moffett@boeing.com> | 2011-12-02 01:28:01 -0500 |
---|---|---|
committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2011-12-06 21:43:07 -0500 |
commit | e7a98675caf272a11dc1012c7a8c6c00cab09f5b (patch) | |
tree | 856c69993207021ffda5550d3e12d88de7381e15 /arch/powerpc/platforms/embedded6xx/linkstation.c | |
parent | 5bdb6f2e5833c1c3e5ea21a2050fe0fada3a4a1d (diff) |
powerpc/mpic: Save computed phys_addr for board-specific code
The MPIC code can already perform an automatic OF address translation
step as part of mpic_alloc(), but several boards need to use that base
address when they perform mpic_assign_isu().
The easiest solution is to save the computed physical address into the
"struct mpic" for later use by the board code.
Signed-off-by: Kyle Moffett <Kyle.D.Moffett@boeing.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch/powerpc/platforms/embedded6xx/linkstation.c')
-rw-r--r-- | arch/powerpc/platforms/embedded6xx/linkstation.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/arch/powerpc/platforms/embedded6xx/linkstation.c b/arch/powerpc/platforms/embedded6xx/linkstation.c index 244f997de79..72b36850c5e 100644 --- a/arch/powerpc/platforms/embedded6xx/linkstation.c +++ b/arch/powerpc/platforms/embedded6xx/linkstation.c | |||
@@ -82,28 +82,22 @@ static void __init linkstation_init_IRQ(void) | |||
82 | { | 82 | { |
83 | struct mpic *mpic; | 83 | struct mpic *mpic; |
84 | struct device_node *dnp; | 84 | struct device_node *dnp; |
85 | const u32 *prop; | ||
86 | int size; | ||
87 | phys_addr_t paddr; | ||
88 | 85 | ||
89 | dnp = of_find_node_by_type(NULL, "open-pic"); | 86 | dnp = of_find_node_by_type(NULL, "open-pic"); |
90 | if (dnp == NULL) | 87 | if (dnp == NULL) |
91 | return; | 88 | return; |
92 | 89 | ||
93 | prop = of_get_property(dnp, "reg", &size); | 90 | mpic = mpic_alloc(dnp, 0, MPIC_PRIMARY | MPIC_WANTS_RESET, 4, 32, " EPIC "); |
94 | paddr = (phys_addr_t)of_translate_address(dnp, prop); | ||
95 | |||
96 | mpic = mpic_alloc(dnp, paddr, MPIC_PRIMARY | MPIC_WANTS_RESET, 4, 32, " EPIC "); | ||
97 | BUG_ON(mpic == NULL); | 91 | BUG_ON(mpic == NULL); |
98 | 92 | ||
99 | /* PCI IRQs */ | 93 | /* PCI IRQs */ |
100 | mpic_assign_isu(mpic, 0, paddr + 0x10200); | 94 | mpic_assign_isu(mpic, 0, mpic->paddr + 0x10200); |
101 | 95 | ||
102 | /* I2C */ | 96 | /* I2C */ |
103 | mpic_assign_isu(mpic, 1, paddr + 0x11000); | 97 | mpic_assign_isu(mpic, 1, mpic->paddr + 0x11000); |
104 | 98 | ||
105 | /* ttyS0, ttyS1 */ | 99 | /* ttyS0, ttyS1 */ |
106 | mpic_assign_isu(mpic, 2, paddr + 0x11100); | 100 | mpic_assign_isu(mpic, 2, mpic->paddr + 0x11100); |
107 | 101 | ||
108 | mpic_init(mpic); | 102 | mpic_init(mpic); |
109 | } | 103 | } |