[PATCH v2 2/8] mtd: rawnand: loongson: Rename loongson1 to loongson

[Binbin Zhou]

Hi Huacai:

Thanks for your reply.

On Mon, Aug 11, 2025 at 2:36 PM Huacai Chen <chenhuacai at kernel.org> wrote:
>
> Hi, Binbin,
>
> On Mon, Aug 11, 2025 at 2:02 PM Binbin Zhou <zhoubinbin at loongson.cn> wrote:
> >
> > The second step in preparing to add Loongson-2K support is to change the
> > names of the driver files and Kconfig options from Loongson1-specific to
> > Loongson-generic.
> Is it possible to merge the first two patches? If not, it is better to
> use loongson1 rather than loongson in the subject line of this patch.

At first, I thought that separating the renaming of file prefixes from
the renaming of file names would make the changes clearer. Another
point is whether renaming Kconfig items would be considered API
breaking, even though no one is currently referencing them?

Of course, if anyone thinks that separating them is unnecessary, I
will merge them in the next version.
>
> Huacai
>
> >
> > Signed-off-by: Binbin Zhou <zhoubinbin at loongson.cn>
> > ---
> >  MAINTAINERS                                                 | 2 +-
> >  drivers/mtd/nand/raw/Kconfig                                | 6 +++---
> >  drivers/mtd/nand/raw/Makefile                               | 2 +-
> >  ...ongson1-nand-controller.c => loongson-nand-controller.c} | 0
> >  4 files changed, 5 insertions(+), 5 deletions(-)
> >  rename drivers/mtd/nand/raw/{loongson1-nand-controller.c => loongson-nand-controller.c} (100%)
> >
> > diff --git a/MAINTAINERS b/MAINTAINERS
> > index 4bac4ea21b64..cc502582c9f1 100644
> > --- a/MAINTAINERS
> > +++ b/MAINTAINERS
> > @@ -16722,7 +16722,7 @@ F:      Documentation/devicetree/bindings/*/loongson,ls1*.yaml
> >  F:     arch/mips/include/asm/mach-loongson32/
> >  F:     arch/mips/loongson32/
> >  F:     drivers/*/*loongson1*
> > -F:     drivers/mtd/nand/raw/loongson1-nand-controller.c
> > +F:     drivers/mtd/nand/raw/loongson-nand-controller.c
> >  F:     drivers/net/ethernet/stmicro/stmmac/dwmac-loongson1.c
> >  F:     sound/soc/loongson/loongson1_ac97.c
> >
> > diff --git a/drivers/mtd/nand/raw/Kconfig b/drivers/mtd/nand/raw/Kconfig
> > index 4b99d9c422c3..d9e3f13666ac 100644
> > --- a/drivers/mtd/nand/raw/Kconfig
> > +++ b/drivers/mtd/nand/raw/Kconfig
> > @@ -462,12 +462,12 @@ config MTD_NAND_NUVOTON_MA35
> >           Enables support for the NAND controller found on
> >           the Nuvoton MA35 series SoCs.
> >
> > -config MTD_NAND_LOONGSON1
> > -       tristate "Loongson1 NAND controller"
> > +config MTD_NAND_LOONGSON
> > +       tristate "Loongson NAND controller"
> >         depends on LOONGSON1_APB_DMA || COMPILE_TEST
> >         select REGMAP_MMIO
> >         help
> > -         Enables support for NAND controller on Loongson1 SoCs.
> > +         Enables support for NAND controller on Loongson family chips.
> >
> >  comment "Misc"
> >
> > diff --git a/drivers/mtd/nand/raw/Makefile b/drivers/mtd/nand/raw/Makefile
> > index 711d043ad4f8..c182b9703a9e 100644
> > --- a/drivers/mtd/nand/raw/Makefile
> > +++ b/drivers/mtd/nand/raw/Makefile
> > @@ -59,7 +59,7 @@ obj-$(CONFIG_MTD_NAND_ROCKCHIP)               += rockchip-nand-controller.o
> >  obj-$(CONFIG_MTD_NAND_PL35X)           += pl35x-nand-controller.o
> >  obj-$(CONFIG_MTD_NAND_RENESAS)         += renesas-nand-controller.o
> >  obj-$(CONFIG_MTD_NAND_NUVOTON_MA35)    += nuvoton-ma35d1-nand-controller.o
> > -obj-$(CONFIG_MTD_NAND_LOONGSON1)       += loongson1-nand-controller.o
> > +obj-$(CONFIG_MTD_NAND_LOONGSON)                += loongson-nand-controller.o
> >
> >  nand-objs := nand_base.o nand_legacy.o nand_bbt.o nand_timings.o nand_ids.o
> >  nand-objs += nand_onfi.o
> > diff --git a/drivers/mtd/nand/raw/loongson1-nand-controller.c b/drivers/mtd/nand/raw/loongson-nand-controller.c
> > similarity index 100%
> > rename from drivers/mtd/nand/raw/loongson1-nand-controller.c
> > rename to drivers/mtd/nand/raw/loongson-nand-controller.c
> > --
> > 2.47.3
> >
> >

--
Thanks.
Binbin