ARM: renesas: Rename arch-/mach-rmobile to arch-/mach-renesas
Rename arch-rmobile to arch-renesas and mach-rmobile to mach-renesas
because all the chips are made by Renesas, while only a subset of
them is from the R-Mobile line.
Use the following command to perform the rename, with manual move of
the directories using git mv and manual fix up to arch/arm/Makefile:
"
$ git grep -l '\<\(arch\|mach\)-rmobile\>' | \
xargs -I {} sed -i 's@\<\(arch\|mach\)-rmobile\>@\1-renesas@g' {}
$ sed -i 's@rmobile@renesas@' board/*/*/Kconfig
"
Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org>
Reviewed-by: Paul Barker <paul.barker.ct@bp.renesas.com>
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index dbd7e01..01d6556 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -2269,7 +2269,7 @@
source "arch/arm/mach-owl/Kconfig"
-source "arch/arm/mach-rmobile/Kconfig"
+source "arch/arm/mach-renesas/Kconfig"
source "arch/arm/mach-meson/Kconfig"
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index d7ca871..a4266a3 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -75,7 +75,7 @@
machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2
machine-$(CONFIG_ARCH_ORION5X) += orion5x
machine-$(CONFIG_ARCH_OWL) += owl
-machine-$(CONFIG_ARCH_RENESAS) += rmobile
+machine-$(CONFIG_ARCH_RENESAS) += renesas
machine-$(CONFIG_ARCH_ROCKCHIP) += rockchip
machine-$(CONFIG_ARCH_S5PC1XX) += s5pc1xx
machine-$(CONFIG_ARCH_SNAPDRAGON) += snapdragon
diff --git a/arch/arm/mach-rmobile/Kconfig b/arch/arm/mach-renesas/Kconfig
similarity index 88%
rename from arch/arm/mach-rmobile/Kconfig
rename to arch/arm/mach-renesas/Kconfig
index c1db953..5aacc6f 100644
--- a/arch/arm/mach-rmobile/Kconfig
+++ b/arch/arm/mach-renesas/Kconfig
@@ -88,12 +88,12 @@
endchoice
config SYS_SOC
- default "rmobile" if ARCH_RENESAS
+ default "renesas" if ARCH_RENESAS
-source "arch/arm/mach-rmobile/Kconfig.32"
-source "arch/arm/mach-rmobile/Kconfig.64"
-source "arch/arm/mach-rmobile/Kconfig.rza1"
-source "arch/arm/mach-rmobile/Kconfig.rzn1"
-source "arch/arm/mach-rmobile/Kconfig.rzg2l"
+source "arch/arm/mach-renesas/Kconfig.32"
+source "arch/arm/mach-renesas/Kconfig.64"
+source "arch/arm/mach-renesas/Kconfig.rza1"
+source "arch/arm/mach-renesas/Kconfig.rzn1"
+source "arch/arm/mach-renesas/Kconfig.rzg2l"
endif
diff --git a/arch/arm/mach-rmobile/Kconfig.32 b/arch/arm/mach-renesas/Kconfig.32
similarity index 100%
rename from arch/arm/mach-rmobile/Kconfig.32
rename to arch/arm/mach-renesas/Kconfig.32
diff --git a/arch/arm/mach-renesas/Kconfig.64 b/arch/arm/mach-renesas/Kconfig.64
new file mode 100644
index 0000000..b5067d0
--- /dev/null
+++ b/arch/arm/mach-renesas/Kconfig.64
@@ -0,0 +1,12 @@
+if RCAR_64
+
+config SYS_MALLOC_F_LEN
+ default 0x8000 if RCAR_64
+
+config OF_LIBFDT_OVERLAY
+ default y if RCAR_64
+
+source "arch/arm/mach-renesas/Kconfig.rcar3"
+source "arch/arm/mach-renesas/Kconfig.rcar4"
+
+endif
diff --git a/arch/arm/mach-rmobile/Kconfig.rcar3 b/arch/arm/mach-renesas/Kconfig.rcar3
similarity index 100%
rename from arch/arm/mach-rmobile/Kconfig.rcar3
rename to arch/arm/mach-renesas/Kconfig.rcar3
diff --git a/arch/arm/mach-rmobile/Kconfig.rcar4 b/arch/arm/mach-renesas/Kconfig.rcar4
similarity index 100%
rename from arch/arm/mach-rmobile/Kconfig.rcar4
rename to arch/arm/mach-renesas/Kconfig.rcar4
diff --git a/arch/arm/mach-rmobile/Kconfig.rza1 b/arch/arm/mach-renesas/Kconfig.rza1
similarity index 100%
rename from arch/arm/mach-rmobile/Kconfig.rza1
rename to arch/arm/mach-renesas/Kconfig.rza1
diff --git a/arch/arm/mach-rmobile/Kconfig.rzg2l b/arch/arm/mach-renesas/Kconfig.rzg2l
similarity index 100%
rename from arch/arm/mach-rmobile/Kconfig.rzg2l
rename to arch/arm/mach-renesas/Kconfig.rzg2l
diff --git a/arch/arm/mach-rmobile/Kconfig.rzn1 b/arch/arm/mach-renesas/Kconfig.rzn1
similarity index 100%
rename from arch/arm/mach-rmobile/Kconfig.rzn1
rename to arch/arm/mach-renesas/Kconfig.rzn1
diff --git a/arch/arm/mach-rmobile/Makefile b/arch/arm/mach-renesas/Makefile
similarity index 100%
rename from arch/arm/mach-rmobile/Makefile
rename to arch/arm/mach-renesas/Makefile
diff --git a/arch/arm/mach-rmobile/board.c b/arch/arm/mach-renesas/board.c
similarity index 100%
rename from arch/arm/mach-rmobile/board.c
rename to arch/arm/mach-renesas/board.c
diff --git a/arch/arm/mach-rmobile/cpu_info-rcar.c b/arch/arm/mach-renesas/cpu_info-rcar.c
similarity index 100%
rename from arch/arm/mach-rmobile/cpu_info-rcar.c
rename to arch/arm/mach-renesas/cpu_info-rcar.c
diff --git a/arch/arm/mach-rmobile/cpu_info-rzg.c b/arch/arm/mach-renesas/cpu_info-rzg.c
similarity index 100%
rename from arch/arm/mach-rmobile/cpu_info-rzg.c
rename to arch/arm/mach-renesas/cpu_info-rzg.c
diff --git a/arch/arm/mach-rmobile/cpu_info-rzg2l.c b/arch/arm/mach-renesas/cpu_info-rzg2l.c
similarity index 100%
rename from arch/arm/mach-rmobile/cpu_info-rzg2l.c
rename to arch/arm/mach-renesas/cpu_info-rzg2l.c
diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-renesas/cpu_info.c
similarity index 100%
rename from arch/arm/mach-rmobile/cpu_info.c
rename to arch/arm/mach-renesas/cpu_info.c
diff --git a/arch/arm/mach-rmobile/emac.c b/arch/arm/mach-renesas/emac.c
similarity index 100%
rename from arch/arm/mach-rmobile/emac.c
rename to arch/arm/mach-renesas/emac.c
diff --git a/arch/arm/mach-rmobile/include/mach/boot0.h b/arch/arm/mach-renesas/include/mach/boot0.h
similarity index 100%
rename from arch/arm/mach-rmobile/include/mach/boot0.h
rename to arch/arm/mach-renesas/include/mach/boot0.h
diff --git a/arch/arm/mach-rmobile/include/mach/gpio.h b/arch/arm/mach-renesas/include/mach/gpio.h
similarity index 100%
rename from arch/arm/mach-rmobile/include/mach/gpio.h
rename to arch/arm/mach-renesas/include/mach/gpio.h
diff --git a/arch/arm/mach-rmobile/include/mach/irqs.h b/arch/arm/mach-renesas/include/mach/irqs.h
similarity index 100%
rename from arch/arm/mach-rmobile/include/mach/irqs.h
rename to arch/arm/mach-renesas/include/mach/irqs.h
diff --git a/arch/arm/mach-rmobile/include/mach/r8a7790.h b/arch/arm/mach-renesas/include/mach/r8a7790.h
similarity index 93%
rename from arch/arm/mach-rmobile/include/mach/r8a7790.h
rename to arch/arm/mach-renesas/include/mach/r8a7790.h
index 233531c..61101df 100644
--- a/arch/arm/mach-rmobile/include/mach/r8a7790.h
+++ b/arch/arm/mach-renesas/include/mach/r8a7790.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
- * arch/arm/include/asm/arch-rmobile/r8a7790.h
+ * arch/arm/include/asm/arch-renesas/r8a7790.h
*
* Copyright (C) 2013,2014 Renesas Electronics Corporation
*/
diff --git a/arch/arm/mach-rmobile/include/mach/r8a7791.h b/arch/arm/mach-renesas/include/mach/r8a7791.h
similarity index 97%
rename from arch/arm/mach-rmobile/include/mach/r8a7791.h
rename to arch/arm/mach-renesas/include/mach/r8a7791.h
index 78a910c..40524d7 100644
--- a/arch/arm/mach-rmobile/include/mach/r8a7791.h
+++ b/arch/arm/mach-renesas/include/mach/r8a7791.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
- * arch/arm/include/asm/arch-rmobile/r8a7791.h
+ * arch/arm/include/asm/arch-renesas/r8a7791.h
*
* Copyright (C) 2013,2014 Renesas Electronics Corporation
*/
diff --git a/arch/arm/mach-rmobile/include/mach/r8a7792.h b/arch/arm/mach-renesas/include/mach/r8a7792.h
similarity index 93%
rename from arch/arm/mach-rmobile/include/mach/r8a7792.h
rename to arch/arm/mach-renesas/include/mach/r8a7792.h
index cc1b00d..51c0d63 100644
--- a/arch/arm/mach-rmobile/include/mach/r8a7792.h
+++ b/arch/arm/mach-renesas/include/mach/r8a7792.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
- * arch/arm/include/asm/arch-rmobile/r8a7792.h
+ * arch/arm/include/asm/arch-renesas/r8a7792.h
*
* Copyright (C) 2016 Renesas Electronics Corporation
*/
diff --git a/arch/arm/mach-rmobile/include/mach/r8a7793.h b/arch/arm/mach-renesas/include/mach/r8a7793.h
similarity index 97%
rename from arch/arm/mach-rmobile/include/mach/r8a7793.h
rename to arch/arm/mach-renesas/include/mach/r8a7793.h
index 4cb0647..f15f823 100644
--- a/arch/arm/mach-rmobile/include/mach/r8a7793.h
+++ b/arch/arm/mach-renesas/include/mach/r8a7793.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
- * arch/arm/include/asm/arch-rmobile/r8a7793.h
+ * arch/arm/include/asm/arch-renesas/r8a7793.h
*
* Copyright (C) 2014 Renesas Electronics Corporation
*/
diff --git a/arch/arm/mach-rmobile/include/mach/r8a7794.h b/arch/arm/mach-renesas/include/mach/r8a7794.h
similarity index 93%
rename from arch/arm/mach-rmobile/include/mach/r8a7794.h
rename to arch/arm/mach-renesas/include/mach/r8a7794.h
index 6d0d729..592625e 100644
--- a/arch/arm/mach-rmobile/include/mach/r8a7794.h
+++ b/arch/arm/mach-renesas/include/mach/r8a7794.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
- * arch/arm/include/asm/arch-rmobile/r8a7794.h
+ * arch/arm/include/asm/arch-renesas/r8a7794.h
*
* Copyright (C) 2014 Renesas Electronics Corporation
*/
diff --git a/arch/arm/mach-rmobile/include/mach/rcar-base.h b/arch/arm/mach-renesas/include/mach/rcar-base.h
similarity index 99%
rename from arch/arm/mach-rmobile/include/mach/rcar-base.h
rename to arch/arm/mach-renesas/include/mach/rcar-base.h
index e422e91..4c2ee81 100644
--- a/arch/arm/mach-rmobile/include/mach/rcar-base.h
+++ b/arch/arm/mach-renesas/include/mach/rcar-base.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
- * arch/arm/include/asm/arch-rmobile/rcar-base.h
+ * arch/arm/include/asm/arch-renesas/rcar-base.h
*
* Copyright (C) 2013,2014 Renesas Electronics Corporation
*/
diff --git a/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h b/arch/arm/mach-renesas/include/mach/rcar-gen3-base.h
similarity index 97%
rename from arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h
rename to arch/arm/mach-renesas/include/mach/rcar-gen3-base.h
index ca12742..5e2e9ec 100644
--- a/arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h
+++ b/arch/arm/mach-renesas/include/mach/rcar-gen3-base.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * ./arch/arm/mach-rmobile/include/mach/rcar-gen3-base.h
+ * ./arch/arm/mach-renesas/include/mach/rcar-gen3-base.h
*
* Copyright (C) 2015 Renesas Electronics Corporation
*/
diff --git a/arch/arm/mach-rmobile/include/mach/rcar-gen4-base.h b/arch/arm/mach-renesas/include/mach/rcar-gen4-base.h
similarity index 96%
rename from arch/arm/mach-rmobile/include/mach/rcar-gen4-base.h
rename to arch/arm/mach-renesas/include/mach/rcar-gen4-base.h
index ac57698..f34473d 100644
--- a/arch/arm/mach-rmobile/include/mach/rcar-gen4-base.h
+++ b/arch/arm/mach-renesas/include/mach/rcar-gen4-base.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/*
- * ./arch/arm/mach-rmobile/include/mach/rcar-gen4-base.h
+ * ./arch/arm/mach-renesas/include/mach/rcar-gen4-base.h
*
* Copyright (C) 2021 Renesas Electronics Corp.
*/
diff --git a/arch/arm/mach-rmobile/include/mach/rcar-mstp.h b/arch/arm/mach-renesas/include/mach/rcar-mstp.h
similarity index 97%
rename from arch/arm/mach-rmobile/include/mach/rcar-mstp.h
rename to arch/arm/mach-renesas/include/mach/rcar-mstp.h
index d241652..7ca362e 100644
--- a/arch/arm/mach-rmobile/include/mach/rcar-mstp.h
+++ b/arch/arm/mach-renesas/include/mach/rcar-mstp.h
@@ -1,6 +1,6 @@
/* SPDX-License-Identifier: GPL-2.0 */
/*
- * arch/arm/include/asm/arch-rmobile/rcar-mstp.h
+ * arch/arm/include/asm/arch-renesas/rcar-mstp.h
*
* Copyright (C) 2013, 2014 Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
* Copyright (C) 2013, 2014 Renesas Electronics Corporation
diff --git a/arch/arm/mach-rmobile/include/mach/renesas.h b/arch/arm/mach-renesas/include/mach/renesas.h
similarity index 100%
rename from arch/arm/mach-rmobile/include/mach/renesas.h
rename to arch/arm/mach-renesas/include/mach/renesas.h
diff --git a/arch/arm/mach-rmobile/include/mach/rzg2l.h b/arch/arm/mach-renesas/include/mach/rzg2l.h
similarity index 100%
rename from arch/arm/mach-rmobile/include/mach/rzg2l.h
rename to arch/arm/mach-renesas/include/mach/rzg2l.h
diff --git a/arch/arm/mach-rmobile/include/mach/sys_proto.h b/arch/arm/mach-renesas/include/mach/sys_proto.h
similarity index 100%
rename from arch/arm/mach-rmobile/include/mach/sys_proto.h
rename to arch/arm/mach-renesas/include/mach/sys_proto.h
diff --git a/arch/arm/mach-rmobile/lowlevel_init_ca15.S b/arch/arm/mach-renesas/lowlevel_init_ca15.S
similarity index 100%
rename from arch/arm/mach-rmobile/lowlevel_init_ca15.S
rename to arch/arm/mach-renesas/lowlevel_init_ca15.S
diff --git a/arch/arm/mach-rmobile/lowlevel_init_gen3.S b/arch/arm/mach-renesas/lowlevel_init_gen3.S
similarity index 100%
rename from arch/arm/mach-rmobile/lowlevel_init_gen3.S
rename to arch/arm/mach-renesas/lowlevel_init_gen3.S
diff --git a/arch/arm/mach-rmobile/memmap-gen3.c b/arch/arm/mach-renesas/memmap-gen3.c
similarity index 100%
rename from arch/arm/mach-rmobile/memmap-gen3.c
rename to arch/arm/mach-renesas/memmap-gen3.c
diff --git a/arch/arm/mach-rmobile/memmap-rzg2l.c b/arch/arm/mach-renesas/memmap-rzg2l.c
similarity index 100%
rename from arch/arm/mach-rmobile/memmap-rzg2l.c
rename to arch/arm/mach-renesas/memmap-rzg2l.c
diff --git a/arch/arm/mach-rmobile/psci-r8a779a0.c b/arch/arm/mach-renesas/psci-r8a779a0.c
similarity index 100%
rename from arch/arm/mach-rmobile/psci-r8a779a0.c
rename to arch/arm/mach-renesas/psci-r8a779a0.c
diff --git a/arch/arm/mach-rmobile/Kconfig.64 b/arch/arm/mach-rmobile/Kconfig.64
deleted file mode 100644
index 57ed1d6..0000000
--- a/arch/arm/mach-rmobile/Kconfig.64
+++ /dev/null
@@ -1,12 +0,0 @@
-if RCAR_64
-
-config SYS_MALLOC_F_LEN
- default 0x8000 if RCAR_64
-
-config OF_LIBFDT_OVERLAY
- default y if RCAR_64
-
-source "arch/arm/mach-rmobile/Kconfig.rcar3"
-source "arch/arm/mach-rmobile/Kconfig.rcar4"
-
-endif