8 files changed, 16 insertions, 16 deletions
diff --git a/arch/arm/mach-rmobile/cpu_info-rcar.c b/arch/arm/mach-rmobile/cpu_info-rcar.c
index fe1795cec81..4c439adfdd6 100644
--- a/arch/arm/mach-rmobile/cpu_info-rcar.c
+++ b/arch/arm/mach-rmobile/cpu_info-rcar.c
@@ -26,7 +26,7 @@ u32 renesas_get_cpu_type(void)
 	return (rmobile_get_prr() & 0x00007F00) >> 8;
 }
 
-u32 rmobile_get_cpu_rev_integer(void)
+u32 renesas_get_cpu_rev_integer(void)
 {
 	const u32 prr = rmobile_get_prr();
 	const u32 rev = prr & PRR_MASK;
@@ -38,7 +38,7 @@ u32 rmobile_get_cpu_rev_integer(void)
 		return ((prr & 0x000000F0) >> 4) + 1;
 }
 
-u32 rmobile_get_cpu_rev_fraction(void)
+u32 renesas_get_cpu_rev_fraction(void)
 {
 	const u32 prr = rmobile_get_prr();
 	const u32 rev = prr & PRR_MASK;
diff --git a/arch/arm/mach-rmobile/cpu_info-rzg2l.c b/arch/arm/mach-rmobile/cpu_info-rzg2l.c
index 6c0b50ffd40..ce7cc2a28db 100644
--- a/arch/arm/mach-rmobile/cpu_info-rzg2l.c
+++ b/arch/arm/mach-rmobile/cpu_info-rzg2l.c
@@ -52,12 +52,12 @@ u32 renesas_get_cpu_type(void)
 	return get_tfa_info()->cpu_type;
 }
 
-u32 rmobile_get_cpu_rev_integer(void)
+u32 renesas_get_cpu_rev_integer(void)
 {
 	return (readl(SYSC_LSI_DEVID) >> 28) + 1;
 }
 
-u32 rmobile_get_cpu_rev_fraction(void)
+u32 renesas_get_cpu_rev_fraction(void)
 {
 	return 0;
 }
diff --git a/arch/arm/mach-rmobile/cpu_info.c b/arch/arm/mach-rmobile/cpu_info.c
index c7fbf39cedb..35cfef2e1ab 100644
--- a/arch/arm/mach-rmobile/cpu_info.c
+++ b/arch/arm/mach-rmobile/cpu_info.c
@@ -47,14 +47,14 @@ static u32 __rmobile_get_cpu_rev_integer(void)
 {
 	return 0;
 }
-u32 rmobile_get_cpu_rev_integer(void)
+u32 renesas_get_cpu_rev_integer(void)
 		__attribute__((weak, alias("__rmobile_get_cpu_rev_integer")));
 
 static u32 __rmobile_get_cpu_rev_fraction(void)
 {
 	return 0;
 }
-u32 rmobile_get_cpu_rev_fraction(void)
+u32 renesas_get_cpu_rev_fraction(void)
 		__attribute__((weak, alias("__rmobile_get_cpu_rev_fraction")));
 
 /* CPU information table */
@@ -122,15 +122,15 @@ int print_cpuinfo(void)
 	int i = rmobile_cpuinfo_idx();
 
 	if (rmobile_cpuinfo[i].cpu_type == RMOBILE_CPU_TYPE_R8A7796 &&
-	    rmobile_get_cpu_rev_integer() == 1 &&
-	    rmobile_get_cpu_rev_fraction() == 1) {
+	    renesas_get_cpu_rev_integer() == 1 &&
+	    renesas_get_cpu_rev_fraction() == 1) {
 		printf("CPU:   Renesas Electronics %s rev 1.1/1.2\n", get_cpu_name(i));
 		return 0;
 	}
 
 	printf("CPU:   Renesas Electronics %s rev %d.%d\n",
-		get_cpu_name(i), rmobile_get_cpu_rev_integer(),
-		rmobile_get_cpu_rev_fraction());
+		get_cpu_name(i), renesas_get_cpu_rev_integer(),
+		renesas_get_cpu_rev_fraction());
 
 	return 0;
 }
