From patchwork Mon Dec 19 20:42:44 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Madalin Bucur X-Patchwork-Id: 707236 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 ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tjCcv6Mq4z9vFK for ; Tue, 20 Dec 2016 07:46:23 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3tjCcv5V5wzDy47 for ; Tue, 20 Dec 2016 07:46:23 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from NAM01-BY2-obe.outbound.protection.outlook.com (mail-by2nam01on0080.outbound.protection.outlook.com [104.47.34.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 3tjCY04mHLzDxRl for ; Tue, 20 Dec 2016 07:43:00 +1100 (AEDT) Received: from CY4PR03CA0017.namprd03.prod.outlook.com (10.168.162.27) by CY1PR0301MB0747.namprd03.prod.outlook.com (10.160.159.153) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.789.14; Mon, 19 Dec 2016 20:42:55 +0000 Received: from BN1BFFO11FD025.protection.gbl (2a01:111:f400:7c10::1:106) by CY4PR03CA0017.outlook.office365.com (2603:10b6:903:33::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.789.14 via Frontend Transport; Mon, 19 Dec 2016 20:42:55 +0000 Authentication-Results: spf=fail (sender IP is 192.88.158.2) smtp.mailfrom=nxp.com; ellerman.id.au; dkim=none (message not signed) header.d=none; ellerman.id.au; dmarc=fail action=none header.from=nxp.com; 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 BN1BFFO11FD025.mail.protection.outlook.com (10.58.144.88) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.789.10 via Frontend Transport; Mon, 19 Dec 2016 20:42:54 +0000 Received: from fsr-fed2164-101.ea.freescale.net (fsr-fed2164-101.ea.freescale.net [10.171.73.197]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id uBJKglbG010992; Mon, 19 Dec 2016 13:42:51 -0700 From: Madalin Bucur To: Subject: [PATCH net v4 2/4] powerpc: fsl/fman: remove fsl, fman from of_device_ids[] Date: Mon, 19 Dec 2016 22:42:44 +0200 Message-ID: <1482180166-10677-3-git-send-email-madalin.bucur@nxp.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1482180166-10677-1-git-send-email-madalin.bucur@nxp.com> References: <1482180166-10677-1-git-send-email-madalin.bucur@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131266537745947498; (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)(336005)(7916002)(39400400002)(39840400002)(39850400002)(39410400002)(39380400002)(39860400002)(39450400003)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(4326007)(356003)(47776003)(8666005)(2351001)(77096006)(43066003)(38730400001)(110136003)(2906002)(106466001)(3450700001)(104016004)(69596002)(105606002)(85426001)(36756003)(86362001)(5003940100001)(305945005)(50226002)(50466002)(8936002)(8676002)(48376002)(81166006)(5660300001)(68736007)(81156014)(76176999)(53806999)(2950100002)(626004)(50986999)(33646002)(6916009)(6666003)(97736004)(189998001)(7059030)(142933001); DIR:OUT; SFP:1101; SCL:1; SRVR:CY1PR0301MB0747; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1BFFO11FD025; 1:JUrBVaRXOl8lXg+iRm0kycBNXxoNVVl1kVADshfWxw4/wETFmewVW/9tKWYMbrxsLfw9Z5IQgPsE+U3fpuAwVn7ZoLH66nCFPpeljZ6CEYH23HA9DYOCQ7rKyMvPejcG6AcnaQsn2mo7TCVM5eTecdgj6F0ZcYYxquIfkaO7RNcSMlcoDBNGfbjWJ9vxjLUEy/k2rfE90D9L19IuqYax2d9NPv6fx1Si50GmmoBwnr1IMhoYhFkelmeeYY7e9ywECKmzGrMJaMnkwwg87cZxJYGGFtg+2e6kPWiVyGU4BTp5WzACisbwrUAx4SIfOtMn80n3jL4I/2ZB4SKeCWGxjjkJtHwZcGl9Oh81SdXg2zNRbI3Rl61h+JOkdJAdMXrSGXoosAsT7P7whQmryYETwnVUPP0dV9qTVO3ItP6Idoo1Y0qSFJLNomCOtJYAA563rWTD3WIoecdIAPwAt8vLTTFnZJw0IiQjZUSCSWrVDvuLG/nSBzYQ/IgmmuYr1G9GWkCpD9LohHzbR8lzOnaJ66D1l3XKroTisMl+GeGD31Ix1SH5MfqZq7w57ggoOAlDwMXa8/vYnn+c/I12N5c2QYqwiqj8PoEQn8aTK/AAmBUni+rY4UDdT3aR6VSNq3uJ MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 5c4d95d0-3ae8-403a-71d1-08d4284f9ba4 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001); SRVR:CY1PR0301MB0747; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0747; 3:HWt+o/GJbyb8PzacBS7FOPaBxfBFMFrFgeujbjIQmOn8IAJvaZSjOX6yMtY6wrLotWrnIwelGTEcBuDz9RLjEc1xoi3eLWiXPa063SVAzZsN5cQMtnZlKyB5e2hxRw8KRnOkuBDmYHagylMgVcCstPksX5G6qux24HhWtznl4HW4va2SeQtEZ166qpmpFllL0CQZfH0RCkgD+L9sTrgIVkEYloSqyXGWnnvRPCL1ZtPJSBh2cXysCFFWfr5eoapGJc/GgQ5IcNegJaiGiQGxDUT6pGX0bLpFbgEy3/hgJfbUPEusiR7RS0aQOCNmKli7pX8yrGhy0ykjvx08EGMZ9mK4UBh8UBApbRnTWbhdYTVSJHfbBNVOlgGEFOvIO97d; 25:9fm5ltrBG2rGONXKM+csIhtNI4tTeq3OEdm1N4LeYF959JLCI89h0xWaaeL2KI3r7cVLBAbsePjMj7RInKYA65gIMWCudZNcZzgyuj03v1YcqPK0DW+ljkdQeSw0lK72S+PcVlv/QBJXPbGos7kNrQaRHHHQpwj2r4Wgvjny9RnvsBjKFk4seZTDAdC4+3NWuVhYBr0WIFP+AKOQE6vu2ppXY4xd8hl4X5dUPvH4QJk0hIQeS54NCkWOWn+Jzsln43UBOjqnv2bSj3F80RABEBk214HcHIzsw6SMPYNTGsmLskWH1L5sr6KaJ32fgoFO3rf6nkigzZkftFPDZhVSt8aAujzy0R+kbF7j0xQfsE+cuygP/um5I9c+CEFQY2exd5aoth2Htkf6lHJL4Uz981RlnMiMW/5pt7N/IeRE5o22zjDOJtoT4Hf8eVvd+LRq0U+d+5ZvMUYV6S0nB8c9wg== X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0747; 31:UiLE7ni3+QL/rD+4AAVlkaj1KWVd6a3nxQkhvxQ5LLsW3NVpROnSR4SZIklS7AnWZrstQa8MnJ0UdW+XS9NpEuwLuYVZqrWw+Yo7SAqTG8X0J9sOY83JtD2BJWsoRpRQEIf1+fwoRW94RndXhfwZamvUPcIHc6fuF6hFZFyRW5z0mqIWzErRU3Vp2Jq/IZ/CREGL8JvO5ItygLjiInyyiW2IBExtCdgXXUOxdDZCVP5ftwe51tv2mS0ZkZH4e95FcQ2sIkMLRIWifjXiE2ytDA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(185117386973197)(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095060)(601004)(2401047)(5005006)(13015025)(13024025)(13023025)(13017025)(8121501046)(13018025)(10201501046)(3002001)(6055026)(6096035)(20161123556025)(20161123559025)(20161123565025)(20161123563025)(20161123561025); SRVR:CY1PR0301MB0747; BCL:0; PCL:0; RULEID:(400006); SRVR:CY1PR0301MB0747; X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0747; 4:HbZPvWQd1P/meOWAIfKVLNGOhIGz2WOYsB7amytJgBZmOn8xLD77E1q692lwwxVkfyhwEmrJvN4nRB0lQ7pfYbuBsG7p/SMrXAjwBKYo6v5DEj56qr1dog19dnBcf2q6RNz1i49Rqa2uNrDv/C581TRZcjqojvgpnY28hFiPhQAPL91V8npxzzmLBjpsDLj3ckjMH2RpP5rgBBJacVJI9CAhZGW0oVpqwWxroNvvXFLWuGAcaykE2l12OG1+0843eT5Z8eRPvxG5xM8PLXb/DZ0UYKkvIWVI5OwLOhnwm+3U4CIHccJe+1ajWnh4WkNCz6oYcHR/W1QYNVYPGVX/IeesvwnhHTKokhSvvsbrRnq1ayE5uTXYN1ixvSQw90Gi4w0dVY25veoc2mnxtLBAivdg8AkI0uV//QsYcjCxjB0F3YwLsk7Q8DhAkT9SQ6/udlCJ6PdWK1Zc+ZR0YSBD+2rmDGtjF2HJpkhJgkguTB8qOOOf1aOQddZLunmLhkkvkq5DNQ0TKQCb6rvDg44M9hpDouuGlZv1gVkbWaW1Liq7WoL6Ja3zkSKSF5LBwIrXlA7ibRbrkeoVY3EIEkBdnQd2PeCA4UJDlTWrHxig9ze8hwbtoiXrJm+hjWSHzzqOqD6HmbdWb8lCfyNptKqYwKbPNrDXqLArQSggBTVZV+GYKvvGzaPo2tc2v6oXvKHjhYeTfNXp6GHyOHdZTsHvCF2EOAPz5kn5pO8plyVCqXZdMAoFhsyP1HFBWN+4w8PY6ZeaMh0QDhW5IZcw29cozA== X-Forefront-PRVS: 01613DFDC8 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY1PR0301MB0747; 23:fiQ3x/mXYxzAaEpg2HOa8ElMTtHR6geGe6fmGKA?= =?us-ascii?Q?de6HwX+eB5OUAs9L1l3WN+yAgieOn40mh7OjgqRyhndyxAAut+OrmotGuyqY?= =?us-ascii?Q?h/nYzr8eb71fuUd91Z+KrVztn3WqLLUOcWE6GOzM9hQAH6gDpV20hcog/7cL?= =?us-ascii?Q?dyfVa9/A3CTRHWMS7DjUxjygu6ZlE/xxgCSw5yuhDsYNH2Sg4gk23YhPBefA?= =?us-ascii?Q?p50LgyZLg/Lr9jOebVkl65zt/LbJjM5XNxweoSCysRlqrKMwCOdFw23YaHFm?= =?us-ascii?Q?Fi7oGUNH2623wZUFT3dGtOdmxYfhXFjV1eRPJmEwmC3YLix81DGJCfYcojsY?= =?us-ascii?Q?d/UluUCz5G8fO56oXxDjWTyCy42uHZ/ITPj0s1xfXZcjojflAGjDjv2eeAJy?= =?us-ascii?Q?LCphIezj+2umZr+tPhzpIdvLHlf05QrN0BDrkYOqhjBN+06jdNJ6P86F+4zK?= =?us-ascii?Q?IU/tn19yip7HXk3mtjLX5WStGH9WYPgDQXfJfYm35gEVZ4SV3htozFZOPNWG?= =?us-ascii?Q?9feIZCuaSXdD3PSkGw3pifu/5WhSi6lCohSs0ghA+Qm349J9h6HQ/PKp5ium?= =?us-ascii?Q?RBJVarTPgvDJ/chFoZWLHX4nYJ41PuwT1biCPqt3ISx5+FBC9fKq/hZ1UkIP?= =?us-ascii?Q?NbUV+bwzDcriCgdCfmt02z+CPD7oTUoyr52j5B//4LThb/OBfxRSo2vCpMPe?= =?us-ascii?Q?qWy5q8X3tDrHKTSURbJecyXpcrPtH/HZEEXjdzXBxVHZRGiKRgzofEcpPNOg?= =?us-ascii?Q?evJCoBSfic6O4XBTe2ti/4wwObxCDjNDrAd0BqcJVOJ0DwnOKWXXOCSIEM/Y?= =?us-ascii?Q?Gkw84SEidH0OhJqNOVc5wPZjWbk/4e2tKHEkJSKaHgYW5+I/q8WQoqHU1y9N?= =?us-ascii?Q?739cp+eO1wKruhXXWX2jS58ROaxy/wxQTkLgJvw+Clrwew1IvVP6SBsA8+DF?= =?us-ascii?Q?fPkZPZw5bW2yYacaSsLIkxa8cJv+Ob5GvsC6bejno5SNA1bJ8BOc+Ry/4gIv?= =?us-ascii?Q?gsdzVdbyygF44Yf8OZMmCmX6SAwaEevzWUFWaHgHtfKq8TRB7x9Sm4evNofo?= =?us-ascii?Q?DaXwMQ2K3TxPbzmWdPC4kl9GgDzCa3oLel3TtPGEYk3QqVVksfdAW/dRRAJB?= =?us-ascii?Q?O3ZZ+RTfqYQqD6z6vipzsr9J9EVO/GpKankSepe3x67DvM+1TBIhRQtg0Iax?= =?us-ascii?Q?gxtpm0yUUx2I2s8G00tE4WDfXVnqxq2sQKfuq0lOKgPuvPxY8HTjjXyLgFTj?= =?us-ascii?Q?TzJJr+zTmI6CkRRfH7vIGz1pIvtbDAnbgDN1WpWuBIrp0oxJvk26eCdLqtGl?= =?us-ascii?Q?PeSOJijJlXI11swVrWgYDrg7lQ9MhgabVnkGJkuyrF05Mc9nJRSb1q+kAwrH?= =?us-ascii?Q?ltnb3rrBPfaDHzK4vhkZCPWMKNVA=3D?= X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0747; 6:+8fnuvzli+TeVXQf8eBSqVtZgtaxD67LiidiFoJ6g8YsXiq/utNwhnjcdFE619zuIXHSjGT8m4D76r9sS/GiJP4zqUx4YHLQDITCPdhHd9p8dQUaZkod0FMJG/JBy03tcr/BmUYYu1ZN56Bl/P+H5M9Jp+a9qkSh+E/LYYpuZYMvbB/2lJkJvmTTp/AlCW7UCPoh+/KX53lu9yJG+IaVGGkqhTvS87hwhNgJxegtyn0yz3sbP9r519LuYQPDlyRvSh7V2zUMu70ue7UGEtsrd1xMVwNw4j30Wg8XK0mIZPXV4JwluTiVm46+EE/QyZlOqnFsNDt/MxnXZmo9FuZLRqyQnbD26Aq24735PzjqTnXdxGFW4w2qTYdF+iJZchC5QkHtspGx/COK8l6LMLwvW+QTOqc5V9KmdqZd9lAETjok9ywbOL013YZ97bUl6Q4i; 5:o/q9LdvsGVprq4E03SBI0Lk3oD/8Nhf2bp4SygTrP2CrML0PlebUuv1D76XT1BuruedL7kBnPoBh3tc2hOVV+Xrr6fRXy8LrGnBQHgMnvr1lU0McJDJhiGYw7PFyR8lm3lDosih5SR8I07GMTx44Cya7vdoUdStIEaBqbILRshbVUWGtXq4B3xLr3bTn1h8x; 24:1bEyd1wtYIHzSktvknCRtIT/h7j0UGqrL4qpCIaxm+zbWf3k4d8wX2DHsPjOcQRichAtwOE+VkYRu5c4FEFUI2H9ZedRD5imb98L+++0DrE= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; CY1PR0301MB0747; 7:FbobyhYETUn1W0HzR63WNb8SUlpRFFprVujirU6fucuVNGAfMR0Ktjh/zy/5upZvFtST+u34iHh8ygaSCJ8365RyL9IRygMb9ZK9iieF+cpyMoypKx92WnzDZ2PIN+rAC7fuNF6ozyQQhkDz9aaoLxl9Z2Jdd86AVO/LqURtVJTLqxr5TL2nTui56zRqL+lTTyDd5SKU3JKaJD2RRbdOSfxygU2EvpwZlIM9WNzmvlhk7UreNjmswAw9tL7+G7ZGhK6ZxO03czAupUSz3vACTl1FUeBkSoSd1VdgukOz6bZer8+9aBb3mkNH9augbjyt62k+NFfMbvIFqCk8Fjm/p/QEV6tTSLBSEg6ynnb0hEa/ukJM636gRp3W5cfZCIKFo9M4I4UaCA4AAy9k0IMcI46JeeNlvS7YXtiQ00u1rnAVfUWwV98PPJbkIml60EMm3nDViRjuNfBI4Ya/pXcWZQ== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Dec 2016 20:42:54.1735 (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: CY1PR0301MB0747 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: , Reply-To: madalin.bucur@nxp.com Cc: scott.wood@nxp.com, linuxppc-dev@lists.ozlabs.org, linux-kernel@vger.kernel.org, davem@davemloft.net Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The fsl/fman drivers will use of_platform_populate() on all supported platforms. Call of_platform_populate() to probe the FMan sub-nodes. Signed-off-by: Igal Liberman Signed-off-by: Madalin Bucur Acked-by: Scott Wood --- arch/powerpc/platforms/85xx/corenet_generic.c | 3 --- drivers/net/ethernet/freescale/fman/fman.c | 7 +++++++ 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/arch/powerpc/platforms/85xx/corenet_generic.c b/arch/powerpc/platforms/85xx/corenet_generic.c index 1179115..824b7f1 100644 --- a/arch/powerpc/platforms/85xx/corenet_generic.c +++ b/arch/powerpc/platforms/85xx/corenet_generic.c @@ -117,9 +117,6 @@ static const struct of_device_id of_device_ids[] = { { .compatible = "fsl,qe", }, - { - .compatible = "fsl,fman", - }, /* The following two are for the Freescale hypervisor */ { .name = "hypervisor", diff --git a/drivers/net/ethernet/freescale/fman/fman.c b/drivers/net/ethernet/freescale/fman/fman.c index dafd9e1..4b83263 100644 --- a/drivers/net/ethernet/freescale/fman/fman.c +++ b/drivers/net/ethernet/freescale/fman/fman.c @@ -2868,6 +2868,13 @@ static struct fman *read_dts_node(struct platform_device *of_dev) fman->dev = &of_dev->dev; + err = of_platform_populate(fm_node, NULL, NULL, &of_dev->dev); + if (err) { + dev_err(&of_dev->dev, "%s: of_platform_populate() failed\n", + __func__); + goto fman_free; + } + return fman; fman_node_put: