From a3aa877c9eabcac9b228273a8b252a8344b62503 Mon Sep 17 00:00:00 2001 From: Toshiyuki Ogasahara Date: Mon, 20 May 2019 11:23:48 +0900 Subject: [PATCH] rcar_gen3: drivers: rpc: Change RPC PHY calibration setting Modify RPC code according to Errata of Hardware User's Manual Signed-off-by: Toshiyuki Ogasahara Signed-off-by: Yoshifumi Hosoya Signed-off-by: Marek Vasut Change-Id: I82d0a2136c7f18870842f84c49343977708eef1e --- drivers/renesas/rcar/rpc/rpc_driver.c | 25 +++++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/drivers/renesas/rcar/rpc/rpc_driver.c b/drivers/renesas/rcar/rpc/rpc_driver.c index bea27521..5c11b62d 100644 --- a/drivers/renesas/rcar/rpc/rpc_driver.c +++ b/drivers/renesas/rcar/rpc/rpc_driver.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2018, Renesas Electronics Corporation. All rights reserved. + * Copyright (c) 2015-2019, Renesas Electronics Corporation. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -11,11 +11,15 @@ #include #include "cpg_registers.h" -#include "rpc_registers.h" +#include "rcar_def.h" #include "rcar_private.h" +#include "rpc_registers.h" #define MSTPSR9_RPC_BIT (0x00020000U) #define RPC_CMNCR_MD_BIT (0x80000000U) +#define RPC_PHYCNT_CAL BIT(31) +#define RPC_PHYCNT_STRTIM_M3V1 (0x6 << 15UL) +#define RPC_PHYCNT_STRTIM (0x7 << 15UL) static void rpc_enable(void) { @@ -25,8 +29,25 @@ static void rpc_enable(void) static void rpc_setup(void) { + uint32_t product, cut, reg, phy_strtim; + if (mmio_read_32(RPC_CMNCR) & RPC_CMNCR_MD_BIT) mmio_clrbits_32(RPC_CMNCR, RPC_CMNCR_MD_BIT); + + product = mmio_read_32(RCAR_PRR) & RCAR_PRODUCT_MASK; + cut = mmio_read_32(RCAR_PRR) & RCAR_CUT_MASK; + + if ((product == RCAR_PRODUCT_M3) && (cut < RCAR_CUT_VER30)) + phy_strtim = RPC_PHYCNT_STRTIM_M3V1; + else + phy_strtim = RPC_PHYCNT_STRTIM; + + reg = mmio_read_32(RPC_PHYCNT); + reg &= ~RPC_PHYCNT_STRTIM; + reg |= phy_strtim; + mmio_write_32(RPC_PHYCNT, reg); + reg |= RPC_PHYCNT_CAL; + mmio_write_32(RPC_PHYCNT, reg); } void rcar_rpc_init(void) -- 2.30.2