From patchwork Mon Jun 17 07:31:35 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 593 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pl1-f199.google.com (mail-pl1-f199.google.com [209.85.214.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 4E9D03F353 for ; Mon, 17 Jun 2019 09:37:36 +0200 (CEST) Received: by mail-pl1-f199.google.com with SMTP id bb9sf5529834plb.2 for ; Mon, 17 Jun 2019 00:37:36 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1560757055; cv=pass; d=google.com; s=arc-20160816; b=jvnet6bVoFCJyCRr4ylrfaMVBrJCb6miSXFBF9nwwIOdovJa9vxW8TEZlYENmTe/0h BC75sia8+i11dsRaUULqnIR9L7C6MhupQQdnaEcRKCD+3tfwUH3VZfmjeFKe3SH262xf HD6COcCWThwXclbMvvJCIit9iouW80Jfa3eFCqogqwZt/b9hTiGOArXbcog8sRYAVnov HFsPhefES4JBEvRqrYi5NEtOtKfsUu+NOmUv0J00nHu3WCzznMBr9iaNCKiPQXJtBzex vS+eJKVuH7Ad0TuQz4lYlKuK3eOICb4G7N6yHiqX1XWmAQNYxinMsaTvGGLfVp0IyJQz fvaw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-archive:list-help:list-post:list-id :mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=fvgekbP6aTYu4o2gCH2ngz/1jCuG+w/Te8xkDP25xu8=; b=Ia6IaPhrxCOTBM2qOrT5lYRmdLieLnMDz8UuBmBa+T+51GuU1E76fNvYo+5zxio2I4 gvUCqVvAKisWJtDEFMn0dBh+f+iHh9fbOUkz6JsLSCZaKH7Ij5Aj4WcQJFp7MM5DCa6y sfZ8hLv76ltKiOvl4pOfK2Kx07/OD/JExRQpb6y8TY4zsF8dQYW1otGh+BpEcHozFkZr BUI0sX95e5i0/YSbpFq2SvK8NdEsXJ/bYJAiexf6+vqh34PNfGrP0Qxqze2p6Mra11V9 bhOQ5DZ/9mt/PphT2wOY8rG5ynxPJA9i62lJ09bDX+fBLs7B8a0+7BPhEPJWMfqeGmnS mR8g== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=cs5G5I5X; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amarulasolutions.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=fvgekbP6aTYu4o2gCH2ngz/1jCuG+w/Te8xkDP25xu8=; b=DNGgmp7wcdN+QYfgQBF/xQOZsDPYKu2KwcqXddmzh2KUvjw/U0LpyIiCS6aD7/NPiR ecbMGEbx0aI4o2PEogAOFyMfU2dsqlCoaFHETd2p7Hz5bW7veIBkmKg/nj+wtpKmX/nq 7KbKS6X1u0J+Lq2h0HKLBZVNiXY8obW+wFz7I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-unsubscribe; bh=fvgekbP6aTYu4o2gCH2ngz/1jCuG+w/Te8xkDP25xu8=; b=nMEqpQHpZQrdgkjSNoguatcHLAEHtTcc4rxIUBrTY2n5DeIIG9M9TMQGUBb52gbN8h hNCtFbOQaRbRoT7jHPdGESJo+pPgC/XMpENzBrgoMHhpNw5z1q1QJQCbf0MNtJSkKJ/j 32YEVLCeQSFBS2aSdXGPlgEWVhLgyVsDQr13mGCkviDAJFgcJbYWbmfW351FCdGt0JIr 767UB2o7WN5luTPPlNkEMK7sXilrwrYYtCYkjAQVNqdMxe4aTJ6cN+IbJBKmIgGAw1Gz ef4rtGHs5cdWAHq54efph+wJWIxjr7xXq4dgBUqgRKBqTJ6lzMDDV1Ju4Tp0NdU8/iEj cSvA== X-Gm-Message-State: APjAAAWcN4gXqAV+x7pJiJeDXW58pAscvEuGRlgpN1G/tePze1CsZagd 7rD2KZ6t7EJnjPbcyaFjl07UV2vJ X-Google-Smtp-Source: APXvYqydHIuqvEp4wdqtDPCvi1EwFJgPDsXQhRPlxEBJIOlVfpSAXKjIP+b4zRdguPXuOF5A145Lgw== X-Received: by 2002:a65:6648:: with SMTP id z8mr47440078pgv.303.1560757055103; Mon, 17 Jun 2019 00:37:35 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:52d2:: with SMTP id g201ls555853pfb.9.gmail; Mon, 17 Jun 2019 00:37:34 -0700 (PDT) X-Received: by 2002:aa7:934f:: with SMTP id 15mr32291759pfn.238.1560757054803; Mon, 17 Jun 2019 00:37:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560757054; cv=none; d=google.com; s=arc-20160816; b=zp1cVDLRlhPmSiXyKn9vuhMBK9BJSJUN6IDnZ3qHVv6FZtbR7CyKUTLuNtk6TXzjXX CUaAw9psJZQOPEIAVp/QVgNQbbLpISttl1h/6vYhym1etxGnHfXFcFvwVf/gbOLTxwYL XFRR8P35qyOy7Kl9VeKWep/PoSajGc4VnnipoSkcbniGG/+Mbhz24bcUxRB6jer4anU8 T1ro2Cm1AAnF4MC4i8cIjSsq7ysq2f5RUGNwc5cXScG2AnB27gqXyPX+8us25MqN/PKr BS63wf6AwgL1pBtfJI4zs8mFE+s8R5wLPvQKGK8lHryyX+lwZSeiBcbC/pSDrqaFM4+X J3Zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:dkim-signature; bh=hZdXqAOxQV+7YboUatTpOWKW8+zHVr9FLJwzuAbfCv8=; b=ZYE3nHwlPc+g6x6ZuSGFOX/sCDWekc6rqou1gk6BOMkzcWGi/t1GLG5Ov2++02Utod QbSMAhSUYULjrwX+yjUzPlsMnymYIXJXKkTYywzePvVNTH+XFy3NI3Z5OMXbAAvHDAk3 G7k/euJn5+by9So8rAzRehcOzvDJ23s3crcBdSLFE//+TQTNLj2y/RUM1bPNWqWDpEbv q8XcEw4mKi1/t+zrjotodIY9ihH2tH/ZM45u09X63FHhvBlkkY7eBzkVyuCkg1eZz18b 9cmgc3PrvdVP46XJUf7LeqhC+1cMTcW+pBLRj6aBK8Nl62nghTK2z3BjBLRMzPIFVmR7 2cug== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=cs5G5I5X; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Received: from mail-sor-f65.google.com (mail-sor-f65.google.com. [209.85.220.65]) by mx.google.com with SMTPS id k4sor10261812pgq.8.2019.06.17.00.37.34 for (Google Transport Security); Mon, 17 Jun 2019 00:37:34 -0700 (PDT) Received-SPF: pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; X-Received: by 2002:a63:1243:: with SMTP id 3mr23875473pgs.235.1560757054475; Mon, 17 Jun 2019 00:37:34 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.245]) by smtp.gmail.com with ESMTPSA id m41sm15205998pje.18.2019.06.17.00.37.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jun 2019 00:37:34 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , YouMin Chen , u-boot@lists.denx.de Cc: Manivannan Sadhasivam , gajjar04akash@gmail.com, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH v2 22/99] ram: rk3399: Rename sys_reg with sys_reg2 Date: Mon, 17 Jun 2019 13:01:35 +0530 Message-Id: <20190617073252.27810-23-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190617073252.27810-1-jagan@amarulasolutions.com> References: <20190617073252.27810-1-jagan@amarulasolutions.com> MIME-Version: 1.0 X-Original-Sender: jagan@amarulasolutions.com X-Original-Authentication-Results: mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=cs5G5I5X; spf=pass (google.com: domain of jagan@amarulasolutions.com designates 209.85.220.65 as permitted sender) smtp.mailfrom=jagan@amarulasolutions.com Content-Type: text/plain; charset="UTF-8" Precedence: list Mailing-list: list linux-amarula@amarulasolutions.com; contact linux-amarula+owners@amarulasolutions.com List-ID: X-Spam-Checked-In-Group: linux-amarula@amarulasolutions.com X-Google-Group-Id: 476853432473 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Use dram config variable name as sys_reg2 instead of sys_reg since the final variable value is to written into a pmugrf register named as sys_reg2. This reflect the both variable and associated register names are same and also help to add next sys_reg's to add it in future. Signed-off-by: Jagan Teki Signed-off-by: YouMin Chen --- drivers/ram/rockchip/sdram_rk3399.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index e8203e4c32..bb673a862e 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -1004,11 +1004,11 @@ static void set_ddrconfig(const struct chan_info *chan, static void dram_all_config(struct dram_info *dram, const struct rk3399_sdram_params *params) { - u32 sys_reg = 0; + u32 sys_reg2 = 0; unsigned int channel, idx; - sys_reg |= SYS_REG_ENC_DDRTYPE(params->base.dramtype); - sys_reg |= SYS_REG_ENC_NUM_CH(params->base.num_channels); + sys_reg2 |= SYS_REG_ENC_DDRTYPE(params->base.dramtype); + sys_reg2 |= SYS_REG_ENC_NUM_CH(params->base.num_channels); for (channel = 0, idx = 0; (idx < params->base.num_channels) && (channel < 2); @@ -1020,15 +1020,15 @@ static void dram_all_config(struct dram_info *dram, if (params->ch[channel].col == 0) continue; idx++; - sys_reg |= SYS_REG_ENC_ROW_3_4(info->row_3_4, channel); - sys_reg |= SYS_REG_ENC_CHINFO(channel); - sys_reg |= SYS_REG_ENC_RANK(info->rank, channel); - sys_reg |= SYS_REG_ENC_COL(info->col, channel); - sys_reg |= SYS_REG_ENC_BK(info->bk, channel); - sys_reg |= SYS_REG_ENC_CS0_ROW(info->cs0_row, channel); - sys_reg |= SYS_REG_ENC_CS1_ROW(info->cs1_row, channel); - sys_reg |= SYS_REG_ENC_BW(info->bw, channel); - sys_reg |= SYS_REG_ENC_DBW(info->dbw, channel); + sys_reg2 |= SYS_REG_ENC_ROW_3_4(info->row_3_4, channel); + sys_reg2 |= SYS_REG_ENC_CHINFO(channel); + sys_reg2 |= SYS_REG_ENC_RANK(info->rank, channel); + sys_reg2 |= SYS_REG_ENC_COL(info->col, channel); + sys_reg2 |= SYS_REG_ENC_BK(info->bk, channel); + sys_reg2 |= SYS_REG_ENC_CS0_ROW(info->cs0_row, channel); + sys_reg2 |= SYS_REG_ENC_CS1_ROW(info->cs1_row, channel); + sys_reg2 |= SYS_REG_ENC_BW(info->bw, channel); + sys_reg2 |= SYS_REG_ENC_DBW(info->dbw, channel); ddr_msch_regs = dram->chan[channel].msch; noc_timing = ¶ms->ch[channel].noc_timings; @@ -1049,7 +1049,7 @@ static void dram_all_config(struct dram_info *dram, 1 << 17); } - writel(sys_reg, &dram->pmugrf->os_reg2); + writel(sys_reg2, &dram->pmugrf->os_reg2); rk_clrsetreg(&dram->pmusgrf->soc_con4, 0x1f << 10, params->base.stride << 10);