lkml.org 
[lkml]   [2019]   [Feb]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 3/9] mtd: rawnand: Move drivers for Ingenic SoCs to subfolder
    Date
    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 <paul@crapouillou.net>
    ---

    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
    \
     
     \ /
      Last update: 2019-02-09 20:25    [W:2.937 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site