From patchwork Mon Jul 25 08:59:55 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qiang Zhao X-Patchwork-Id: 652195 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rybVH5wq7z9sBR for ; Mon, 25 Jul 2016 19:26:31 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3rybVH58swzDrKP for ; Mon, 25 Jul 2016 19:26:31 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from NAM01-SN1-obe.outbound.protection.outlook.com (mail-sn1nam01on0080.outbound.protection.outlook.com [104.47.32.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3rybT86HNfzDqpW for ; Mon, 25 Jul 2016 19:25:32 +1000 (AEST) Received: from BLUPR0301CA0019.namprd03.prod.outlook.com (10.162.113.157) by CY1PR0301MB1180.namprd03.prod.outlook.com (10.160.165.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.544.10; Mon, 25 Jul 2016 09:11:14 +0000 Received: from BN1BFFO11FD008.protection.gbl (2a01:111:f400:7c10::1:191) by BLUPR0301CA0019.outlook.office365.com (2a01:111:e400:5259::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.549.15 via Frontend Transport; Mon, 25 Jul 2016 09:11:13 +0000 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; Received-SPF: Fail (protection.outlook.com: domain of nxp.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BN1BFFO11FD008.mail.protection.outlook.com (10.58.144.71) with Microsoft SMTP Server (TLS) id 15.1.539.16 via Frontend Transport; Mon, 25 Jul 2016 09:11:14 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id u6P9B2mM010061; Mon, 25 Jul 2016 02:11:11 -0700 From: Zhao Qiang To: Subject: [Patch v3 2/3] irqchip/qeic: merge qeic init code from platforms to a common function Date: Mon, 25 Jul 2016 16:59:55 +0800 Message-ID: <1469437196-38003-2-git-send-email-qiang.zhao@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1469437196-38003-1-git-send-email-qiang.zhao@nxp.com> References: <1469437196-38003-1-git-send-email-qiang.zhao@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131139114748287679; (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)(1110001)(1109001)(339900001)(199003)(189002)(7846002)(305945005)(356003)(5003940100001)(8666005)(229853001)(81166006)(81156014)(8936002)(50226002)(36756003)(19580405001)(19580395003)(33646002)(86362001)(575784001)(105606002)(92566002)(2906002)(50466002)(47776003)(77096005)(50986999)(76176999)(68736007)(87936001)(110136002)(2351001)(586003)(48376002)(8676002)(4326007)(106466001)(97736004)(2950100001)(6806005)(104016004)(189998001)(85426001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB1180; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD008; 1:ZsqRsidypXV6CxUDHvHs1UGPgnhf+Coljo80PZ5PGJw4aP/FOOGGLVsRMPtWibJbki7EHGrkYd9Y+x1bKggzrDADdHtXQV83S2S67NPkMTKIc0uYDk/Zqc+zLZxFLgNA6abujZFHZEK55EC4Ly2nXI+19KjLdPSrCor9CtF4/6Sjtj+rCohX6FQCrYUbinnIybzTSDv8VoyfsVrmt2gRtTlN4TNuKT5T8uSf9YuSaX+Z+Jng3JnI5kUe+TrhpR181G8YYzv03pIr7I9+ar7hqIWYloyYLT+omX45Mi1IaDRsscHCZlG5+T5+P6zS6OmbQzvfk1kFIZJVgIlq+hgWnDlNaUcs5Y3Ryycaw6hTcx6JLJznvEzLVn4MzxZEtSHRjgZ1IulczSXYvQNgGMY4aRIWQ8KiFNtOgMsNwyTskOI56IufhxovKlsZD6ryOJtLEGW+ITs9AUHsurcac4OuMfk+21BDxOpphTphhDBFhdA2zr5pA8ZnlKoipbAmMMlbE6VcHNRXL6s67c4I2PV4ljQx2akKR2GwwCyy5/zfVt7nIStvbyaUYU9enjC6nfBkw5fFTAITf79wqG8PM1q9DIk/v24kpvEPQR5hQUPlt3hmOKH7D5fukRfVaBgUULMAbM/ygeSKo9zPU0RcXP/YDd38QEjo7vJlmIMmmADoidktdRePBV8PwOYMUawL8EjN+CB4qrexDwtdwNKAgD9y4DwmNw3zc9qKuYdT5WTw+UY= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: fe25da29-2a04-4307-b95e-08d3b46ba12f X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1180; 2:/xyF17qiWkFuWw7lG3wwfAS9tgZBaW3IXXZh4VzQ/1cQBPiymDWWhwLMd/DobuqMR+0qbu30XiOhkiWj0gCjqKUr0MVhxMZh34EpWcDLPjo9CbOFhp0Uahdqbk/YHxPQITa/RAuHLrzAHfYAKHQIr+doA0N8qxTS1jtBGlHRBCdnmwx0gNyXMCvwy/gRIi3T; 3:nALvboH028XvuCSCGMaxFZyQaQjWo3lAFufniHMKA7gAmjTSHMtt0G85rTfRRlqyEntqCQ7DvTY6ULef5DLzXOWcsQyhsReJ44VGlsOCGg06QS3t25NQVkqlJcTJOqj37btH3JUTFYDASYusjUWN/JZA3BYbvydo8EbtOvxfCcuL4lVbB+eNVmEqCkykci64vIpMXk45M2MF5HRpGZhn8GaSwreGp8GBVDJED8c+Kn4=; 25:GX9PlH0WxKs+SfmetxfAyAlyPR72k5/o+kmJup0TVyxif2h4MiqfpbWh3RQc1jRmWKY6bftMuzL3pFRmTXJ0u25ySHFwqYseG9CaHRenJK9pn0wsTI77mAVLwJdE+Mu1spVXmo6oatGv2BWoBcI3ynEZZpsuJMHzTW5OywSoRlBtlVLifMqupp3mwNOjdjsqOFV4nrb3DscpA8wk7RzXabT9RSTO1zONuBDLW1g37hD4+y7RjZnN/rBmISypKy1NrWuqGVC+ralYn/MKvruLh2HgU+Y+c4LgGv0aERbVYqBgW457tk+Bt6aQXwypvY+cmYRwLJFIeasXbYBjbei5GhgCSwXjcYKEpu/9a+U1sIODJ6KxRMYXKbLHmuOqKvxC/glSAe1E3v3d1DWmTE6/lIynxbl7x6mkmWIXiSlTX+A= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:CY1PR0301MB1180; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1180; 31:6v+8luo3RHRNm2xQBGAw1eb/1ewqAkJaeecVlMC0FlsctDL0CJuLPGQbNoEjJpISM64qjBJhcM0FC8n1nNNuyaZuMAdUWVlx3VNhrj6TGO9M2mr2IEgQllNCLfh3LTT5HjcEgZBmQtW7Xt5GJS1dhwD2XwptSNj6WYplyInhvl6ynIFjpHjix93rq42g6RGHrAnBnVaqQm0zT78K7wOnvg==; 4:dWcSdmtuIXdFzj5WhCC8y3KIfG/DYTxB3eKkCcTe7B+jUdiFmWbE38/JCve5v075rnNJk4pPDb0V/q9jkYQkuOsGeTgsnUD31ghycaT0WAfgf7gpZi0k/Gws3wQGuZeaM5WiUPfXNl/kbwFOzYbKMuvJy82bECmhqP+24XKk3LdIny4JVor6YyG80mMn3g652p+omriH0lf4h7dqJTTJ/scLUf9J4XKF3s+sj5aKmXdsrKnTuyWclSNtZTYBpxRvsTAFMvUH3hg+5Dz/+xC4KKlpGrh76iKc/dbtigcWZ7TdcI/S47rO806O/Tuch4F/TzZ7YJrd8nUVieT4eMcvug4E5C3sB7FtCm1ycatMmIRQnUCMoPHJuo/KTrCAla9b7RMgUv7c5KQo/o3IqSC/iUhx/yn8/eeoEaLL/zSzMsP/KgMgWIZuqN/LKBpqBOOFDfwEB0RrJ+P/GeQ8aWdloA7VqnmBibbDlTZ8Wqf8a1YWRI3aAzpUAuOF+3xDYoP4W0yn+a3nC8tGDfAkhH/+pg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(13023025)(13017025)(13015025)(13024025)(13018025)(5005006)(3002001)(10201501046)(6055026); SRVR:CY1PR0301MB1180; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB1180; X-Forefront-PRVS: 0014E2CF50 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB1180; 23:Dq4f5zECFeZcPCEA1OuMMwR0UUi9NsZtZnqcMfN?= =?us-ascii?Q?xcEw1SfTAzfywwf+fl49D2ZTbzA5mrttb1qYRUP8KlnLWRbA7El3vNziosru?= =?us-ascii?Q?PDIoYDae51UcVMWZUROjNdxx4XI4dm7n1fX9IU1/fW+A1L0/wl3v8bjvApWW?= =?us-ascii?Q?YvYp3My6RTRhwH6otxSdm9lCEgPr4FepKihcdoc6jWKSsoHX18c3K57qCO+l?= =?us-ascii?Q?zc/A/+xt+jAdv5QFkzF++F5hJYVurprk9x1IhXisPFUAtxUrSN3WS/fHybBr?= =?us-ascii?Q?VXSBNKsk7kldYP3gXowHY4z8GB+AQIwTA6xa4LZlGQGuUWPjBdtjIygL2YpL?= =?us-ascii?Q?ktmokx9IltXm5jCBG1OIQnSF4f4U/IvnQC/3LUhtrGnicrW9wr/SVB+RMp3Z?= =?us-ascii?Q?IICZtUoUo0w0ZCHZMB4M+fa+w2eAqAXd/3z+YtpYFMu3f6Fl799snVTBFleD?= =?us-ascii?Q?1C7GkBN/P6MI8MzR6Ku+YJg/E94GyZNO3Q50n5PgRyTjmtF+4D5vhMQ4T9G4?= =?us-ascii?Q?dpZlIv4fCdkxShmU8Aa1Ha1063/B71XvsEi9WvjdMo5mD/pRNVkB0SF2If/r?= =?us-ascii?Q?XcjiNU6VU9Mwu7d/04038I2yWN3+tW3L8WVl/xZ5gTrDrhhXqblCnJIBFck5?= =?us-ascii?Q?VOl0hLefifHWBtfdTj5Ey2Zn7rs3fmg5iWsl2BJSN3U5c6JdYyxhT5EBOjTM?= =?us-ascii?Q?ytiako8DToE2r30LAJcEXOwpqpmJeL4+iimuDmdGcA3gL86u77a9kD7S3HKr?= =?us-ascii?Q?SMqSULU21I1ETwOEwLEHwUlzTcgAynGV3TyOS/vyA1ICccUJQUOvRroZI8XZ?= =?us-ascii?Q?HsvtfwRHN2FFAMceGOoIw6MSDOOS2Kbii7uBVhsg4KtLVMvms36YHPaIS0es?= =?us-ascii?Q?fUO1i7O2gu/QhS3jnQ/Ex5f6ciFMH2qXor0c38oDnXmJMAdcK/17zIQEIMvI?= =?us-ascii?Q?ZBXlUfTXuskqDzvPXkCn273BhXGr2vsQaF8YtEzXhCmrVw9qlf6sJt/880ZY?= =?us-ascii?Q?aQ4PE1syoyRHCuKgp6dEPaERhwT3MYQ4JPqU/MEkF9aM2w9nG+7uHj4HMkpD?= =?us-ascii?Q?kpiY9fg6XZya2u61wIF5W/2LMjj0h36Y8jPaymJp5H+0+g1NWmGX0owO0cSx?= =?us-ascii?Q?CFbdfWSTYDA7H6VacfnHkH9cQtsg55Wrv?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB1180; 6:RWJHgXzhJlljPaqI039sMdt+8XMGKjWNA2f1eaA44h0vl9egJjEtD3JK8ZFJ6zNECk5tOyE9baKaJj79HXDSIiqe+abQ6Zm9Hd/0eqZkl00YH7pg5VtQd5NIckKhx14v4tgzsD2Qa20JkeVMgiNdXA8j8YRjFXScPBD8IQKmike94/j+kf/xcTxxNTvOk1iBENHE1IYpqI3fWvFZbxCx3RGNIT+lPL+UZz5bp/BQkrmnXJNxD89Je38iT1w6puGFBvZNindzuGcE9upy/jZphEfYezRv7NMeRQ7tW9Cfq8w=; 5:BbHSemZmmT5rVVLLcTTjIZV+Ls09EFhcEP0xkOZ931rXiJb2l0eZTNlvPVrKqYKQieY3nrU3DVjRR/Ur87LTuWwhIPnBegmIhRQ/3qcS1spVUD+QLf9bm0R3fhiT/zzjF+p8g+B8rc9RM6VIg25cO08nF1gyn4mPFO/yds3+BuA=; 24:t1mZih6xxe0XzJQBbaIGMFppxnrYgFW9ciy4K+RssS0sE10wkMGB1TMtmeywr+ikiU+Bi4iTCXQQKWlIScH+HTQepcsu+6esfJ7q5lCBHT4=; 7:FbgS5WJtlGC82qzSMLpMmd8EOIvXKqQzXUmHnJhhWak19hds5j9qu3BGm/mvADnjWmNHp46vdl02Dr9CilorHHqpM9Tn1tn1iq82vCvx2Fu2MpuJwq9snRrzWPjPrnIQIJmBvXSEhGKeFqunijUM0RhkX/WeQ8Gb4cQRDlReJ3cwtTVvCMweW+w85l3AWw9r+IdotzYHr0VMWAqTutVP0YHzu2SP9cYa+MG3mJ4oqHKPjpZYikSpKN/g5+c8sQT5 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Jul 2016 09:11:14.6415 (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: CY1PR0301MB1180 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: oss@buserror.net, Zhao Qiang , linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, xiaobo.xie@nxp.com Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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 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 1f91225..1853fda 100644 --- a/drivers/irqchip/irq-qeic.c +++ b/drivers/irqchip/irq-qeic.c @@ -589,4 +589,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);