ARM: renesas: Rename rmobile_get_cpu_rev_*() to renesas_get_cpu_rev_*()

Rename rmobile_get_cpu_rev_*() to renesas_get_cpu_rev_*() 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 '\<rmobile_get_cpu_rev_\(integer\|fraction\)\>' | \
  xargs -I {} sed -i 's@\<rmobile_get_cpu_rev_\(integer\|fraction\)\>@renesas_get_cpu_rev_\1@g' {}
"

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/mach-rmobile/cpu_info-rcar.c b/arch/arm/mach-rmobile/cpu_info-rcar.c
index fe1795cec81ce20b3a6fe045bf89c10641a1cf99..4c439adfdd6c29f47b0bf4fd2f45e2995e61303b 100644 (file)
--- 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 6c0b50ffd40fe833b125eb06adf9399e420c5b29..ce7cc2a28db2a185b9c100cf23af80cafd2dc386 100644 (file)
--- 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 c7fbf39cedb38361cc8db35cfd63c4b0c70fdd2b..35cfef2e1ab0e69d3d850ff27e061a0935f388a1 100644 (file)
--- 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 485ea7e28d11e4606efa2a0d8cf3d84e817e1af6..233531cb4ab745dddf29e2c477b784e4ce40371c 100644 (file)
--- 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 2006ad58a52d8342ddcbdea791d0f9e35d264f16..78a910cfdd2ad1f7f9b0833388b4b3a9b12fd901 100644 (file)
--- 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 02f4286ef1ac134991d80ebdfee75a180c59848a..4cb064731ca040124f0dc072e1c6e3fd0ad0a9c5 100644 (file)
--- 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 a2a949d4d61cb32a60fc3e3d45ee4c7a245bfcaa..6d0d729bb1252577d97b536a32c9a04338faf8f7 100644 (file)
--- 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 464a67f78d2dc342762f65a7c25793a86e712757..d41b737d6b155bc962834837afc02fa37675fb94 100644 (file)
--- 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 */

diff --git a/board/renesas/lager/lager.c b/board/renesas/lager/lager.c
index d9d460834b21a72024269c2ee581b11fd76c34f6..ab06078c5114506c722864f5044c59eb26a2564b 100644 (file)
--- a/board/renesas/lager/lager.c
+++ b/board/renesas/lager/lager.c
@@ -46,7 +46,7 @@ void s_init(void)
        writel(0xA5A5A500, &swdt->swtcsra);
 
        /* CPU frequency setting. Set to 1.4GHz */
