From patchwork Wed May 31 10:58:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurentiu Tudor X-Patchwork-Id: 9756673 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 126F3602BF for ; Wed, 31 May 2017 11:05:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D75D02836F for ; Wed, 31 May 2017 11:05:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C92CA283D1; Wed, 31 May 2017 11:05:58 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,DKIM_VALID autolearn=unavailable version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 31BDE2836F for ; Wed, 31 May 2017 11:05:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=5Zsit/erKxszTEcikwPfh12ov7CYq57c2GhjPukxCto=; b=Zbz6eddyLvgHKy SJ5so+tOEf8SSShwsxdBaN+yGm13Now1futS1+43zw0VFkPZZI7t3NOq2YN7jLXYRqfJ4pQaAY0JX ZuZzaldkfWHBBIcVqoGhNAb5xVknA2geD733SKDBgRAMHRydMeXE//tuT7SipHZ1GmqM3yXem2rrP mmTPWpHODfuOBkiCvFXmTzHPKN8LEdatXa4A2hT588oMivcZi5qsOOXQN9Y8MDZ24TP/hZmO4zfei 1iBTOGpv6jVuQ96eUgtR1CqhHWBSTcmmjm+IkBC3NcYOVChP7StyNWvR4vYQhhKJphWDtQRaDyWhd lyN3FNuXwEcS7QyIysUg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dG1Rs-0007tw-Dt; Wed, 31 May 2017 11:05:56 +0000 Received: from mail-by2nam01on0080.outbound.protection.outlook.com ([104.47.34.80] helo=NAM01-BY2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dG1MU-0002Zn-N2 for linux-arm-kernel@lists.infradead.org; Wed, 31 May 2017 11:00:45 +0000 Received: from BLUPR0301CA0030.namprd03.prod.outlook.com (10.162.113.168) by BN6PR03MB2803.namprd03.prod.outlook.com (10.175.125.9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1124.9; Wed, 31 May 2017 11:00:00 +0000 Received: from BL2FFO11FD019.protection.gbl (2a01:111:f400:7c09::153) by BLUPR0301CA0030.outlook.office365.com (2a01:111:e400:5259::40) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1124.9 via Frontend Transport; Wed, 31 May 2017 10:59:59 +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; 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 BL2FFO11FD019.mail.protection.outlook.com (10.173.161.37) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1075.5 via Frontend Transport; Wed, 31 May 2017 10:59:51 +0000 Received: from fsr-fed1964-102.ea.freescale.net (fsr-fed1964-102.ea.freescale.net [10.171.73.177]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id v4VAwtf7004429; Wed, 31 May 2017 03:59:45 -0700 From: To: , Subject: [PATCH v4 10/10] staging: fsl-mc: move bus driver out of staging Date: Wed, 31 May 2017 13:58:52 +0300 Message-ID: <20170531105852.22304-11-laurentiu.tudor@nxp.com> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170531105852.22304-1-laurentiu.tudor@nxp.com> References: <20170531105852.22304-1-laurentiu.tudor@nxp.com> X-EOPAttributedMessage: 0 X-Matching-Connectors: 131407019990564317; (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)(39400400002)(39450400003)(39850400002)(39840400002)(39860400002)(39380400002)(39410400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(9170700003)(38730400002)(33646002)(36756003)(2906002)(498600001)(54906002)(48376002)(106466001)(50986999)(76176999)(105606002)(6306002)(50466002)(966005)(85426001)(2876002)(86152003)(53936002)(104016004)(8656002)(305945005)(77096006)(7416002)(50226002)(8936002)(2950100002)(356003)(6666003)(8676002)(81166006)(47776003)(1076002)(97736004)(39060400002)(575784001)(86362001)(4326008)(5003940100001)(5660300001)(189998001); DIR:OUT; SFP:1101; SCL:1; SRVR:BN6PR03MB2803; H:az84smr01.freescale.net; FPR:; SPF:Fail; MLV:ovrnspm; MX:1; A:1; PTR:InfoDomainNonexistent; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD019; 1:YGtxaJ9X/qCdGyxnZtfRnKeO7kzfQda3G10cmgkd8o1a+lpH+7zCnG+7Qnfl3g5UjElVJfikd4Ffb7ZktHLC9+L1PylvPlAHTWtVuxt8YcVzMGdbBQ/Ar/JDsPL9+Q4+aCgaTxiCknKt5+YBO5IjpO7Eu7PMe/2yGypNaqKtAzZvBtyofjAW9+haUzkAEj5LPH5FTUMWISt9wDTOTYpCYFOGrmClRWf+JIiVcnCxFvPwezcnJJ0aMRIegpcd+cwmKOEkuc15oeM1W2n0FXptSacEu+w1fJnDGeRAhZiAlUn8seXnQ2mQcymrpNNyG9GWLPShwmo2v4Lkyh1AMP1WAoZFtZV5ZhibDIVxrFu/sTmD0/TrnDEKwC2clwzQC4HIHaAIrOolN3aj8u2z3lmonyaTj3prd/32DaQvcb4/K3bMTS5lo8VGxRpPITunu/xac9Dhbk3WabgVuEfZQUSZFC8LcRoHUN9VATupVNJonDw/NHKdoLfIPTkB37PFA3Oz7U3tRbgGTH9vbcXyBUAhhafpMnWzSlQ5DOB8Z7bB0mJFLxDAh/PcVI/kwqsjLcfGB/EQ5u9Hs1Ik1tkfR1sSP2hsNyCwlZS9tIQUunobt+bUoy8t0CrRqPWRxkiXRGRRE1ohFsLDurNCxbnCJGjrmQgGhyrNXpj3J6RBefm0hfbESoQunBMwM01eU9GjzJTm MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BN6PR03MB2803: X-MS-Office365-Filtering-Correlation-Id: 18cf8524-2bbd-48e7-fb1d-08d4a8142df9 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(201703131430075)(201703131517081); SRVR:BN6PR03MB2803; X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2803; 3:m7W/royWrhBwxMPkKQoJSh3OEBxKFntYDxZW45jzwsObFp8bf4KUZQ/RORUwVRMqBuYkkfBe2KUXYhpHJRjZW07Lh6x2H1g9UAUOxvgLxQmiQdfeNs+7xEinTIVtCqeVISHOtgU7CNY488G4v13jFJX26MWcwTqdoTquT0NgOSTB26XlDbShh8zU3aQXZxGRKBssNz2ehGV/9jR4n7CGzDUAG3LxIxbNIVA8KvPUvWpkmOjfDGyOcmnltq1oHpUARL/PMjPFVuwm68y5sCb8FZ6wIzKC0Zb3uPrh4hJXmTu/z4LsuVJlzi/UjR1G3QgIezoBpgOnPIIVHYCIIIDGK5CXrgWkL6b4xJHwedw1hDiJg2TjOU9VxhXZbcvznjTtLJsG/zSkcAWcfDp+5rnp0k+JVH1QHuGedB+yGWumd74DJVO7LXzBTkI9JwiLbUbR; 25:s0mHkYRm7XIyEL0++9ZieAjgSxPIULg8Njv4ofHNbAc8bO4PV9PUVQIFy29JlX4+i33jZnWbNCN3DAH/Rv3r2PmmuVv/7LW47ylI11r0E1F0BNJfXtBl9uFIwOW/Y/2OQXfv2K6MEzQiJjmDzphLN7G5Lhb/yPj4bduze07sUjPq9tU6oMsPBRtCNEXekb7rOszHkVUoYVKgevZ67wQVZ/1QIAq8v8tu7k2YTMddx+oKN14mUylruVqTh4wNRZ6g9VUMEiFTbjlDhnm2j21GP7Bu67jSutSRCcJZaS57r4wxbAYyqwETXmYWmdhEXyRdptc3vaNZXjyflrKZQVMx/kaHsW9rqA08Vz+Y4yO1eoh4lDjPeyDZ0XcYsj0J/Ipa/VyvGQpcFgchLr+nAQ3q8+RrMczHKeAwRU7wQoEeF4Cxot0t+u6v2HTq3ydE3dUO+Blo8YWJ5z3OMnMGgGl15FEsw1BG5f3a97tkD7UoFXY= X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2803; 31:eF4+WZWM/dZ8CwTS3PIriBxmsypHdl8MXfthaGOvojmUijfX+Ljn7W7x8S2EfNSArq4YxEJ9fkEFkIOJ6UD77AuWLwZHj4aFHi3IrEc1uCrtWppRNeIqdFFvZTLucDLA5/EBgcZ5djLnuivd7KySQAl4GNPuibj7Ubf7AUh8T1Npr9JfqQndCAxeXoFM+ELSRHWwlW3hJhBIpVsc5xBnW8vXcPhZN8Lz0Q2vRFrJDRp3vvm9Y8R0o7nP3En6ZAsulvwHAeFvV9ZFjQoAnKNexA== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:(180628864354917)(9452136761055)(185117386973197)(227817650892897)(101931422205132); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6095135)(601004)(2401047)(13018025)(13016025)(8121501046)(5005006)(10201501046)(3002001)(93006095)(93001095)(6055026)(6096035)(20161123563025)(20161123565025)(20161123556025)(20161123559100)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(20161123561025); SRVR:BN6PR03MB2803; BCL:0; PCL:0; RULEID:(400006); SRVR:BN6PR03MB2803; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB2803; 4:5jGuS2GpJh8CfAaVqRoPS1uCsSWTZVQP50+KcefnUM?= =?us-ascii?Q?qfGArkOcJJvwPUQVwhrSVZ5HZSTrrqe5whZ9Fb0d5Y2IxsuabO9EFHEUjnKT?= =?us-ascii?Q?8RitmiCLLjoT/LOKqmJ9dNfXHhDXeel//AdgS1z31oBZT2Z9crXAjP2nB0jv?= =?us-ascii?Q?Hle749AgZWL2oYXpUnPg0eSEQQ/liu9mR8/eL0Eg7m+miCgv/tuxZpCqcGsM?= =?us-ascii?Q?SDz4+cAjfTycIxWNg9TihTWmLMgvVtPaIZaIlKgNS4gb7Ujb/DKgrasCQ6e1?= =?us-ascii?Q?onYBElD9Un/beQX+X+sp8ovrS2S5KjAqQRG4O1e4mQQY2sFvQwZkDg6oV8DD?= =?us-ascii?Q?ajmNoUF+6JviNbqTqBFqfnaS1FqimYHQN8YUhSeFkG0emaS+jQrWaOa7Fz0r?= =?us-ascii?Q?6ZUOq0MpJ/4gBpkY0wJKg2hIPrIt8uZ9kRECvv+BERxKC7NIw+TCNnk5DAAX?= =?us-ascii?Q?rG1DJzdYmpDXSV81ED8rBsytsfV5jCsqXTSk62Bq/IHJ8KMwipVa367Yy/JI?= =?us-ascii?Q?z2LP3yUy0QdizRIy7k8vRYNoCONrviG93i2QMpEYAvW11ilDAaYnwjqydLTU?= =?us-ascii?Q?k/2/M4KtYK1lrJ7fkfKanVas++R12D09o6oi7bcZ2IcVOWhdbcXSU0NneIlu?= =?us-ascii?Q?81Tj1gorSE2X6QKWCdeI8LboljufkmGdlHI0MHQ5zFH3oefshl5XL+eN+0KE?= =?us-ascii?Q?Z3keizqzVPXrKjae5Cjli5iiXzZccaQngfO8VAZfBaqewQBsCF+FCpNVHZre?= =?us-ascii?Q?QbpAyp9MQXjQpSgFb+Pl2fm8uJqWv23iwdB0QhZRJA4/PoHtGC3edxM/4YfD?= =?us-ascii?Q?t9jYYGJXH13oFPEsjSYx2GnmqfRYJRIJ5eevzwrujoVuLHXqxVex6UBi58Jd?= =?us-ascii?Q?eFhOOust1FFkZb3hvcdKRQ4DuVNABrYk1LrkZuhQ/4ckC5Z0pLcBTaGpn5V7?= =?us-ascii?Q?L5StS1FpiYaVe9R/Mg9KgeC+k2aXQZ7Dwk4eTB8oeFJWvGsOgZQGI7BY7nm9?= =?us-ascii?Q?w2pN3rj34mO76v8jHGCaISqMnGfV0gO+Ji8/DRGiGIwIPlTPNTkGYm+7MWd2?= =?us-ascii?Q?S5AMI=3D?= X-Forefront-PRVS: 0324C2C0E2 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BN6PR03MB2803; 23:s1Js1Qzbd8MSchp9DRbHAL0pwHf6ryKX5YxrD+Urr?= =?us-ascii?Q?mSHQbmlZwYcMmzflFsAIz2EinzvAf/e/+oIKB28pydBVW/GMlkd/oRhkwY2y?= =?us-ascii?Q?jzFjElX3JzG224KGpDjKHZ8c0lRJGAkKB3jt5FRgV8vVNX3GvUuEVUrj6scV?= =?us-ascii?Q?Sxg2bPzWCvFcpoA59JKr+ANql3vEeBMIbywXbGxlO9MbzMz3K7Bdkmjpxwhf?= =?us-ascii?Q?b4WoxJKz2VXJKwP01/e6wTW2jIR1pRNLlSH2T209fcEn1ekw3CGFnuQc0AZk?= =?us-ascii?Q?NTZJIq+zopT/vSbp4fmfveqTYVeYJffO0iinBZW8YhYN9JmAddYL+X/FQUPc?= =?us-ascii?Q?2L24REFQ2qdmq5GYi5rf/VTeKMSsjoI2mo62c5VlkWM+d2KX7mUoeSV485ci?= =?us-ascii?Q?lSdd59Cn9LC81/z8w2+K1F2U6ygZ4TlMNtaA/nSJMHwdYk0psR0wSHr1/NoH?= =?us-ascii?Q?6IG7zEkZN1D8Sj2p+QL8sYsGaMzTuQRPheb3IuqmvMVJfru7RfuGSTGE0UQD?= =?us-ascii?Q?Rtgx5TKKC9hvEHhR1jR9nWe6BvvO4TLYqL9bWGzG1NXr50DLa3IM0LJVYjZ1?= =?us-ascii?Q?nNsv44IQUyBw89ICx6BhSY1ThePbb3APG34zgXJUVNqLKHZGc15nex42jDXn?= =?us-ascii?Q?key/h2IPlxFx4HaWGLTdNiWZVEyFWXBvzEh0kLZ9/3KvgN6Xt4rwW9Das6Jb?= =?us-ascii?Q?q5E4jFfCGrJ6ay5xVwkW5VgdXij6xeDpyTtpV1Xu5H9nb81qqDYDfRIhkYTC?= =?us-ascii?Q?c1DCGvD7uPEk6FRg381HXwlWxCwS2XmydYZFtvYZJWafZfaGWjLiuLGbx3Xj?= =?us-ascii?Q?TLB+pPUicQrOIJVwia7lKEa+3xR3wL+8kr1srjWrIBBpgcZoAjOom4UGwOY5?= =?us-ascii?Q?vLkrEkeQKnArx51z23wXtZki2lynKgvIKSUiB5RxgFivN4wkXUo9+jBqzHiX?= =?us-ascii?Q?MTVB7u53MgSCJtPlZzXciVnt91TDlFM/e25BptM3kzygZNJ0nRR4abV4n4+p?= =?us-ascii?Q?WX1CgKeLI5TAGCHMvUlP2jTpeZ7V84jcqUer6B2QEmdKltaGaTW8rcZc8tRj?= =?us-ascii?Q?ehId6gTyfSRiyQS+VQ/+q1vAuHo5uKmEer7hB2wg2L9jCGX0o3QJplAbieAL?= =?us-ascii?Q?mI/WU8FthjpVqyDt/K6iM7+ECgIyYtROIwlSTwU78k69srZQoSgTyDxr6aok?= =?us-ascii?Q?jc9rGUzMDkXUjgAY2OKel/C1yDBRe6rryX6Ezrr5l9/SV7Eq4dzv/Q+aCGqw?= =?us-ascii?Q?W2K/wtg78g5HRKCKxBaVst+jUlTtZRfqTthwY3NmN56rz8h9QKCMBZx5uvSr?= =?us-ascii?Q?ikjxrbzz2XwUluJN55wGHF4mN2IJlF1Z6jWCusf54j4l6+OV3Yuc05FadzmN?= =?us-ascii?Q?B9giw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2803; 6:P7WgPqkSHgudODGND2QCW/NS2mf/A4pVnAm9n9pjEhZRUYt/J+wN4tcBZzRD17+yMcJ0kXG0SBLCZGqwyQJA//39GTRWi28RqG63p0V1E5a6bDAccAOSwREzX3xJIJeSKyZ+GB7f8ikG49vcjGn0u/yKqlqAaLlMw4oDAcCVy+GvNOkelNVdHAVsGXIOLqCTHSPkSQwmkyoC6NpIf8eG7HHK8SVLuhEIUk/vGdGfcslPFQSDzOYAKUHsqRzgRPBGT8B/4hf+CdymEl9+exugb0dISCQGlDlv/zgQHCiUqUVw9VpICrjyM1NR1pRt/NQwAKjwMznLAY+iukUta6LIiWMJNc3I33kp7LrMI76L0nsNyOK5X5Ks4ZoU1p5Gfvb2gy5gJbc6ljSrLANOiqbqpDXF8jOgsBzmmRDGFLTIkBVnLjGtwYcZv2XmtmkormKAAybfK7hfweThlfoywcTkcKwTiMT181QYrmLuIIVdBJzsHreHOgjdHqG404m83C5/sJdLBw3JCybAi+v5FzEA6w==; 5:UOchx6siA9QB6iF8HpVe4oMnmcjn1Cy/1LE49sl8E17vUarpvdXmyEsL8jYApgGwOjetIuohvbC5RyYym9Gmy9tz2nFxE0NQ9B4vKMK5iCRMyavp6WImDgPP2mVOVp1+rGrxyGnm4/bYHmZJHN4yqqCHsMnXOCXrmNJVeZy/Tq+UFuWVUTVvIQh/MnbK5FOp; 24:+HGq7EWnzpoBJR4FfzmKVMDQVCRDKvIEzSsW2iull3J2oNvftxR9gaYkG1oIyV6chsErOk512nikcIBZx9WODfs4N6ldDcGXpysUx2Pjano= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; BN6PR03MB2803; 7:AOYh7zodPYs+BW+TBccKek4HGAAdUgVs3J29Z24SeUU9MBR82MzBwIApxv8ykBG6CIbLx4RWl3f+KpnrEskIRf1yjsbslz6FP1eSQ9sJH5YGAAMF3jlbs1Ch3znXKEH6sO5WF21DKBVWNxdH5Ar/zLqbWLkP08ER//7PnTSzQbf6q6KgBbmxpJE15sFCW4YgQOwXE1d/ulWNXDVqi920XVNaV9xogt9LPo804EmO+Oq3GpRFeMzoSSRGFE+FlBdv22iHm2VraYpgivuywLbYbForgpFQD7Zh3XnEu/rbykcSf84MNAfmo2pT5tB6hsIGYj1LCJD5hm5vvdGAJrfczw== X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2017 10:59:51.1472 (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: BN6PR03MB2803 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170531_040024_355179_966C6214 X-CRM114-Status: UNSURE ( 9.57 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devel@driverdev.osuosl.org, arnd@arndb.de, ruxandra.radulescu@nxp.com, Marc Zyngier , Stuart Yoder , roy.pledge@nxp.com, linux-kernel@vger.kernel.org, agraf@suse.de, catalin.horghidan@nxp.com, ioana.ciornei@nxp.com, Thomas Gleixner , leoyang.li@nxp.com, bharat.bhushan@nxp.com, Jason Cooper , linux-arm-kernel@lists.infradead.org, Laurentiu Tudor Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Stuart Yoder Move the source files out of staging into their final locations: -include files in drivers/staging/fsl-mc/include go to include/linux/fsl -irq-gic-v3-its-fsl-mc-msi.c goes to drivers/irqchip -source in drivers/staging/fsl-mc/bus goes to drivers/bus/fsl-mc -README.txt, providing and overview of DPAA goes to Documentation/dpaa2/overview.txt Update or delete other remaining staging files-- Makefile, Kconfig, TODO. Update dpaa2_eth and dpio staging drivers. Signed-off-by: Stuart Yoder Signed-off-by: Laurentiu Tudor [Laurentiu: rebased, add dpaa2_eth and dpio #include updates] Cc: Thomas Gleixner Cc: Jason Cooper Cc: Marc Zyngier --- Notes: -no changes since v4 -v4 -rebased -update existing dpaa2 drivers to work with the bus out of staging -v3 -no changes -v2 -updated MAINTAINERS with new location .../README.txt => Documentation/dpaa2/overview.txt | 0 MAINTAINERS | 2 +- drivers/bus/Kconfig | 2 ++ drivers/bus/Makefile | 3 +++ drivers/bus/fsl-mc/Kconfig | 17 +++++++++++++++++ drivers/bus/fsl-mc/Makefile | 19 +++++++++++++++++++ drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp-cmd.h | 0 drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp.c | 6 +++--- .../{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp-cmd.h | 0 drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.c | 4 ++-- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.h | 0 .../{staging/fsl-mc/bus => bus/fsl-mc}/dpmng-cmd.h | 0 drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmng.c | 6 +++--- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc-cmd.h | 0 .../{staging/fsl-mc/bus => bus/fsl-mc}/dprc-driver.c | 4 ++-- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc.c | 6 +++--- .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-allocator.c | 6 +++--- .../{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-bus.c | 6 +++--- .../{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-msi.c | 5 +++-- .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-private.h | 2 +- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-io.c | 5 +++-- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-sys.c | 6 +++--- drivers/irqchip/Makefile | 1 + .../bus => irqchip}/irq-gic-v3-its-fsl-mc-msi.c | 3 +-- drivers/staging/fsl-dpaa2/ethernet/README | 2 +- drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 4 ++-- drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h | 2 +- drivers/staging/fsl-dpaa2/ethernet/dpni.c | 4 ++-- drivers/staging/fsl-mc/TODO | 18 ------------------ drivers/staging/fsl-mc/bus/Kconfig | 10 ---------- drivers/staging/fsl-mc/bus/Makefile | 15 +-------------- drivers/staging/fsl-mc/bus/dpcon.c | 8 ++++---- drivers/staging/fsl-mc/bus/dpio/dpio-driver.c | 2 +- drivers/staging/fsl-mc/bus/dpio/dpio-service.c | 2 +- drivers/staging/fsl-mc/bus/dpio/dpio.c | 4 ++-- .../fsl-mc/include => include/linux/fsl}/dpbp.h | 0 .../fsl-mc/bus => include/linux/fsl}/dpcon-cmd.h | 0 .../fsl-mc/include => include/linux/fsl}/dpmng.h | 0 .../fsl-mc/include => include/linux/fsl}/dprc.h | 1 - .../fsl-mc/include => include/linux/fsl}/mc-bus.h | 2 +- .../fsl-mc/include => include/linux/fsl}/mc-cmd.h | 0 .../fsl-mc/include => include/linux/fsl}/mc-sys.h | 0 .../staging/fsl-mc/include => include/linux/fsl}/mc.h | 2 +- 43 files changed, 90 insertions(+), 89 deletions(-) rename drivers/staging/fsl-mc/README.txt => Documentation/dpaa2/overview.txt (100%) create mode 100644 drivers/bus/fsl-mc/Kconfig create mode 100644 drivers/bus/fsl-mc/Makefile rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp-cmd.h (100%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpbp.c (98%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp-cmd.h (100%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.c (98%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.h (100%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmng-cmd.h (100%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmng.c (96%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc-cmd.h (100%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc-driver.c (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc.c (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-allocator.c (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-bus.c (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-msi.c (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-private.h (98%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-io.c (99%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-sys.c (99%) rename drivers/{staging/fsl-mc/bus => irqchip}/irq-gic-v3-its-fsl-mc-msi.c (98%) delete mode 100644 drivers/staging/fsl-mc/TODO rename {drivers/staging/fsl-mc/include => include/linux/fsl}/dpbp.h (100%) rename {drivers/staging/fsl-mc/bus => include/linux/fsl}/dpcon-cmd.h (100%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/dpmng.h (100%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/dprc.h (99%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc-bus.h (99%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc-cmd.h (100%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc-sys.h (100%) rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc.h (99%) diff --git a/drivers/staging/fsl-mc/README.txt b/Documentation/dpaa2/overview.txt similarity index 100% rename from drivers/staging/fsl-mc/README.txt rename to Documentation/dpaa2/overview.txt diff --git a/MAINTAINERS b/MAINTAINERS index ffac090..4bc71be 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10544,7 +10544,7 @@ M: Stuart Yoder M: Laurentiu Tudor L: linux-kernel@vger.kernel.org S: Maintained -F: drivers/staging/fsl-mc/ +F: drivers/bus/fsl-mc/ F: Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt QT1010 MEDIA DRIVER diff --git a/drivers/bus/Kconfig b/drivers/bus/Kconfig index 0a52da4..dbb1f44 100644 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig @@ -184,4 +184,6 @@ config DA8XX_MSTPRI configuration. Allows to adjust the priorities of all master peripherals. +source "drivers/bus/fsl-mc/Kconfig" + endmenu diff --git a/drivers/bus/Makefile b/drivers/bus/Makefile index cc6364b..dee9a84 100644 --- a/drivers/bus/Makefile +++ b/drivers/bus/Makefile @@ -14,6 +14,9 @@ obj-$(CONFIG_MVEBU_MBUS) += mvebu-mbus.o # Interconnect bus driver for OMAP SoCs. obj-$(CONFIG_OMAP_INTERCONNECT) += omap_l3_smx.o omap_l3_noc.o +# DPAA2 fsl-mc bus +obj-$(CONFIG_FSL_MC_BUS) += fsl-mc/ + obj-$(CONFIG_OMAP_OCP2SCP) += omap-ocp2scp.o obj-$(CONFIG_QCOM_EBI2) += qcom-ebi2.o obj-$(CONFIG_SUNXI_RSB) += sunxi-rsb.o diff --git a/drivers/bus/fsl-mc/Kconfig b/drivers/bus/fsl-mc/Kconfig new file mode 100644 index 0000000..5c009ab --- /dev/null +++ b/drivers/bus/fsl-mc/Kconfig @@ -0,0 +1,17 @@ +# +# DPAA2 fsl-mc bus +# +# Copyright (C) 2014-2016 Freescale Semiconductor, Inc. +# +# This file is released under the GPLv2 +# + +config FSL_MC_BUS + bool "QorIQ DPAA2 fsl-mc bus driver" + depends on OF && ARCH_LAYERSCAPE + select GENERIC_MSI_IRQ_DOMAIN + help + Driver to enable the bus infrastructure for the QorIQ DPAA2 + architecture. The fsl-mc bus driver handles discovery of + DPAA2 objects (which are represented as Linux devices) and + binding objects to drivers. diff --git a/drivers/bus/fsl-mc/Makefile b/drivers/bus/fsl-mc/Makefile new file mode 100644 index 0000000..d56afee --- /dev/null +++ b/drivers/bus/fsl-mc/Makefile @@ -0,0 +1,19 @@ +# +# Freescale Management Complex (MC) bus drivers +# +# Copyright (C) 2014 Freescale Semiconductor, Inc. +# +# This file is released under the GPLv2 +# +obj-$(CONFIG_FSL_MC_BUS) += mc-bus-driver.o + +mc-bus-driver-objs := fsl-mc-bus.o \ + mc-sys.o \ + mc-io.o \ + dprc.o \ + dpmng.o \ + dprc-driver.o \ + fsl-mc-allocator.o \ + fsl-mc-msi.o \ + dpmcp.o \ + dpbp.o diff --git a/drivers/staging/fsl-mc/bus/dpbp-cmd.h b/drivers/bus/fsl-mc/dpbp-cmd.h similarity index 100% rename from drivers/staging/fsl-mc/bus/dpbp-cmd.h rename to drivers/bus/fsl-mc/dpbp-cmd.h diff --git a/drivers/staging/fsl-mc/bus/dpbp.c b/drivers/bus/fsl-mc/dpbp.c similarity index 98% rename from drivers/staging/fsl-mc/bus/dpbp.c rename to drivers/bus/fsl-mc/dpbp.c index d9e450a..3a7bc3d 100644 --- a/drivers/staging/fsl-mc/bus/dpbp.c +++ b/drivers/bus/fsl-mc/dpbp.c @@ -29,9 +29,9 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "../include/mc-sys.h" -#include "../include/mc-cmd.h" -#include "../include/dpbp.h" +#include +#include +#include #include "dpbp-cmd.h" diff --git a/drivers/staging/fsl-mc/bus/dpmcp-cmd.h b/drivers/bus/fsl-mc/dpmcp-cmd.h similarity index 100% rename from drivers/staging/fsl-mc/bus/dpmcp-cmd.h rename to drivers/bus/fsl-mc/dpmcp-cmd.h diff --git a/drivers/staging/fsl-mc/bus/dpmcp.c b/drivers/bus/fsl-mc/dpmcp.c similarity index 98% rename from drivers/staging/fsl-mc/bus/dpmcp.c rename to drivers/bus/fsl-mc/dpmcp.c index ad4c8b4..5c5c2aa 100644 --- a/drivers/staging/fsl-mc/bus/dpmcp.c +++ b/drivers/bus/fsl-mc/dpmcp.c @@ -29,8 +29,8 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "../include/mc-sys.h" -#include "../include/mc-cmd.h" +#include +#include #include "dpmcp.h" #include "dpmcp-cmd.h" diff --git a/drivers/staging/fsl-mc/bus/dpmcp.h b/drivers/bus/fsl-mc/dpmcp.h similarity index 100% rename from drivers/staging/fsl-mc/bus/dpmcp.h rename to drivers/bus/fsl-mc/dpmcp.h diff --git a/drivers/staging/fsl-mc/bus/dpmng-cmd.h b/drivers/bus/fsl-mc/dpmng-cmd.h similarity index 100% rename from drivers/staging/fsl-mc/bus/dpmng-cmd.h rename to drivers/bus/fsl-mc/dpmng-cmd.h diff --git a/drivers/staging/fsl-mc/bus/dpmng.c b/drivers/bus/fsl-mc/dpmng.c similarity index 96% rename from drivers/staging/fsl-mc/bus/dpmng.c rename to drivers/bus/fsl-mc/dpmng.c index ad5d5bb..312fa0ee 100644 --- a/drivers/staging/fsl-mc/bus/dpmng.c +++ b/drivers/bus/fsl-mc/dpmng.c @@ -29,9 +29,9 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "../include/mc-sys.h" -#include "../include/mc-cmd.h" -#include "../include/dpmng.h" +#include +#include +#include #include "dpmng-cmd.h" diff --git a/drivers/staging/fsl-mc/bus/dprc-cmd.h b/drivers/bus/fsl-mc/dprc-cmd.h similarity index 100% rename from drivers/staging/fsl-mc/bus/dprc-cmd.h rename to drivers/bus/fsl-mc/dprc-cmd.h diff --git a/drivers/staging/fsl-mc/bus/dprc-driver.c b/drivers/bus/fsl-mc/dprc-driver.c similarity index 99% rename from drivers/staging/fsl-mc/bus/dprc-driver.c rename to drivers/bus/fsl-mc/dprc-driver.c index 39c9a3b..2a392fd 100644 --- a/drivers/staging/fsl-mc/bus/dprc-driver.c +++ b/drivers/bus/fsl-mc/dprc-driver.c @@ -13,8 +13,8 @@ #include #include #include -#include "../include/mc-bus.h" -#include "../include/mc-sys.h" +#include +#include #include "dprc-cmd.h" #include "fsl-mc-private.h" diff --git a/drivers/staging/fsl-mc/bus/dprc.c b/drivers/bus/fsl-mc/dprc.c similarity index 99% rename from drivers/staging/fsl-mc/bus/dprc.c rename to drivers/bus/fsl-mc/dprc.c index fcf7b47..069e4dd 100644 --- a/drivers/staging/fsl-mc/bus/dprc.c +++ b/drivers/bus/fsl-mc/dprc.c @@ -29,9 +29,9 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "../include/mc-sys.h" -#include "../include/mc-cmd.h" -#include "../include/dprc.h" +#include +#include +#include #include "dprc-cmd.h" diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c b/drivers/bus/fsl-mc/fsl-mc-allocator.c similarity index 99% rename from drivers/staging/fsl-mc/bus/fsl-mc-allocator.c rename to drivers/bus/fsl-mc/fsl-mc-allocator.c index d3def40..5ea3b26 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c +++ b/drivers/bus/fsl-mc/fsl-mc-allocator.c @@ -10,11 +10,11 @@ #include #include -#include "../include/mc-bus.h" -#include "../include/mc-sys.h" +#include +#include +#include #include "dpbp-cmd.h" -#include "dpcon-cmd.h" #include "fsl-mc-private.h" #define FSL_MC_IS_ALLOCATABLE(_obj_type) \ diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c similarity index 99% rename from drivers/staging/fsl-mc/bus/fsl-mc-bus.c rename to drivers/bus/fsl-mc/fsl-mc-bus.c index 7b48ade..f59aa9f 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c +++ b/drivers/bus/fsl-mc/fsl-mc-bus.c @@ -20,9 +20,9 @@ #include #include #include -#include "../include/mc-bus.h" -#include "../include/dpmng.h" -#include "../include/mc-sys.h" +#include +#include +#include #include "fsl-mc-private.h" #include "dprc-cmd.h" diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c b/drivers/bus/fsl-mc/fsl-mc-msi.c similarity index 99% rename from drivers/staging/fsl-mc/bus/fsl-mc-msi.c rename to drivers/bus/fsl-mc/fsl-mc-msi.c index a92fa5a..42314b3 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c +++ b/drivers/bus/fsl-mc/fsl-mc-msi.c @@ -16,8 +16,9 @@ #include #include #include -#include "../include/mc-bus.h" -#include "../include/mc-cmd.h" +#include +#include + #include "fsl-mc-private.h" /* diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-private.h b/drivers/bus/fsl-mc/fsl-mc-private.h similarity index 98% rename from drivers/staging/fsl-mc/bus/fsl-mc-private.h rename to drivers/bus/fsl-mc/fsl-mc-private.h index 01ef9329..8912d19 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-private.h +++ b/drivers/bus/fsl-mc/fsl-mc-private.h @@ -10,7 +10,7 @@ #ifndef _FSL_MC_PRIVATE_H_ #define _FSL_MC_PRIVATE_H_ -#include "../include/mc.h" +#include int __must_check fsl_mc_device_add(struct dprc_obj_desc *obj_desc, struct fsl_mc_io *mc_io, diff --git a/drivers/staging/fsl-mc/bus/mc-io.c b/drivers/bus/fsl-mc/mc-io.c similarity index 99% rename from drivers/staging/fsl-mc/bus/mc-io.c rename to drivers/bus/fsl-mc/mc-io.c index d66b87f..a24c11d 100644 --- a/drivers/staging/fsl-mc/bus/mc-io.c +++ b/drivers/bus/fsl-mc/mc-io.c @@ -31,8 +31,9 @@ */ #include -#include "../include/mc-bus.h" -#include "../include/mc-sys.h" +#include +#include +#include #include "fsl-mc-private.h" #include "dpmcp.h" diff --git a/drivers/staging/fsl-mc/bus/mc-sys.c b/drivers/bus/fsl-mc/mc-sys.c similarity index 99% rename from drivers/staging/fsl-mc/bus/mc-sys.c rename to drivers/bus/fsl-mc/mc-sys.c index 4d82802..ac86226 100644 --- a/drivers/staging/fsl-mc/bus/mc-sys.c +++ b/drivers/bus/fsl-mc/mc-sys.c @@ -37,9 +37,9 @@ #include #include #include -#include "../include/mc-sys.h" -#include "../include/mc-cmd.h" -#include "../include/mc.h" +#include +#include +#include #include "dpmcp.h" diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index b64c59b..6cc4c26 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -76,3 +76,4 @@ obj-$(CONFIG_EZNPS_GIC) += irq-eznps.o obj-$(CONFIG_ARCH_ASPEED) += irq-aspeed-vic.o obj-$(CONFIG_STM32_EXTI) += irq-stm32-exti.o obj-$(CONFIG_QCOM_IRQ_COMBINER) += qcom-irq-combiner.o +obj-$(CONFIG_FSL_MC_BUS) += irq-gic-v3-its-fsl-mc-msi.o diff --git a/drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c b/drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c similarity index 98% rename from drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c rename to drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c index 49127ac..63cdd63 100644 --- a/drivers/staging/fsl-mc/bus/irq-gic-v3-its-fsl-mc-msi.c +++ b/drivers/irqchip/irq-gic-v3-its-fsl-mc-msi.c @@ -16,8 +16,7 @@ #include #include #include -#include "../include/mc-bus.h" -#include "fsl-mc-private.h" +#include static struct irq_chip its_msi_irq_chip = { .name = "ITS-fMSI", diff --git a/drivers/staging/fsl-dpaa2/ethernet/README b/drivers/staging/fsl-dpaa2/ethernet/README index 410952e..1e825df 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/README +++ b/drivers/staging/fsl-dpaa2/ethernet/README @@ -36,7 +36,7 @@ are treated as internal resources of other objects. For a more detailed description of the DPAA2 architecture and its object abstractions see: - drivers/staging/fsl-mc/README.txt + Documentation/dpaa2/overview.txt Each Linux net device is built on top of a Datapath Network Interface (DPNI) object and uses Buffer Pools (DPBPs), I/O Portals (DPIOs) and Concentrators diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c index 6f9eed6..97a64d2 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c @@ -38,8 +38,8 @@ #include #include -#include "../../fsl-mc/include/mc.h" -#include "../../fsl-mc/include/mc-sys.h" +#include +#include #include "dpaa2-eth.h" /* CREATE_TRACE_POINTS only needs to be defined once. Other dpa files diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h index c67cced..0a07b41 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.h @@ -38,7 +38,7 @@ #include "../../fsl-mc/include/dpaa2-io.h" #include "../../fsl-mc/include/dpaa2-fd.h" -#include "../../fsl-mc/include/dpbp.h" +#include #include "../../fsl-mc/include/dpcon.h" #include "dpni.h" #include "dpni-cmd.h" diff --git a/drivers/staging/fsl-dpaa2/ethernet/dpni.c b/drivers/staging/fsl-dpaa2/ethernet/dpni.c index cea46ed..4f758a9 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpni.c +++ b/drivers/staging/fsl-dpaa2/ethernet/dpni.c @@ -30,8 +30,8 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "../../fsl-mc/include/mc-sys.h" -#include "../../fsl-mc/include/mc-cmd.h" +#include +#include #include "dpni.h" #include "dpni-cmd.h" diff --git a/drivers/staging/fsl-mc/TODO b/drivers/staging/fsl-mc/TODO deleted file mode 100644 index 54a8bc6..0000000 --- a/drivers/staging/fsl-mc/TODO +++ /dev/null @@ -1,18 +0,0 @@ -* Add at least one device driver for a DPAA2 object (child device of the - fsl-mc bus). Most likely candidate for this is adding DPAA2 Ethernet - driver support, which depends on drivers for several objects: DPNI, - DPIO, DPMAC. Other pre-requisites include: - - * MC firmware uprev. The MC firmware upon which the fsl-mc - bus driver and DPAA2 object drivers are based is continuing - to evolve, so minor updates are needed to keep in sync with binary - interface changes to the MC. - -* Cleanup - -Please send any patches to Greg Kroah-Hartman , -german.rivera@freescale.com, devel@driverdev.osuosl.org, -linux-kernel@vger.kernel.org - -[1] https://lkml.org/lkml/2015/7/9/93 -[2] https://lkml.org/lkml/2015/7/7/712 diff --git a/drivers/staging/fsl-mc/bus/Kconfig b/drivers/staging/fsl-mc/bus/Kconfig index a10aaf0..0f75b56 100644 --- a/drivers/staging/fsl-mc/bus/Kconfig +++ b/drivers/staging/fsl-mc/bus/Kconfig @@ -6,16 +6,6 @@ # This file is released under the GPLv2 # -config FSL_MC_BUS - bool "QorIQ DPAA2 fsl-mc bus driver" - depends on OF && ARCH_LAYERSCAPE - select GENERIC_MSI_IRQ_DOMAIN - help - Driver to enable the bus infrastructure for the QorIQ DPAA2 - architecture. The fsl-mc bus driver handles discovery of - DPAA2 objects (which are represented as Linux devices) and - binding objects to drivers. - config FSL_MC_DPIO tristate "QorIQ DPAA2 DPIO driver" depends on FSL_MC_BUS diff --git a/drivers/staging/fsl-mc/bus/Makefile b/drivers/staging/fsl-mc/bus/Makefile index 659eccf..e86ad44 100644 --- a/drivers/staging/fsl-mc/bus/Makefile +++ b/drivers/staging/fsl-mc/bus/Makefile @@ -5,20 +5,7 @@ # # This file is released under the GPLv2 # -obj-$(CONFIG_FSL_MC_BUS) += mc-bus-driver.o - -mc-bus-driver-objs := fsl-mc-bus.o \ - mc-sys.o \ - mc-io.o \ - dprc.o \ - dpmng.o \ - dprc-driver.o \ - fsl-mc-allocator.o \ - fsl-mc-msi.o \ - irq-gic-v3-its-fsl-mc-msi.o \ - dpmcp.o \ - dpbp.o \ - dpcon.o +obj-$(CONFIG_FSL_MC_BUS) += dpcon.o # MC DPIO driver obj-$(CONFIG_FSL_MC_DPIO) += dpio/ diff --git a/drivers/staging/fsl-mc/bus/dpcon.c b/drivers/staging/fsl-mc/bus/dpcon.c index eb71357..abbc3c2 100644 --- a/drivers/staging/fsl-mc/bus/dpcon.c +++ b/drivers/staging/fsl-mc/bus/dpcon.c @@ -29,11 +29,11 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "../include/mc-sys.h" -#include "../include/mc-cmd.h" -#include "../include/dpcon.h" +#include +#include +#include -#include "dpcon-cmd.h" +#include "../include/dpcon.h" /** * dpcon_open() - Open a control session for the specified object diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-driver.c b/drivers/staging/fsl-mc/bus/dpio/dpio-driver.c index e36da20..6170547 100644 --- a/drivers/staging/fsl-mc/bus/dpio/dpio-driver.c +++ b/drivers/staging/fsl-mc/bus/dpio/dpio-driver.c @@ -38,8 +38,8 @@ #include #include #include +#include -#include "../../include/mc.h" #include "../../include/dpaa2-io.h" #include "qbman-portal.h" diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio-service.c b/drivers/staging/fsl-mc/bus/dpio/dpio-service.c index e5d6674..bb4a99f 100644 --- a/drivers/staging/fsl-mc/bus/dpio/dpio-service.c +++ b/drivers/staging/fsl-mc/bus/dpio/dpio-service.c @@ -30,7 +30,7 @@ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include -#include "../../include/mc.h" +#include #include "../../include/dpaa2-io.h" #include #include diff --git a/drivers/staging/fsl-mc/bus/dpio/dpio.c b/drivers/staging/fsl-mc/bus/dpio/dpio.c index d81e023..b16a990 100644 --- a/drivers/staging/fsl-mc/bus/dpio/dpio.c +++ b/drivers/staging/fsl-mc/bus/dpio/dpio.c @@ -30,8 +30,8 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ -#include "../../include/mc-sys.h" -#include "../../include/mc-cmd.h" +#include +#include #include "dpio.h" #include "dpio-cmd.h" diff --git a/drivers/staging/fsl-mc/include/dpbp.h b/include/linux/fsl/dpbp.h similarity index 100% rename from drivers/staging/fsl-mc/include/dpbp.h rename to include/linux/fsl/dpbp.h diff --git a/drivers/staging/fsl-mc/bus/dpcon-cmd.h b/include/linux/fsl/dpcon-cmd.h similarity index 100% rename from drivers/staging/fsl-mc/bus/dpcon-cmd.h rename to include/linux/fsl/dpcon-cmd.h diff --git a/drivers/staging/fsl-mc/include/dpmng.h b/include/linux/fsl/dpmng.h similarity index 100% rename from drivers/staging/fsl-mc/include/dpmng.h rename to include/linux/fsl/dpmng.h diff --git a/drivers/staging/fsl-mc/include/dprc.h b/include/linux/fsl/dprc.h similarity index 99% rename from drivers/staging/fsl-mc/include/dprc.h rename to include/linux/fsl/dprc.h index 2f4a7a7..135c87b 100644 --- a/drivers/staging/fsl-mc/include/dprc.h +++ b/include/linux/fsl/dprc.h @@ -305,4 +305,3 @@ int dprc_get_container_id(struct fsl_mc_io *mc_io, int *container_id); #endif /* _FSL_DPRC_H */ - diff --git a/drivers/staging/fsl-mc/include/mc-bus.h b/include/linux/fsl/mc-bus.h similarity index 99% rename from drivers/staging/fsl-mc/include/mc-bus.h rename to include/linux/fsl/mc-bus.h index 42700de..23c06e1 100644 --- a/drivers/staging/fsl-mc/include/mc-bus.h +++ b/include/linux/fsl/mc-bus.h @@ -11,7 +11,7 @@ #ifndef _FSL_MC_MCBUS_H_ #define _FSL_MC_MCBUS_H_ -#include "../include/mc.h" +#include #include struct irq_domain; diff --git a/drivers/staging/fsl-mc/include/mc-cmd.h b/include/linux/fsl/mc-cmd.h similarity index 100% rename from drivers/staging/fsl-mc/include/mc-cmd.h rename to include/linux/fsl/mc-cmd.h diff --git a/drivers/staging/fsl-mc/include/mc-sys.h b/include/linux/fsl/mc-sys.h similarity index 100% rename from drivers/staging/fsl-mc/include/mc-sys.h rename to include/linux/fsl/mc-sys.h diff --git a/drivers/staging/fsl-mc/include/mc.h b/include/linux/fsl/mc.h similarity index 99% rename from drivers/staging/fsl-mc/include/mc.h rename to include/linux/fsl/mc.h index 1c46c0c..929bfdb 100644 --- a/drivers/staging/fsl-mc/include/mc.h +++ b/include/linux/fsl/mc.h @@ -14,7 +14,7 @@ #include #include #include -#include "../include/dprc.h" +#include #define FSL_MC_VENDOR_FREESCALE 0x1957