From patchwork Sun Feb 18 16:05:15 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Boris Brezillon X-Patchwork-Id: 874882 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; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="V5DTpWiT"; 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 3zksDh3LJZz9sWv for ; Mon, 19 Feb 2018 03:05:50 +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: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=5MzSrBh9+0QrPkv4lb4UxZU6zdElqdmAMe50C+YO5Bc=; b=V5DTpWiTqTClOJ lZyhlVM6FsJ3VhVuIGWxXdrIVCr3aKhhTJzi1o87ucC2rTCritXGJ7L+C2VL4dHn9b/cZXRxTC0tR xhLAHE11aJMeJjzjnquT89m4T68nV3aoVIsQ6pLNpOdtM+dUHSr98UMTy7ik4AfWX6aFc5DRbSp7i fBNSTrhmBRkAicBrvXMfBKhrhMtFJpj0aEy+JkonFxcKDiLiez+wIooQgLGl3Ra/xR7HVVnVH+oah 6Yqc8FLFNyguxxU5EVmLs0sKloeRtRkxuOPZfkD9ak9TpBtDjeBU1xHS4WVUOXvrZdgLk/KFJauKb I5XeqTiyPfl36Qr8p34Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1enRT6-0007rR-5d; Sun, 18 Feb 2018 16:05:36 +0000 Received: from mail.free-electrons.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1enRT0-0007pn-Vp for linux-mtd@lists.infradead.org; Sun, 18 Feb 2018 16:05:33 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id 7CE122046F; Sun, 18 Feb 2018 17:05:18 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.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.free-electrons.com (Postfix) with ESMTPSA id 2E7A42046F; Sun, 18 Feb 2018 17:05:18 +0100 (CET) From: Boris Brezillon To: Boris Brezillon , Richard Weinberger , linux-mtd@lists.infradead.org, Kyungmin Park Subject: [PATCH 1/2] mtd: onenand: Get rid of comments giving the file path inside the file itself Date: Sun, 18 Feb 2018 17:05:15 +0100 Message-Id: <20180218160516.27946-1-boris.brezillon@bootlin.com> X-Mailer: git-send-email 2.14.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180218_080531_182485_94EBE5F4 X-CRM114-Status: GOOD ( 10.02 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 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: Marek Vasut , Brian Norris , David Woodhouse , Cyrille Pitchen Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Some files add a comment giving the path of the file inside the Linux tree, which is pretty useless since the reader had to find the file to open it. Getting rid of these comments will also allow us to easily move these files around when needed. Signed-off-by: Boris Brezillon --- drivers/mtd/onenand/generic.c | 2 -- drivers/mtd/onenand/omap2.c | 2 -- drivers/mtd/onenand/onenand_base.c | 2 -- drivers/mtd/onenand/onenand_bbt.c | 2 -- 4 files changed, 8 deletions(-) diff --git a/drivers/mtd/onenand/generic.c b/drivers/mtd/onenand/generic.c index 125da34d8ff9..d5ccaf943b91 100644 --- a/drivers/mtd/onenand/generic.c +++ b/drivers/mtd/onenand/generic.c @@ -1,6 +1,4 @@ /* - * linux/drivers/mtd/onenand/generic.c - * * Copyright (c) 2005 Samsung Electronics * Kyungmin Park * diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/onenand/omap2.c index 87c34f607a75..9c159f0dd9a6 100644 --- a/drivers/mtd/onenand/omap2.c +++ b/drivers/mtd/onenand/omap2.c @@ -1,6 +1,4 @@ /* - * linux/drivers/mtd/onenand/omap2.c - * * OneNAND driver for OMAP2 / OMAP3 * * Copyright © 2005-2006 Nokia Corporation diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index 979f4031f23c..05907b1b4098 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c @@ -1,6 +1,4 @@ /* - * linux/drivers/mtd/onenand/onenand_base.c - * * Copyright © 2005-2009 Samsung Electronics * Copyright © 2007 Nokia Corporation * diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c index 420260c25ca0..dde20487937d 100644 --- a/drivers/mtd/onenand/onenand_bbt.c +++ b/drivers/mtd/onenand/onenand_bbt.c @@ -1,7 +1,5 @@ // SPDX-License-Identifier: GPL-2.0 /* - * linux/drivers/mtd/onenand/onenand_bbt.c - * * Bad Block Table support for the OneNAND driver * * Copyright(c) 2005 Samsung Electronics From patchwork Sun Feb 18 16:05:16 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Boris Brezillon X-Patchwork-Id: 874883 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; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="dJym7XHX"; 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 3zksDq40kPz9sWv for ; Mon, 19 Feb 2018 03:06:03 +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=HUG/ffWfHyqcLujab/YhI7l9HzpqRe5X8mFK6Fe6ZgU=; b=dJym7XHX3//vE8Ti59HSgGDnEm MHrR4wpTmG0a+zUsCDHhclMHSlUj3TSEug/LG/hu5QKzkqwRq4LDpeAdfastxZn7r0kSNP9VMtara StX1cu0wlk2wpJpWloLO2BG9eF4tyYvfSs15KcEJ2UazY5YxwJGNCarnvTm7ykyFnwlmK0HAXlgSA VWuNvJYLGfxzRXaDIKy20lcz7icVSCpWB8Q0IDe2EgD7OmMnWJ9j1XDHv/oitnDyVN6CHVtkTXtGZ Ci+9x6pxNYNUvc8QAcrrs8K5ctC9cHkDZXEAGRW8swGB/gN6LsuFiSe+op18Q6HdlzFhAXTqq3ydB Erywdx4A==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1enRTQ-00082F-Ha; Sun, 18 Feb 2018 16:05:56 +0000 Received: from mail.free-electrons.com ([62.4.15.54]) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1enRT0-0007pm-Vq for linux-mtd@lists.infradead.org; Sun, 18 Feb 2018 16:05:33 +0000 Received: by mail.free-electrons.com (Postfix, from userid 110) id AB8B02071C; Sun, 18 Feb 2018 17:05:18 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.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.free-electrons.com (Postfix) with ESMTPSA id 5A94E20715; Sun, 18 Feb 2018 17:05:18 +0100 (CET) From: Boris Brezillon To: Boris Brezillon , Richard Weinberger , linux-mtd@lists.infradead.org, Kyungmin Park Subject: [PATCH 2/2] mtd: Move onenand code base to drivers/mtd/nand/onenand Date: Sun, 18 Feb 2018 17:05:16 +0100 Message-Id: <20180218160516.27946-2-boris.brezillon@bootlin.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180218160516.27946-1-boris.brezillon@bootlin.com> References: <20180218160516.27946-1-boris.brezillon@bootlin.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180218_080531_344410_5DCD060A X-CRM114-Status: GOOD ( 11.15 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] 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: Marek Vasut , Brian Norris , David Woodhouse , Cyrille Pitchen MIME-Version: 1.0 Sender: "linux-mtd" Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Move onenand code base to the drivers/mtd/nand directory in the hope that someday someone will patch it to use the generic NAND helpers. If it never happens, at least we'll have all NAND related support in a single directory and not spread over the drivers/mtd/ directory. Signed-off-by: Boris Brezillon --- MAINTAINERS | 2 +- drivers/mtd/Kconfig | 2 -- drivers/mtd/Makefile | 2 +- drivers/mtd/nand/Kconfig | 2 ++ drivers/mtd/nand/Makefile | 1 + drivers/mtd/{ => nand}/onenand/Kconfig | 0 drivers/mtd/{ => nand}/onenand/Makefile | 0 drivers/mtd/{ => nand}/onenand/generic.c | 0 drivers/mtd/{ => nand}/onenand/omap2.c | 0 drivers/mtd/{ => nand}/onenand/onenand_base.c | 0 drivers/mtd/{ => nand}/onenand/onenand_bbt.c | 0 drivers/mtd/{ => nand}/onenand/samsung.c | 0 drivers/mtd/{ => nand}/onenand/samsung.h | 0 13 files changed, 5 insertions(+), 4 deletions(-) rename drivers/mtd/{ => nand}/onenand/Kconfig (100%) rename drivers/mtd/{ => nand}/onenand/Makefile (100%) rename drivers/mtd/{ => nand}/onenand/generic.c (100%) rename drivers/mtd/{ => nand}/onenand/omap2.c (100%) rename drivers/mtd/{ => nand}/onenand/onenand_base.c (100%) rename drivers/mtd/{ => nand}/onenand/onenand_bbt.c (100%) rename drivers/mtd/{ => nand}/onenand/samsung.c (100%) rename drivers/mtd/{ => nand}/onenand/samsung.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 34b2e9ed6d3d..82678c855d3b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -10206,7 +10206,7 @@ ONENAND FLASH DRIVER M: Kyungmin Park L: linux-mtd@lists.infradead.org S: Maintained -F: drivers/mtd/onenand/ +F: drivers/mtd/nand/onenand/ F: include/linux/mtd/onenand*.h ONSTREAM SCSI TAPE DRIVER diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig index 2a8ac6829d42..46ab7feec6b6 100644 --- a/drivers/mtd/Kconfig +++ b/drivers/mtd/Kconfig @@ -333,8 +333,6 @@ source "drivers/mtd/devices/Kconfig" source "drivers/mtd/nand/Kconfig" -source "drivers/mtd/onenand/Kconfig" - source "drivers/mtd/lpddr/Kconfig" source "drivers/mtd/spi-nor/Kconfig" diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile index d6f8f625e1ff..93473d215a38 100644 --- a/drivers/mtd/Makefile +++ b/drivers/mtd/Makefile @@ -32,7 +32,7 @@ obj-$(CONFIG_MTD_SWAP) += mtdswap.o nftl-objs := nftlcore.o nftlmount.o inftl-objs := inftlcore.o inftlmount.o -obj-y += chips/ lpddr/ maps/ devices/ nand/ onenand/ tests/ +obj-y += chips/ lpddr/ maps/ devices/ nand/ tests/ obj-$(CONFIG_MTD_SPI_NOR) += spi-nor/ obj-$(CONFIG_MTD_UBI) += ubi/ diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 1c1a1f487e20..88c7d3b4ff8b 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -1,4 +1,6 @@ config MTD_NAND_CORE tristate +source "drivers/mtd/nand/onenand/Kconfig" + source "drivers/mtd/nand/raw/Kconfig" diff --git a/drivers/mtd/nand/Makefile b/drivers/mtd/nand/Makefile index a72d3cb0f325..3f0cb87f1a57 100644 --- a/drivers/mtd/nand/Makefile +++ b/drivers/mtd/nand/Makefile @@ -3,4 +3,5 @@ nandcore-objs := core.o bbt.o obj-$(CONFIG_MTD_NAND_CORE) += nandcore.o +obj-y += onenand/ obj-y += raw/ diff --git a/drivers/mtd/onenand/Kconfig b/drivers/mtd/nand/onenand/Kconfig similarity index 100% rename from drivers/mtd/onenand/Kconfig rename to drivers/mtd/nand/onenand/Kconfig diff --git a/drivers/mtd/onenand/Makefile b/drivers/mtd/nand/onenand/Makefile similarity index 100% rename from drivers/mtd/onenand/Makefile rename to drivers/mtd/nand/onenand/Makefile diff --git a/drivers/mtd/onenand/generic.c b/drivers/mtd/nand/onenand/generic.c similarity index 100% rename from drivers/mtd/onenand/generic.c rename to drivers/mtd/nand/onenand/generic.c diff --git a/drivers/mtd/onenand/omap2.c b/drivers/mtd/nand/onenand/omap2.c similarity index 100% rename from drivers/mtd/onenand/omap2.c rename to drivers/mtd/nand/onenand/omap2.c diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/nand/onenand/onenand_base.c similarity index 100% rename from drivers/mtd/onenand/onenand_base.c rename to drivers/mtd/nand/onenand/onenand_base.c diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/nand/onenand/onenand_bbt.c similarity index 100% rename from drivers/mtd/onenand/onenand_bbt.c rename to drivers/mtd/nand/onenand/onenand_bbt.c diff --git a/drivers/mtd/onenand/samsung.c b/drivers/mtd/nand/onenand/samsung.c similarity index 100% rename from drivers/mtd/onenand/samsung.c rename to drivers/mtd/nand/onenand/samsung.c diff --git a/drivers/mtd/onenand/samsung.h b/drivers/mtd/nand/onenand/samsung.h similarity index 100% rename from drivers/mtd/onenand/samsung.h rename to drivers/mtd/nand/onenand/samsung.h