-       if (rmobile_get_cpu_rev_integer() >= R8A7790_CUT_ES2X) {
+       if (renesas_get_cpu_rev_integer() >= R8A7790_CUT_ES2X) {
                u32 stat = 0;
                u32 stc = ((1400 / CLK2MHZ(get_board_sys_clk())) - 1)
                        << PLL0_STC_BIT;

diff --git a/board/renesas/lager/qos.c b/board/renesas/lager/qos.c
index ddc831c0c216ab2d91be8e383b827628a83f62e8..f7eade2ed111dded8069a7400168213fc63deb9a 100644 (file)
--- a/board/renesas/lager/qos.c
+++ b/board/renesas/lager/qos.c
@@ -2419,7 +2419,7 @@ static void qos_init_es2(void)
 
 void qos_init(void)
 {
-       if (rmobile_get_cpu_rev_integer() >= R8A7790_CUT_ES2X)
+       if (renesas_get_cpu_rev_integer() >= R8A7790_CUT_ES2X)
                qos_init_es2();
        else
                qos_init_es1();

diff --git a/board/renesas/stout/qos.c b/board/renesas/stout/qos.c
index 9030ba7f61f9c85e8ea2cd16e42ef8c8d1dbbe37..8a878123a5db95b6709b482a9975d1062efc3886 100644 (file)
--- a/board/renesas/stout/qos.c
+++ b/board/renesas/stout/qos.c
@@ -2421,7 +2421,7 @@ static void qos_init_es2(void)
 
 void qos_init(void)
 {
-       if (rmobile_get_cpu_rev_integer() >= R8A7790_CUT_ES2X)
+       if (renesas_get_cpu_rev_integer() >= R8A7790_CUT_ES2X)
                qos_init_es2();
        else
                qos_init_es1();

diff --git a/board/renesas/stout/stout.c b/board/renesas/stout/stout.c
index 46c48dff0a0f402fc628d695cded38274f525c3d..109e19a292df42638ffa5c2bd2de740e0aa500e9 100644 (file)
--- a/board/renesas/stout/stout.c
+++ b/board/renesas/stout/stout.c
@@ -46,7 +46,7 @@ void s_init(void)
        writel(0xA5A5A500, &swdt->swtcsra);
 
        /* CPU frequency setting. Set to 1.4GHz */
-       if (rmobile_get_cpu_rev_integer() >= R8A7790_CUT_ES2X) {
+       if (renesas_get_cpu_rev_integer() >= R8A7790_CUT_ES2X) {
                u32 stat = 0;
                u32 stc = ((1400 / CLK2MHZ(get_board_sys_clk())) - 1)
                        << PLL0_STC_BIT;

diff --git a/drivers/mmc/renesas-sdhi.c b/drivers/mmc/renesas-sdhi.c
index 4b7cf77324319db66926360ad0e2051d63c72f72..03e360ec1a2e640172c3f6d14f93acdbb980d972 100644 (file)
--- a/drivers/mmc/renesas-sdhi.c
+++ b/drivers/mmc/renesas-sdhi.c
@@ -886,29 +886,29 @@ static void renesas_sdhi_filter_caps(struct udevice *dev)
 
        /* HS400 is not supported on H3 ES1.x, M3W ES1.[012], V3M, V3H ES1.x, D3 */
        if (((renesas_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7795) &&
-           (rmobile_get_cpu_rev_integer() <= 1)) ||
+           (renesas_get_cpu_rev_integer() <= 1)) ||
            ((renesas_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) &&
-           (rmobile_get_cpu_rev_integer() == 1) &&
-           (rmobile_get_cpu_rev_fraction() <= 2)) ||
+           (renesas_get_cpu_rev_integer() == 1) &&
+           (renesas_get_cpu_rev_fraction() <= 2)) ||
            (renesas_get_cpu_type() == RMOBILE_CPU_TYPE_R8A77970) ||
            ((renesas_get_cpu_type() == RMOBILE_CPU_TYPE_R8A77980) &&
-           (rmobile_get_cpu_rev_integer() <= 1)) ||
+           (renesas_get_cpu_rev_integer() <= 1)) ||
            (renesas_get_cpu_type() == RMOBILE_CPU_TYPE_R8A77995))
                plat->cfg.host_caps &= ~MMC_MODE_HS400;
 
        /* H3 ES2.0, ES3.0 and M3W ES1.2 and M3N bad taps */
        if (((renesas_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7795) &&
-           (rmobile_get_cpu_rev_integer() >= 2)) ||
+           (renesas_get_cpu_rev_integer() >= 2)) ||
            ((renesas_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) &&
-           (rmobile_get_cpu_rev_integer() == 1) &&
-           (rmobile_get_cpu_rev_fraction() == 2)) ||
+           (renesas_get_cpu_rev_integer() == 1) &&
+           (renesas_get_cpu_rev_fraction() == 2)) ||
            (renesas_get_cpu_type() == RMOBILE_CPU_TYPE_R8A77965))
                priv->hs400_bad_tap = BIT(2) | BIT(3) | BIT(6) | BIT(7);
 
        /* M3W ES1.x for x>2 can use HS400 with manual adjustment and taps */
        if ((renesas_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) &&
-           (rmobile_get_cpu_rev_integer() == 1) &&
-           (rmobile_get_cpu_rev_fraction() > 2)) {
+           (renesas_get_cpu_rev_integer() == 1) &&
+           (renesas_get_cpu_rev_fraction() > 2)) {
                priv->adjust_hs400_enable = true;
                priv->adjust_hs400_offset = 3;
                priv->hs400_bad_tap = BIT(1) | BIT(3) | BIT(5) | BIT(7);
@@ -918,7 +918,7 @@ static void renesas_sdhi_filter_caps(struct udevice *dev)
 
        /* M3W+ bad taps */
        if ((renesas_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) &&
-           (rmobile_get_cpu_rev_integer() == 3))
+           (renesas_get_cpu_rev_integer() == 3))
                priv->hs400_bad_tap = BIT(1) | BIT(3) | BIT(5) | BIT(7);
 
        /* M3N can use HS400 with manual adjustment */
@@ -939,20 +939,20 @@ static void renesas_sdhi_filter_caps(struct udevice *dev)
 
        /* H3 ES1.x, ES2.0 and M3W ES1.[0123] uses 4 tuning taps */
        if (((renesas_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7795) &&
-           (rmobile_get_cpu_rev_integer() <= 2)) ||
+           (renesas_get_cpu_rev_integer() <= 2)) ||
            ((renesas_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) &&
-           (rmobile_get_cpu_rev_integer() == 1) &&
-           (rmobile_get_cpu_rev_fraction() <= 3)))
+           (renesas_get_cpu_rev_integer() == 1) &&
+           (renesas_get_cpu_rev_fraction() <= 3)))
                priv->nrtaps = 4;
        else
                priv->nrtaps = 8;
 #endif
        /* H3 ES1.x and M3W ES1.0 uses bit 17 for DTRAEND */
        if (((renesas_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7795) &&
-           (rmobile_get_cpu_rev_integer() <= 1)) ||
+           (renesas_get_cpu_rev_integer() <= 1)) ||
            ((renesas_get_cpu_type() == RMOBILE_CPU_TYPE_R8A7796) &&
-           (rmobile_get_cpu_rev_integer() == 1) &&
-           (rmobile_get_cpu_rev_fraction() == 0)))
+           (renesas_get_cpu_rev_integer() == 1) &&
+           (renesas_get_cpu_rev_fraction() == 0)))
                priv->read_poll_flag = TMIO_SD_DMA_INFO1_END_RD;
        else
                priv->read_poll_flag = TMIO_SD_DMA_INFO1_END_RD2;

