diff options
author | Marek Vasut <marek.vasut+renesas@gmail.com> | 2019-02-25 14:57:08 +0100 |
---|---|---|
committer | Marek Vasut <marek.vasut+renesas@gmail.com> | 2019-03-04 13:29:32 +0100 |
commit | 845d8fbb6e47cf13688298836648fd2e403891ea (patch) | |
tree | 96a349d8519a8b59078ee2b991b0b413ce4828cb /drivers/renesas | |
parent | 4a561637225562b7e24137d0d1bb23bea3dd2707 (diff) | |
download | trusted-firmware-a-845d8fbb6e47cf13688298836648fd2e403891ea.tar.gz |
rcar_gen3: Add M3-W 3.0 support
Add support for the M3W 3.0 SoC and synchronize the upstream ATF with
Renesas downstream ATF release v2.0.1.
Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com>
Diffstat (limited to 'drivers/renesas')
-rw-r--r-- | drivers/renesas/rcar/pwrc/pwrc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/renesas/rcar/pwrc/pwrc.c b/drivers/renesas/rcar/pwrc/pwrc.c index d7f088094b..d85e4a51b0 100644 --- a/drivers/renesas/rcar/pwrc/pwrc.c +++ b/drivers/renesas/rcar/pwrc/pwrc.c @@ -309,7 +309,7 @@ void rcar_pwrc_clusteroff(uint64_t mpidr) c = rcar_pwrc_get_mpidr_cluster(mpidr); dst = IS_CA53(c) ? RCAR_CA53CPUCMCR : RCAR_CA57CPUCMCR; - if (RCAR_PRODUCT_M3 == product && cut <= RCAR_M3_CUT_VER11) + if (RCAR_PRODUCT_M3 == product && cut < RCAR_CUT_VER30) goto done; if (RCAR_PRODUCT_H3 == product && cut <= RCAR_CUT_VER20) @@ -383,7 +383,7 @@ static void __attribute__ ((section(".system_ram"))) product = reg & RCAR_PRODUCT_MASK; cut = reg & RCAR_CUT_MASK; - if (product == RCAR_PRODUCT_M3) + if (product == RCAR_PRODUCT_M3 && cut < RCAR_CUT_VER30) goto self_refresh; if (product == RCAR_PRODUCT_H3 && cut < RCAR_CUT_VER20) @@ -450,7 +450,7 @@ self_refresh: mmio_write_32(DBSC4_REG_DBRFEN, 0U); rcar_micro_delay(1U); - if (product == RCAR_PRODUCT_M3) + if (product == RCAR_PRODUCT_M3 && cut < RCAR_CUT_VER30) return; if (product == RCAR_PRODUCT_H3 && cut < RCAR_CUT_VER20) |