From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754050AbdK1P2Q (ORCPT ); Tue, 28 Nov 2017 10:28:16 -0500 Received: from mail-sn1nam01on0076.outbound.protection.outlook.com ([104.47.32.76]:5366 "EHLO NAM01-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754037AbdK1P2I (ORCPT ); Tue, 28 Nov 2017 10:28:08 -0500 Authentication-Results: spf=fail (sender IP is 192.88.168.50) smtp.mailfrom=nxp.com; nxp.com; dkim=none (message not signed) header.d=none;nxp.com; dmarc=fail action=none header.from=nxp.com; From: To: , CC: , , , , , , , Stuart Yoder , Laurentiu Tudor , Thomas Gleixner , Jason Cooper , Marc Zyngier Subject: [PATCH v3] staging: fsl-mc: move bus driver out of staging Date: Tue, 28 Nov 2017 17:27:57 +0200 Message-ID: <20171128152757.1058-1-laurentiu.tudor@nxp.com> X-Mailer: git-send-email 2.9.4 X-EOPAttributedMessage: 0 X-Matching-Connectors: 131563564863382470;(91ab9b29-cfa4-454e-5278-08d120cd25b8);() X-Forefront-Antispam-Report: CIP:192.88.168.50;IPV:NLI;CTRY:US;EFV:NLI;SFV:NSPM;SFS:(10009020)(6009001)(7966004)(336005)(376002)(39380400002)(346002)(39860400002)(2980300002)(1110001)(1109001)(339900001)(199003)(189002)(356003)(50226002)(33646002)(105606002)(2906002)(966005)(85426001)(104016004)(1076002)(498600001)(106466001)(86152003)(51416003)(8676002)(86362001)(97736004)(8656006)(68736007)(305945005)(77096006)(8936002)(575784001)(189998001)(50986999)(6306002)(5660300001)(36756003)(7416002)(53936002)(2876002)(81166006)(81156014)(50466002)(47776003)(316002)(39060400002)(6636002)(6666003)(4326008)(48376002)(110136005)(54906003)(16586007);DIR:OUT;SFP:1101;SCL:1;SRVR:CY4PR03MB2693;H:tx30smr01.am.freescale.net;FPR:;SPF:Fail;PTR:InfoDomainNonexistent;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: 1;BN1AFFO11FD028;1:6Hxgj+VYTLaNQimLggzrLScTBl1DzcUDXjP4f1MLX3L9ptH+T/Z/8QjLfiULUP3gnJ0kq27IHthcWRKkFAuTfkWTxcXyHq/fKBw96PLh1sbDQMoQwIG1MCuymRZUy/eM MIME-Version: 1.0 Content-Type: text/plain X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d87131e3-5857-4e78-8266-08d536749f85 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(5600026)(4604075)(4534020)(4628075)(201703131517081)(2017052603199);SRVR:CY4PR03MB2693; X-Microsoft-Exchange-Diagnostics: 1;CY4PR03MB2693;3:+Unr8tcFYwN217bIDHG0TzITJvyguqsFBQpvk6O1U6AcHAWFF29xYt7wrlhHrK4XrUHRI0er3Qi/liYTE9NbDGy+mxLY2oMcPtHdt530LwVLAnHXWu79MW9ZOgAq059B+AFc1ynoLYBfmEphSzYUJKlGDUBkdgjl6s2BDSeEbJMXgsK6uzVxp7UazYsKMX3a7wAhZ0cIXgHk9adlU0jeR8LeknaA6Ak+3COffn0aRhEPvt8JvBm7AqWQ3/04vKmU38L5zLFXJa1DH3ODEDwGosTvibJ+nRHj8ZB/wM2a+nk2seHgC77k0drMV5igrk6Ewxa19Lk3V+XR3tylYUqnnlIK/ipOyH8+Sw58PspDhws=;25:LjBu3LLNOHYpZxDTxhh7ly0nRuTCPsa+AsYK8qP54/hSNg4J8Xg2dVFC0yrTzl3yggxjXZdoYJGWf47ModT8NH3NcmkB9/ocx8IoE6ja2sARNCWfgbAf3Jaa/1FZ/mK+YMGxw0Kx5nZf+cNj42aP95i/vzURZFF+WtqqVMLM0xZSHWuQhJBz7JVO3s4RrbI1E8FPgwDWCVr9xY4r2DaG/I25iCiB+t7UxVnIxQqKcbpnD1pi3ThKb9W2Xofx5o/XVn2UNcnVDNL36qhW7AcWYBOvyMLvewbXzCoeWD3VePc7C7/lgUAdyhV8rnp9yxa7eA5vbRARQW8QL8R4s3qv3A== X-MS-TrafficTypeDiagnostic: CY4PR03MB2693: X-Microsoft-Exchange-Diagnostics: 1;CY4PR03MB2693;31:v34c1BnWXKHNqgsQqGYOg9k3V+faDz7HpRZGUzAa5QxNQQ+LFlTzD/XCzHY9eqX9aBaxpraCHwQZf7n7WTNzDBr2dRf0oA+T8uHU4h5+1A4YGdmDgP1ztzZVysapEIdIpwSKXp3m2VjV9QC5X6MS+NV6bRaeobzrEa+6qBbeLJ6Cq/wXL5nr6y8uwNKeZGi3N3fLv7GCYneTX+ijK/L2hGJJ31XBmJZLxBtOO6hHsmE=;4:+1RaQ66XEQ5X2V0D4AhzJikqKFDsAOZS1Xi6L9fql/foZ+he/Jbi2d8RI99hJYQuf2Iji4GaSzkXoBWiQwMx+EqPxT8Ap6syC3XEOe+wviqbg7mtrzjJHtzCoxMa5Hb/epKUQIyiVfKY8flSeRkgta5tuMwqJXX2XthhNVSGWdBJXutRM+6MWJDwX43iMErfaCgYAnOKF3N94yvd5dvollR08JE2qAb5yKP74J0y4OAnKepGIBzx2sSwYou5t7TlHEf3R6auSCXmhvgamg2sM5nl939OXPMck9fWxpC5y/MhK18Dr2Q/UDc/ikF9nl3jNqpks/Y/trKzCSqV3XTMQNQCr6ObnO8+6DWNz4VSE6FJDLomI70C7H4AKz7GNE4uRtZlB63SqKOKIoXWIiAM7rTfuMD/a1vuX1uXRGkMhLE6yYb4EdvasXab45+HtRgEpFVikjdpypFO5RQnKXev8A== 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)(2401047)(8121501046)(5005006)(3231022)(10201501046)(93006095)(93001095)(3002001)(6055026)(6096035)(20161123559100)(20161123561025)(20161123563025)(20161123556025)(20161123565025)(201703131430075)(201703131433075)(201703131441075)(201703131448075)(201703161259150)(201708071742011);SRVR:CY4PR03MB2693;BCL:0;PCL:0;RULEID:(100000803101)(100110400095)(400006);SRVR:CY4PR03MB2693; X-Forefront-PRVS: 0505147DDB X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CY4PR03MB2693;23:SJ++4XjUKzHSXbhmCoxKw8uAPnvzOhWClCb3cx387?= =?us-ascii?Q?7NqmoMUfGJ0shEiNWTsNJDM7Txym5eRqfbixOGrc7NzBM+sdKL80anP0p4Af?= =?us-ascii?Q?gm3ctMeSVguNBOh2JzyIhpC8Y2qQt1thuaP9WaEA5AcHJ3FAjwQkRJQQq1ZF?= =?us-ascii?Q?5KdwINcZ9tToZtWi55RUOTq9MbvFF+1wUmvePQME1d33fOKMkau44cydnbS6?= =?us-ascii?Q?jH8QjuaUeEp00IDqV6MCRQM9FgLCFW3mi1AVRjqWuZcn/Cuz+Sb68a5RQVkF?= =?us-ascii?Q?PO0w4GVkG2y0B9rPh/VefqJKZCW56WKOqqXkuGGrvbrU9YNSKxR7w0fwK3fq?= =?us-ascii?Q?O2MiDI6J4P456f7iUWvuQGaUgsZot6mB4B6hlRqtlVhFirBkIHooiwB2yx9k?= =?us-ascii?Q?wFDniz7Rpe84mHdkyhAnySA1668JHrkeyS72ZQxc4e/qMu3nF1C2Y4txwxYQ?= =?us-ascii?Q?8WQaLZaiGauOf/4YPZXRbGcrYMXMjw2b1RAgL425LGBgr5NyytIebZ6/eSKS?= =?us-ascii?Q?MhgOEpCVG+BurYx2OHPfwxInB4n5xc/mYsdt5nnoRykjY4yTG6+QJrF4OeaH?= =?us-ascii?Q?BpaV6lPmXp9ZklcCP5gj2akcF04J12ZNlyBI2jB2ylOrOBma1eOTdmc2KBHQ?= =?us-ascii?Q?xuSGBBKsCUPUoBsyqmR/boBd56AfgPX0+bh1ljBU1KnCSncNjM8ytMTFdeCB?= =?us-ascii?Q?w8j9v7pZkfY/U73D9oQPWyhSt6QjPLNrH2RJe30jJE18Q/6TU+cMbV/TkTlM?= =?us-ascii?Q?cDWB73IKlzv19kBMsBdpMHFlrM3aw4igMYUIKk5Pf6INBoSYteVjeCMBdF0U?= =?us-ascii?Q?61LXj4hF3IJCtLPgfh8+5UYEQXQ5UK83cxXFWQFOkXJOixK0CtAJKxNYn3BN?= =?us-ascii?Q?XNgwEmDzpVHJy85HPAfRjI6+YrvnQbwnuPUYcA4Hey0lLg6gJC+LRHzMXYmp?= =?us-ascii?Q?1yN76aUNWMSjdYxugr0hA60cogJxfKmnbp3Yml5XYGd+JOUB/gzhvOSSaMpl?= =?us-ascii?Q?03akgA4tmqoGwY/etgxs8upIU41kKqCXRgpj/zuXcgp3fpf8JdOMHLJNciP+?= =?us-ascii?Q?2L24WDl9relXNOsBBQLrlsFNLdC5dVhX2WPCtg/0xHMT/4SJQtzBjyiYlhjZ?= =?us-ascii?Q?cloHj9E2y+jE8soqh/wW4fqT32+9bLEVJFyBFw2aRT2zhWdlrMuNzohLrr0M?= =?us-ascii?Q?CLv1l822EDRkOxt1Sf7Ge+XptmAD/ogmvvssHRG4N7OSN5aBxjkrMfLCVfeh?= =?us-ascii?Q?2ScX9s3M0OWrDUXyBBnVBgZe2nhBhlnrh3nkw7Ho0EPfMLz9g8iGF5dGiAdM?= =?us-ascii?B?dz09?= X-Microsoft-Exchange-Diagnostics: 1;CY4PR03MB2693;6:0aHLr0OF+JBWmNAZ9G6N975PdO0nEDNlfzuZOclFdgPkDZqbaZrOhn8Vt6u7nRGzCVI//3DUu44yAEYDcRUyMfgK/et3jxgbU2Muihnd/N/yX13SVMoaKlo2CYiOTcG7hRb0XDO/u4Dd+bzWMdLe3SUgSdA/HdN8U/HMzc97BfEM4PpEIXpvxhGdVgNCjHw1bcy4GbfNCijbhlIRKO8rUfFWXkplaxMdoombH/tOlQkUjuQAcXe6gIk9f3PgPuup2uXUvgcjbgRKQKh/bOC0sY/GgokDP6XFHkV+KfLQ/VCVTxapaPNP0gO2vnOTQsMHrNUAyN6Fn0Wg35W0ry2CFW2qaR/OKb3j18WdVOxlqys=;5:VViH2B2564lzpq3ItRoaXS5Z3SPLXLboeR45/b/9tzsid8gZx6KiK4HBLJExCyiGQK+ng+6Br6oHVwZeyWI5lQVC1GydncPgpl7/2u3uiPLYOyKea/fGJEj1Ii+ikvIWHwDGgnKBpTXg4WeZf5sjy41d1IVSPqWkO408jV+ptVY=;24:IhIoGSSQrv+SwTiVEKpK017EruEyBOwYspN9E3JglwOTXGhFzycetf0yx1zcq+11xsJdBmqrkvcD0GetG/n9YJmSs/NgUqoEsCun8nyJ8vA=;7:YakTEmRTB88Y5/2ebzapPO3uHHmA4xPY1XaTv6wBqEOZ0AAmZHO4o8CSoftcmmxNcbXNus+Oy//Vp6yqmn+cYnnVmbWw4PlY+0KveRoRPegy700zYP1Eg7k/BpyF6nMgRn4J6QxLJpsDb7woWdZ9PukC+PedxEv10YjVsLPpEuolebKPIM+rG6/kJ0v0p1JISxKaTq16RVZnKjaWsrICfEHQKBflwqWlQxkTC0McRpqvFijFjof2DLQ7nz9Etodm SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-MS-Exchange-CrossTenant-OriginalArrivalTime: 28 Nov 2017 15:28:06.1042 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: d87131e3-5857-4e78-8266-08d536749f85 X-MS-Exchange-CrossTenant-Id: 5afe0b00-7697-4969-b663-5eab37d5f47e X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=5afe0b00-7697-4969-b663-5eab37d5f47e;Ip=[192.88.168.50];Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR03MB2693 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: -v3: - rebased -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 aa71ab52f..f2d9fe7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -11276,7 +11276,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 dc7b3c7..7773150 100644 --- a/drivers/bus/Kconfig +++ b/drivers/bus/Kconfig @@ -199,4 +199,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 9bcd0bf..c955d8b 100644 --- a/drivers/bus/Makefile +++ b/drivers/bus/Makefile @@ -15,6 +15,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 131c715..522f574 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 f29ea3e..6d4c8a6 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 1000fb3..dd64978 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 3cbf92d..1562599 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 db3636d..101c91c 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 d2df34a..641d8a4 100644 --- a/drivers/irqchip/Makefile +++ b/drivers/irqchip/Makefile @@ -32,6 +32,7 @@ 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-platform-msi.o irq-gic-v4.o obj-$(CONFIG_ARM_GIC_V3_ITS_PCI) += irq-gic-v3-its-pci-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 6d81ac0..06972f1 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 0d8ed00..8778009 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 e8be761..b16ff5c 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 fc76e90..c84cb8c 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 5ba1a0f..1c53127 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 a8a8e15..6f150ea 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 -- 2.9.4