From patchwork Mon Nov 30 02:48:56 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Qiang X-Patchwork-Id: 549849 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 [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 8B5211401AF for ; Mon, 30 Nov 2015 14:02:51 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 704B21A0A15 for ; Mon, 30 Nov 2015 14:02:51 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0105.outbound.protection.outlook.com [207.46.100.105]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id DA9811A0A84 for ; Mon, 30 Nov 2015 13:57:03 +1100 (AEDT) Received: from DM2PR03CA0044.namprd03.prod.outlook.com (10.141.96.43) by BN1PR0301MB0770.namprd03.prod.outlook.com (10.160.78.152) with Microsoft SMTP Server (TLS) id 15.1.331.20; Mon, 30 Nov 2015 02:56:56 +0000 Received: from BN1AFFO11FD035.protection.gbl (2a01:111:f400:7c10::137) by DM2PR03CA0044.outlook.office365.com (2a01:111:e400:2428::43) with Microsoft SMTP Server (TLS) id 15.1.331.20 via Frontend Transport; Mon, 30 Nov 2015 02:56:56 +0000 Authentication-Results: spf=permerror (sender IP is 192.88.158.2) smtp.mailfrom=freescale.com; freescale.mail.onmicrosoft.com; dkim=none (message not signed) header.d=none; freescale.mail.onmicrosoft.com; dmarc=none action=none header.from=freescale.com; Received-SPF: PermError (protection.outlook.com: domain of freescale.com used an invalid SPF mechanism) Received: from az84smr01.freescale.net (192.88.158.2) by BN1AFFO11FD035.mail.protection.outlook.com (10.58.52.159) with Microsoft SMTP Server (TLS) id 15.1.331.11 via Frontend Transport; Mon, 30 Nov 2015 02:56:55 +0000 Received: from titan.ap.freescale.net ([10.192.208.233]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id tAU2uSUF027212; Sun, 29 Nov 2015 19:56:51 -0700 From: Zhao Qiang To: Subject: [PATCH v13 5/6] QE: use subsys_initcall to init qe Date: Mon, 30 Nov 2015 10:48:56 +0800 Message-ID: <1448851737-33125-5-git-send-email-qiang.zhao@freescale.com> X-Mailer: git-send-email 2.1.0.27.g96db324 In-Reply-To: <1448851737-33125-1-git-send-email-qiang.zhao@freescale.com> References: <1448851737-33125-1-git-send-email-qiang.zhao@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD035; 1:qdj2LtesvzjQn4w4QfpsSV93vd597h6NovxXryAq7Ca2mYRnQ/SBAIjJxIphvF0d120/2jUR12ajtQpNjBx0uQUgJhDAk7xB+Uxj9QFMG/GD32BoA+WXN2Md8d4TpUz+15DMBjtX+BfEWiNu0gEHAY8Ohl01FuSeLRrxgYdPZqjOBqq5888oMXKzIzCOF54RNoSDolJPYL8nSSWyg9v7rTHXWt/FugBoawBAPV3t8o+wqGftjUqyFl+4Nu8bKs3OStw8wlaIK9ZYcjB9OhtrGsZeU/vfmyZOVYhOKnx99t/Cuf9eZBnQCj0Ry0yUhpyyN1utgbWdtW75x+pMT/Lk/EhaoW/hgi+LrnfEHkyp7+HCi0JJNQfsORMuElY0gK+4bnjYQUEVRwOm0R7BEnbyyhYmlcYvsarUQKNoyWK4XE1CxENWsJlkLeyOSYacLGDQ X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(448002)(199003)(189002)(87936001)(81156007)(586003)(47776003)(2950100001)(19580405001)(110136002)(107886002)(50226001)(92566002)(50466002)(97736004)(33646002)(229853001)(1096002)(11100500001)(4001430100002)(5001960100002)(77096005)(189998001)(2351001)(86362001)(106466001)(50986999)(48376002)(69596002)(104016004)(85326001)(5008740100001)(5003940100001)(76176999)(19580395003)(36756003)(1220700001)(6806005); DIR:OUT; SFP:1102; SCL:1; SRVR:BN1PR0301MB0770; H:az84smr01.freescale.net; FPR:; SPF:PermError; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0770; 2:RlEQ3Lf+eyU5XwryAy8AyaBRtuBLutNeUMux4Pzh8ByZ8HJVENFYsVokqqw7og3v7UdM63g8TUZk781LzyyFjGAP2psHZWTQk8pKJ2Fr1SBV8fHcgiKEkVrEHG71mwKaJy1o6Eaqyi2rJtVqtUjmbg==; 3:PhDsn1rikebVpTrgUDj7whLfrsc6SjvF4hUICC5d1hlappvLAsORGwgEJS52JgtFvWsdo7KJOIzezhcpnuPgY3mfmXF/RW/zl38Nt7YyUyN4oSVptg24shqrvm93NNkjTlxEs0rIs1ADroG7RKmveo6QuUU/Y9I2d5+DN8s8/735BKGcgwrZmYq08QKPLZxhFE0zepkLz+QgtdYCNseztqQocAL9RHM+g1jDZLXA4o8=; 25:YL1U2QrCq0WYEEO8JTU2YvR38rlycBq4VtgKlrFrWH8Nve+mPbPGACIJXg/L/ImxMyCw3GIezcKlfwrPpafPFOMagX2ZBlLbwnE3Tn74Fh9dIitvd3jbVbR6ZFaZEqw1XiclWmpFKzIiQU58eyj3UYSputo1hE1kWhQk74JYaLq0MqR1Nogo+qpeAyPuuBBJINdgI8cdZbKWcSYvvfo1UqiIXOhyPggNZ/dqVGnp3MGDm77d9EvTyg6IkY3s5zqtT/JPWztoM7ZZFifLRwOSww== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BN1PR0301MB0770; X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0770; 20:hvXjRaPJGw++idSfNojlDYT4EUnywznmzHRxB1KHAnbER6+5bV8q7Cp9MBtKe4QL8aQMIMuHAawYSTIZZmaghfLf1t28W6xd3yYlmJ6xxcgsuLhLQ5XrYBOjQ4bCvjm9fbwZRWyc6zCeMarvkcxhpbeZvwsGq+Oc7G6SCMZLm++QeQjbaD/hQuGUHY2IzPvK9Rzke8ggSCHQdJMkSckNQlkXgLgEkO2eDWAUoMdHyQpbLQkGCwvO3hx3xaSXg9xcC1li2/g3nLa/2zo0uIGVBCCTkwwT+k6Y6Yo3MBchsB1/l25FYdMYo6mlPrVXSh4mtddmBgjJ7K5TQVPYdsMKK/2SK57xrn2HzPKqYd6MJXo=; 4:4yT3ANGzfn4BctyACF7fCRpuuWtL+wrr23lbs86n8+IyCjeWJ2jAe6dFUlOfeIqUCwbN+JvTwFJ9Gmps0q9UD50wlDmDfA61p8nwHgfHpqimLjOfNi1x7raF/KpcrUUc40CvjFyyprah/5501LXFK3mAV7XpsQ6IYzozY5gE3iKyoWRDNePJpdcYZnnmtcxutp+e+jn3etK9rKk00dCHXjn4JoIYiVfNXZSkpRq52absDbPPi+Dz/WdP2THY6a2oHjrOhHo4eFSfZl65B6QOb0TeFzpQ5FnG6jCKKUi/iJd+UNnozB9RQpn2Nu/p2bxR5/ATG5yf7PlOj8udTwbm1ASygjEBu+3mMdKG+imFAWhfN5tNJ7j5ve9gwQ/BxrVE0JaejYYM+CZOY5JEAwlBR6k+lL3t0aFw1oUoaBoIsxYNOl3/+dUdkdksgnuQH+Iu X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(520078)(10201501046)(3002001); SRVR:BN1PR0301MB0770; BCL:0; PCL:0; RULEID:; SRVR:BN1PR0301MB0770; X-Forefront-PRVS: 0776C39A48 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN1PR0301MB0770; 23:3/xLFuh2OlTMpcy68tNfR1ZBfyEcV/8IjQ5zxjA?= =?us-ascii?Q?hOcqPHiUCT7zZGcYXzPr5c+fFqUdbmVu//jcmvzRXQHAFSdx475jS7UIsT0o?= =?us-ascii?Q?3Vdc5mNZCEJ091KbNnfejmigBjH+6xxPkyzKj+GzkEbDbOAJE2u/5tKc4xme?= =?us-ascii?Q?RZiBDsHv9qL7wmcQoqv2ZpeuZIhQyBFoZvI/dh9Tw/0ZPAFvSeVR7V+q7OEJ?= =?us-ascii?Q?/Ojy+4TXVXqoks+jMca0ynq+EtY7gyWs97D5qHEwbG7zyhK9F+NpiUXExfo5?= =?us-ascii?Q?0NkU7acN7o3bgoSSB7G+0+bJYE5gXwzsB8FJH7jAj2XpYgZlnq8TTNqR1qk4?= =?us-ascii?Q?xqkHjc8KtFre0MJZydOJxGuGOZvmXd755ketL9hS6i1pFnmvcj7nNJOHk5bo?= =?us-ascii?Q?qssxhAWEISqLUEvvWbQ2DEAjPSjZkmY8wRhMFPd3uhLW7lZcH2GZ3aO/+DLq?= =?us-ascii?Q?SPPm8yoEbhnu4VSEvgdPyAGfjfQ4OsSeva980gm98g9gfajhsQgEDl/sZvgP?= =?us-ascii?Q?yeU5mPkb7Tx43mZr+DlV/j/GovX48gb8WQ0hKhwlxjE36AtzMLw7h2GYq3p2?= =?us-ascii?Q?XeBM+jQ+h56/kd6YNE0pMuIqN8E1UhxUxFrqMb7ubg0U7N4Phba3SoL4D7lT?= =?us-ascii?Q?CeHDjoeZDuEA5UlcJUh+qdltHwtqm1as2gnMQ9eyqWzWl54IOk5SSUfpuRXL?= =?us-ascii?Q?UaW1jNY0agy8Lz2mgUb7xSndNEChKqXsN9X0JtyA7J6Uy6JfFja6HCedZGS9?= =?us-ascii?Q?Zdvu4w3YPWPYgOAqTIFDZ7+QgJsvBQRdqTeROeH31vkSrw2NjWmQvSD3H4ph?= =?us-ascii?Q?aT0vusd4BUPmx5zW1Iyb+qjd6jWJ8KPfm8ut9sc3bgf1XqapbGLFK2Pg0Xbl?= =?us-ascii?Q?X0q3QKlKCKc3Gn9x71eHbk5YBKRwhCcrq0Z8V7Ls+7MGO0RDd5Q1t7Q7wydN?= =?us-ascii?Q?vylFUxOq3hg7EH91AyXuKJr72SOjb4YtbaZUVFU+s8OfHG2mOLRvedG06MBy?= =?us-ascii?Q?DveG0K/GnHICizPX7P5PXQ3KCY53mXYJlWKBzpJph1b+nCz+qCK7tiHcmMx8?= =?us-ascii?Q?DDX4C/dehJ8u73hrdLf6SJZ8Hmhig?= X-Microsoft-Exchange-Diagnostics: 1; BN1PR0301MB0770; 5:65Xwlbg3ua3W3DzUSiGk8ZBPRR7yMuqHNYe3qD0Y5yg9cAacvmRsXR8jH4TDHJI0KxutUln7qoxdm9q9fBIX5cwBlq9fD1tts0PrC62EzZO8ymlPwaenVjImyXYWnltkziW0IxR0ZIw11M5YOg065Q==; 24:2Nz7UCCRyyVHYUDav2DwvM5zSvVl7vli88PphKfsNPiqkWbDX+L3x/NNMkLnyYgXeSfGmk3Qqq61lmBhgkzpHHx01zYBIEck9PKHBQXCTmI= X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 30 Nov 2015 02:56:55.7084 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN1PR0301MB0770 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Zhao Qiang , catalin.marinas@arm.com, linux-kernel@vger.kernel.org, scottwood@freescale.com, olof@lixom.net, akpm@linux-foundation.org, linuxppc-dev@lists.ozlabs.org, X.xie@freescale.com Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Use subsys_initcall to init qe to adapt ARM architecture. Remove qe_reset from PowerPC platform file. Signed-off-by: Zhao Qiang --- Changes for v12: - Nil Changes for v13: - drop a print arch/powerpc/platforms/83xx/km83xx.c | 2 -- arch/powerpc/platforms/83xx/mpc832x_mds.c | 2 -- arch/powerpc/platforms/83xx/mpc832x_rdb.c | 2 -- arch/powerpc/platforms/83xx/mpc836x_mds.c | 2 -- arch/powerpc/platforms/83xx/mpc836x_rdk.c | 3 --- arch/powerpc/platforms/85xx/common.c | 1 - arch/powerpc/sysdev/qe_lib/qe.c | 13 +++++++++++++ 7 files changed, 13 insertions(+), 12 deletions(-) diff --git a/arch/powerpc/platforms/83xx/km83xx.c b/arch/powerpc/platforms/83xx/km83xx.c index bf4c447..ae111581 100644 --- a/arch/powerpc/platforms/83xx/km83xx.c +++ b/arch/powerpc/platforms/83xx/km83xx.c @@ -136,8 +136,6 @@ static void __init mpc83xx_km_setup_arch(void) mpc83xx_setup_pci(); #ifdef CONFIG_QUICC_ENGINE - qe_reset(); - np = of_find_node_by_name(NULL, "par_io"); if (np != NULL) { par_io_init(np); diff --git a/arch/powerpc/platforms/83xx/mpc832x_mds.c b/arch/powerpc/platforms/83xx/mpc832x_mds.c index 8d76220..aacc43f 100644 --- a/arch/powerpc/platforms/83xx/mpc832x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc832x_mds.c @@ -74,8 +74,6 @@ static void __init mpc832x_sys_setup_arch(void) mpc83xx_setup_pci(); #ifdef CONFIG_QUICC_ENGINE - qe_reset(); - if ((np = of_find_node_by_name(NULL, "par_io")) != NULL) { par_io_init(np); of_node_put(np); diff --git a/arch/powerpc/platforms/83xx/mpc832x_rdb.c b/arch/powerpc/platforms/83xx/mpc832x_rdb.c index eff5baa..0c7a43e 100644 --- a/arch/powerpc/platforms/83xx/mpc832x_rdb.c +++ b/arch/powerpc/platforms/83xx/mpc832x_rdb.c @@ -203,8 +203,6 @@ static void __init mpc832x_rdb_setup_arch(void) mpc83xx_setup_pci(); #ifdef CONFIG_QUICC_ENGINE - qe_reset(); - if ((np = of_find_node_by_name(NULL, "par_io")) != NULL) { par_io_init(np); of_node_put(np); diff --git a/arch/powerpc/platforms/83xx/mpc836x_mds.c b/arch/powerpc/platforms/83xx/mpc836x_mds.c index 1a26d2f..eb24abd 100644 --- a/arch/powerpc/platforms/83xx/mpc836x_mds.c +++ b/arch/powerpc/platforms/83xx/mpc836x_mds.c @@ -82,8 +82,6 @@ static void __init mpc836x_mds_setup_arch(void) mpc83xx_setup_pci(); #ifdef CONFIG_QUICC_ENGINE - qe_reset(); - if ((np = of_find_node_by_name(NULL, "par_io")) != NULL) { par_io_init(np); of_node_put(np); diff --git a/arch/powerpc/platforms/83xx/mpc836x_rdk.c b/arch/powerpc/platforms/83xx/mpc836x_rdk.c index b63b42d..823e370 100644 --- a/arch/powerpc/platforms/83xx/mpc836x_rdk.c +++ b/arch/powerpc/platforms/83xx/mpc836x_rdk.c @@ -35,9 +35,6 @@ static void __init mpc836x_rdk_setup_arch(void) ppc_md.progress("mpc836x_rdk_setup_arch()", 0); mpc83xx_setup_pci(); -#ifdef CONFIG_QUICC_ENGINE - qe_reset(); -#endif } /* diff --git a/arch/powerpc/platforms/85xx/common.c b/arch/powerpc/platforms/85xx/common.c index 23791de..18bca20 100644 --- a/arch/powerpc/platforms/85xx/common.c +++ b/arch/powerpc/platforms/85xx/common.c @@ -105,7 +105,6 @@ void __init mpc85xx_qe_init(void) return; } - qe_reset(); of_node_put(np); } diff --git a/arch/powerpc/sysdev/qe_lib/qe.c b/arch/powerpc/sysdev/qe_lib/qe.c index c2518cd..88ae5c7 100644 --- a/arch/powerpc/sysdev/qe_lib/qe.c +++ b/arch/powerpc/sysdev/qe_lib/qe.c @@ -671,6 +671,19 @@ unsigned int qe_get_num_of_snums(void) } EXPORT_SYMBOL(qe_get_num_of_snums); +static int __init qe_init(void) +{ + struct device_node *np; + + np = of_find_compatible_node(NULL, NULL, "fsl,qe"); + if (!np) + return -ENODEV; + qe_reset(); + of_node_put(np); + return 0; +} +subsys_initcall(qe_init); + #if defined(CONFIG_SUSPEND) && defined(CONFIG_PPC_85xx) static int qe_resume(struct platform_device *ofdev) {