From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D4FF8C282CC for ; Sat, 9 Feb 2019 19:23:58 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A2AB6218D2 for ; Sat, 9 Feb 2019 19:23:58 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="sR46Nkl6"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=crapouillou.net header.i=@crapouillou.net header.b="HivDEbU8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A2AB6218D2 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=crapouillou.net Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org 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=sw7T3i9TS66jTFEdf1om49OzRssinKmPLjNQKpbRuxk=; b=sR46Nkl6O3vwYnSY7Ckvv2I1EN VFVz+c28LAO1yxPxXTNWwhmEZhDLr0fjL6ONnkTb4P+imyvAvtfJAt6poT9yu8MUMHfRV15Q8qi61 hbD4OCc4MKjqcLQyzRS/irBCR8LFDb51wsGRKVCHOjSRBbA8A5cquk/+QZhUtUpsgkrY5ItztNIkr TzfXejfdAMnfAnBWAySFB8BDZ966x1trTcsNI2S2jhhZIT3895k4WG4rUka66xSQs4TiHr3LekUSV 4yCjLjezd9rHOiBKDLERfe4uzyxw3CQ4MmzCU0Q+b4WAhYUc85wl0I/2XKrbjZCaa+jkX62q/A/Tf hWh1/hJg==; 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 1gsYEF-0003Nw-9X; Sat, 09 Feb 2019 19:23:55 +0000 Received: from outils.crapouillou.net ([89.234.176.41] helo=crapouillou.net) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1gsYDt-0002yM-Ad for linux-mtd@lists.infradead.org; Sat, 09 Feb 2019 19:23:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=crapouillou.net; s=mail; t=1549740211; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:content-type: content-transfer-encoding:in-reply-to:in-reply-to: references:references; bh=IBnrvLm/CuhDgm6WMEETEN6lnr413251EOLYRQaxvzc=; b=HivDEbU8G6/n22Y7JMbATV+lhtJ/qxSOPuRz7xgUjmJufOowkNzVWgZ2mHQ2o3GED0iajC j4bJuoCHFoS9VylWQI2sYtTgJ06CfB5LRip7OaOZH7SJaJEFxtiGx6jpTWuvwlTIg3oC53 Jex/UCZuSY/yVc8ZTLGRfPwITDpcDgM= From: Paul Cercueil To: Miquel Raynal , David Woodhouse , Brian Norris , Boris Brezillon , Marek Vasut , Richard Weinberger , Rob Herring , Mark Rutland , Harvey Hunt Subject: [PATCH v4 3/9] mtd: rawnand: Move drivers for Ingenic SoCs to subfolder Date: Sat, 9 Feb 2019 16:22:59 -0300 Message-Id: <20190209192305.4434-3-paul@crapouillou.net> In-Reply-To: <20190209192305.4434-1-paul@crapouillou.net> References: <20190209192305.4434-1-paul@crapouillou.net> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190209_112333_937288_13725F07 X-CRM114-Status: GOOD ( 15.26 ) 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: Paul Cercueil , devicetree@vger.kernel.org, linux-mtd@lists.infradead.org, linux-kernel@vger.kernel.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" Errors-To: linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org Before adding support for more SoCs and seeing the number of files for these drivers grow, we move them to their own subfolder to keep it tidy. Signed-off-by: Paul Cercueil --- Changes: v2: New patch v3: No change v4: No change drivers/mtd/nand/raw/Kconfig | 14 +------------- drivers/mtd/nand/raw/Makefile | 3 +-- drivers/mtd/nand/raw/ingenic/Kconfig | 13 +++++++++++++ drivers/mtd/nand/raw/ingenic/Makefile | 2 ++ drivers/mtd/nand/raw/{ => ingenic}/jz4740_nand.c | 0 drivers/mtd/nand/raw/{ => ingenic}/jz4780_bch.c | 0 drivers/mtd/nand/raw/{ => ingenic}/jz4780_bch.h | 0 drivers/mtd/nand/raw/{ => ingenic}/jz4780_nand.c | 0 8 files changed, 17 insertions(+), 15 deletions(-) create mode 100644 drivers/mtd/nand/raw/ingenic/Kconfig create mode 100644 drivers/mtd/nand/raw/ingenic/Makefile rename drivers/mtd/nand/raw/{ => ingenic}/jz4740_nand.c (100%) rename drivers/mtd/nand/raw/{ => ingenic}/jz4780_bch.c (100%) rename drivers/mtd/nand/raw/{ => ingenic}/jz4780_bch.h (100%) rename drivers/mtd/nand/raw/{ => ingenic}/jz4780_nand.c (100%) diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig index 1a55d3e3d4c5..d886be2fc174 100644 --- a/drivers/mtd/nand/raw/Kconfig +++ b/drivers/mtd/nand/raw/Kconfig @@ -470,19 +470,7 @@ config MTD_NAND_NUC900 This enables the driver for the NAND Flash on evaluation board based on w90p910 / NUC9xx. -config MTD_NAND_JZ4740 - tristate "Support for JZ4740 SoC NAND controller" - depends on MACH_JZ4740 || COMPILE_TEST - depends on HAS_IOMEM - help - Enables support for NAND Flash on JZ4740 SoC based boards. - -config MTD_NAND_JZ4780 - tristate "Support for NAND on JZ4780 SoC" - depends on JZ4780_NEMC - help - Enables support for NAND Flash connected to the NEMC on JZ4780 SoC - based boards, using the BCH controller for hardware error correction. +source "drivers/mtd/nand/raw/ingenic/Kconfig" config MTD_NAND_FSMC tristate "Support for NAND on ST Micros FSMC" diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile index 57159b349054..f419d373d090 100644 --- a/drivers/mtd/nand/raw/Makefile +++ b/drivers/mtd/nand/raw/Makefile @@ -45,8 +45,7 @@ obj-$(CONFIG_MTD_NAND_NUC900) += nuc900_nand.o obj-$(CONFIG_MTD_NAND_MPC5121_NFC) += mpc5121_nfc.o obj-$(CONFIG_MTD_NAND_VF610_NFC) += vf610_nfc.o obj-$(CONFIG_MTD_NAND_RICOH) += r852.o -obj-$(CONFIG_MTD_NAND_JZ4740) += jz4740_nand.o -obj-$(CONFIG_MTD_NAND_JZ4780) += jz4780_nand.o jz4780_bch.o +obj-y += ingenic/ obj-$(CONFIG_MTD_NAND_GPMI_NAND) += gpmi-nand/ obj-$(CONFIG_MTD_NAND_XWAY) += xway_nand.o obj-$(CONFIG_MTD_NAND_BCM47XXNFLASH) += bcm47xxnflash/ diff --git a/drivers/mtd/nand/raw/ingenic/Kconfig b/drivers/mtd/nand/raw/ingenic/Kconfig new file mode 100644 index 000000000000..67806c87b2c4 --- /dev/null +++ b/drivers/mtd/nand/raw/ingenic/Kconfig @@ -0,0 +1,13 @@ +config MTD_NAND_JZ4740 + tristate "Support for JZ4740 SoC NAND controller" + depends on MACH_JZ4740 || COMPILE_TEST + depends on HAS_IOMEM + help + Enables support for NAND Flash on JZ4740 SoC based boards. + +config MTD_NAND_JZ4780 + tristate "Support for NAND on JZ4780 SoC" + depends on JZ4780_NEMC + help + Enables support for NAND Flash connected to the NEMC on JZ4780 SoC + based boards, using the BCH controller for hardware error correction. diff --git a/drivers/mtd/nand/raw/ingenic/Makefile b/drivers/mtd/nand/raw/ingenic/Makefile new file mode 100644 index 000000000000..44c2ca053d24 --- /dev/null +++ b/drivers/mtd/nand/raw/ingenic/Makefile @@ -0,0 +1,2 @@ +obj-$(CONFIG_MTD_NAND_JZ4740) += jz4740_nand.o +obj-$(CONFIG_MTD_NAND_JZ4780) += jz4780_nand.o jz4780_bch.o diff --git a/drivers/mtd/nand/raw/jz4740_nand.c b/drivers/mtd/nand/raw/ingenic/jz4740_nand.c similarity index 100% rename from drivers/mtd/nand/raw/jz4740_nand.c rename to drivers/mtd/nand/raw/ingenic/jz4740_nand.c diff --git a/drivers/mtd/nand/raw/jz4780_bch.c b/drivers/mtd/nand/raw/ingenic/jz4780_bch.c similarity index 100% rename from drivers/mtd/nand/raw/jz4780_bch.c rename to drivers/mtd/nand/raw/ingenic/jz4780_bch.c diff --git a/drivers/mtd/nand/raw/jz4780_bch.h b/drivers/mtd/nand/raw/ingenic/jz4780_bch.h similarity index 100% rename from drivers/mtd/nand/raw/jz4780_bch.h rename to drivers/mtd/nand/raw/ingenic/jz4780_bch.h diff --git a/drivers/mtd/nand/raw/jz4780_nand.c b/drivers/mtd/nand/raw/ingenic/jz4780_nand.c similarity index 100% rename from drivers/mtd/nand/raw/jz4780_nand.c rename to drivers/mtd/nand/raw/ingenic/jz4780_nand.c -- 2.11.0 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/