This patchset is to remove PPCisms for QEIC
Subsystems (10)
Zhao Qiang
maintainerv11 cover This patchset is to remove PPCisms for QEIC
QEIC is an interrupt controller for QE, was put under drivers/soc/fsl/qe, and now move to driver/irqchip.
And QEIC is supported more than just powerpc boards, so remove PPCisms.
changelog:
Changes for v8:
- use IRQCHIP_DECLARE() instead of subsys_initcall in qeic driver
- remove include/soc/fsl/qe/qe_ic.h
Changes for v9:
- rebase
- fix the compile issue when apply the second patch, in fact, there was no compile issue when apply all the patches of this patchset
Changes for v10:
- simplify codes, remove duplicated codes
Changes for v11:
- rebase
Zhao Qiang (4):
irqchip/qeic: move qeic driver from drivers/soc/fsl/qe
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
Changes for v6:
- rebase
Changes for v7:
- na
irqchip/qeic: merge qeic init code from platforms to a common function
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
Changes for v6:
- rebase
Changes for v7:
- na
Changes for v8:
- use IRQCHIP_DECLARE() instead of subsys_initcall
irqchip/qeic: merge qeic_of_init into 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
Changes for v6:
- rebase
Changes for v7:
- na
irqchip/qeic: remove PPCisms for QEIC
Changes for v6:
- new added
Changes for v7:
- fix warning
Changes for v8:
- remove include/soc/fsl/qe/qe_ic.h
*** BLURB HERE ***
Zhao Qiang (4):
irqchip/qeic: merge qeic init code from platforms to a common function irqchip/qeic: merge qeic_of_init into qe_ic_init irqchip/qeic: remove PPCisms for QEIC
QE: remove PPCisms for QE
arch/powerpc/platforms/83xx/km83xx.c | 1 - arch/powerpc/platforms/83xx/misc.c | 16 -- arch/powerpc/platforms/83xx/mpc832x_mds.c | 1 - arch/powerpc/platforms/83xx/mpc832x_rdb.c | 1 - arch/powerpc/platforms/83xx/mpc836x_mds.c | 1 - arch/powerpc/platforms/83xx/mpc836x_rdk.c | 1 - arch/powerpc/platforms/85xx/corenet_generic.c | 10 - arch/powerpc/platforms/85xx/mpc85xx_mds.c | 15 -- arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 17 -- arch/powerpc/platforms/85xx/twr_p102x.c | 15 -- drivers/irqchip/irq-qeic.c | 263 ++++++++++++-------------- drivers/net/ethernet/freescale/Kconfig | 11 +- drivers/soc/fsl/qe/Kconfig | 2 +- drivers/soc/fsl/qe/qe.c | 82 ++++---- drivers/soc/fsl/qe/qe_io.c | 42 ++-- drivers/soc/fsl/qe/qe_tdm.c | 8 +- drivers/soc/fsl/qe/ucc.c | 10 +- drivers/soc/fsl/qe/ucc_fast.c | 74 ++++---- drivers/tty/serial/Kconfig | 2 +- drivers/tty/serial/ucc_uart.c | 1 + drivers/usb/gadget/udc/Kconfig | 2 +- drivers/usb/host/Kconfig | 2 +- include/soc/fsl/qe/qe.h | 1 - include/soc/fsl/qe/qe_ic.h | 139 -------------- 24 files changed, 244 insertions(+), 473 deletions(-) delete mode 100644 include/soc/fsl/qe/qe_ic.h
Signature · 1 line
2.14.1
Zhao Qiang
maintainerPATCH v11 1/4 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"
--- 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 | 13 +++++++++++++ 6 files changed, 13 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
@@ -283,20 +283,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
@@ -48,10 +48,6 @@ void __init mpc85xx_rdb_pic_init(void) {struct mpic *mpic; -#ifdef CONFIG_QUICC_ENGINE -struct device_node *np; -#endif -if (of_machine_is_compatible ("fsl,MPC85XXRDB-CAMP" )) { mpic = mpic_alloc(NULL, 0, MPIC_NO_RESET | MPIC_BIG_ENDIAN |
@@ -66,18 +62,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 +13 -0
@@ -18,6 +18,7 @@#include <linux/of_address.h> #include <linux/kernel.h> #include <linux/init.h> +#include <linux/irqchip.h> #include <linux/errno.h> #include <linux/reboot.h> #include <linux/slab.h>
@@ -598,4 +599,16 @@ static int __init init_qe_ic_sysfs(void)return 0 ; } +static int __init qeic_of_init (struct device_node *node, +struct device_node *parent) +{ +if (!node) +return -ENODEV ; +qe_ic_init (node,0 , qe_ic_cascade_low_mpic, + qe_ic_cascade_high_mpic); +of_node_put (node); +return 0 ; +} + +IRQCHIP_DECLARE (qeic,"fsl,qe-ic" , qeic_of_init);subsys_initcall (init_qe_ic_sysfs);
Signature · 1 line
2.14.1
Re: [Patch v11 1/4] irqchip/qeic: merge qeic init code from platforms to a common function
Quoted 20 lines · Zhao Qiang
The codes of
qe_icinit from a variety of platforms are redundant, merge them to a common function and put it toirqchip/irq-qeic.cFor non-p1021_mds
mpc85xx_mdsboards, 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_mpicwas used for boards has the same interrupt number for low interrupt and high interrupt,qe_ic_inithas checked if "low interrupt == high interrupt"Signed-off-by Zhao Qiang <[email protected]>--- 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 | 13 +++++++++++++ 6 files changed, 13 insertions(+), 68 deletions(-)
[...]
Quoted 20 lines
drivers/irqchip/irq-qeic.c +4
-0@@ -18,6 +18,7 @@#include <linux/of_address.h> #include <linux/kernel.h> #include <linux/init.h> +#include <linux/irqchip.h> #include <linux/errno.h> #include <linux/reboot.h> #include <linux/slab.h> @@ -598,4 +599,16 @@ static int __init init_qe_ic_sysfs(void)return 0 ; } +static int __init qeic_of_init (struct device_node *node, +struct device_node *parent) +{
drivers/irqchip/irq-qeic.c static int __init init_qe_ic_sysfs(void) · line 614
Quoted 10 lines
drivers/irqchip/irq-qeic.c +9
-0+if (!node) +return -ENODEV ; +qe_ic_init (node,0 , qe_ic_cascade_low_mpic, + qe_ic_cascade_high_mpic); +of_node_put (node); +return 0 ; +} + +IRQCHIP_DECLARE (qeic,"fsl,qe-ic" , qeic_of_init);subsys_initcall (init_qe_ic_sysfs);
Where is that file? It doesn't seem to be in mainline. I'm afraid this doesn't help reviewing this series...
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
Zhao Qiang
maintainerPATCH v11 2/4 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.
--- drivers/irqchip/irq-qeic.c | 90 ++++++++++++++++++++-------------------------- include/soc/fsl/qe/qe_ic.h | 7 ---- 2 files changed, 39 insertions(+), 58 deletions(-)
drivers/irqchip/irq-qeic.c +39 -51
@@ -407,27 +407,33 @@ 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 (struct device_node *node,unsigned int flags) {struct qe_ic *qe_ic;struct resource res; -u32 temp =0 , ret, high_active =0 ; +u32 temp =0 , high_active =0 ; +int ret =0 ; + +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));
@@ -438,9 +444,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 */
@@ -467,13 +473,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)
@@ -570,45 +587,16 @@ int qe_ic_set_high_priority(unsigned int virq, unsigned int priority, int high)return 0 ; } -static struct bus_type qe_ic_subsys = { - .name ="qe_ic" , - .dev_name ="qe_ic" , -}; - -static struct device device_qe_ic = { - .id =0 , - .bus = &qe_ic_subsys, -}; - -static int __init init_qe_ic_sysfs (void ) +static int __init init_qe_ic (struct device_node *node, +struct device_node *parent) { -int rc; - -printk (KERN_DEBUG "Registering qe_ic with sysfs...\n" ); +int ret; - rc =subsys_system_register (&qe_ic_subsys,NULL ); -if (rc) { -printk (KERN_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" ); -return -ENODEV ; - } -return 0 ; -} + ret =qe_ic_init (node,0 ); +if (ret) +return ret; -static int __init qeic_of_init (struct device_node *node, -struct device_node *parent) -{ -if (!node) -return -ENODEV ; -qe_ic_init (node,0 , qe_ic_cascade_low_mpic, - qe_ic_cascade_high_mpic); -of_node_put (node);return 0 ; } -IRQCHIP_DECLARE (qeic,"fsl,qe-ic" , qeic_of_init); -subsys_initcall (init_qe_ic_sysfs); +IRQCHIP_DECLARE (qeic,"fsl,qe-ic" , 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.14.1
Re: [Patch v11 2/4] irqchip/qeic: merge qeic_of_init into qe_ic_init
Quoted 22 lines · Zhao Qiang
qeic_of_initjust getdevice_nodeof qeic from dtb and callqe_ic_init, pass thedevice_nodetoqe_ic_init.
So mergeqeic_of_initintoqe_ic_initto get the qeic node inqe_ic_init.Signed-off-by Zhao Qiang <[email protected]>--- drivers/irqchip/irq-qeic.c | 90 ++++++++++++++++++++-------------------------- include/soc/fsl/qe/qe_ic.h | 7 ---- 2 files changed, 39 insertions(+), 58 deletions(-)drivers/irqchip/irq-qeic.c +0
-3@@ -407,27 +407,33 @@ 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))
drivers/irqchip/irq-qeic.c unsigned int qe_ic_get_high_irq(struct qe_ic *qe_ic) · line 418
Quoted 10 lines
drivers/irqchip/irq-qeic.c +6
-1+static int __init qe_ic_init (struct device_node *node,unsigned int flags) {struct qe_ic *qe_ic;struct resource res; -u32 temp =0 , ret, high_active =0 ; +u32 temp =0 , high_active =0 ; +int ret =0 ; + +if (!node) +return -ENODEV ;
How can this happen? You got here because you've matched a node.
Quoted 106 lines
drivers/irqchip/irq-qeic.c +32
-37ret =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));@@ -438,9 +444,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 */ @@ -467,13 +473,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)@@ -570,45 +587,16 @@ int qe_ic_set_high_priority(unsigned int virq, unsigned int priority, int high)return 0 ; } -static struct bus_type qe_ic_subsys = { - .name ="qe_ic" , - .dev_name ="qe_ic" , -}; - -static struct device device_qe_ic = { - .id =0 , - .bus = &qe_ic_subsys, -}; - -static int __init init_qe_ic_sysfs (void ) +static int __init init_qe_ic (struct device_node *node, +struct device_node *parent) { -int rc; - -printk (KERN_DEBUG "Registering qe_ic with sysfs...\n" ); +int ret; - rc =subsys_system_register (&qe_ic_subsys,NULL ); -if (rc) { -printk (KERN_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" ); -return -ENODEV ; - } -return 0 ; -} + ret =qe_ic_init (node,0 ); +if (ret) +return ret;
drivers/irqchip/irq-qeic.c int qe_ic_set_high_priority(unsigned int virq, unsigned int priority, int high) · line 600
Quoted 10 lines
drivers/irqchip/irq-qeic.c +0
-8-static int __init qeic_of_init (struct device_node *node, -struct device_node *parent) -{ -if (!node) -return -ENODEV ; -qe_ic_init (node,0 , qe_ic_cascade_low_mpic, - qe_ic_cascade_high_mpic); -of_node_put (node);return 0 ; }
What is "ret" used for here? From what I can see, this function should be:
static int __init init_qe_ic(...)
{
return qe_ic_init(node, 0);
}This also begs the question of what this 0 is for. Given that this is the only place qe_ic_init gets called, I wonder what "flags" is for.
Quoted 16 lines
drivers/irqchip/irq-qeic.c +1
-2-IRQCHIP_DECLARE (qeic,"fsl,qe-ic" , qeic_of_init); -subsys_initcall (init_qe_ic_sysfs); +IRQCHIP_DECLARE (qeic,"fsl,qe-ic" , init_qe_ic);include/soc/fsl/qe/qe_ic.h +0
-3@@ -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));
include/soc/fsl/qe/qe_ic.h enum qe_ic_grp_id { · line 66
Quoted 10 lines
include/soc/fsl/qe/qe_ic.h +0
-4unsigned 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)
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...
Zhao Qiang
maintainerPATCH v11 3/4 irqchip/qeic: remove PPCisms for QEIC
In reply to Zhao QiangQEIC was supported on PowerPC, and dependent on PPC, Now it is supported on other platforms, so remove PPCisms.
--- arch/powerpc/platforms/83xx/km83xx.c | 1 - arch/powerpc/platforms/83xx/misc.c | 1 - arch/powerpc/platforms/83xx/mpc832x_mds.c | 1 - arch/powerpc/platforms/83xx/mpc832x_rdb.c | 1 - arch/powerpc/platforms/83xx/mpc836x_mds.c | 1 - arch/powerpc/platforms/83xx/mpc836x_rdk.c | 1 - arch/powerpc/platforms/85xx/corenet_generic.c | 1 - arch/powerpc/platforms/85xx/mpc85xx_mds.c | 1 - arch/powerpc/platforms/85xx/mpc85xx_rdb.c | 1 - arch/powerpc/platforms/85xx/twr_p102x.c | 1 - drivers/irqchip/irq-qeic.c | 188 +++++++++++--------------- include/soc/fsl/qe/qe_ic.h | 132 ------------------ 12 files changed, 80 insertions(+), 250 deletions(-) delete mode 100644 include/soc/fsl/qe/qe_ic.h
arch/powerpc/platforms/83xx/km83xx.c +0 -1
@@ -38,7 +38,6 @@#include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h> #include <soc/fsl/qe/qe.h> -#include <soc/fsl/qe/qe_ic.h> #include "mpc83xx.h"
arch/powerpc/platforms/83xx/misc.c +0 -1
@@ -17,7 +17,6 @@#include <asm/io.h> #include <asm/hw_irq.h> #include <asm/ipic.h> -#include <soc/fsl/qe/qe_ic.h> #include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h>
arch/powerpc/platforms/83xx/mpc832x_mds.c +0 -1
@@ -37,7 +37,6 @@#include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h> #include <soc/fsl/qe/qe.h> -#include <soc/fsl/qe/qe_ic.h> #include "mpc83xx.h"
arch/powerpc/platforms/83xx/mpc832x_rdb.c +0 -1
@@ -26,7 +26,6 @@#include <asm/ipic.h> #include <asm/udbg.h> #include <soc/fsl/qe/qe.h> -#include <soc/fsl/qe/qe_ic.h> #include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h>
arch/powerpc/platforms/83xx/mpc836x_mds.c +0 -1
@@ -45,7 +45,6 @@#include <sysdev/fsl_pci.h> #include <sysdev/simple_gpio.h> #include <soc/fsl/qe/qe.h> -#include <soc/fsl/qe/qe_ic.h> #include "mpc83xx.h"
arch/powerpc/platforms/83xx/mpc836x_rdk.c +0 -1
@@ -21,7 +21,6 @@#include <asm/ipic.h> #include <asm/udbg.h> #include <soc/fsl/qe/qe.h> -#include <soc/fsl/qe/qe_ic.h> #include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h>
arch/powerpc/platforms/85xx/corenet_generic.c +0 -1
@@ -27,7 +27,6 @@#include <asm/udbg.h> #include <asm/mpic.h> #include <asm/ehv_pic.h> -#include <soc/fsl/qe/qe_ic.h> #include <linux/of_platform.h> #include <sysdev/fsl_soc.h>
arch/powerpc/platforms/85xx/mpc85xx_mds.c +0 -1
@@ -49,7 +49,6 @@#include <sysdev/fsl_pci.h> #include <sysdev/simple_gpio.h> #include <soc/fsl/qe/qe.h> -#include <soc/fsl/qe/qe_ic.h> #include <asm/mpic.h> #include <asm/swiotlb.h> #include "smp.h"
arch/powerpc/platforms/85xx/mpc85xx_rdb.c +0 -1
@@ -27,7 +27,6 @@#include <asm/udbg.h> #include <asm/mpic.h> #include <soc/fsl/qe/qe.h> -#include <soc/fsl/qe/qe_ic.h> #include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h>
arch/powerpc/platforms/85xx/twr_p102x.c +0 -1
@@ -23,7 +23,6 @@#include <asm/udbg.h> #include <asm/mpic.h> #include <soc/fsl/qe/qe.h> -#include <soc/fsl/qe/qe_ic.h> #include <sysdev/fsl_soc.h> #include <sysdev/fsl_pci.h>
drivers/irqchip/irq-qeic.c +80 -108
264 lines not on this page · raw message
include/soc/fsl/qe/qe_ic.h deleted +0 -132
132 lines not on this page · raw message
Signature · 1 line
2.14.1
Zhao Qiang
maintainerPATCH v11 4/4 QE: remove PPCisms for QE
In reply to Zhao QiangQE was supported on PowerPC, and dependent on PPC, Now it is supported on other platforms. so remove PPCisms.
--- drivers/net/ethernet/freescale/Kconfig | 11 ++--- drivers/soc/fsl/qe/Kconfig | 2 +- drivers/soc/fsl/qe/qe.c | 82 +++++++++++++++++++++------------- drivers/soc/fsl/qe/qe_io.c | 42 ++++++++--------- drivers/soc/fsl/qe/qe_tdm.c | 8 ++-- drivers/soc/fsl/qe/ucc.c | 10 ++--- drivers/soc/fsl/qe/ucc_fast.c | 74 +++++++++++++++--------------- drivers/tty/serial/Kconfig | 2 +- drivers/tty/serial/ucc_uart.c | 1 + drivers/usb/gadget/udc/Kconfig | 2 +- drivers/usb/host/Kconfig | 2 +- include/soc/fsl/qe/qe.h | 1 - 12 files changed, 126 insertions(+), 111 deletions(-)
drivers/net/ethernet/freescale/Kconfig +6 -5
@@ -5,10 +5,11 @@ config NET_VENDOR_FREESCALE bool "Freescale devices" default y - depends on FSL_SOC || QUICC_ENGINE || CPM1 || CPM2 || PPC_MPC512x || \ - M523x || M527x || M5272 || M528x || M520x || M532x || \ - ARCH_MXC || ARCH_MXS || (PPC_MPC52xx && PPC_BESTCOMM) || \ - ARCH_LAYERSCAPE || COMPILE_TEST + depends on FSL_SOC || (QUICC_ENGINE && PPC32) || CPM1 || CPM2 || \ + PPC_MPC512x || M523x || M527x || M5272 || M528x || M520x || \ + M532x || ARCH_MXC || ARCH_MXS || \ + (PPC_MPC52xx && PPC_BESTCOMM) || ARCH_LAYERSCAPE || \ + COMPILE_TEST ---help--- If you have a network (Ethernet) card belonging to this class, say Y.
@@ -73,7 +74,7 @@ config FSL_XGMAC_MDIO config UCC_GETH tristate "Freescale QE Gigabit Ethernet" - depends on QUICC_ENGINE + depends on QUICC_ENGINE && FSL_SOC && PPC32 select FSL_PQ_MDIO select PHYLIB ---help---
drivers/soc/fsl/qe/Kconfig +1 -1
@@ -4,7 +4,7 @@ config QUICC_ENGINE bool "Freescale QUICC Engine (QE) Support" - depends on FSL_SOC && PPC32 + depends on OF && HAS_IOMEM select GENERIC_ALLOCATOR select CRC32 help
drivers/soc/fsl/qe/qe.c +50 -32
183 lines not on this page · raw message
drivers/soc/fsl/qe/qe_io.c +18 -24
88 lines not on this page · raw message
drivers/soc/fsl/qe/qe_tdm.c +4 -4
@@ -228,10 +228,10 @@ void ucc_tdm_init(struct ucc_tdm *utdm, struct ucc_tdm_info *ut_info) &siram[siram_entry_id * 32 + 0x200 + i]); } -setbits16 (&siram[(siram_entry_id *32 ) + (utdm->num_of_ts -1 )], -SIR_LAST ); -setbits16 (&siram[(siram_entry_id *32 ) +0x200 + (utdm->num_of_ts -1 )], -SIR_LAST ); +qe_setbits16 (&siram[(siram_entry_id *32 ) + (utdm->num_of_ts -1 )], +SIR_LAST ); +qe_setbits16 (&siram[(siram_entry_id *32 ) +0x200 + + (utdm->num_of_ts -1 )],SIR_LAST );/* Set SIxMR register */ sixmr =SIMR_SAD (siram_entry_id);
drivers/soc/fsl/qe/ucc.c +5 -5
@@ -39,7 +39,7 @@ int ucc_set_qe_mux_mii_mng(unsigned int ucc_num)return -EINVAL ;spin_lock_irqsave (&cmxgcr_lock, flags); -clrsetbits_be32 (&qe_immr->qmx.cmxgcr,QE_CMXGCR_MII_ENET_MNG , +qe_clrsetbits32 (&qe_immr->qmx.cmxgcr,QE_CMXGCR_MII_ENET_MNG , ucc_num <<QE_CMXGCR_MII_ENET_MNG_SHIFT );spin_unlock_irqrestore (&cmxgcr_lock, flags);
@@ -84,7 +84,7 @@ int ucc_set_type(unsigned int ucc_num, enum ucc_speed_type speed)return -EINVAL ; } -clrsetbits_8 (guemr,UCC_GUEMR_MODE_MASK , +qe_clrsetbits8 (guemr,UCC_GUEMR_MODE_MASK ,UCC_GUEMR_SET_RESERVED3 | speed);return 0 ;
@@ -113,9 +113,9 @@ int ucc_mux_set_grant_tsa_bkpt(unsigned int ucc_num, int set, u32 mask)get_cmxucr_reg (ucc_num, &cmxucr, ®_num, &shift);if (set) -setbits32 (cmxucr, mask << shift); +qe_setbits32 (cmxucr, mask << shift);else -clrbits32 (cmxucr, mask << shift); +qe_clrbits32 (cmxucr, mask << shift);return 0 ; }
@@ -211,7 +211,7 @@ int ucc_set_qe_mux_rxtx(unsigned int ucc_num, enum qe_clock clock,if (mode ==COMM_DIR_RX ) shift +=4 ; -clrsetbits_be32 (cmxucr,QE_CMXUCR_TX_CLK_SRC_MASK << shift, +qe_clrsetbits32 (cmxucr,QE_CMXUCR_TX_CLK_SRC_MASK << shift, clock_bits << shift);return 0 ;
drivers/soc/fsl/qe/ucc_fast.c +38 -36
162 lines not on this page · raw message
drivers/tty/serial/Kconfig +1 -1
@@ -1176,7 +1176,7 @@ config SERIAL_LANTIQ config SERIAL_QE tristate "Freescale QUICC Engine serial port support" - depends on QUICC_ENGINE + depends on QUICC_ENGINE && FSL_SOC && PPC32 select SERIAL_CORE select FW_LOADER default n
drivers/tty/serial/ucc_uart.c +1 -0
@@ -34,6 +34,7 @@#include <soc/fsl/qe/ucc_slow.h> #include <linux/firmware.h> +#include <asm/cpm.h> #include <asm/reg.h> /*
drivers/usb/gadget/udc/Kconfig +1 -1
@@ -327,7 +327,7 @@ config USB_AMD5536UDC config USB_FSL_QE tristate "Freescale QE/CPM USB Device Controller" - depends on FSL_SOC && (QUICC_ENGINE || CPM) + depends on (FSL_SOC && QUICC_ENGINE && PPC32) || (FSL_SOC && CPM) help Some of Freescale PowerPC processors have a Full Speed QE/CPM2 USB controller, which support device mode with 4
drivers/usb/host/Kconfig +1 -1
@@ -647,7 +647,7 @@ config USB_UHCI_BIG_ENDIAN_DESC config USB_FHCI_HCD tristate "Freescale QE USB Host Controller support" - depends on OF_GPIO && QE_GPIO && QUICC_ENGINE + depends on OF_GPIO && QE_GPIO && QUICC_ENGINE && FSL_SOC && PPC32 select FSL_GTM select QE_USB help
include/soc/fsl/qe/qe.h +0 -1
@@ -21,7 +21,6 @@#include <linux/spinlock.h> #include <linux/errno.h> #include <linux/err.h> -#include <asm/cpm.h> #include <soc/fsl/qe/immap_qe.h> #include <linux/of.h> #include <linux/of_address.h>
Signature · 1 line
2.14.1
Re: [Patch v11 4/4] QE: remove PPCisms for QE
Quoted 4 lines · Zhao Qiang
QE was supported on PowerPC, and dependent on PPC, Now it is supported on other platforms. so remove PPCisms.
Signed-off-by Zhao Qiang <[email protected]>
Quoted 14 lines
--- drivers/net/ethernet/freescale/Kconfig | 11 ++--- drivers/soc/fsl/qe/Kconfig | 2 +- drivers/soc/fsl/qe/qe.c | 82 +++++++++++++++++++++------------- drivers/soc/fsl/qe/qe_io.c | 42 ++++++++--------- drivers/soc/fsl/qe/qe_tdm.c | 8 ++-- drivers/soc/fsl/qe/ucc.c | 10 ++--- drivers/soc/fsl/qe/ucc_fast.c | 74 +++++++++++++++--------------- drivers/tty/serial/Kconfig | 2 +- drivers/tty/serial/ucc_uart.c | 1 + drivers/usb/gadget/udc/Kconfig | 2 +- drivers/usb/host/Kconfig | 2 +- include/soc/fsl/qe/qe.h | 1 - 12 files changed, 126 insertions(+), 111 deletions(-)
This patch doesn't have anything to do with irqchips or interrupts in general. It should be split per maintenance domain, and sent to the relevant maintainers.
Thanks,
M.
Signature · 1 line
Jazz is not dead. It just smells funny...