From patchwork Fri Oct 19 07:49:05 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Brezillon X-Patchwork-Id: 986609 X-Patchwork-Delegate: boris.brezillon@free-electrons.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=bootlin.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="uk8zLZz+"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42byvk4tBRz9s4Z for ; Fri, 19 Oct 2018 18:58:10 +1100 (AEDT) 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:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id: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=n4CdZbDnW9qXdgGUoHnvybwyzTHp6eZhQaWUi6IvQoQ=; b=uk8zLZz+QD582d/C1hA737nJh8 EOdloQqBpjkJoN5ujeYbVE5dVCY19HvXd1iGnkEzlGeXGSlaqyaoq/3gKYgCE7ty+HFLwuxbZwi8L 6jCBOF/ZQth+6suJIyaFl3GMIf4mPDnGS7Z0TUqVtS8mGLGu98aTWGydcypeR1vs1TnqGadQdLsk7 gPO73HirJTDhrDtErvLXHNE554RK8wYOu1hEF+CtYKfBpsjBIgaT9zLHfwNt68gvgJ/w41f2YZ0nv IgpPGrdkv3Vq9YUlIdr6jDvLtiwF+RqW3fnIK2vKOhe+LdaSFjMtglTLjndxtjMqefiDjtouogQ4b Zz60TTBQ==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gDPfT-00016q-CD; Fri, 19 Oct 2018 07:57:59 +0000 Received: from mail.bootlin.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1gDPXV-0003Sw-FZ for linux-mtd@lists.infradead.org; Fri, 19 Oct 2018 07:50:32 +0000 Received: by mail.bootlin.com (Postfix, from userid 110) id 1A6D520DE8; Fri, 19 Oct 2018 09:49:33 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.bootlin.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost.localdomain (91-160-177-164.subs.proxad.net [91.160.177.164]) by mail.bootlin.com (Postfix) with ESMTPSA id BDC1620DF8; Fri, 19 Oct 2018 09:49:15 +0200 (CEST) From: Boris Brezillon To: David Woodhouse , Brian Norris , Boris Brezillon , Marek Vasut , Richard Weinberger , linux-mtd@lists.infradead.org Subject: [PATCH v2 12/15] mtd: maps: Rename physmap_of_{versatile, gemini} into physmap-{versatile, gemini} Date: Fri, 19 Oct 2018 09:49:05 +0200 Message-Id: <20181019074908.13226-13-boris.brezillon@bootlin.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20181019074908.13226-1-boris.brezillon@bootlin.com> References: <20181019074908.13226-1-boris.brezillon@bootlin.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20181019_004945_914697_8A29111A X-CRM114-Status: GOOD ( 17.09 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , devicetree@vger.kernel.org, Pawel Moll , Ian Campbell , Linus Walleij , Rob Herring , Kumar Gala , Ricardo Ribalda Delgado MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Now that the physmap_of driver is gone, the gemini and versative extensions are part of the physmap driver. Rename the source files and the config option to reflect this. Signed-off-by: Boris Brezillon Reviewed-by: Ricardo Ribalda Delgado --- Changes in v2: - Add Ricardo's R-b --- drivers/mtd/maps/Kconfig | 4 ++-- drivers/mtd/maps/Makefile | 4 ++-- drivers/mtd/maps/physmap-core.c | 4 ++-- drivers/mtd/maps/{physmap_of_gemini.c => physmap-gemini.c} | 2 +- drivers/mtd/maps/{physmap_of_gemini.h => physmap-gemini.h} | 2 +- drivers/mtd/maps/{physmap_of_versatile.c => physmap-versatile.c} | 2 +- drivers/mtd/maps/{physmap_of_versatile.h => physmap-versatile.h} | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) rename drivers/mtd/maps/{physmap_of_gemini.c => physmap-gemini.c} (98%) rename drivers/mtd/maps/{physmap_of_gemini.h => physmap-gemini.h} (90%) rename drivers/mtd/maps/{physmap_of_versatile.c => physmap-versatile.c} (99%) rename drivers/mtd/maps/{physmap_of_versatile.h => physmap-versatile.h} (90%) diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig index 5bffebacce86..bb0d64e3fcd6 100644 --- a/drivers/mtd/maps/Kconfig +++ b/drivers/mtd/maps/Kconfig @@ -74,7 +74,7 @@ config MTD_PHYSMAP_OF physically into the CPU's memory. The mapping description here is taken from OF device tree. -config MTD_PHYSMAP_OF_VERSATILE +config MTD_PHYSMAP_VERSATILE bool "ARM Versatile OF-based physical memory map handling" depends on MTD_PHYSMAP_OF depends on MFD_SYSCON @@ -84,7 +84,7 @@ config MTD_PHYSMAP_OF_VERSATILE platforms, basically to add a VPP (write protection) callback so the flash can be taken out of write protection. -config MTD_PHYSMAP_OF_GEMINI +config MTD_PHYSMAP_GEMINI bool "Cortina Gemini OF-based physical memory map handling" depends on MTD_PHYSMAP_OF depends on MFD_SYSCON diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile index ad32b185a120..ce737e15b7cf 100644 --- a/drivers/mtd/maps/Makefile +++ b/drivers/mtd/maps/Makefile @@ -18,8 +18,8 @@ obj-$(CONFIG_MTD_CK804XROM) += ck804xrom.o obj-$(CONFIG_MTD_TSUNAMI) += tsunami_flash.o obj-$(CONFIG_MTD_PXA2XX) += pxa2xx-flash.o physmap-objs-y += physmap-core.o -physmap-objs-$(CONFIG_MTD_PHYSMAP_OF_VERSATILE) += physmap_of_versatile.o -physmap-objs-$(CONFIG_MTD_PHYSMAP_OF_GEMINI) += physmap_of_gemini.o +physmap-objs-$(CONFIG_MTD_PHYSMAP_VERSATILE) += physmap-versatile.o +physmap-objs-$(CONFIG_MTD_PHYSMAP_GEMINI) += physmap-gemini.o physmap-objs := $(physmap-objs-y) obj-$(CONFIG_MTD_PHYSMAP) += physmap.o obj-$(CONFIG_MTD_PISMO) += pismo.o diff --git a/drivers/mtd/maps/physmap-core.c b/drivers/mtd/maps/physmap-core.c index 07af8368d173..8a8af37576ff 100644 --- a/drivers/mtd/maps/physmap-core.c +++ b/drivers/mtd/maps/physmap-core.c @@ -31,8 +31,8 @@ #include #include -#include "physmap_of_gemini.h" -#include "physmap_of_versatile.h" +#include "physmap-gemini.h" +#include "physmap-versatile.h" struct physmap_flash_info { unsigned int nmaps; diff --git a/drivers/mtd/maps/physmap_of_gemini.c b/drivers/mtd/maps/physmap-gemini.c similarity index 98% rename from drivers/mtd/maps/physmap_of_gemini.c rename to drivers/mtd/maps/physmap-gemini.c index 9df62ca721d5..1cf128a0526d 100644 --- a/drivers/mtd/maps/physmap_of_gemini.c +++ b/drivers/mtd/maps/physmap-gemini.c @@ -13,7 +13,7 @@ #include #include #include -#include "physmap_of_gemini.h" +#include "physmap-gemini.h" /* * The Flash-relevant parts of the global status register diff --git a/drivers/mtd/maps/physmap_of_gemini.h b/drivers/mtd/maps/physmap-gemini.h similarity index 90% rename from drivers/mtd/maps/physmap_of_gemini.h rename to drivers/mtd/maps/physmap-gemini.h index 60e13a689d6a..72bd04ce3fdb 100644 --- a/drivers/mtd/maps/physmap_of_gemini.h +++ b/drivers/mtd/maps/physmap-gemini.h @@ -2,7 +2,7 @@ #include #include -#ifdef CONFIG_MTD_PHYSMAP_OF_GEMINI +#ifdef CONFIG_MTD_PHYSMAP_GEMINI int of_flash_probe_gemini(struct platform_device *pdev, struct device_node *np, struct map_info *map); diff --git a/drivers/mtd/maps/physmap_of_versatile.c b/drivers/mtd/maps/physmap-versatile.c similarity index 99% rename from drivers/mtd/maps/physmap_of_versatile.c rename to drivers/mtd/maps/physmap-versatile.c index 03f2b6e7bc7e..0179d710bb3f 100644 --- a/drivers/mtd/maps/physmap_of_versatile.c +++ b/drivers/mtd/maps/physmap-versatile.c @@ -28,7 +28,7 @@ #include #include #include -#include "physmap_of_versatile.h" +#include "physmap-versatile.h" static struct regmap *syscon_regmap; diff --git a/drivers/mtd/maps/physmap_of_versatile.h b/drivers/mtd/maps/physmap-versatile.h similarity index 90% rename from drivers/mtd/maps/physmap_of_versatile.h rename to drivers/mtd/maps/physmap-versatile.h index 0302502c9462..9cf39d031f5a 100644 --- a/drivers/mtd/maps/physmap_of_versatile.h +++ b/drivers/mtd/maps/physmap-versatile.h @@ -2,7 +2,7 @@ #include #include -#ifdef CONFIG_MTD_PHYSMAP_OF_VERSATILE +#ifdef CONFIG_MTD_PHYSMAP_VERSATILE int of_flash_probe_versatile(struct platform_device *pdev, struct device_node *np, struct map_info *map);