From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753395AbcHADT7 (ORCPT ); Sun, 31 Jul 2016 23:19:59 -0400 Received: from mail-sn1nam02on0064.outbound.protection.outlook.com ([104.47.36.64]:35027 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753190AbcHADTi (ORCPT ); Sun, 31 Jul 2016 23:19:38 -0400 X-Greylist: delayed 863 seconds by postgrey-1.27 at vger.kernel.org; Sun, 31 Jul 2016 23:19:37 EDT Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com;nxp.com; dkim=none (message not signed) header.d=none; From: Zhao Qiang To: CC: , , , , Zhao Qiang Subject: [PATCH v4 2/3] irqchip/qeic: merge qeic init code from platforms to a common function Date: Mon, 1 Aug 2016 10:53:19 +0800 Message-ID: <1470020000-12197-2-git-send-email-qiang.zhao@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1470020000-12197-1-git-send-email-qiang.zhao@nxp.com> References: <1470020000-12197-1-git-send-email-qiang.zhao@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131144942800673918;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.168.50;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(7916002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(97736004)(33646002)(110136002)(305945005)(50986999)(76176999)(5003940100001)(105606002)(48376002)(2351001)(229853001)(92566002)(7846002)(50466002)(19580405001)(47776003)(8676002)(586003)(8936002)(81156014)(81166006)(189998001)(104016004)(106466001)(50226002)(85426001)(68736007)(4326007)(19580395003)(2950100001)(36756003)(86362001)(575784001)(2906002)(77096005)(8666005)(87936001)(356003)(7059030);DIR:OUT;SFP:1101;SCL:1;SRVR:DM2PR0301MB0703;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BN1BFFO11FD049;1:gPC31nyRHhViZVtcM/YeYQZeTFYic3Ao46DqxBxNSoZogaL0H2ltWMnnewL18QLX/bRzYfW8o/8oSIM6r2r3lpdofSSClgL/ytS2h9VkGRHFRai18GOLzhiYIm68uAbGEgFOH+5YRnAIe0Vmtx8RYpPEE/8fJBfDAv5m9mT14DNDSNrUl3+RxaJpvuYLd18ze8AzPQGIlYkcekZFnG1grQvqNZ89cf0lIHTUlPCyocDTRhR/ujORfu513fZ5ol2Oei/2CopEUzlxr8VOBxNvapymDt/RZAOxC+2YNtEHyk7gimMscUWql+lY5W0SP1KN8AwrAU4I1GVdF/4lq7LPwOYjC9aXVQU+cLbz/LkOMVBNupp/9a+ENYE0MtGsCUaLTZI270h4a3Y4yihC0qsguE7LjlKfkfAw80cxOugH/NjYNqdHPPO85LqvqDCpmOrJLgkEc+WPgP2mAbhDDkdY42Tut5QBdYhuVg4yhCZCHyCiQOL1i13HHYHm9A0gCHhctQ9Iyny1WO9iKwsYesgm9ZfAhP86p1yP3GLAU2zlmScXSIFf0H7FeiU83K6yu9jvHQaZsuvX3oaAtzIJc7+GjBw3jzIDinL8NPQ6lKs40PLZPJ/6O78b9rNFbZIRfRO7TbyvEsMIKR4F6iC3KqOfLNsytac1gxDbG9FzM8E2AZYTzJ+dRifTloP6wKyQ3UrfnOXSOAXDx2X9ymy+xy743/Yuxlc2jf791XCFDg1QH3M= MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: f8c638ef-f6fe-4369-1196-08d3b9b8941d X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0703;2:e2aJPTMHyll2oFJYuflIMKWMugxwjcmP2XYjRJ6xgMNcJxV41X/YpEsvN05UXnDFQibiUfC5bcsM5jnu4/IzRINciHd4oDfTgErczUDKQsNBywRFkr3wbFVLgna3JyW6qnugfp/PBYwvYT+elaeFyKaqPFcKsNVfyuyEnTcDSDWrQOC/pa0akgitunlOEt0p;3:AON8YZYL04Ye15sPgm6TeLS15+8dl2mGiwLBJd3zWRI0kRzd5wHX/0zbBO+1Tp2ZaCsMTfL/Aa7tGe87ezy0DQDN+jyM79sjbo9MuVPhguhEzzw9vzmcnBoE0xZ9jqFzGo+lj+Ie42MUMcDQoEY8dqnuS69y8sxCzpODa+cQM4T5MBUHexkLZVIllZf7gkFTKQHIgWKxRGj+9201NYYtAUBhMZko1lDXV3+Cx9kRc3w=;25:H9kAHW0HCA5fUUVRQoqgRHcAnUuUGbs7ll1p8OE9UiFwMvBlVJe3xFdKCxW9tDhsWRMHzDLZVt3wfZQo7iMOpFJ/4umo6jy3iXFD7iIHmAXeNZOD+B4XzZeN5lnCEHgCVsMxzCQycuZzuXlSNXxcHu01IW37y1CiJYKwPXKUeKfPhYt89+yHEmu0l2nPh904Fk2s8B3uWYgF3KFNMlVclmRMEBfzvbEHCv3Mtp+0cJEKWyJuyBNb7DGf4uY2U/YUczGJzBdT9DAAn3WxI7xRbLihI2HWsXwfDwxC8CZjVS1yEBCdUT56Tb3VPMWodnuEmUiRFj2moAIrzQVq5hMAREQQPnCnIizn8x5az7VT5GiBm+wPeUcY7rlOW5mo0nYL5b1gBt3QBDiSyXg/9Hwv1oEgh9dcRi3KlumANhKmF0U= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB0703; X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0703;31:ibcPS2toB0YunolMcW7Hgg4Z2icS0ygyof0fLkW6kJRSnL0NwCx/wl8wkyVszD1DvzxrgtWWPU7NEimQoyXySR2KhWd/0v4Ov3uEpTzh3moH7OBj0d8nWE+f1Iy+jOI0P14C5qrK9PnquIVDRaLJLQuWIbZXDCEdePce3Ole9XALBZ0+75ENg3VTs5bUQI6xYf6Su9yCOSoDun9TTN+GKQ==;4:na5oj/lbZQc7yTzh8WFGSzUDoxKpD04Y95j/lPYiWwGbe6pEbgugcZYF66LFP42YIKQGY4UjipebbYnHPqy5xgJAkDT/YhwIWfQrjg1qFRd+HE7MeMCavhP/nwyQr/u7fJNsLPFqBqRBlJW6UjIuAtj3XeT8DOY2qVyS8XE6AX3oSzK1N27TowNF7aBpJb4ZeKhwrLgE237PzwNURcUs4qCKsVz6Ib64DQNZP4CHwblFi47v2kzox8wf0CfBJwHuEcdagKLNLJLw+yHA3dy2MaRtIMYsmbQye6jWlNqm7PNwxk2GdBRMlmOIwieUy1w3ettubWP4Q3a1DSskJrMPAXiSgUXkMSyZAUcxPqq6NMCgF4uS4dCBZtRHwkL7OfBOG7d7U/l8mySEu6rDruZFbdse/FlH7vlmOEVGIAqIlZOF4s+eAJwMhmS81EFf6n6K6cnwgGvDHCGqSWdoYj7/t+ngHwf7b4WbJHSOSG4vcTttpPeI6owz0BCtMQ39CpD4OrvtrJ79RjWuQvOiK7hj3A== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(13023025)(13024025)(13015025)(13018025)(13017025)(8121501046)(5005006)(10201501046)(3002001)(6055026);SRVR:DM2PR0301MB0703;BCL:0;PCL:0;RULEID:(400006);SRVR:DM2PR0301MB0703; X-Forefront-PRVS: 0021920B5A X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM2PR0301MB0703;23:6+TmqTT5MO40nSrrMf1jN2Y64+77p6F9rK1BzqB?= =?us-ascii?Q?cR4VjQ8jsLilZBCmD6l+GUoIpuuoTqatKpFj/yIameNSvqAoTomL7kSuFxe8?= =?us-ascii?Q?GRrMEQJ3sMZFkCS5jl6cOYB6WLM1Fw+P/zXg7JmTpZuTBpco9jX5SV/Adiks?= =?us-ascii?Q?31bCVV9vVMBGjhCuVi5gT1sSqIdVrlI2+M7yITJxVJbkVGqjexTgTWyEaxOq?= =?us-ascii?Q?neEIPe1HckvA/EU5UBB31KKqNwD5We/OIbwmCFZlSTBWw8t/xYs3y6Q84cbW?= =?us-ascii?Q?qsyPSt96dVyMzL9olBt0jf1COXrB0psIWk6As7IoHFEIAfqLeMZb0C0vyQ6k?= =?us-ascii?Q?+kP2xg3+S5hcYJmUstj0w5E6us0AW77enSIhVrsjx/CLx2ghazQRjiw75R9s?= =?us-ascii?Q?U081LVQwCZ2NxxbzkwlBBYI8vCnghINJy9bkJMNcdyTcurG73fAfR/TmunL5?= =?us-ascii?Q?U8GJ0djJbsjyLlSFum9Tlbi93yNhAjfJnkWJnF/KfzglRMkiB2fwrQjiS0kV?= =?us-ascii?Q?Nel3Ek+xXQiwB8C+/6flku+spCxxokgU89al0YZASmcHu9dDnd83jOE/C/LJ?= =?us-ascii?Q?qW/aaQx5kLvnMnZICDRYaL2WWCPQxAzeKxTa5q/fLb3TFdCErZToGY8Oqeh+?= =?us-ascii?Q?+HFT4HEOEbnAo2cBLGa1khLkrwWJas6121mvITCmi1tphag87nsFwAGWFsHm?= =?us-ascii?Q?UAKGY/l7Zxd73rEwR2XhKa1JaD6OsHBfbGIVoyXmF/M7VUXU6+KSuuQMYiOB?= =?us-ascii?Q?pDFtXRUI0cbXkbW3QTsmryOQE+nbB26mnQCPiuwtY63GgT6Jw4N8igUMi5+B?= =?us-ascii?Q?2Qbs9qoQxnJhtxw5P9QxN/T8xcJzBdLwvyxxUiy1H0cOakokWImi2bZIZIX7?= =?us-ascii?Q?TRXyXtjN68C3PoEscdpn+BcAuF0LgZgZw2iTtCwsoK6O6VccdM6bDWlZzPnJ?= =?us-ascii?Q?PV1Ne7Mh5+gVdqUWYd/mt0qr7OgCW4OrJf7q54Bbn5j9Rq0ej4RUPtFVuqud?= =?us-ascii?Q?Pav70k42m988ZOxzbSHNspa/LAp8eHO04KcDaeotgZZmp1ri5gcYg3CEFzoO?= =?us-ascii?Q?EpKiBUaPU1XLgatpA7OrQSk052Xit6AQVZnF1sgCGqIMjZPEhxvGGEV4f5Pu?= =?us-ascii?Q?k2gSpPenV28A=3D?= X-Microsoft-Exchange-Diagnostics: 1;DM2PR0301MB0703;6:253TKe+UIxyKsv1ZFjx7aJWqMVbc5XEMyE4hyubol0KC4QvbUeHoglhQ4Eyg6zeqRcXD57TCFFHx/SoqrKU7pIw+7lt62r9Gn+mdqISd+0FEEybFZMA5GtG+db/ZsCfy0KS9loUnM2mX6NvA6Jde5HrChgU6yBE6wogRaABuquVQb1EJkfqpfgRGTs4Zam80AqvTG8jXzZ5hYuZYozYfX9oPzzCJMz8yNIhfQvc0P5FXGlmVpNpuJePGseJwhjM4wXuut5Vu82N8WbEc1FZFPwGwEjQZEPnyBd3dRckybjE=;5:0DBUcDseSuIdOCjYjx3VBajrQPn2J48tKlllqHicrw/Kx90NK7zKCOomO+3CcGqhbeoyoMZoBMYe4snhIen+7Jskd8SZNi3xH07CgNcprLWYSyScD2E7EBBs/g3hqCLRsZuR4fV3Rlu1ym0pF6t6c7Sa49gUJDf9Yo4acfzlIB0=;24:p1XEo8VjWy7eWIxJtjv1svAxLQAK1/1rOFgoRNINQuwx0O3Pw5p04iPBGhiog0qEe6fF1SzUDzURXbmnRgkSxFjN5ycF0/v6b0iW+wyW7og=;7:LXS89/WI6cXyoL5LYLu2VtgC4kgReEJA0c6VK70fslUfYdlFaWHpaJBkFoNcHS8UnV+PAHfw50q8lXp7qwVB31ueJ+Vvce4iEe+4STedoPB2KgwcMeK3lPwKIEJ9IyK2MtF87pgxPcH3XtLz4pp1cKribQTExg1Xk/QH2kIoCRhM31+Exbeg7ANOPy2SCJfrx0ro9Yui7Q1X1oJdODCUjg/Y6+KCIqAz7q0rQgKpmmhck3vjU6u14q2RoJs0KpaB SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 Aug 2016 03:04:39.7553 (UTC) X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM2PR0301MB0703 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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" Signed-off-by: Zhao Qiang --- Changes for v2: - modify subject and commit msg - add check for qeic by type Changes for v3: - na Changes for v4: - 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(-) diff --git a/arch/powerpc/platforms/83xx/misc.c b/arch/powerpc/platforms/83xx/misc.c index 7e923ca..9431fc7 100644 --- a/arch/powerpc/platforms/83xx/misc.c +++ b/arch/powerpc/platforms/83xx/misc.c @@ -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 */ diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c index a2b0bc8..526fc2b 100644 --- a/arch/powerpc/platforms/85xx/corenet_generic.c +++ b/arch/powerpc/platforms/85xx/corenet_generic.c @@ -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); - } } /* diff --git a/arch/powerpc/platforms/85xx/mpc85xx_mds.c b/arch/powerpc/platforms/85xx/mpc85xx_mds.c index f61cbe2..7ae4901 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c @@ -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) { } diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c index 3f4dad1..779f54f 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c @@ -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 - } /* diff --git a/arch/powerpc/platforms/85xx/twr_p102x.c b/arch/powerpc/platforms/85xx/twr_p102x.c index 71bc255..603e244 100644 --- a/arch/powerpc/platforms/85xx/twr_p102x.c +++ b/arch/powerpc/platforms/85xx/twr_p102x.c @@ -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 } /* ************************************************************************ diff --git a/drivers/irqchip/irq-qeic.c b/drivers/irqchip/irq-qeic.c index 48ceded..1463731 100644 --- a/drivers/irqchip/irq-qeic.c +++ b/drivers/irqchip/irq-qeic.c @@ -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); -- 2.1.0.27.g96db324