From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964841AbdKJDuM (ORCPT ); Thu, 9 Nov 2017 22:50:12 -0500 Received: from mail-by2nam03on0077.outbound.protection.outlook.com ([104.47.42.77]:58530 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S964788AbdKJDuH (ORCPT ); Thu, 9 Nov 2017 22:50:07 -0500 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; From: Zhao Qiang To: , , CC: , Zhao Qiang Subject: [Patch v13 2/4] irqchip/qeic: merge qeic init code from platforms to a common function Date: Fri, 10 Nov 2017 11:31:23 +0800 Message-ID: <20171110033125.991-3-qiang.zhao@nxp.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20171110033125.991-1-qiang.zhao@nxp.com> References: <20171110033125.991-1-qiang.zhao@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131547594059148134;(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)(7966004)(336005)(346002)(39380400002)(39860400002)(376002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(36756003)(97736004)(1076002)(5003940100001)(5660300001)(85426001)(81166006)(356003)(2906002)(6666003)(8676002)(8936002)(2950100002)(81156014)(2201001)(77096006)(305945005)(47776003)(8656006)(48376002)(104016004)(50466002)(50986999)(76176999)(68736007)(189998001)(4326008)(105606002)(86362001)(53936002)(106466001)(50226002)(16586007)(110136005)(54906003)(498600001)(316002)(33646002);DIR:OUT;SFP:1101;SCL:1;SRVR:CY4PR03MB2696;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BN1BFFO11FD002;1:APWLr58xxwwjx0bciFgpZYsNQ3CY7B/+pN/t9FI+wvCeviaRR2FACzuzsgdfKTHCxmK/pOMgFmrUEY4Ziu76liwKfEENjJzduOfsnvdSXSV7KzZTE9k9K/BhAtNRpn6G MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 944f7990-65d3-4e80-e05e-08d527ee2157 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4628075)(201703131517081)(2017052603256);SRVR:CY4PR03MB2696; X-Microsoft-Exchange-Diagnostics: 1;CY4PR03MB2696;3:mMitDyu+UZz6t5GZZkcyw//fZ0sWMBCp48tYAePL442kEVGf+8870kFRgKSmXChKVzXLOcv+Im8oMNWXtR907bt3gzDw9Z6yruPwRSMPwjP4faBeVryt7Jy8O9cffRHQYJdd/UvPmPR45YypqQu4Ys4ZeGlqKP6RJvyPvImrdoZLd8pmFxL6X5ptCqvWmcr18W9rz+7DsRz4MeNz0z8vehGhUSAyeMRXQMmPRJuqI2p4T4d/QKbOO+pHv3fC5CEDI8T9VPpF7vZp5ckXg0VtPYL0MKP2ax6snD8fq6QeRYDrA2NDoRamooy0nO6+dp8+Q/nXi6w/rCilU5qRye96Uxvu7PX3boeorIca/ahxaKQ=;25:3veyggqOk2mxpwPZ0UVkRv17VhnFCTRgblJOl7HsXj+HCF1N9NqTIBip8Fhk7CGTNpGbEN1SO6UF9RMPhIJjvJXGXRVnl5EN2Glxo4fM0WXiWoFgbRCmylic0yugYhC+bYpErRc0pzo0YLV6CdWuay8GylnnUT/COkaJz9dpuzIa/Vd+1uCftopBuf5sVtEX8P/ve0A/RHUIuI0qoi3FWLN4frSqM4lx3+Z70rhu4WWFfjVvuPvDL6EtHCDnG+lZiTlNh8nFyFyEADChohT0gFQmYxJeBc/d7aYYiU51abRzLyrQGtJz3Tvv8eDo+wLvlSEwEGk9x/aGQs6cz39Xkg== X-MS-TrafficTypeDiagnostic: CY4PR03MB2696: X-Microsoft-Exchange-Diagnostics: 1;CY4PR03MB2696;31:guLcnC7hIyEOPg7CKcMZID5xJfBGTpE3J9y3pAn7nOKwF33iV0hIyPBrR9QD2iGxNaD6M9Pm3KPjXXVNwoQfp1RsaOUibsC7IRUY5lmNyEp/PJMbbXVt8mVZA6InbwML/wcHWx62m652E+kVxb+M7llCY4SJMeMnB259/iDDrnTLfZq+3FQWSTcUdu3XmtE8aD07b+qD2QeQy2Y0s2yavlrY7hkq4KGBtlpDeytOk/0=;4:31Z/yZuq4XZA+bgcjT8gjEEvGnde9nzKgo7OpHR+vRBrg0sRqODUd/noE5gD5dZnJ1sfYQpOOtTxSpLMUPo9Gn/sBK8MxR6j9/TZmGq1xbrvT0/0QUbolMvg52WD2XjPBj7MpdZ1Lih3de7rIbd0GC+9Rbe9/iiQWHiq5wRJnlfXAp/czW62ILlc1WuHCH4w3eFnvlFe6WIaBZGjrJRP0N+c6en/tk1wg6RXGCgkktjsvCLiWqS8wtyO6jb8G38rvL410E3Km5ZXebn+hxZ/DL0kyjrmTXSbFhVp7gemJcS7ajAba7N0rydpCXaKikIt X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(2401047)(5005006)(8121501046)(93006095)(93001095)(3002001)(10201501046)(3231021)(100000703101)(100105400095)(6055026)(6096035)(20161123559100)(20161123556025)(20161123561025)(201703131430075)(201703131441075)(201703131448075)(201703131433075)(201703161259150)(20161123563025)(20161123565025)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:CY4PR03MB2696;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:CY4PR03MB2696; X-Forefront-PRVS: 0487C0DB7E X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY4PR03MB2696;23:FA4CzFboCDa02iwQ+jTjY+rcC8jx+wqjRyk5MkzQc?= =?us-ascii?Q?HyYuTN7DNajAKpCzipWRv9U1j+1UTK3gQFZ4L3j2nelYzaxOks0iBfEY0dfn?= =?us-ascii?Q?l3XFpOr+fYsZSizanDCp80Gp7rZrc2Yy53vyThi7Zuuw/WaDsju4JXsaJ+iR?= =?us-ascii?Q?Bgw46VuvcpXYZRO2r35ZyxaYYGnh4idnveM23a+2mlgVlVEWLef2GPw/VUQT?= =?us-ascii?Q?27e0/pT8MWrevZh3vyumXZl+1T8zZ/nqXzfPIRPY88hT9znno6bD/EUwVv17?= =?us-ascii?Q?WcwEd7wq+L96S+omX0yNm/YJj42BbqKOGoFQX1n3xokqGQkn1TVjUTuCKew2?= =?us-ascii?Q?qsobZ/6DQzFam5xuqAQbJuC9Y2/rTKmE5ELuhhZPVFcfIN/1YjuAyGockwLi?= =?us-ascii?Q?f6GbEt1xmg2mFtf/6ULu49xmoWHAsxRnmVoNZ2Q5odBhcLkhfc8mpccVppGd?= =?us-ascii?Q?NPB2Bb02oRfzZYVvYaRV9+vpZQjdFK8DTVWJYpUd/2AaUQdVgxMrKqNL4chn?= =?us-ascii?Q?pEn3XNs9z0qnsLZJ11laGu4f331BxFzUl4rbPKvQQNlXnp9goM/TMeqWBt4+?= =?us-ascii?Q?THFMcsHkYO8IZNJOVWLuEBlAEvElTkiFZ8MzMEXxOVH4I3TeA0v48xRtIWSL?= =?us-ascii?Q?OQNK1UivWi+uCeUcAN647VwMmO3394yV8q+pcax1x5MvIl/f0BJQ8L9oKARR?= =?us-ascii?Q?oQIGbYhlrBZhrirLLYOYJm5FHa3GaGePanhcsV10mrqZf/9BoU7fJaYBxcj1?= =?us-ascii?Q?7U9HqS/oOfOqH6O+TeQ7C208RkwR0q6H0UnetJAgQpvchzTiPEj2h3ZqUCok?= =?us-ascii?Q?3nNMxpLsEfM+oAdkvP57kD7V+OipBRn8CU0+713nLWXhqDFv2V+cqHJbpCmN?= =?us-ascii?Q?4uhR8+nsJKMWeRnp34rGg/A769CGhKhTDrfnManOo1k+uMGwnRPg8WV+eeCT?= =?us-ascii?Q?xRZmSKbla1VpKEzXf7e00vjD2lhLlL0dY7B9qcLeBiJ+MS8IjLN38sJWQDBi?= =?us-ascii?Q?3y2jn2a0sKt+C1O33t7kkP2Wvb0zwj2E9SNZawr5A98jhNTFciA2utpYOxcx?= =?us-ascii?Q?97U5RnVxD8AgpV7FKPYmuVn24lniEtBgD8aIvOhxzAankVlpvZdn1UVuyO0v?= =?us-ascii?Q?2hngzJeN91gBmnKLJxedAolxiHCqYHaLlstcw9ozbV6EDRipThxFWZlr9UWw?= =?us-ascii?Q?RbyV/Mzc4/zhnQOLv9ag6trGzvKYze46tW5?= X-Microsoft-Exchange-Diagnostics: 1;CY4PR03MB2696;6:meFibRCU9TkbuuMTSQh7JDsfz3l/g/+KvZ0VS4xdhh95ogUTjt3USZtNha4Sh3qysMmNREH7G4rVQhm7nqt+E7SZfZ23TgedGvn3QzF0FPwNRst7q726NvEzEj6QMFkoO4mz26QliZyN5HCHvmR83zg9GcRs7V5Ovv7awTqyBHL4Rx36AE9xZEex1yXVtOl+uPMSvhyNnvJ7AwAKPslbbcKKc0xKX5QwCc734DyTeLZp1YR9ikw/JYX65mRMISwjxops+3YlocrtPZcMMiJA4c44fcC2hFPJehMVIjSP5DT10ZY7p4mI7XMuFDXR3yV0oOLLJwn1+lJwue+3g9xLO1v6o/sp1eucY/HHOsz9ONg=;5:zfufSb/AOZMWWcTP7DtfWj13ufLOq1RG6NqUKTlRxTUjyt42NynWFEraqDMLKwhzVrcISGTO1t4h9XfqxyDCJifnBtWpoYJBBg3iwyEkP6JHiVwJ+eM1qeddbmxV6PtawZhpThCKjbfprC7dqspO5tNF8W3cD+DKu4scmZgvhGs=;24:LvrvilTql3BFxEGxI3BLw2no5tUIWAZH/D78UJV5wzqxZPSZhbEjoaMGnphgwnXJ32sV/fwBnGb9auYHRMRxRvYcdBHurEU2ftM/Oog58O0=;7:suu616l+T0qwDYtEdRhWqYpBKxLfl1OVvFHOzInOsCm7Kd+tx+dRoyOsH6jyHkn6Uq7BxSFNIgAmeOb4eyrRJ8ktLnl8JGSBMgvPM67A1pDkrlyFwLyCOxtYboIdrnRSzaZExki5yyJ5WlRuQawLqKNDtLRFMjwM6GcLvkH623oVayPsQsM9el8fMXvlH1d8kov4n01acURb1Oo0T3aXqdS8sVI9F7MLTN06v1+DI62HafM0kVgDZAJBg0/xvCc6 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 Nov 2017 03:50:05.6028 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 944f7990-65d3-4e80-e05e-08d527ee2157 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: CY4PR03MB2696 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 --- 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(-) diff --git a/arch/powerpc/platforms/83xx/misc.c b/arch/powerpc/platforms/83xx/misc.c index d75c9816a5c9..c09a13532c89 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 ac191a7a1337..1b385acbf4dd 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 d7e440e6dba3..06f34a99152e 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_mds.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_mds.c @@ -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) { } diff --git a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c index 10069503e39f..000d385933af 100644 --- a/arch/powerpc/platforms/85xx/mpc85xx_rdb.c +++ b/arch/powerpc/platforms/85xx/mpc85xx_rdb.c @@ -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 - } /* diff --git a/arch/powerpc/platforms/85xx/twr_p102x.c b/arch/powerpc/platforms/85xx/twr_p102x.c index 360f6253e9ff..6be9b337035a 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 aba71354e17c..673afb439839 100644 --- a/drivers/irqchip/irq-qeic.c +++ b/drivers/irqchip/irq-qeic.c @@ -18,6 +18,7 @@ #include #include #include +#include #include #include #include @@ -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); -- 2.14.1