@@ -4,7 +4,7 @@
*
*/
-#include <mach/rmobile.h>
+#include <mach/renesas.h>
#include <asm/io.h>
#include <linux/libfdt.h>
similarity index 100%
rename from arch/arm/mach-rmobile/include/mach/rmobile.h
rename to arch/arm/mach-rmobile/include/mach/renesas.h
@@ -10,7 +10,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <asm/processor.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/rcar-mstp.h>
#include <linux/bitops.h>
#include <linux/delay.h>
@@ -22,7 +22,7 @@
#include <linux/errno.h>
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/rcar-mstp.h>
#include <netdev.h>
#include <miiphy.h>
@@ -16,7 +16,7 @@
#include <linux/errno.h>
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/rcar-mstp.h>
#include <spl.h>
@@ -9,7 +9,7 @@
#include <asm/processor.h>
#include <asm/mach-types.h>
#include <asm/io.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#if defined(CONFIG_RENESAS_EXTRAM_BOOT)
/* QoS version 0.311 for ES1 and version 0.321 for ES2 */
@@ -10,7 +10,7 @@
#include <init.h>
#include <net.h>
#include <asm/arch/rcar-mstp.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/sys_proto.h>
#include <asm/global_data.h>
#include <asm/gpio.h>
@@ -8,7 +8,7 @@
#include <asm/processor.h>
#include <asm/mach-types.h>
#include <asm/io.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#if defined(CONFIG_RENESAS_EXTRAM_BOOT)
enum {
@@ -22,7 +22,7 @@
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
#include <asm/arch/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/rcar-mstp.h>
#include <i2c.h>
#include <mmc.h>
@@ -6,7 +6,7 @@
* Copyright (C) 2020 Renesas Electronics Corp.
*/
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/sys_proto.h>
#include <asm/global_data.h>
#include <asm/io.h>
@@ -23,7 +23,7 @@
#include <linux/errno.h>
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/rcar-mstp.h>
#include <netdev.h>
#include <miiphy.h>
@@ -16,7 +16,7 @@
#include <linux/errno.h>
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/rcar-mstp.h>
#include <spl.h>
@@ -9,7 +9,7 @@
#include <asm/processor.h>
#include <asm/mach-types.h>
#include <asm/io.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#if defined(CONFIG_RENESAS_EXTRAM_BOOT)
/* QoS version 0.311 */
@@ -6,7 +6,7 @@
* Copyright (C) 2023 Renesas Electronics Corp.
*/
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/sys_proto.h>
#include <asm/global_data.h>
#include <asm/io.h>
@@ -24,7 +24,7 @@
#include <linux/errno.h>
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/rcar-mstp.h>
#include <netdev.h>
#include <miiphy.h>
@@ -16,7 +16,7 @@
#include <linux/errno.h>
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/rcar-mstp.h>
#include <spl.h>
@@ -9,7 +9,7 @@
#include <asm/processor.h>
#include <asm/mach-types.h>
#include <asm/io.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
/* QoS version 0.240 for ES1 and version 0.411 for ES2 */
#if defined(CONFIG_RENESAS_EXTRAM_BOOT)
@@ -26,7 +26,7 @@
#include <linux/errno.h>
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/rcar-mstp.h>
#include <miiphy.h>
#include <i2c.h>
@@ -16,7 +16,7 @@
#include <linux/errno.h>
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/rcar-mstp.h>
#include <spl.h>
@@ -8,7 +8,7 @@
#include <asm/processor.h>
#include <asm/mach-types.h>
#include <asm/io.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
/* QoS version 0.955 for ES1 and version 0.973 for ES2 */
#if defined(CONFIG_RENESAS_EXTRAM_BOOT)
@@ -24,7 +24,7 @@
#include <linux/errno.h>
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/rcar-mstp.h>
#include <netdev.h>
#include <miiphy.h>
@@ -16,7 +16,7 @@
#include <linux/errno.h>
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/rcar-mstp.h>
#include <spl.h>
@@ -10,7 +10,7 @@
#include <asm/processor.h>
#include <asm/mach-types.h>
#include <asm/io.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
/* QoS version 0.240 for ES1 and version 0.334 for ES2 */
#if defined(CONFIG_RENESAS_EXTRAM_BOOT)
@@ -14,7 +14,7 @@
#include <asm/global_data.h>
#include <asm/io.h>
#include <dm/uclass-internal.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <linux/libfdt.h>
#ifdef CONFIG_RCAR_64
@@ -4,7 +4,7 @@
*/
#include <clock_legacy.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/io.h>
#define CPGWPR 0xE6150900
@@ -23,7 +23,7 @@
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
#include <asm/arch/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/rcar-mstp.h>
#include <i2c.h>
#include <mmc.h>
@@ -10,7 +10,7 @@
#include <asm/processor.h>
#include <asm/mach-types.h>
#include <asm/io.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#if defined(CONFIG_RENESAS_EXTRAM_BOOT)
/* QoS version 0.11 */
@@ -23,7 +23,7 @@
#include <linux/errno.h>
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/rcar-mstp.h>
#include <netdev.h>
#include <miiphy.h>
@@ -16,7 +16,7 @@
#include <linux/errno.h>
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/rcar-mstp.h>
#include <spl.h>
@@ -6,7 +6,7 @@
* Copyright (C) 2021 Renesas Electronics Corp.
*/
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/sys_proto.h>
#include <asm/global_data.h>
#include <asm/io.h>
@@ -10,7 +10,7 @@
#include <asm/processor.h>
#include <asm/mach-types.h>
#include <asm/io.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
/* QoS version 0.955 for ES1 and version 0.973 for ES2 */
#if defined(CONFIG_RENESAS_EXTRAM_BOOT)
@@ -25,7 +25,7 @@
#include <linux/errno.h>
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/rcar-mstp.h>
#include <miiphy.h>
#include <i2c.h>
@@ -16,7 +16,7 @@
#include <linux/errno.h>
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/rcar-mstp.h>
#include <spl.h>
@@ -21,7 +21,7 @@
#include <asm/arch/sys_proto.h>
#include <asm/gpio.h>
#include <asm/arch/gpio.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/rcar-mstp.h>
#include <i2c.h>
#include <mmc.h>
@@ -6,7 +6,7 @@
* Copyright (C) 2021 Renesas Electronics Corp.
*/
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/arch/sys_proto.h>
#include <asm/global_data.h>
#include <asm/io.h>
@@ -13,7 +13,7 @@
#include <malloc.h>
#include <spi.h>
#include <wait_bit.h>
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
#include <asm/io.h>
#include <linux/bitops.h>
@@ -8,7 +8,7 @@
#ifndef __RCAR_GEN2_COMMON_H
#define __RCAR_GEN2_COMMON_H
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
/* console */
#define CFG_SYS_BAUDRATE_TABLE { 38400, 115200 }
@@ -9,7 +9,7 @@
#ifndef __RCAR_GEN3_COMMON_H
#define __RCAR_GEN3_COMMON_H
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
/* boot option */
@@ -9,7 +9,7 @@
#ifndef __RCAR_GEN4_COMMON_H
#define __RCAR_GEN4_COMMON_H
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
/* Console */
#define CFG_SYS_BAUDRATE_TABLE { 38400, 115200, 921600, 1843200 }
@@ -6,7 +6,7 @@
#ifndef __RENESAS_RZG2L_H
#define __RENESAS_RZG2L_H
-#include <asm/arch/rmobile.h>
+#include <asm/arch/renesas.h>
/* console */
#define CFG_SYS_BAUDRATE_TABLE { 115200, 38400 }
Rename rmobile.h to renesas.h 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: " $ git grep -l 'include.*rmobile.h' | \ xargs -I {} sed -i '/include.*rmobile.h/ s@rmobile.h@renesas.h@g' {} " Signed-off-by: Marek Vasut <marek.vasut+renesas@mailbox.org> --- Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> Cc: Paul Barker <paul.barker.ct@bp.renesas.com> Cc: Tom Rini <trini@konsulko.com> --- arch/arm/mach-rmobile/cpu_info-rzg2l.c | 2 +- arch/arm/mach-rmobile/include/mach/{rmobile.h => renesas.h} | 0 board/hoperun/hihope-rzg2/hihope-rzg2.c | 2 +- board/renesas/alt/alt.c | 2 +- board/renesas/alt/alt_spl.c | 2 +- board/renesas/alt/qos.c | 2 +- board/renesas/blanche/blanche.c | 2 +- board/renesas/blanche/qos.c | 2 +- board/renesas/draak/draak.c | 2 +- board/renesas/falcon/falcon.c | 2 +- board/renesas/gose/gose.c | 2 +- board/renesas/gose/gose_spl.c | 2 +- board/renesas/gose/qos.c | 2 +- board/renesas/grayhawk/grayhawk.c | 2 +- board/renesas/koelsch/koelsch.c | 2 +- board/renesas/koelsch/koelsch_spl.c | 2 +- board/renesas/koelsch/qos.c | 2 +- board/renesas/lager/lager.c | 2 +- board/renesas/lager/lager_spl.c | 2 +- board/renesas/lager/qos.c | 2 +- board/renesas/porter/porter.c | 2 +- board/renesas/porter/porter_spl.c | 2 +- board/renesas/porter/qos.c | 2 +- board/renesas/rcar-common/common.c | 2 +- board/renesas/rcar-common/v3-common.c | 2 +- board/renesas/salvator-x/salvator-x.c | 2 +- board/renesas/silk/qos.c | 2 +- board/renesas/silk/silk.c | 2 +- board/renesas/silk/silk_spl.c | 2 +- board/renesas/spider/spider.c | 2 +- board/renesas/stout/qos.c | 2 +- board/renesas/stout/stout.c | 2 +- board/renesas/stout/stout_spl.c | 2 +- board/renesas/ulcb/ulcb.c | 2 +- board/renesas/whitehawk/whitehawk.c | 2 +- drivers/spi/sh_qspi.c | 2 +- include/configs/rcar-gen2-common.h | 2 +- include/configs/rcar-gen3-common.h | 2 +- include/configs/rcar-gen4-common.h | 2 +- include/configs/rzg2l-smarc.h | 2 +- 40 files changed, 39 insertions(+), 39 deletions(-) rename arch/arm/mach-rmobile/include/mach/{rmobile.h => renesas.h} (100%)