irqchip/qeic: move qeic driver from drivers/soc/fsl/qe
Subsystems (6)
Zhao Qiang
maintainerPATCH v5 1/3 irqchip/qeic: move qeic driver from drivers/soc/fsl/qe
move the driver from drivers/soc/fsl/qe to drivers/irqchip, merge qe_ic.h and qe_ic.c into irq-qeic.c.
---
Changes for v2:
- modify the subject and commit msg
Changes for v3:
- merge .h file to .c, rename it with irq-qeic.c
Changes for v4:
- modify comments
Changes for v5:
- disable rename detection
drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-qeic.c | 601 ++++++++++++++++++++++++++++++++++++++++++++ drivers/soc/fsl/qe/Makefile | 2 +- drivers/soc/fsl/qe/qe_ic.c | 512 ------------------------------------- drivers/soc/fsl/qe/qe_ic.h | 103 -------- 5 files changed, 603 insertions(+), 616 deletions(-) create mode 100644 drivers/irqchip/irq-qeic.c delete mode 100644 drivers/soc/fsl/qe/qe_ic.c delete mode 100644 drivers/soc/fsl/qe/qe_ic.h
drivers/irqchip/Makefile +1 -0
@@ -69,3 +69,4 @@ obj-$(CONFIG_PIC32_EVIC) += irq-pic32-evic.o obj-$(CONFIG_MVEBU_ODMI) += irq-mvebu-odmi.o obj-$(CONFIG_LS_SCFG_MSI) += irq-ls-scfg-msi.o obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o +obj-$(CONFIG_QUICC_ENGINE) += irq-qeic.o
drivers/irqchip/irq-qeic.c new file +601 -0
601 lines not on this page · raw message
drivers/soc/fsl/qe/Makefile +1 -1
@@ -1,7 +1,7 @@ # # Makefile for the linux ppc-specific parts of QE # -obj-$(CONFIG_QUICC_ENGINE)+= qe.o qe_common.o qe_ic.o qe_io.o +obj-$(CONFIG_QUICC_ENGINE)+= qe.o qe_common.o qe_io.o obj-$(CONFIG_CPM) += qe_common.o obj-$(CONFIG_UCC) += ucc.o obj-$(CONFIG_UCC_SLOW) += ucc_slow.o
drivers/soc/fsl/qe/qe_ic.c deleted +0 -512
512 lines not on this page · raw message
drivers/soc/fsl/qe/qe_ic.h deleted +0 -103
103 lines not on this page · raw message
Signature · 1 line
2.1.0.27.g96db324
Zhao Qiang
maintainerPATCH v5 2/3 irqchip/qeic: merge qeic init code from platforms to a common function
The codes of qe_ic init from a variety of platforms are redundant, merge them to a common function and put it to irqchip/irq-qeic.c
For non-p1021_mds mpc85xx_mds boards, use "qe_ic_init(np, 0, qe_ic_cascade_low_mpic, qe_ic_cascade_high_mpic);" instead of "qe_ic_init(np, 0, qe_ic_cascade_muxed_mpic, NULL);".
qe_ic_cascade_muxed_mpic was used for boards has the same interrupt number for low interrupt and high interrupt, qe_ic_init has checked if "low interrupt == high interrupt"
---
Changes for v2:
- modify subject and commit msg
- add check for qeic by type
Changes for v3:
- na
Changes for v4:
- na
Changes for v5:
- na
arch/powerpc/platforms/83xx/misc.c | 15 --------------- arch/powerpc/platforms/85xx/corenet_generic.c | 9 --------- arch/powerpc/platforms/85xx/mpc85xx_mds.c | 14 -------------- arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 16 ---------------- arch/powerpc/platforms/85xx/twr_p102x.c | 14 -------------- drivers/irqchip/irq-qeic.c | 16 ++++++++++++++++ 6 files changed, 16 insertions(+), 68 deletions(-)
arch/powerpc/platforms/83xx/misc.c +0 -15
@@ -93,24 +93,9 @@ void __init mpc83xx_ipic_init_IRQ(void) }#ifdef CONFIG_QUICC_ENGINE -void __init mpc83xx_qe_init_IRQ (void ) -{ -struct device_node *np; - - np =of_find_compatible_node (NULL ,NULL ,"fsl,qe-ic" ); -if (!np) { - np =of_find_node_by_type (NULL ,"qeic" ); -if (!np) -return ; - } -qe_ic_init (np,0 , qe_ic_cascade_low_ipic, qe_ic_cascade_high_ipic); -of_node_put (np); -} -void __init mpc83xx_ipic_and_qe_init_IRQ (void ) {mpc83xx_ipic_init_IRQ (); -mpc83xx_qe_init_IRQ (); }#endif /* CONFIG_QUICC_ENGINE */
arch/powerpc/platforms/85xx/corenet_generic.c +0 -9
@@ -41,8 +41,6 @@ void __init corenet_gen_pic_init(void)unsigned int flags =MPIC_BIG_ENDIAN |MPIC_SINGLE_DEST_CPU |MPIC_NO_RESET ; -struct device_node *np; -if (ppc_md.get_irq == mpic_get_coreint_irq) flags |=MPIC_ENABLE_COREINT ;
@@ -50,13 +48,6 @@ void __init corenet_gen_pic_init(void)BUG_ON (mpic ==NULL );mpic_init (mpic); - - np =of_find_compatible_node (NULL ,NULL ,"fsl,qe-ic" ); -if (np) { -qe_ic_init (np,0 , qe_ic_cascade_low_mpic, - qe_ic_cascade_high_mpic); -of_node_put (np); - } }/*
arch/powerpc/platforms/85xx/mpc85xx_mds.c +0 -14
@@ -279,20 +279,6 @@ static void __init mpc85xx_mds_qeic_init(void)of_node_put (np); return; } - - np =of_find_compatible_node (NULL ,NULL ,"fsl,qe-ic" ); -if (!np) { - np =of_find_node_by_type (NULL ,"qeic" ); -if (!np) -return ; - } - -if (machine_is (p1021_mds)) -qe_ic_init (np,0 , qe_ic_cascade_low_mpic, - qe_ic_cascade_high_mpic); -else -qe_ic_init (np,0 , qe_ic_cascade_muxed_mpic,NULL ); -of_node_put (np); }#else static void __init mpc85xx_mds_qe_init (void ) { }
arch/powerpc/platforms/85xx/mpc85xx_rdb.c +0 -16
@@ -49,10 +49,6 @@ void __init mpc85xx_rdb_pic_init(void)struct mpic *mpic;unsigned long root =of_get_flat_dt_root (); -#ifdef CONFIG_QUICC_ENGINE -struct device_node *np; -#endif -if (of_flat_dt_is_compatible (root,"fsl,MPC85XXRDB-CAMP" )) { mpic = mpic_alloc(NULL, 0, MPIC_NO_RESET | MPIC_BIG_ENDIAN |
@@ -67,18 +63,6 @@ void __init mpc85xx_rdb_pic_init(void)BUG_ON (mpic ==NULL );mpic_init (mpic); - -#ifdef CONFIG_QUICC_ENGINE - np =of_find_compatible_node (NULL ,NULL ,"fsl,qe-ic" ); -if (np) { -qe_ic_init (np,0 , qe_ic_cascade_low_mpic, - qe_ic_cascade_high_mpic); -of_node_put (np); - - }else -pr_err ("%s: Could not find qe-ic node\n" , __func__); -#endif - }/*
arch/powerpc/platforms/85xx/twr_p102x.c +0 -14
@@ -35,26 +35,12 @@ static void __init twr_p1025_pic_init(void) {struct mpic *mpic; -#ifdef CONFIG_QUICC_ENGINE -struct device_node *np; -#endif - mpic =mpic_alloc (NULL ,0 ,MPIC_BIG_ENDIAN |MPIC_SINGLE_DEST_CPU ,0 ,256 ," OpenPIC " );BUG_ON (mpic ==NULL );mpic_init (mpic); - -#ifdef CONFIG_QUICC_ENGINE - np =of_find_compatible_node (NULL ,NULL ,"fsl,qe-ic" ); -if (np) { -qe_ic_init (np,0 , qe_ic_cascade_low_mpic, - qe_ic_cascade_high_mpic); -of_node_put (np); - }else -pr_err ("Could not find qe-ic node\n" ); -#endif }/* ************************************************************************
drivers/irqchip/irq-qeic.c +16 -0
@@ -598,4 +598,20 @@ static int __init init_qe_ic_sysfs(void)return 0 ; } +static int __init qeic_of_init (void ) +{ +struct device_node *np; + + np =of_find_compatible_node (NULL ,NULL ,"fsl,qe-ic" ); +if (!np) { + np =of_find_node_by_type (NULL ,"qeic" ); +if (!np) +return ; + } +qe_ic_init (np,0 , qe_ic_cascade_low_mpic, + qe_ic_cascade_high_mpic); +of_node_put (np); +} + +subsys_initcall (qeic_of_init);subsys_initcall (init_qe_ic_sysfs);
Signature · 1 line
2.1.0.27.g96db324
Zhao Qiang
maintainerPATCH v5 3/3 irqchip/qeic: merge qeic_of_init into qe_ic_init
In reply to Zhao Qiangqeic_of_init just get device_node of qeic from dtb and call qe_ic_init, pass the device_node to qe_ic_init.
So merge qeic_of_init into qe_ic_init to get the qeic node in qe_ic_init.
---
Changes for v2:
- modify subject and commit msg
- return 0 and add put node when return in qe_ic_init
Changes for v3:
- na
Changes for v4:
- na
Changes for v5:
- na
drivers/irqchip/irq-qeic.c | 91 +++++++++++++++++++++++++--------------------- include/soc/fsl/qe/qe_ic.h | 7 ---- 2 files changed, 50 insertions(+), 48 deletions(-)
drivers/irqchip/irq-qeic.c +50 -41
@@ -406,27 +406,38 @@ unsigned int qe_ic_get_high_irq(struct qe_ic *qe_ic)return irq_linear_revmap (qe_ic->irqhost, irq); } -void __init qe_ic_init (struct device_node *node,unsigned int flags, -void (*low_handler)(struct irq_desc *desc), -void (*high_handler)(struct irq_desc *desc)) +static int __init qe_ic_init (unsigned int flags) { +struct device_node *node;struct qe_ic *qe_ic;struct resource res; -u32 temp =0 , ret, high_active =0 ; +u32 temp =0 , high_active =0 ; +int ret =0 ; + + node =of_find_compatible_node (NULL ,NULL ,"fsl,qe-ic" ); +if (!node) { + node =of_find_node_by_type (NULL ,"qeic" ); +if (!node) +return -ENODEV ; + } ret =of_address_to_resource (node,0 , &res); -if (ret) -return ; +if (ret) { + ret = -ENODEV ; + goto err_put_node; + } qe_ic =kzalloc (sizeof (*qe_ic),GFP_KERNEL ); -if (qe_ic ==NULL ) -return ; +if (qe_ic ==NULL ) { + ret = -ENOMEM ; + goto err_put_node; + } qe_ic->irqhost =irq_domain_add_linear (node,NR_QE_IC_INTS , &qe_ic_host_ops, qe_ic);if (qe_ic->irqhost ==NULL ) { -kfree (qe_ic); -return ; + ret = -ENOMEM ; + goto err_free_qe_ic; } qe_ic->regs =ioremap (res.start,resource_size (&res));
@@ -437,9 +448,9 @@ void __init qe_ic_init(struct device_node *node, unsigned int flags, qe_ic->virq_low =irq_of_parse_and_map (node,1 );if (qe_ic->virq_low ==NO_IRQ ) { -printk (KERN_ERR "Failed to map QE_IC low IRQ\n" ); -kfree (qe_ic); -return ; +pr_err ("Failed to map QE_IC low IRQ\n" ); + ret = -ENOMEM ; + goto err_domain_remove; }/* default priority scheme is grouped. If spread mode is */
@@ -466,13 +477,24 @@ void __init qe_ic_init(struct device_node *node, unsigned int flags,qe_ic_write (qe_ic->regs,QEIC_CICR , temp);irq_set_handler_data (qe_ic->virq_low, qe_ic); -irq_set_chained_handler (qe_ic->virq_low, low_handler); +irq_set_chained_handler (qe_ic->virq_low, qe_ic_cascade_low_mpic);if (qe_ic->virq_high !=NO_IRQ && qe_ic->virq_high != qe_ic->virq_low) {irq_set_handler_data (qe_ic->virq_high, qe_ic); -irq_set_chained_handler (qe_ic->virq_high, high_handler); +irq_set_chained_handler (qe_ic->virq_high, + qe_ic_cascade_high_mpic); } +of_node_put (node); +return 0 ; + +err_domain_remove: +irq_domain_remove (qe_ic->irqhost); +err_free_qe_ic: +kfree (qe_ic); +err_put_node: +of_node_put (node); +return ret; }void qe_ic_set_highest_priority (unsigned int virq,int high)
@@ -579,39 +601,26 @@ static struct device device_qe_ic = { .bus = &qe_ic_subsys, }; -static int __init init_qe_ic_sysfs (void ) +static int __init init_qe_ic (void ) { -int rc; +int ret; -printk (KERN_DEBUG "Registering qe_ic with sysfs...\n" ); + ret =qe_ic_init (0 ); +if (ret) +return ret; - rc =subsys_system_register (&qe_ic_subsys,NULL ); -if (rc) { -printk (KERN_ERR "Failed registering qe_ic sys class\n" ); + ret =subsys_system_register (&qe_ic_subsys,NULL ); +if (ret) { +pr_err ("Failed registering qe_ic sys class\n" );return -ENODEV ; } - rc =device_register (&device_qe_ic); -if (rc) { -printk (KERN_ERR "Failed registering qe_ic sys device\n" ); + ret =device_register (&device_qe_ic); +if (ret) { +pr_err ("Failed registering qe_ic sys device\n" );return -ENODEV ; } -return 0 ; -} - -static int __init qeic_of_init (void ) -{ -struct device_node *np; - np =of_find_compatible_node (NULL ,NULL ,"fsl,qe-ic" ); -if (!np) { - np =of_find_node_by_type (NULL ,"qeic" ); -if (!np) -return ; - } -qe_ic_init (np,0 , qe_ic_cascade_low_mpic, - qe_ic_cascade_high_mpic); -of_node_put (np); +return 0 ; } -subsys_initcall (qeic_of_init); -subsys_initcall (init_qe_ic_sysfs); +subsys_initcall (init_qe_ic);
include/soc/fsl/qe/qe_ic.h +0 -7
@@ -58,16 +58,9 @@ enum qe_ic_grp_id { };#ifdef CONFIG_QUICC_ENGINE -void qe_ic_init (struct device_node *node,unsigned int flags, -void (*low_handler)(struct irq_desc *desc), -void (*high_handler)(struct irq_desc *desc));unsigned int qe_ic_get_low_irq (struct qe_ic *qe_ic);unsigned int qe_ic_get_high_irq (struct qe_ic *qe_ic);#else -static inline void qe_ic_init (struct device_node *node,unsigned int flags, -void (*low_handler)(struct irq_desc *desc), -void (*high_handler)(struct irq_desc *desc)) -{}static inline unsigned int qe_ic_get_low_irq (struct qe_ic *qe_ic) {return 0 ; }static inline unsigned int qe_ic_get_high_irq (struct qe_ic *qe_ic)
Signature · 1 line
2.1.0.27.g96db324