From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754262AbcGECaW (ORCPT ); Mon, 4 Jul 2016 22:30:22 -0400 Received: from mail-by2nam03on0044.outbound.protection.outlook.com ([104.47.42.44]:2259 "EHLO NAM03-BY2-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753886AbcGECaV (ORCPT ); Mon, 4 Jul 2016 22:30:21 -0400 X-Greylist: delayed 1954 seconds by postgrey-1.27 at vger.kernel.org; Mon, 04 Jul 2016 22:30:20 EDT 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; From: Zhao Qiang To: , , , CC: , , , Zhao Qiang Subject: [PATCH 1/2] qe/ic: move qe_ic_init from platforms to irqchip Date: Tue, 5 Jul 2016 09:46:58 +0800 Message-ID: <1467683219-29326-1-git-send-email-qiang.zhao@nxp.com> X-Mailer: git-send-email 2.1.0.27.g96db324 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131121574638022789;(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)(189002)(199003)(4326007)(77096005)(50226002)(8936002)(69596002)(105606002)(2906002)(11100500001)(8666005)(5001770100001)(5003940100001)(7846002)(97736004)(305945005)(68736007)(6806005)(104016004)(356003)(19580405001)(19580395003)(229853001)(92566002)(81156014)(8676002)(81166006)(85426001)(47776003)(189998001)(106466001)(36756003)(33646002)(50986999)(50466002)(48376002)(586003)(575784001)(86362001)(87936001)(2201001)(7059030);DIR:OUT;SFP:1101;SCL:1;SRVR:BLUPR03MB581;H:az84smr01.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD013;1:Am/SmM5zRp3wqrAsH9ashcIQPlFYr1n62pQT6834eFehvywRpLbhNCkHAbi1JhqaRxJB4OhQcjNDC/v9+Wm8R23QIAlpGAnkzi3FiJRAlyzydQXfcfv/C+zMfSzKZ2vcaR5zlpwSskC+1XZKAYH/kgura8GBusaSTKOR3wC+zZ2QyaeuXJuSW2OLEUckeK+AkYrJOxlnK46GvfhklWpjvZyIvj/TYG4sdrqe9ScPzmv2AlzSIj8iAdhbrQ0jIjEYqI7A8VUQC2cIQ5oJvsqlbpDByCAhiRO8LOBMEiULAJbimYzYXA7fEfmM3zCUm8B1+TnK8nW7aJhrsutdPZhy2qGQBg9lhtO/AM1nxMglrMtejQY9UmtP/aCml+4tu1iJAhrRbEb0lyKbd9ou8sYOaUxfNdwB3hWHkoGXTiRVLywD4Dx7DGwFK9JimVuk6So+zZCWSd9iIWr0Cpw3xqATDbaZHMcSDCYFKR694WQuyC0T/RJykoqYzj1Z8bpfQUbP6hVh6KuGn4rMrNKVVVdSG4IpJyeqvdNHuEaMwkqYj5msrD2kk1FkNbrqFgMuipFf5rnazMsiYg47Tz5JoQr5vDnaX0KKTFON5QrH7mka1RRO5ZcMqEELuR/X/uNFRHSE1COwrWAYXNUNpKne+lzMLXMOQJY+qyD/mSo2KRX69BpAt/pPEQVQd6cgPM1ANCcTyrJFevkhE1ZgtvBe6Oy8oP5TyRgqbnziQzJXSGlfISTe8zc2WMOQaSqkL0lI9sc5 MIME-Version: 1.0 Content-Type: text/plain X-MS-Office365-Filtering-Correlation-Id: 8ca2db00-d462-4f22-0f27-08d3a477c125 X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB581;2:kPOCsfQT5HKPsNEYgsHqejeEgCJTaMPeLGNklpuD+n369K5CYqqzReV82ol4d/fF8BjoIoYh5X/5KpkfDuQZnrbpa57zpoKDl9bSamaAmK7OFWNeNEyWAhuXHsId4EqZjqspb4VLBNebCiaFDy7ECs5h2Vyl4LEWVYZhFGB80Z2lIz+P8n/e2/2XFaAVYGnw;3:dpNyNUbiG28iB3kRpZ6xXRkbQUyhtnAvctrQZX+8slvbFh3IwZiuMVpUHLIM8dsIqIQZHcBrcOC9I/KqGH48CTdhgLbyrSEpvvYakY/Dk40/Zru6IKw/QALrghAt/KjjVBuWZpPB61NzbSeGCn6Y2ofFDgfyS2Rv+L4zQ8ClSeZIvSO/avUYPHRBLXtYPBEUdVMOgoiPMlDBSKXUI6Tnh4xmFb2TXpi/ZxA2MLa3Cxg= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB581; X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB581;25:UT3UqnfXb6azU1YKAeOBLzdQY5wD67ljUwLEHmYjThEg0Y9BQn8W1cHofbhlfbARbTKbdKD6MjFutpV8oA4+YCJgi5JCJQOGaPbKuL4RKYFjlzs5ZttU3y3OIZuUSfCVUqTmxbeqxK1veT8mkNU9F+r7RpLxsUXFx0cKuiflHOV4zPv0PkyUyd/mNHy5Ap1lRy6Gn95OrBXL0lLjVJQf7BHziamWeKJZyIYAOOns/FFmhzox5C8SPC2cNvzWtUDv3InfJKsFUVBMzuXeV1O8NuS12b6WjEoYZ/ADxfFr+SZhbd7OLdFxExR9MKUwT7Ygbgw7mlRFl/SgZ8aAXowe9tJr3IhmXdrIymPHCr2zf8pUwTZOPZiGoU5XylClXdCmWPg2FxJrhBxjHHIohidyVPSRoEr0kbmaFRYgXt97nn0aFxYsbFpJxUZiA2acJ62ykdZZqdx6yFkFs/9UrwUhBcbbaJ2PrDsf6J7cIkrGrHBRCbQIrQWwFO6pULzh+0gpIym7iRyN1OSs+VP1xSRNPM4/ImSnN2eXRH9pdnel1CZ+lIec0xz9u24ZpuPbI6fbl5gK1RpGxCBcKFCdh9O22nqGUsT7pyp7o+nAtIA3SQy2StHltV6XY38dx7dchnb7O4nJrEV9Het5ZaK9neCGc25D0x7bmpIeRd7lHPR3KXvc85Y4Genk4MS4BeUiwMJ9JE2sAq31HeSrrLolXmHUdA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197); X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(601004)(2401047)(13024025)(13023025)(13017025)(13015025)(13018025)(5005006)(8121501046)(10201501046)(3002001)(6055026);SRVR:BLUPR03MB581;BCL:0;PCL:0;RULEID:(400006);SRVR:BLUPR03MB581; X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB581;4:xOxR4K74ZMsycRQmg9H5dyNmV4+PWMORj/3tpA5YVKuwzgQAyNwfKh2V5fao9DUnEYITJAk4WFaiRxqYmFJt5ao8xR880zV9cmsLC/mkhEHejBXqPUneaH7/MkF/juMYdHrG/j2iU6oelsewQoGvPIixsDPQNGLo/L+YPU2pSbnv3sNW7OtvcVX6BFNxXX68g0/Y5Is1h4BAwJ4BUaaONBXscBlw+oWp3SzJBkONL+47VK1kTobC3smBYlc9O45QVi2rWVKpmyNdWFx5f8xSZjZWPqg+gQamz5keq6GegUwiwz4IPv+ToStU6OZvDFK0lyGM/VavjXmALAwooSt4E2apL5auGrhGasQuCEgQVQVQZQxfMQVV3iZUq3WUf/xYRwoEp6m27RDcINVqft8sxu1up45Gzv6OcQFPW5Y4GEavOt2axAN58l8lj3KBAiG605hgBkRXYeZbaOMjIgrsyiyGxKzh4VlHRWNCz9Z0iYSZIpB/n+Enn/iHGrrTBRWGgc3lmBPgGL3pmdxZoiIoHA== X-Forefront-PRVS: 0994F5E0C5 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BLUPR03MB581;23:Dxar4djwaA7+KHOccky70IOlJ4KiRUeSHnyZwnB5az?= =?us-ascii?Q?SorlXmx5tF09euefGnfFFn8eVIIt85h6B2dkZ+LrqwAtxxSaPu29bLUYuHjB?= =?us-ascii?Q?qCteKQ+hW1hJHXOAnjhSfLbhzmedOTLcLQQ/Oceo6c+vhHXYTeOBJIVaINkk?= =?us-ascii?Q?2A/lOJ4iDUTiU9H7UEVpLbxV9sodS6IYUG2Ykclm1bzulGicXYxodwLrRX8G?= =?us-ascii?Q?1an6yzGZhGDtHm1EHtp4Mfnc0boqOlhF1iHwI6hB0v/OQpQQvRdn/svEoBD3?= =?us-ascii?Q?7slsvbThXtpEWKzG5xWG22egESGOOVo+IlZszCcrbWWFvnN1I0LrZF0ab0eT?= =?us-ascii?Q?cRDrLWECChZMeaN9xCMOkCoeUX4gUJ+2ncxC93vDC7vxFO4rhaB7MVycUMUs?= =?us-ascii?Q?e2AYhhpVr2y84PrF2V/xlXTgcNTGs6LPLNVciNR+xbYA09d/cxB4kcXubN/j?= =?us-ascii?Q?72fioiKL1gcj15EnzpgMAeD7jCKiddNy/t51JyluIRknfrcLyAuyWkxjAOT1?= =?us-ascii?Q?lhdwFMr6+muygXErP+p9fpDPz4tP5+xXL6RbmBaR1j+u4L4gVAd6KdNBvFEC?= =?us-ascii?Q?4oUT7MB1tp/ucqlv5hh5HoQI1f5od8LDYOm9IjSusJbC+uGpBZT6K30GuTCr?= =?us-ascii?Q?TJC8ig674ot0ImQ2O5vqNUL+iuqQ+Rqrclvd+R16Uv8we50u+HvhT8ZIu8LF?= =?us-ascii?Q?6zZjOI9Hiwn4JzmusLXM+kF82CrgQ1E7Gi3+Tfv2JYooJHvb7le6jMHqeOwa?= =?us-ascii?Q?uidToJiq9T00f4hCZEXECCazMptgIcQ2aUcIkcN7bxalf1pmrfiMmY1+8MfF?= =?us-ascii?Q?py5aqqC8Fb8lXNDTfXFTW3VWLnELPy1ayEVArQf5j+7WyHtT4V0ICcia1Lt/?= =?us-ascii?Q?oxIa02anut9o5/srAmJU9V0NtI3zqFr3EKtkfylFv5y/F0gF/c76ViKaceOK?= =?us-ascii?Q?6tCY47403V/477S0IZIu4YA5k3iGT/I8FaaQCgpD8EKlG9OKDr1Us7LS+N69?= =?us-ascii?Q?ZMfCJIPgT1FOcp5St7rGFO5msXlV83vn4nglvIdiJqeIaQjeRgNdqhNIiG5O?= =?us-ascii?Q?kfYjDzBuBdoPyPMpjKjJvqL91QJrG1LJ0jGI6fAqmBduXxp1l4TsLcWIlWjr?= =?us-ascii?Q?7QwYNubiblSqd+j8Lhn9S8U9rPvjy/qr5jrQYO4cYL7ZlD8OXI2A=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BLUPR03MB581;6:K+rZ5BfBhZy7Qyx6322tDqx9Hdk2tWDPHFujYNue1y0/anxxXK2K8WMeN2LXGytSZ+ocyUocx5kFiOHcqqCutT9HVTC/2EADy+LjR3lf+kH4BIRE8m1jWm/oigq6wHlmi2up6gMUw5DWkpI3rMiLGvjYKpWPa3WKFwrJMNyj8zHw7kxLLhEDNVerYsQlS8WCxldKbutteohZPhJ59AA7GhSOiA44YWTCIo9JqugL/jcntAjvEgl6iBa5awSGNQ7atbEIXz2f8lTJ9PYkQQDrjVWAr6+/PGh9TRaEQeYv12o=;5:GlsIqkMCRzW95EvqCdjJ0mfnpV6zbage66KQKmeOMN2FkTDQKoOK6gmfAxtLeQ8nUpAChxRAAGFPf7lx2jKWu9rlH26N1iqPpk+2ITgHspwGZ3Ijx4CjdHWOC9MYHScFxyP/ulkXobVx+Zx3xzYp8GM7L4QF4efRX7hKzFalGR4=;24:yxIjVz3bTaW8V2vD1GLNT4cth9/yAbpGb/BOuGwJCTI6tzvFcZlFFIB4EIK4ue+/YB7jrRfMuYRw7ickOzOAuyriTNVHuUZfpx9aYAa0FOM=;7:XVDgzESrtz3c63YA5ywWWj2wIPeOEPU7Agh+Vtz5NndXTFoLuBZ8tlZTgW+ePb9bBcpkPS/eiaa8gFmvcpQVGR7cOA63xq0aog5qyjyL7LJKx1IgIUw/Is1aMCimBntUYrg7E6npimwgc5NKEv9v/nLvDm2UOL8c4XjSffg2pVN/2MRgjXom+VfSF1VxKvaxXAXhFhjTd8LlUZiOMaAmUnR9B4c6eI1VYDONzaI24/tgphIObNZAn443AAReNw1C SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Jul 2016 01:57:43.5526 (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: BLUPR03MB581 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The codes of qe_ic_init in platforms are redundant, move them to qe_ic under irqchip 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/qe_ic.c | 14 ++++++++++++++ 6 files changed, 14 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/qe_ic.c b/drivers/irqchip/qe_ic.c index ec2ca86..f7f9a81 100644 --- a/drivers/irqchip/qe_ic.c +++ b/drivers/irqchip/qe_ic.c @@ -509,4 +509,18 @@ 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) { + qe_ic_init(np, 0, qe_ic_cascade_low_mpic, + qe_ic_cascade_high_mpic); + of_node_put(np); + } + return 0; +} + +subsys_initcall(qeic_of_init); subsys_initcall(init_qe_ic_sysfs); -- 2.1.0.27.g96db324