From patchwork Mon Aug 28 10:54:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurentiu Tudor X-Patchwork-Id: 9925267 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 97A6160329 for ; Mon, 28 Aug 2017 10:55:35 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 888542869D for ; Mon, 28 Aug 2017 10:55:35 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7D0D7286AB; Mon, 28 Aug 2017 10:55:35 +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=-2.6 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, DKIM_VALID, RCVD_IN_DNSWL_LOW 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 617802869D for ; Mon, 28 Aug 2017 10:55:34 +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: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:In-Reply-To:References: List-Owner; bh=K74WElWFxRMkNRW9sAGpvxYXK6CsBaZy61m2xbYvEmY=; b=GOgDNeaG6MCXKG c+TpextriBnIyx7QxJbUsM3MAJMzKbZ+CQr6wXoEwdGeHBLfoiPrPaK5p3ws50/eZpGfhb/5t+v9E u/em+lmTVwJPo23Cqv/hcKyiCpt0noGoKFMyRaEuTzfsCujD8t7w0D0YJd7p5yITeoCDPXeRrbE0e 8NDODeE4WdXn7hZMPWA6p5iza/Wbu7EkNCEnUTSVtzmcIQ6AZ7mCkptMbuEpQpJK9sLpRHiBElTAo yiZPlxpheSF2br4qee7YixwLl/6G30wQyH+5uwPtjenLLPWNGdAL85kPLeRKPx20zouEddphRqFU/ xzdYRrzM6Ek/cM71Hrpg==; 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 1dmHhZ-0000T5-Cr; Mon, 28 Aug 2017 10:55:29 +0000 Received: from mail-by2nam03on0085.outbound.protection.outlook.com ([104.47.42.85] helo=NAM03-BY2-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dmHgy-000786-5u for linux-arm-kernel@lists.infradead.org; Mon, 28 Aug 2017 10:54:58 +0000 Received: from BN3PR03CA0114.namprd03.prod.outlook.com (10.174.66.32) by CY4PR03MB3319.namprd03.prod.outlook.com (10.171.247.10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.9; Mon, 28 Aug 2017 10:54:25 +0000 Received: from BN1AFFO11FD043.protection.gbl (2a01:111:f400:7c10::180) by BN3PR03CA0114.outlook.office365.com (2603:10b6:400:4::32) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.1.1385.9 via Frontend Transport; Mon, 28 Aug 2017 10:54:25 +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 BN1AFFO11FD043.mail.protection.outlook.com (10.58.52.190) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1341.15 via Frontend Transport; Mon, 28 Aug 2017 10:54:24 +0000 Received: from fsr-fed1964-102.ea.freescale.net (fsr-fed1964-102.ea.freescale.net [10.171.72.223]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id v7SAsIjB023634; Mon, 28 Aug 2017 03:54:18 -0700 From: To: , Subject: [PATCH v2] staging: fsl-mc: move bus driver out of staging Date: Mon, 28 Aug 2017 13:54:05 +0300 Message-ID: <20170828105405.19552-1-laurentiu.tudor@nxp.com> X-Mailer: git-send-email 2.9.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131483912650960646; (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)(39380400002)(39860400002)(2980300002)(1109001)(1110001)(339900001)(189002)(199003)(81166006)(81156014)(50466002)(2876002)(48376002)(8676002)(50226002)(47776003)(97736004)(4326008)(5003940100001)(39060400002)(6666003)(575784001)(36756003)(68736007)(626005)(8656003)(6306002)(356003)(104016004)(53936002)(86152003)(54906002)(86362001)(77096006)(966005)(69596002)(305945005)(33646002)(7416002)(8936002)(85426001)(189998001)(5660300001)(1076002)(498600001)(105606002)(106466001)(2906002)(50986999); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR03MB3319; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD043; 1:8RvdqhbhDYmfhDMu1eDYzIpPBWah8EK8tLRwQzAXqnJBuDaDL5e7iDKeG0Z3430JOStBKzMisZnf8giWN8fDeGr/qrfext5FEu2C0LUXVXymZVxLVYN+WPYrT4MvYxUs MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0b48eab5-e594-4896-cda5-08d4ee0325b1 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(300000503095)(300135400095)(2017052603199)(201703131430075)(201703131517081)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY4PR03MB3319; X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB3319; 3:J5wgGrnwVH3f2d6aqyd0W5K9JxE9xj0j298oIBZjGyXxX0a/hxh17sUccb+bPzevsaOI+z+YovziYSwq1P/JQoBQ95CTKYrZICnWJ0kSjZ8yQN56DfqLsVa+hhmSvwPyM0GLqMShoVzKGFv9Ez8ylHu2nHg1lGOQ375jFkZ5KyV6TEigVnlZThHlA7TrE8hghe4q82UiXADtXeyeSZLhNAmVBLNQh4+Jrq5fJNgdcKCfH7ZJiM0fpVbdhJ48Jj05KuwtHd3ZG3hC75iTcqnLhf2nfjzkWlWtMmoCWKtow7qYj1+daT0ndZWQc02hkvY/t9hskqPEQsSYBi+xe8A6mL0nQjzFjHmi64sCI8Var5I=; 25:IHnzb/PSrW16NcbmdH98c9D/PgaAroTucy4W+JccL7TL8NKJKHkpfuTzn2cGdNxxAh0ccQkSCoOI8yXL6vcPRmFp+JyfPxahHMVulbRLxxOC2G8yM6HsrJY6WtSY+yoC88SSs499RJhx2gpakkT5oFxkuhuFDvzNU7bV0Z7fBainJ1o2ht/zc/nPFrKs8juvXleleoMO717Jf3KlCkzAHElFsnL5Sg2Wui7BxzMBn+43UHGZvn/uxVI0wxw/YdwPYi6OkFDFU43/YncQ6ma6bZjy0pEbrJoFT12cG8Z0X9E3HWZyE6dLZOJJ/R1zEx3JKEuFvvzZqDwVZDa+snoNfQ== X-MS-TrafficTypeDiagnostic: CY4PR03MB3319: X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB3319; 31:2ncTBhbdk1sUqSalQV7FoeZ0ZicGCsDcRkKX8+dvTNlMt+JgxY5AxMli2QA/eBO5Solmq3Jt0/Dtt7mVMVpo4aXJ4QtXFg+ZWG5OUGVFrFS3V583JTkny76coNIkNwqTp3Ge/rIdYiKNJvN3LgWeIuuuLVdNjf/uMpUZkY1wUKgAcVQurUN/AnHfjirfNeoJkoqKhblShrCUNLvuPTN8COmmdDSJXkKt1HVV+254DwM=; 4:EYA4vOoPMNBLqHtDQIUVn8nk5A1fVDLhVbIo7k7g+Eig4WwsGhOwfw0ZUawhB10Ynecn88vKp1mNp1avoIl1OsNtbfZUmnj0n2OjWIbGy6fF02VUZjZPN1AvTPfRsIL88Fu1c29N6OjWX8v99hlB5FND2nHzesOvPGKNcKSxsUxpp/fgNAxBeHMmeh5UTDX7skU4REG+KOMPKXGxYvcHDn8ZKHXaoXVof72WcTW2j7e3C7ojHrAVDt0yFL91qPcX3HKvNrY7TQsxdDj/r859XqyZhZU1FCtzUWeNK0Vg4fARXmQ3G97YfPA5kK8ncnyU8yoTp5wZUkX2m9NvsHsMvGNBwOODyuQ9xZdmQOgJUB3hWW3QZuo976Onae8OJKaThw7jHsLtMJ+iDoOotcRaLuRefzCgiy0K8eidpKse+KpmmlOqC9Buc0Av4dqWHPiW X-Exchange-Antispam-Report-Test: UriScan:(180628864354917)(9452136761055)(185117386973197)(227817650892897)(101931422205132); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6095135)(601004)(2401047)(8121501046)(5005006)(13018025)(13016025)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(3002001)(6055026)(6096035)(20161123559100)(20161123561025)(20161123556025)(20161123563025)(20161123565025)(201703131430075)(201703131433075)(201703131448075)(201703161259150)(201703151042153)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR03MB3319; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(400006)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR03MB3319; X-Forefront-PRVS: 0413C9F1ED X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR03MB3319; 23:l6xir/Q4M9+pbk2KFX7KWj8dhOjVe5pgoXUKZXTom?= =?us-ascii?Q?aU9JIx2p+QAgrs8aivcGd/PMotike52WxD8dQAgpu0e+LVIlkRU6Jib1iZAI?= =?us-ascii?Q?IrpVjp2semxVa8p068mh5lXj9Zt6AtPGPqAruwzgkRS+B7vHeTBUI3X+t8Zu?= =?us-ascii?Q?XY2tM5AZJIypBIKzhXsJQVQHbPvFHrQD9ol/jAuyeBjbKHKUI29/Q6x8iH98?= =?us-ascii?Q?6BI0QXQocC38pm4O4G3SZF2KU/7tn5gqdr3rxBGhQmTPmNDOGoS8UuTuyxDH?= =?us-ascii?Q?6h4hFVuGav6UjqF8JJncaibfgwGNlLNANM5y6SU4T4nBUO9Q21l5q/IeWFrB?= =?us-ascii?Q?PVJpGYNb4imKYxno22lUnpN5aZaXZAf5CM4q067jvguUot7oZWGJ+jOhw6NB?= =?us-ascii?Q?Q+wf9mzpnIMur37RiJ7zoBanInnu1y3OhVfIUbRW28FVpsqhY7Ts7uXcDsbY?= =?us-ascii?Q?oLYC8Uo0xPGb5lgjTKNcCTglV56MGng0YbNOD20gYIruuvASimZMSpP85Fwg?= =?us-ascii?Q?EJD4GFuEyd8BYiNnbZD7w7Q7jXZfD29OpGkdmCQ8IHjoAD2JEVqyGhfrbxbg?= =?us-ascii?Q?jYQTdJKbvOVmESB1o9R3QAJB3DwLnJamriq/4FgHtjHMXIbPWqRJHVb0i7dc?= =?us-ascii?Q?OBb36tc1R/pGssEVvBAT7bz5ciwss2WHDrHL/cKOdIeoB7N2HO2LYJsCKRLv?= =?us-ascii?Q?rEtMuPmPwvPmqo9LuWubHBxzn7uHRuT2pmVOr0AD25wHfbZxnA2m3bD5wx+q?= =?us-ascii?Q?ri75vOIxTMtfYIlMcY2mIEQAX+Uh1WORe2whApxghHzVEWXdt62bK/IELM8/?= =?us-ascii?Q?b+pCe4KhVWGLHQK2lvD/c/U6hU4dviOMBo9TrWNfV6fukkmSqLNMN/eeNdmX?= =?us-ascii?Q?/MVSzQrxkYilF8f37h4IO4/DXKQy6LOOjBbD4gjlBGZkFh0t3SAaQ7ouh++3?= =?us-ascii?Q?LYprHFlw4zjm/LFoQRClt7jQwcsm1QdvlLHTwRSdoQU0dYwfI1GxGYfxYOtk?= =?us-ascii?Q?1P4/VzwFuotzqioCrivSunTGixA7aDQ/49OV6+BSVnul33NpbIyf4jdCa3w1?= =?us-ascii?Q?mfKuoO1hKMfAdTy+jdtitoX9wJxhmVnAAKBUQAgcrIgXlSSDYzvhvLqh1VyM?= =?us-ascii?Q?0uFf7OTjtqAzLWYOXCoEFtfyvfOh+fZO/6IEgxCSLDimgJ+wsB50ibbS1zWC?= =?us-ascii?Q?O8fIGyFTIu04bgBaiyaWDcSuFRJbzOExBuo?= X-Microsoft-Exchange-Diagnostics: 1; CY4PR03MB3319; 6:Dp/TUZwLbz3APGw7O6QTdfajNZHe+1Ytpt1YV8EgbzCz5cm9GBDkrZD8Wuae2DzRE4Q4MY5rYfdmRnqRbIoAPuRt7SgN6McNB16RejS4QKfow5R2ag2ZdM3t+ai/kKF0q2W0XSobuWgF0F5BRhourD6Op4poBDXFWzD6aVV5N9bIkHmXe1iJhsoeYWzoNl5SLHXMAFitbQg+JFJn45PrsUkpUF5+/HnyCfvkAiblsfEj+8OrY1HSzug/Z75wrwG3LO9pUM38A0/6pSqJ9jZltkYPlgf7zi5kC2Elrp77P9YU4IRhmh9RPr47R4EHkjvtmkWjM5CEO6BzJGukIonFDA==; 5:YQG3yfYwdJut0etTSAZiwGNjGnznZHl2jDhg/hm8vvjZqOfFgDg0+fIl1RnnsO60CuAYCpaAgl9LfBaqs6VEGQ3aJDf/AQS7+FHNGRG0wqPfQrSn8GdT3Vz6tyQ0lLRnM+kYXc4PTH1XQnMbqKsy4Q==; 24:qT71CXKbqUWDlJvtPvcxrhzt9Wo2tXcXkleIoDLh1kte2GTyMSFu9K3weRG1SAXWWaovaDhjsH1RemyrYEmdozS2B0+47AkHxwk64xr2yvo=; 7:Y/XHfu6iv8xbTw//xfmVpM8YGpKgM2T5KzZ36Juxp7njonVbSxk4qNhgI7gLfS62Uu1GCAzEIh7NDa3gcnRLx3i8oP1rlKy6yKef81daaamqSPuSYyipgxmjMrPkQpcXI28qTNzxi5ll7u42MRrSmFxgmTXl2aGWMT1N8lgQjRiWahyX93OKvaSwkq0d3+C9TzwZjwPwqYSWBVpsH/my5lAWTphYUQMG/auSzJZAL1U= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Aug 2017 10:54:24.8464 (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: CY4PR03MB3319 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170828_035452_456322_ADA7479C X-CRM114-Status: GOOD ( 12.48 ) 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, ruxandra.radulescu@nxp.com, arnd@arndb.de, marc.zyngier@arm.com, 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: -v2: - group irqchip gic its glue code together with the rest (Marc Zyngier) .../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 | 17 +++++++++++++++++ drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp-cmd.h | 0 drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.c | 2 +- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.h | 0 drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmng-cmd.h | 0 drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc-cmd.h | 0 .../{staging/fsl-mc/bus => bus/fsl-mc}/dprc-driver.c | 1 - drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc.c | 2 +- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dprc.h | 0 .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-allocator.c | 1 - .../{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-bus.c | 0 .../{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-msi.c | 0 .../fsl-mc/bus => bus/fsl-mc}/fsl-mc-private.h | 2 +- drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-io.c | 1 - drivers/{staging/fsl-mc/bus => bus/fsl-mc}/mc-sys.c | 2 +- drivers/irqchip/Makefile | 1 + .../fsl-mc/bus => irqchip}/irq-gic-v3-its-fsl-mc-msi.c | 2 +- drivers/staging/fsl-dpaa2/ethernet/README | 2 +- drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c | 2 +- drivers/staging/fsl-dpaa2/ethernet/dpni.c | 2 +- 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/dpbp.c | 2 +- drivers/staging/fsl-mc/bus/dpcon.c | 2 +- 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 | 2 +- .../staging/fsl-mc/include => include/linux/fsl}/mc.h | 0 34 files changed, 56 insertions(+), 58 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}/dpmcp-cmd.h (100%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/dpmcp.c (99%) 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}/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}/dprc.h (100%) 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 (100%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-msi.c (100%) rename drivers/{staging/fsl-mc/bus => bus/fsl-mc}/fsl-mc-private.h (99%) 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 (99%) delete mode 100644 drivers/staging/fsl-mc/TODO rename {drivers/staging/fsl-mc/include => include/linux/fsl}/mc.h (100%) 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 6f7721d..2149eeb 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10900,7 +10900,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 2408ea3..23e0279 100644 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig @@ -183,4 +183,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..30b55ac --- /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 || (COMPILE_TEST && (ARM || ARM64 || X86 || PPC))) + 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..1fe40282 --- /dev/null +++ b/drivers/bus/fsl-mc/Makefile @@ -0,0 +1,17 @@ +# +# 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 \ + dprc-driver.o \ + fsl-mc-allocator.o \ + fsl-mc-msi.o \ + dpmcp.o 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 99% rename from drivers/staging/fsl-mc/bus/dpmcp.c rename to drivers/bus/fsl-mc/dpmcp.c index eea42f6..e56505f 100644 --- a/drivers/staging/fsl-mc/bus/dpmcp.c +++ b/drivers/bus/fsl-mc/dpmcp.c @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -#include "../include/mc.h" +#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/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 06df528..42a1f6a 100644 --- a/drivers/staging/fsl-mc/bus/dprc-driver.c +++ b/drivers/bus/fsl-mc/dprc-driver.c @@ -13,7 +13,6 @@ #include #include #include -#include "../include/mc.h" #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 6f6c65a..f8d579e 100644 --- a/drivers/staging/fsl-mc/bus/dprc.c +++ b/drivers/bus/fsl-mc/dprc.c @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -#include "../include/mc.h" +#include #include "dprc.h" #include "dprc-cmd.h" diff --git a/drivers/staging/fsl-mc/bus/dprc.h b/drivers/bus/fsl-mc/dprc.h similarity index 100% rename from drivers/staging/fsl-mc/bus/dprc.h rename to drivers/bus/fsl-mc/dprc.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 b37a6f4..4ff5c7b 100644 --- a/drivers/staging/fsl-mc/bus/fsl-mc-allocator.c +++ b/drivers/bus/fsl-mc/fsl-mc-allocator.c @@ -10,7 +10,6 @@ #include #include -#include "../include/mc.h" #include "fsl-mc-private.h" diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-bus.c b/drivers/bus/fsl-mc/fsl-mc-bus.c similarity index 100% rename from drivers/staging/fsl-mc/bus/fsl-mc-bus.c rename to drivers/bus/fsl-mc/fsl-mc-bus.c diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-msi.c b/drivers/bus/fsl-mc/fsl-mc-msi.c similarity index 100% rename from drivers/staging/fsl-mc/bus/fsl-mc-msi.c rename to drivers/bus/fsl-mc/fsl-mc-msi.c diff --git a/drivers/staging/fsl-mc/bus/fsl-mc-private.h b/drivers/bus/fsl-mc/fsl-mc-private.h similarity index 99% rename from drivers/staging/fsl-mc/bus/fsl-mc-private.h rename to drivers/bus/fsl-mc/fsl-mc-private.h index 62d3989..d8b8281 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 #include "dprc.h" #include 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 f65c23c..1e17ce6 100644 --- a/drivers/staging/fsl-mc/bus/mc-io.c +++ b/drivers/bus/fsl-mc/mc-io.c @@ -31,7 +31,6 @@ */ #include -#include "../include/mc.h" #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 7ce105b..def3d3c 100644 --- a/drivers/staging/fsl-mc/bus/mc-sys.c +++ b/drivers/bus/fsl-mc/mc-sys.c @@ -38,7 +38,7 @@ #include #include #include -#include "../include/mc.h" +#include #include "dpmcp.h" diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile index e88d856..1a5b354 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -29,6 +29,7 @@ obj-$(CONFIG_ARCH_REALVIEW) += irq-gic-realview.o obj-$(CONFIG_ARM_GIC_V2M) += irq-gic-v2m.o obj-$(CONFIG_ARM_GIC_V3) += irq-gic-v3.o irq-gic-common.o obj-$(CONFIG_ARM_GIC_V3_ITS) += irq-gic-v3-its.o irq-gic-v3-its-pci-msi.o irq-gic-v3-its-platform-msi.o +obj-$(CONFIG_FSL_MC_BUS) += irq-gic-v3-its-fsl-mc-msi.o obj-$(CONFIG_PARTITION_PERCPU) += irq-partition-percpu.o obj-$(CONFIG_HISILICON_IRQ_MBIGEN) += irq-mbigen.o obj-$(CONFIG_ARM_NVIC) += irq-nvic.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 99% 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 123e4af..57c6b2a 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 @@ -15,7 +15,7 @@ #include #include #include -#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 26017fe..3f50e1a 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c +++ b/drivers/staging/fsl-dpaa2/ethernet/dpaa2-eth.c @@ -39,7 +39,7 @@ #include #include -#include "../../fsl-mc/include/mc.h" +#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/dpni.c b/drivers/staging/fsl-dpaa2/ethernet/dpni.c index 04a5b14..67f0623 100644 --- a/drivers/staging/fsl-dpaa2/ethernet/dpni.c +++ b/drivers/staging/fsl-dpaa2/ethernet/dpni.c @@ -32,7 +32,7 @@ */ #include #include -#include "../../fsl-mc/include/mc.h" +#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 504c987..9700f2c 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 || (COMPILE_TEST && (ARM || ARM64 || X86 || PPC))) - 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 && ARCH_LAYERSCAPE diff --git a/drivers/staging/fsl-mc/bus/Makefile b/drivers/staging/fsl-mc/bus/Makefile index 6df407e..b8f4c4d 100644 --- a/drivers/staging/fsl-mc/bus/Makefile +++ b/drivers/staging/fsl-mc/bus/Makefile @@ -5,19 +5,8 @@ # # 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 \ - 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) += dpbp.o \ + dpcon.o # MC DPIO driver obj-$(CONFIG_FSL_MC_DPIO) += dpio/ diff --git a/drivers/staging/fsl-mc/bus/dpbp.c b/drivers/staging/fsl-mc/bus/dpbp.c index 363730a..9f9ff82 100644 --- a/drivers/staging/fsl-mc/bus/dpbp.c +++ b/drivers/staging/fsl-mc/bus/dpbp.c @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -#include "../include/mc.h" +#include #include "../include/dpbp.h" #include "dpbp-cmd.h" diff --git a/drivers/staging/fsl-mc/bus/dpcon.c b/drivers/staging/fsl-mc/bus/dpcon.c index ca1da85..aa9ab7b 100644 --- a/drivers/staging/fsl-mc/bus/dpcon.c +++ b/drivers/staging/fsl-mc/bus/dpcon.c @@ -30,7 +30,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -#include "../include/mc.h" +#include #include "../include/dpcon.h" #include "dpcon-cmd.h" 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 f809682..706eeb5 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 00eb221..7db0a04 100644 --- a/drivers/staging/fsl-mc/bus/dpio/dpio.c +++ b/drivers/staging/fsl-mc/bus/dpio/dpio.c @@ -31,7 +31,7 @@ * POSSIBILITY OF SUCH DAMAGE. */ #include -#include "../../include/mc.h" +#include #include "dpio.h" #include "dpio-cmd.h" diff --git a/drivers/staging/fsl-mc/include/mc.h b/include/linux/fsl/mc.h similarity index 100% rename from drivers/staging/fsl-mc/include/mc.h rename to include/linux/fsl/mc.h