diff --git a/arch/arm/mach-rmobile/include/mach/r8a7790.h b/arch/arm/mach-rmobile/include/mach/r8a7790.h
index 485ea7e28d1..233531cb4ab 100644
--- a/arch/arm/mach-rmobile/include/mach/r8a7790.h
+++ b/arch/arm/mach-rmobile/include/mach/r8a7790.h
@@ -28,6 +28,6 @@
 
 #define R8A7790_CUT_ES2X	2
 #define IS_R8A7790_ES2()	\
-	(rmobile_get_cpu_rev_integer() == R8A7790_CUT_ES2X)
+	(renesas_get_cpu_rev_integer() == R8A7790_CUT_ES2X)
 
 #endif /* __ASM_ARCH_R8A7790_H */
diff --git a/arch/arm/mach-rmobile/include/mach/r8a7791.h b/arch/arm/mach-rmobile/include/mach/r8a7791.h
index 2006ad58a52..78a910cfdd2 100644
--- a/arch/arm/mach-rmobile/include/mach/r8a7791.h
+++ b/arch/arm/mach-rmobile/include/mach/r8a7791.h
@@ -65,6 +65,6 @@
 
 #define R8A7791_CUT_ES2X	2
 #define IS_R8A7791_ES2()	\
-	(rmobile_get_cpu_rev_integer() == R8A7791_CUT_ES2X)
+	(renesas_get_cpu_rev_integer() == R8A7791_CUT_ES2X)
 
 #endif /* __ASM_ARCH_R8A7791_H */
diff --git a/arch/arm/mach-rmobile/include/mach/r8a7793.h b/arch/arm/mach-rmobile/include/mach/r8a7793.h
index 02f4286ef1a..4cb064731ca 100644
--- a/arch/arm/mach-rmobile/include/mach/r8a7793.h
+++ b/arch/arm/mach-rmobile/include/mach/r8a7793.h
@@ -71,6 +71,6 @@
 
 #define R8A7793_CUT_ES2X	2
 #define IS_R8A7793_ES2() \
-	(rmobile_get_cpu_rev_integer() == R8A7793_CUT_ES2X)
+	(renesas_get_cpu_rev_integer() == R8A7793_CUT_ES2X)
 
 #endif /* __ASM_ARCH_R8A7793_H */
diff --git a/arch/arm/mach-rmobile/include/mach/r8a7794.h b/arch/arm/mach-rmobile/include/mach/r8a7794.h
index a2a949d4d61..6d0d729bb12 100644
--- a/arch/arm/mach-rmobile/include/mach/r8a7794.h
+++ b/arch/arm/mach-rmobile/include/mach/r8a7794.h
@@ -28,6 +28,6 @@
 
 #define R8A7794_CUT_ES2		2
 #define IS_R8A7794_ES2()	\
-	(rmobile_get_cpu_rev_integer() == R8A7794_CUT_ES2)
+	(renesas_get_cpu_rev_integer() == R8A7794_CUT_ES2)
 
 #endif /* __ASM_ARCH_R8A7794_H */
diff --git a/arch/arm/mach-rmobile/include/mach/rmobile.h b/arch/arm/mach-rmobile/include/mach/rmobile.h
index 464a67f78d2..d41b737d6b1 100644
--- a/arch/arm/mach-rmobile/include/mach/rmobile.h
+++ b/arch/arm/mach-rmobile/include/mach/rmobile.h
@@ -49,8 +49,8 @@
 
 const u8 *rzg_get_cpu_name(void);
 u32 renesas_get_cpu_type(void);
-u32 rmobile_get_cpu_rev_integer(void);
-u32 rmobile_get_cpu_rev_fraction(void);
+u32 renesas_get_cpu_rev_integer(void);
+u32 renesas_get_cpu_rev_fraction(void);
 #endif /* __ASSEMBLY__ */
 
 #endif /* __ASM_ARCH_RMOBILE_H */