From patchwork Wed Sep 28 03:25:01 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qiang Zhao X-Patchwork-Id: 675926 X-Patchwork-Delegate: scottwood@freescale.com Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3skNjy1M0bz9ryZ for ; Wed, 28 Sep 2016 13:39:34 +1000 (AEST) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3skNjy0ZXpzDrYr for ; Wed, 28 Sep 2016 13:39:34 +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-sn1nam01on0040.outbound.protection.outlook.com [104.47.32.40]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3skNgY1zPKzDrZD for ; Wed, 28 Sep 2016 13:37:29 +1000 (AEST) Received: from BN6PR03CA0021.namprd03.prod.outlook.com (10.168.230.159) by SN1PR0301MB2013.namprd03.prod.outlook.com (10.163.225.30) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.639.5; Wed, 28 Sep 2016 03:37:25 +0000 Received: from BN1BFFO11FD047.protection.gbl (2a01:111:f400:7c10::1:162) by BN6PR03CA0021.outlook.office365.com (2603:10b6:404:23::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.639.5 via Frontend Transport; Wed, 28 Sep 2016 03:37:18 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) 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.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1BFFO11FD047.mail.protection.outlook.com (10.58.145.2) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.629.5 via Frontend Transport; Wed, 28 Sep 2016 03:37:18 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u8S3b9BN027236; Tue, 27 Sep 2016 20:37:15 -0700 From: Zhao Qiang To: , Subject: [PATCH v6 2/4] irqchip/qeic: merge qeic init code from platforms to a common function Date: Wed, 28 Sep 2016 11:25:01 +0800 Message-ID: <1475033103-18192-2-git-send-email-qiang.zhao@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1475033103-18192-1-git-send-email-qiang.zhao@nxp.com> References: <1475033103-18192-1-git-send-email-qiang.zhao@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131195074391428524; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(979002)(6009001)(7916002)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(33646002)(48376002)(86362001)(36756003)(104016004)(50466002)(5003940100001)(105606002)(5001770100001)(97736004)(106466001)(81166006)(81156014)(69596002)(8676002)(305945005)(47776003)(2906002)(356003)(4326007)(8936002)(7846002)(85426001)(8666005)(50226002)(87936001)(5660300001)(626004)(11100500001)(19580405001)(19580395003)(586003)(229853001)(76176999)(68736007)(92566002)(189998001)(77096005)(2950100002)(50986999)(7059030)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1101; SCL:1; SRVR:SN1PR0301MB2013; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD047; 1:+rLA80tjFo18N5EPsXe2clGKPUC2Q1a3pe2Qihm7e9vZvk/krCnMKVPL1DQbSBwZXYxMQ0s8XdZpXnaBz15/a/VtXGlAsII+i5dbyd84F/on10g9dJqOo+Kp4s5h71ZhcDsTupDoqGb2MkR5EySv/VYNS6c1vcNwvgTzfhVekVzEqsTN/QHn7dRGBGxqmlWW5yuKrNakPtNfe2GI1RAb5YmvB8EXr80TjIVXE/p+x75uz5wqXy2QfTpI+Kfs8x8FGCKZ0YACnhIJioLubpndFBeFcnBq6pT6z9GmM+vWEYnmEwaOr48VNRdtyc9aU3GmUM8UjdkgL1EpMO1m7xbbpcSG8vGwv2dbkInsORCD1mXWNbUYgO2qyWyV21ZKlcJZmdjdW1F8JuWPOB37iA/zHAhAtrKS56E40UuPtgF4Vy14ividWyZ1yq2k+s3DL2LHnJeTkMN6YmvKJ1LPLWSDVBAIjQwvCAQ6msCRPOMEQsUar4o8TiOfR4OBZlmHbsSNronFBQAP8agvQmccCW/ZCk5lX2WUmefgfic7No8zwv42rGKsYXf2lATyWueOMOSwPvTm7p04091pvHVDE92QEZfpokqh/AfAMJ7vfBjv04cfy3rp+DTtHGkG+tzOzMPxf491/WooTTAUGrxImxpcZ1oo8LLiiFJbZYnizeGR2inlETGH6n3DCkRqVrIgQ05LHXGSVxemo9Q4ZhqDIEYSAAoNqGyKGkei54o63wCGTmanDcM8gFOX7Xxoi6t6HZO6 MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: e2f87370-1e35-4751-6c4e-08d3e750bfd6 X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2013; 2:TYUjc+K3ont42NIjnTbsPPfTh1X/3hg+DY5RezVwqmIdMJJQ8CmUysfV0yS+HSUdgbLp95dtnMGPtqD2wTyjXQmaeuah+opgw8Oc5ERDOJsSUdxTmCHxRbRRwixj2WwC5tDbvXJOga0RhIi5kJ0gNNGzS5wl2VVB596nWlrZ3CUKNIfE8xZTh7KBFXfpu0dB; 3:t2K6RqqfSMRYxdhLhBrxMTrthGkK3lTg2/xTS0AgeYzeT/3+iYjCQ1ACtNm3hXzyZyb6pLlMrnRH/bCpOjt6R9e5oSVuzqlsObwitDal+cUlQW47UhPShAbLzEvt/JP+5iSrE/ohWrsqYE4bDA1dU8vXhd+n+Yc7n8BsrWnTJhm4LAMmV/IBoOhrtZWZ3uFi4i88G272obimqerYQSWSOvRgVW/S4kSCv1/dgHI77Wk=; 25:AJ0ig3v/GRSC5vd/hzndNPOa5/7EwTdOUeMnoK9mjJRU4xfL4RRQfppch24LDR7Dx1Fb6FyuhWMmVo1V9t9Eov0HkcGmFHPR5nevMMj8QisZ9H0DB7yq+K7doWLox3JHbvxJEFCq7BmJbYXWNRQWyivR+EEX1dEC6Ob6y61KXfE+fa3iAj/CfNhkzAoPgDfkK3piovSRSZFHGPeANZGaK3L43n3VbDWUkhIZX7I8FhqS6RYlF73Pe4AXGAGwMns8w0fyPf7z71DkrCcWhw08T9Ap9FtBOY0usjgM981kL2kwuHlRcwT2rGltZ7PoG712oM9DwoCMiT/jYcF8RXcQx1IpymYRenwK/IbqWFiZzc6Gq+U6O2hg6OwJVjL5ffBTC/F1Cu6Flb3RBTnR4MWMiPnRKbrQ3CTxHcXINQf8/Rs= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SN1PR0301MB2013; X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2013; 31:V3G8tGfFy1VkubNDdhdLVuH/Ff6Itb8bA2AifaBY+hw77RGcmgNIxz5PtIkVZlJ84YPxfCSLPA3s/R3ZhM8tGDzsAP69ImhXw2MoMkZNJBd4mtWqC5EIwoHiBTSko64kaB4G+jsGtJk4yolZxUb+xHADSFaLeRItnqSFK/axc2NFV67CZm7sJtoIBiOY7kgCKZU5jyOZhw3MZsW17qEm5U16UMo8jtlOEdDwhZkMOHg=; 4:WIylgUnsUa8jPIvdT+dZPHzJObhwkeTUAj2ueZcZ7V6MdhzavqG66Be3DoRWSR8Vtwca9wWAFja1Z5ilqWh2C2TR1IWmsrbkperwNCL1FOuflXlSXB/xKGJz7LzyfZXcth8pBujO9uPSgj2IgEXGVnJJFspcsy6acvCcPT4DdlirJiol7QxjrK0al5vkmADJjysaWPuctnDzRRTx56hy14dJT/ZhL+JHT5G90TQ2e+Leu7k8Aj59w2NycbxY9+/AHJvLe6NG4Q0tFpvP7LgpojbKqL0eNLULFD7/02QPkfqmoXNoNPmpaAnnNQBJL6EmDmMNbHOSV7SWbqT1vQ86/R5L7OpOt9Km4KPeMEYZUhLtBOMU25nWDvYxcW9KTlD+u6+3m7cY2G4821xf23FurwC7/erjaowWg1zUr3gBpOYuV1eDksT1IHOWKwD7slwQWBK9WjdjawqSvRV3AHLeUe0nUIQxy2J+cN0mi/n+8AnP4lvjs51fPi1vjW2hZPZIX84Xb4wmwsY8O3iVz0gKkcwNNUYt2S/jQcyKtSDw97U= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040176)(601004)(2401047)(5005006)(8121501046)(13017025)(13015025)(13024025)(13018025)(13023025)(10201501046)(3002001)(6055026); SRVR:SN1PR0301MB2013; BCL:0; PCL:0; RULEID:(400006); SRVR:SN1PR0301MB2013; X-Forefront-PRVS: 0079056367 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SN1PR0301MB2013; 23:YWgTzIXIx4+fvb/wQMJo/M9XKTrlxlVWuwKqW4G?= =?us-ascii?Q?ipOHRWtj3dYsKhMqSR6WW6zelwQYpJRItwNQh7Wzmp+Qf3bgjohU0hw8kVFL?= =?us-ascii?Q?LaVkOEMi/5YiIvU+dx/vk5s0NX3LxuV6rSxxvNOGL5WhM42s+CU3/IJOQx+W?= =?us-ascii?Q?3RmagCAnzZ8PRbeJCJil1/PFCIvmfPSXqJBjKZ+miB57wz2eqttzkbAygUYy?= =?us-ascii?Q?ikSsnWo0z6bujvDQJPn5UsLn7iUM0cmLrtrExChKtPqmTxS77xxKtn23q6GP?= =?us-ascii?Q?n4bSygFB1xs51gw+XSTRnkWgMsTwDIgWt+UPbsEhwQzypdQFsRv7G9H6dCHk?= =?us-ascii?Q?sMm7dhEgkihUuFM9/nMvfpq6nPSRE0Al65+e15JTdshWJxxsss2UJAOGrRyt?= =?us-ascii?Q?ssYe9P1A8//tfgs0Yl99g4uXuio4cu5/0ycGfMoX1NNLBLfwXjHcUo72XU80?= =?us-ascii?Q?6qZ2ZFUyJbzGf5e2CXP4AIede/BPFgZF8o+NaucfREwDHcCqV6Zdcyh/INp/?= =?us-ascii?Q?xAeYSYaFu/vXitZ1Uo3stF34DR5B8eS5/4J8fQC97wnFAY4BJFpx2tkMWqYR?= =?us-ascii?Q?yW8ayySS3hBExkcDoYVPeNyqq3E/OvEB+4n5D/L5gszQtsQmbhuhXpEiUlAc?= =?us-ascii?Q?FJ7b88GNlABEgJ/sGV6VJtk+PkQtcTtFIU5kNxUI4vwU+Ae7AG8NG/9cBD7O?= =?us-ascii?Q?AmpZ34bhNbLuGqLJV/oWC70IUp6YfCd+ZiLETP+/ISku8O5XNd8lwBWAl+JQ?= =?us-ascii?Q?iFN23/6X7AsxdaMcRSWVSi26B8zpZJ07eTJjk49k7baQ52fJsVxeZQ1vjDD+?= =?us-ascii?Q?MuwgG69pi3Cc7SnrGS+1fWJYAhmSy1tYC7SXLtcKdsWj9nr/o3eOAVVVvaje?= =?us-ascii?Q?Vvr1/yVJY4j2KTbtpKbXOWoh5uwan5LtOp8hMzm+CiNt8Vqas3fioCCe9it+?= =?us-ascii?Q?8HEOIJT3fhVIw5agOJUE4rXCVqtdRvioWfvEQ4ku16gHJOKZ34X5ZM0bIyVb?= =?us-ascii?Q?SnZ3esC5/3Cy9KqCF/x5AVrybjTpDCSU77zPRqeOxeJ124dhYJV4pgZYy0y7?= =?us-ascii?Q?m0Fkp8CFc4oMF2ue27apQC8v+4OoE+q7K3IOymohcWMt5ALEQtGeSgmPO/+d?= =?us-ascii?Q?F/J++N+Kr5pcktPDp3PVvdcJQsXOE1dt9cm8jt4VjOlkHV9dOdY3SFq/AAX4?= =?us-ascii?Q?H/OlZsTbmOAlyz62gZCREpNjsEl5QUcOavgWyXX11DtDEjo4QDewBOya0i4L?= =?us-ascii?Q?eUv7MuK6WiyS76Tz2OgqC2J0ao3A+O4TRer30s/epEAoGKDSRdD/eoIZWx+E?= =?us-ascii?Q?dpg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; SN1PR0301MB2013; 6:GW07YNuLywKXtnUNFMPg4tBq7nMSDjNac+5n+UqOD5dCo8ABL3Ku9ZQTS3690B5ZheYRJtQJ6JtfFuCWR0qedbvmj8yykJM/uhVoaXJ346wbQAZQrxmJNU08aUBR475Du+y7T14GFh3O4EpKQCUY+18meOayyPKeye9eWMaadbpIgQcjepyZ8I920kfIEqF/AxCbpgR/pRhVRE8oZ67deZdmjEwlVJeBXSpNOzpYLDn4MzupdJN5nrZoFlWyUicy6Hecj6/2xhhaDiFuKBjWqQfsKDGeoBkYaRoFGrKbWqw=; 5:eoOqdEZdyy7maDw4a7BPYWmzfsAH/K7fkFCdJCEgoowqQMMx30E91dFFet1MnAep/NZprhAAuaCkmhCymlcauJJi8Qg2Xh0rrMBSElfmeSn1LvLzPHd17O9+OAjT6hjEOid5ZddJ00MJKKEVgOuaIHoWGC/iJv5HK7vugGNbDW4=; 24:HTSLtbVtWAGAGpzGp0FMIR/eSL5BuBeQzM14MO0xPBxWJ1XEt37jKbBzghUwTclmbAFm0nLdOqXW7W+AUPo7qPMolCFHlmKksiYvEy5wiU4=; 7:Wwa8Oj+eqQ+Jn34lJ1fuZpnr1YqCb+7uI4JrUoWuZFNbts/CCuYtOgRTH3eQw/S50jeqrylR0Nuk+hhqPxkZmrcLKC+gzcvyrC+2MvyBRLbBnzB6BAuz/akwmd3CcX77eJOeuiaEGW4ojd4SMZVW+OEaPOZzok7m7G1o5uT/DXfhemyvQRoE+TiC87WyQDMV4STspDWCIXBnVJt3V5LgOiB8jh4oDxpXrpU/XJNyu2BSQFo6Muk7ChrFQ1y8Tht1NkHhesB8HnGILlxt/Frmxge1j75yti0DGS1r7wtuiJpIBHWi5WO5DpJeFJAHe+Nd SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Sep 2016 03:37:18.9088 (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.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SN1PR0301MB2013 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jason@lakedaemon.net, marc.zyngier@arm.com, linux-kernel@vger.kernel.org, xiaobo.xie@nxp.com, linuxppc-dev@lists.ozlabs.org, Zhao Qiang 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 Changes for v4: - na Changes for v5: - na Changes for v6: - rebase 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 d75c981..c09a135 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 1179115..1d96c3f 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 d7e440e..06f34a9 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 1006950..000d385 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 360f625..6be9b33 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);