diff --git a/drivers/pinctrl/renesas/pfc-r8a7790.c b/drivers/pinctrl/renesas/pfc-r8a7790.c
index e1811c4c9081558f7980d6ce9764535b1004994d..acd6b01f4973aa5f8b4b13a761bd904acebc40d2 100644 (file)
--- a/drivers/pinctrl/renesas/pfc-r8a7790.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7790.c
@@ -6117,8 +6117,8 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = {
 static int r8a7790_pinmux_soc_init(struct sh_pfc *pfc)
 {
        /* Initialize TDSEL on old revisions */
-       if ((rmobile_get_cpu_rev_integer() == 1) &&
-           (rmobile_get_cpu_rev_fraction() == 0))
+       if ((renesas_get_cpu_rev_integer() == 1) &&
+           (renesas_get_cpu_rev_fraction() == 0))
                sh_pfc_write(pfc, 0xe6060088, 0x00155554);
 
        return 0;

diff --git a/drivers/pinctrl/renesas/pfc-r8a7794.c b/drivers/pinctrl/renesas/pfc-r8a7794.c
index 29eab2610c1b23894f2920fcc89790b264a0e5b3..2f55021818264a6f5daf422055cb799e08e85235 100644 (file)
--- a/drivers/pinctrl/renesas/pfc-r8a7794.c
+++ b/drivers/pinctrl/renesas/pfc-r8a7794.c
@@ -5818,8 +5818,8 @@ static const struct pinmux_bias_reg pinmux_bias_regs[] = {
 static int r8a7794_pinmux_soc_init(struct sh_pfc *pfc)
 {
        /* Initialize TDSEL on old revisions */
-       if ((rmobile_get_cpu_rev_integer() == 1) &&
-           (rmobile_get_cpu_rev_fraction() == 0))
+       if ((renesas_get_cpu_rev_integer() == 1) &&
+           (renesas_get_cpu_rev_fraction() == 0))
                sh_pfc_write(pfc, 0xe6060068, 0x55555500);
 
        return 0;

diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c
index 8a93d1b1bfd84973d7550e4b5822e8ba30d6aa2c..165c0a1351ace8c048e81900ac956bbc6602e59e 100644 (file)
--- a/drivers/spi/renesas_rpc_spi.c
+++ b/drivers/spi/renesas_rpc_spi.c
@@ -212,7 +212,7 @@ static u32 rpc_spi_get_strobe_delay(void)
         *       7: On other R-Car Gen3
         *      15: On R-Car Gen4
         */
-       if (cpu_type == RMOBILE_CPU_TYPE_R8A7796 && rmobile_get_cpu_rev_integer() == 1)
+       if (cpu_type == RMOBILE_CPU_TYPE_R8A7796 && renesas_get_cpu_rev_integer() == 1)
                return RPC_PHYCNT_STRTIM(6);
        else if (cpu_type == RMOBILE_CPU_TYPE_R8A779F0 ||
                 cpu_type == RMOBILE_CPU_TYPE_R8A779G0 ||