diff options
Diffstat (limited to 'target/linux/layerscape/patches-5.4/814-qe-0003-irqchip-qeic-merge-qeic_of_init-into-qe_ic_init.patch')
-rw-r--r-- | target/linux/layerscape/patches-5.4/814-qe-0003-irqchip-qeic-merge-qeic_of_init-into-qe_ic_init.patch | 173 |
1 files changed, 0 insertions, 173 deletions
diff --git a/target/linux/layerscape/patches-5.4/814-qe-0003-irqchip-qeic-merge-qeic_of_init-into-qe_ic_init.patch b/target/linux/layerscape/patches-5.4/814-qe-0003-irqchip-qeic-merge-qeic_of_init-into-qe_ic_init.patch deleted file mode 100644 index 877cd94e0d..0000000000 --- a/target/linux/layerscape/patches-5.4/814-qe-0003-irqchip-qeic-merge-qeic_of_init-into-qe_ic_init.patch +++ /dev/null @@ -1,173 +0,0 @@ -From 25694a71e1958a4d72891b99b6a2805b7a7bffff Mon Sep 17 00:00:00 2001 -From: Zhao Qiang <qiang.zhao@nxp.com> -Date: Tue, 14 Mar 2017 10:40:38 +0800 -Subject: [PATCH] irqchip/qeic: merge qeic_of_init into qe_ic_init - -qeic_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. - -Signed-off-by: Zhao Qiang <qiang.zhao@nxp.com> ---- - drivers/irqchip/irq-qeic.c | 89 ++++++++++++++++++++-------------------------- - include/soc/fsl/qe/qe_ic.h | 7 ---- - 2 files changed, 39 insertions(+), 57 deletions(-) - ---- a/drivers/irqchip/irq-qeic.c -+++ b/drivers/irqchip/irq-qeic.c -@@ -402,27 +402,33 @@ unsigned int qe_ic_get_high_irq(struct q - 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)); -@@ -433,9 +439,9 @@ void __init qe_ic_init(struct device_nod - 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 */ -@@ -462,13 +468,24 @@ void __init qe_ic_init(struct device_nod - 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) -@@ -565,44 +582,16 @@ int qe_ic_set_high_priority(unsigned int - 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; -+ int ret; - -- printk(KERN_DEBUG "Registering qe_ic with sysfs...\n"); -+ ret = qe_ic_init(node, 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"); -- return -ENODEV; -- } -- rc = device_register(&device_qe_ic); -- if (rc) { -- printk(KERN_ERR "Failed registering qe_ic sys device\n"); -- return -ENODEV; -- } - return 0; - } - --static int __init qeic_of_init(struct device_node *node, -- struct device_node *parent) --{ -- if (!node) -- return; -- qe_ic_init(node, 0, qe_ic_cascade_low_mpic, -- qe_ic_cascade_high_mpic); -- of_node_put(node); --} -- --IRQCHIP_DECLARE(qeic, "fsl,qe-ic", qeic_of_init); --subsys_initcall(init_qe_ic_sysfs); -+IRQCHIP_DECLARE(qeic, "fsl,qe-ic", init_qe_ic); ---- a/include/soc/fsl/qe/qe_ic.h -+++ b/include/soc/fsl/qe/qe_ic.h -@@ -54,16 +54,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) |