aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongtao Jia <hongtao.jia@freescale.com>2013-04-09 22:52:55 -0400
committerScott Wood <scottwood@freescale.com>2015-03-23 20:51:17 -0400
commit807d38b73b63bbbaa8e1baacf76f7874992f91e8 (patch)
tree1115d86c2b88a01a0ba7510f451c7c9c1094a9b5
parent7dea9ec5a039555376af62e718547852117aced1 (diff)
powerpc/mpic: Add get_version API both for internal and external use
MPIC version is useful information for both mpic_alloc() and mpic_init(). The patch provide an API to get MPIC version for reusing the code. Also, some other IP block may need MPIC version for their own use. The API for external use is also provided. This function had been previously added but was removed by commit 5e86bfde9cd93f2 ("powerpc/mpic: remove unused functions") due to the lack of a user. This function will be used by "powerpc/mpic: Add get_version API both for internal and external use". Signed-off-by: Jia Hongtao <hongtao.jia@freescale.com> Signed-off-by: Li Yang <leoli@freescale.com> [scottwood@freescale.com: changelog update] Signed-off-by: Scott Wood <scottwood@freescale.com>
-rw-r--r--arch/powerpc/include/asm/mpic.h3
-rw-r--r--arch/powerpc/sysdev/mpic.c10
2 files changed, 13 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/mpic.h b/arch/powerpc/include/asm/mpic.h
index 6ce63a7662f8..98697611e7b3 100644
--- a/arch/powerpc/include/asm/mpic.h
+++ b/arch/powerpc/include/asm/mpic.h
@@ -391,6 +391,9 @@ extern struct bus_type mpic_subsys;
391#define MPIC_REGSET_STANDARD MPIC_REGSET(0) /* Original MPIC */ 391#define MPIC_REGSET_STANDARD MPIC_REGSET(0) /* Original MPIC */
392#define MPIC_REGSET_TSI108 MPIC_REGSET(1) /* Tsi108/109 PIC */ 392#define MPIC_REGSET_TSI108 MPIC_REGSET(1) /* Tsi108/109 PIC */
393 393
394/* Get the version of primary MPIC */
395extern u32 fsl_mpic_primary_get_version(void);
396
394/* Allocate the controller structure and setup the linux irq descs 397/* Allocate the controller structure and setup the linux irq descs
395 * for the range if interrupts passed in. No HW initialization is 398 * for the range if interrupts passed in. No HW initialization is
396 * actually performed. 399 * actually performed.
diff --git a/arch/powerpc/sysdev/mpic.c b/arch/powerpc/sysdev/mpic.c
index f72b592d60cc..2c817a736b77 100644
--- a/arch/powerpc/sysdev/mpic.c
+++ b/arch/powerpc/sysdev/mpic.c
@@ -1219,6 +1219,16 @@ static u32 fsl_mpic_get_version(struct mpic *mpic)
1219 * Exported functions 1219 * Exported functions
1220 */ 1220 */
1221 1221
1222u32 fsl_mpic_primary_get_version(void)
1223{
1224 struct mpic *mpic = mpic_primary;
1225
1226 if (mpic)
1227 return fsl_mpic_get_version(mpic);
1228
1229 return 0;
1230}
1231
1222struct mpic * __init mpic_alloc(struct device_node *node, 1232struct mpic * __init mpic_alloc(struct device_node *node,
1223 phys_addr_t phys_addr, 1233 phys_addr_t phys_addr,
1224 unsigned int flags, 1234 unsigned int flags,