From patchwork Tue Aug 2 01:57:35 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Qiang Zhao X-Patchwork-Id: 654474 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 3s3KT45bYFz9t20 for ; Tue, 2 Aug 2016 12:11:52 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3s3KT44nZJzDqdt for ; Tue, 2 Aug 2016 12:11:52 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from NAM02-CY1-obe.outbound.protection.outlook.com (mail-cys01nam02on0048.outbound.protection.outlook.com [104.47.37.48]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3s3KPt17x4zDqcg for ; Tue, 2 Aug 2016 12:09:05 +1000 (AEST) Received: from BN3PR0301CA0004.namprd03.prod.outlook.com (10.160.180.142) by BY2PR0301MB0696.namprd03.prod.outlook.com (10.160.63.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.549.15; Tue, 2 Aug 2016 02:09:00 +0000 Received: from BY2FFO11FD027.protection.gbl (2a01:111:f400:7c0c::173) by BN3PR0301CA0004.outlook.office365.com (2a01:111:e400:4000::14) 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; Tue, 2 Aug 2016 02:09:00 +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 BY2FFO11FD027.mail.protection.outlook.com (10.1.15.216) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.549.5 via Frontend Transport; Tue, 2 Aug 2016 02:08:59 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id u7228mLJ014918; Mon, 1 Aug 2016 19:08:57 -0700 From: Zhao Qiang To: Subject: [PATCH v5 2/3] irqchip/qeic: merge qeic init code from platforms to a common function Date: Tue, 2 Aug 2016 09:57:35 +0800 Message-ID: <1470103056-41711-2-git-send-email-qiang.zhao@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1470103056-41711-1-git-send-email-qiang.zhao@nxp.com> References: <1470103056-41711-1-git-send-email-qiang.zhao@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131145773400392593; (91ab9b29-cfa4-454e-5278-08d120cd25b8); () X-Forefront-Antispam-Report: CIP:192.88.158.2; IPV:NLI; CTRY:US; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(7916002)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(50226002)(76176999)(2906002)(68736007)(86362001)(575784001)(5003940100001)(50986999)(7846002)(305945005)(8936002)(81166006)(97736004)(356003)(8666005)(47776003)(8676002)(586003)(4326007)(81156014)(36756003)(11100500001)(104016004)(77096005)(87936001)(105606002)(189998001)(69596002)(106466001)(33646002)(2950100001)(229853001)(2351001)(19580405001)(48376002)(50466002)(19580395003)(110136002)(92566002)(85426001)(7059030); DIR:OUT; SFP:1101; SCL:1; SRVR:BY2PR0301MB0696; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11FD027; 1:IW4lV+9vvuLkYiS3Ziu3v6yAtIVwB7u9PzBS8MvJUeCwpAkKxwjZ/ichOuZVvhGJHgl41HhOrXnMj9Yw5KRpDeTewe/OLfANesDnm9mcPGB/+cZ2yH4ZAoiHm56fCBM9y2+NUn2CX6fyJ8kKAS33wARSrH9NDP8CjCczsmgGJpT9X9EED5b1sGQpfhtzweu56rUmf0ahjK5FTQzWlBz6Oq6WPKq+LtASbOx6CcVL6be3qUAWwmQlJMQILWCEwSWzTKKRwvg/34GlTI1D0EUPrYJE58jLTkK8fsSkssl6JU6zQFmJxQej7XxepUCqGLqlRNqvu3IB2ru7kTo0VBSaFf4stzNDSRaDekrPhxIOElMR5AM1CGbPXxGcdlCOuBE18qLgV5Co3VEgCLzk8jdR1HWW8fwtNMQq/XvCpYumP4kCH5aoLtwUJGqf695QIlq9Cd5oFZtKPtrFsozqmgN/XXdF+txa1LFBiLZRecaPyNKZX3pZpSO/LpxYpsnDrkTjaeERMUwWOBlvADBNhO7Y5tWOHoZM6c/rlSQHeRAUuSJhdmSVZeTudKheAud9iaeJ3naB+2AlJtoslMXGh/nwnmWo26vEatc2R1vgOiCIa/MmPOsGqf3GZAUbvbCKNwz6AaJbCqhp73q74iV7l0U7J8gGpKHbkaSbbEfuoBumWzDQFlHZmauS3QjUaXeHxUiTj2ai8QTrpx7fxW5AKV5/5ZfrVpoPeowEmVq/C8J7diQ= MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 81c68b1e-5689-4686-0391-08d3ba79f7ca X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0696; 2:tFNayYLungaejUKcGr4CO1YBeWXcae7Kl1JS4LMP7/fQcD23RCM59/ZjV/FI5Lw4c5oFnk3AMza14NjUd8d2EFA3L1mupDc9To5EyWCWIBLPr/PkfaLSzUP9NmlcNwuu6XKLYgN4MH6xVY0Sy89Ts/dtO9GqxEveOicmqDVdhCNKypmCd+K0+EwOmqyj622R; 3:jD809D2NlVikW5EB7/1Ud/iDyFURndWhO+coM0WedwTguU03WKWJtUYBQ+Hp+sPTVnEyMliOrqff2qeByFUga6hZhDWHYbQkGrz3GlL4jPizTqEhAKR5cOjJXnKgUFJZmbGwonOyCFn+ptAFYOE086esISz2C83e6qtXWp1PGRZ9yaXN0NX5wbWWuCpe80651gHRDKO4hlJOciDh3SkksWXOC64Xo5G1VoExlKmUv2o= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR0301MB0696; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0696; 25:CxDrfR2Jk+58rDN2KUhIUooS3akpSawq98dIeZ6m+CK/vyKSiShUhPqSqDGSmLXKW5gl/n9RuCVsXqV4KlRIymwoLA8u2EcyiQxK0sWcTI7pDdgXYUgxLGmlQ0wppJhFdqLF9noccbjGscZkczBFpXH2IXpKYmPNJQJciWhDRtKDLHDh8S4Hbri3mjYcaMtCH/RATUARTLgFLlLZSS3ngf3epHoBYdU3ueKSjPTk8kqVn6l3MFhIyPhBf5bud1pnECEZac5JCxhBpMf+nnvXTfuEO+Knsp26ECoN/G1OhoIHIKOnSyBERrf27PL7pdVGRS/YP5q0YoSEeKb1A/Y3h50tfguFhH8qCfBKL3kTbYb6+3DZoMnILaI2Po4VAZJe4TWxRSDB5h90ZEApx+D5Wc0PdsJsbExTMcmMFPyN8ppWqeparQH2h/0UdnSJ5fYAe0J121lCbJTcHZbsa+Oadzx/wEDC4oiCkyVVqs3Q4hbVIoIgsyFX0xR6Vc2LhsMXiLR2VAmbGEeRTgJ6uAxSaYyoTYfzs2lqchvXqAcbPbOD3SN+LObuULimXU/Jg3wrZ+NJvL+taueO7o0HR93Q3iqZ+A+tU0tva+dvQWheiYdHXtUvvpeER5Y6Pp5HmdmpdI38O54HhCgzJDQHKjj9EHE40cEa0DLQmvY+Xd/bmZ0xALOQ+YIa0J7sgUBrNwc/IXi3EzbPTWs8y5i2xydriw==; 31:rUNkwd6RFJBfCKuEhm0ZWMSjVNRKSREPltEy1PKeVZFua3SB5DK8SQX9P9CLBrzr+jHdgpB9VgEirc8ngOnBNx3Qh2kZ62w/QzV5mtbUh32X5tykmFz3G6v6D2d7TtzwFrlCVxVv8cBGRGgPHyMTMDz43UwGdNm0GLMay/NB9i4bj0GmlXuCsgmIXRxCkz5mt4TjwxDG3oO5aMr7S+gNtaXSNFyykZUFtz4SjgERhZI= 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)(13024025)(13015025)(5005006)(13018025)(10201501046)(3002001)(6055026); SRVR:BY2PR0301MB0696; BCL:0; PCL:0; RULEID:(400006); SRVR:BY2PR0301MB0696; X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0696; 4:+P/ouD6iz9BrVD3JEXk3Kxz/45DTUR8bUv3D1VliXQ81k1aKbPVU572+5bGADFu26E8dxdYyV2B5e4ptAvEbY2YmrF0J6482pF/Frc9bWKMnJGLZEMsg6f7u4DzpXO8gt7Fdcsf8C5JgM3e8YLtizfB0nO5Td6d9mD4Aaf+gAt5hoj52LvN/YXUDYtGkWe/REAHXEYzh1kVCKf06Wl/UFd7KfG9ZfdhFt+ooGDtpq/1d7Rh1+tMgE+MQNvb/f0QRu61k1s5dv1HlvZNUDLMtMbJVWhluC526tgul/9Tb1zUeBQDqBCuaNBgKXpUrkrHxkgPFXPHAhNN15+73lqTddyjYx1Nk+acj4hIeN4FfjWG7Rwic9w06XgrhoqgFHa26GaPJIAkwnr8PWNDCpF34jOnnqCsLIOSN3jbci4V9wtiYDT5s6TpQhEvu8il3tGnb6PiCZZL1U83mYKnYll5U9H7nMYxkyFq1d8v/XxRcmw+6qGDBD9sFHzIjHMJxaqBmubg+V/rjwxiEK202aMGP/g== X-Forefront-PRVS: 0022134A87 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR0301MB0696; 23:la7+uGgHvEzYXrGi4afUkuWGsO/o+RxZE+BSRPf?= =?us-ascii?Q?Woq6FabTY+9xVy+hlWolJ0/EJXY7OfgHKPR9MwmmiiWaaSOt4EFy/tQZekyJ?= =?us-ascii?Q?6WP2shGN3+H+26wRGKe1GAeL2/1P3TprR45QTauPWeqoM3SlmHAUmjqNYB5i?= =?us-ascii?Q?5iiHWwQAgjyMMmXajkxQscaP7UZyY4zOwzn3rmzTnZAkQMiYl43g+UllEGMY?= =?us-ascii?Q?2qYXfGfDhvk3HSuWqnF64ywR38xTR5pANgA4C7+0ptKIwLdzzngk7kLAOe8E?= =?us-ascii?Q?NTn1jqa1HCcBloSDgmJFIyevZ/+J27/wW/NlU/uqXyZfgufm3vYJUKdkZ7hj?= =?us-ascii?Q?03cLTqAN6wR78+ei89qt9zlUxgcNE6CFSM0T552zE2lkfy5jTXSSunNb6ylV?= =?us-ascii?Q?yr9wjuWlMklm3VyEFj9//lxrXH821a1O25DM1VamYI0E1lmjcCMf60OIki0j?= =?us-ascii?Q?HtaUVP8niUyh3EmgiahYsl8AJKl0Jxp/8JYP1DbMK+7kLmTm4+jJrFfXTUXq?= =?us-ascii?Q?ACyVr2wv5xtlI6W47La8HWxhhu65uH7LXklmEoBwKre5mL/HVEQaMxxr2AX9?= =?us-ascii?Q?5YAh8PX1MJB82NofRGj/DVlwjemCj4oTpjrKiyVSw0Yvq2a5YOVfNOt4Bmrc?= =?us-ascii?Q?Vapw0wqpUQkx2O7ZrDpbzuwrVF3Db7ovNMZhc64iIpnLrBlGSIkeLERqip4e?= =?us-ascii?Q?ba8rYmTcY7dEIB3HC+GQpEW6gFNZcFgkEucx3e4dW80/2aKLozvOmgvehISl?= =?us-ascii?Q?bK3ohM4RAsX+eWJBeD+yE0RZLb+vyPdmVRbKumD+MhUQ2YbLFQ1E1EFUXcel?= =?us-ascii?Q?BXaE7U4o3pJiH2toPgDGREkrwtqjnkOp3DI+bi6ZibM2jubdBLg8dvpJpolY?= =?us-ascii?Q?7u61o9TPWERkKq7K9bCTG+UP9vWjSuvatUHIM6VSzQTuq+oIik0HVV1q9/uG?= =?us-ascii?Q?oCdest6wU7tEDg6S2qZ7gT8G0J4yrKElh7S8Rvrc3oQS5AMIBrswwrmIXN0t?= =?us-ascii?Q?WUZnD4uCuQsMA7Ggt2k54WqfUjIiv/tIUoM0SmMmZDR28HKcd+9GaykHOzm/?= =?us-ascii?Q?m0pBFEHKljwhUM0/KJDSwXHYALjAvfXf9LoiECPNI7oDi641AlpezDwwrnF7?= =?us-ascii?Q?dIBkVNi7BXqOJXg8bQmpa/oiBaRlAJ92JKOKSoCXzY0zz4rK1JRIz8OrQei9?= =?us-ascii?Q?iWyA4nP4DMT3wmgI=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR0301MB0696; 6:jbzuHLV63eH/weNLnl/Df0V10w8jDRMMw5YtYDoDCeaj+LbvxrhWy3ChGjxhVPNAfNznobuu7CToJkaNCOdDmLHDlhO2/wtVAeYB6zlGB7jzuZKCPZTijhvSThJ7qCRkXG0+GMTbx23hept63TaJvdrGWbIEK1XvopZvHQRdr9oulmQC1GAWRRPnHFAfdQiVCAO5bTzFujkB6Wj1gwffr0aFO7q5nb48TjUbkNFB6Vkmig6yQ9dbsmZ2fNojg4fhxIbMgdjpKfHy9b7ixmDiRnzQN895daqpRIcXDy+WCTs=; 5:1r2rncOu1PupxTE2dDZD/Kz6wkBa36RESNC4R+CDKlNm01Kk8rxAvKFOBgdl1+5U1onoJPofLTwGMOMzntGw4XNwoC50RlFuB/g88KAxiiZwWrxHkLh4YiTDvN/jLgtVKNqmYWerlzgg1IQk7AdtHukkW1tP1RWOea/dwHyPxTg=; 24:42vv1KQH2zlqbLaYFIr3pGFDwJGc19WnToUt/Oz8mcXX/0rk4H4L6Z4zLkfcpbxtEIPdbRNbSJPD8JnCzhgBLZ1Igj7wpVjoIfZ8vpe3+pQ=; 7:qBdmH9elhVAlRjN0JiKT4Jo5eHLU2iGuxz8jfd371GG52UJux435mpd48Qks8K1VFnbEv5O6GrIoCIDh1pu2a1b8eBQij59YyWeoo11RQp2zY4goLAg8USVDbYMM16fA+8XpLDUF/QCLNpqq5NHgwnjl39w5K/Ut3mPkgPZNaHMJ1AWI4LvwNM2qNtDPTTSiF9jHlwJBYN3SReAfM+nHghIPU9q3Zc7OqpgbYLYLvYxe5tDcwDjxbyzoNmsIaA7i SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Aug 2016 02:08:59.9300 (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: BY2PR0301MB0696 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 Changes for v4: - na Changes for v5: - 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);