diff options
| author | Tom Rini <[email protected]> | 2024-03-02 14:30:25 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-03-02 14:30:25 -0500 |
| commit | eac52e4be4e234d563d6911737ee7ccdc0ada1f1 (patch) | |
| tree | 9fc71e478d84ea5be40f1a0196a5507ee31246e4 /drivers/spi | |
| parent | 574aac1c8c59522c286bec4cdfb07c22bc3c124d (diff) | |
| parent | 7b1a24765deae9c202012fa9280e884b70f358f1 (diff) | |
Merge patch series "ARM: renesas: Rename R-Mobile to Renesas"
Marek Vasut <[email protected]> says:
Rename R-Mobile to Renesas all over the place because the chips are
made by Renesas, while only a subset of them is from the R-Mobile line.
Diffstat (limited to 'drivers/spi')
| -rw-r--r-- | drivers/spi/renesas_rpc_spi.c | 10 | ||||
| -rw-r--r-- | drivers/spi/sh_qspi.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/drivers/spi/renesas_rpc_spi.c b/drivers/spi/renesas_rpc_spi.c index 3eb14061c81..8aff2238645 100644 --- a/drivers/spi/renesas_rpc_spi.c +++ b/drivers/spi/renesas_rpc_spi.c @@ -203,7 +203,7 @@ static void rpc_spi_flush_read_cache(struct udevice *dev) static u32 rpc_spi_get_strobe_delay(void) { #ifndef CONFIG_RZA1 - u32 cpu_type = rmobile_get_cpu_type(); + u32 cpu_type = renesas_get_cpu_type(); /* * NOTE: RPC_PHYCNT_STRTIM value: @@ -212,11 +212,11 @@ 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 == RENESAS_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 || - cpu_type == RMOBILE_CPU_TYPE_R8A779H0) + else if (cpu_type == RENESAS_CPU_TYPE_R8A779F0 || + cpu_type == RENESAS_CPU_TYPE_R8A779G0 || + cpu_type == RENESAS_CPU_TYPE_R8A779H0) return RPC_PHYCNT_STRTIM2(15); else #endif diff --git a/drivers/spi/sh_qspi.c b/drivers/spi/sh_qspi.c index 7dd1fe75e04..72594993853 100644 --- a/drivers/spi/sh_qspi.c +++ b/drivers/spi/sh_qspi.c @@ -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> |