From patchwork Tue Jun 11 14:50:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 472 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id A352D3F08F for ; Tue, 11 Jun 2019 16:53:16 +0200 (CEST) Received: by mail-pf1-f200.google.com with SMTP id j7sf9768399pfn.10 for ; Tue, 11 Jun 2019 07:53:16 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1560264795; cv=pass; d=google.com; s=arc-20160816; b=gccjrMwyZQdAUFAqnrvar4VK8DqhB7TMkl6SNP0tAL+SnqeYDzhND5M8mh9pJZBTvS Q7t0i4EOIQExWX+JYxh9uNpXYN/7D4zmSEZyUIcoFPgszSJtveANuZHf0wFuBlwSDbfp iCSgc0TqBtiSUwKzeKbiZnTzeDhYa8RN8Gc6HuBz/losb2jG9DYY3FHkPHiKjcoSUxL6 Oukm3BgHLSiYFB+/9eI0G7bJ0MEZfhCzdDRBWQ8/SXoTl+4Ua23gmdWrwI/6iRslUTmD 4THPL+Q7LnOu05od2etk0tOzfxZ19EkPFQUhGxrbxVA7iSY0Sv6W9yd5b3NrfGdk70vy kwHA== 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=krkUpsnertrTOwJGQM7r3wOB2plL4q2KbsfgEW6qD6A=; b=ES2bHo3NgJ3y7l5hf4dGzW96TOZtp4c22bEbmCCc2Ztp7AJEB0fzRBlTDCNJRtqgZT mIF86N5c5iYuA9IXzkP+rFxA6tQ+oqzxS6hUiNGDTAOe0rBv+J7SfV47lVsrpKKbdpcc oKkT6ZPCbeCi816lnNzQ7tnu9FY1dJLR32uSX967u0AlD7wF0tYqQ0Ln3066JunrKbvq T45TDrt/bhWX2hC9cqzz6jVlJSY+boMFLsemvCpwnJMX8SP/MYDOwOlRIJuI8gOix2YZ MvqPs94XI81CqLzjX95sy80I8eX4gKVIWXHa62ags2kelB4bZXUSK5t6n3PGsJyDCZGh ozKA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=SwxAipMn; 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=krkUpsnertrTOwJGQM7r3wOB2plL4q2KbsfgEW6qD6A=; b=QFC0YLAioxUjgGeda+WD4J2nOpiyPyw069OeiVBJKs8soyydDGaBzFPCF8jL9284eo m5dzuouMhjl8L2ldli6KG5FQz32kPbaPa/EjJenYLOXz0HVurhrIFs8dG02zrB8Wwm9a oiFlAYuaLO93qtKZbV1v/RGWLTsyZae5mWvbA= 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=krkUpsnertrTOwJGQM7r3wOB2plL4q2KbsfgEW6qD6A=; b=dkKm4mfp/LvbScwPfuKW2GXNLAx6i3MaFE5tIFMyxBUPGCrmzWBjBASusLCW/3Wuux O3VHzEQD9dreQGqusD/GkYvV9Z6BzAWiuusFvbIw9tu4G0v/k3k7PAz2rz5FX84vfcoY uZ2JpZ4pO5hAD5spHYw4WFzGw/eylGD7Y+yvb+wAkyJII5P+bEFgnEO8o3ziT2B5WN/d KfZu1ic0zstohIACZZDXPvL0RXH7EkNGw2nkoLSOBp2sSjwbk8ftXmqJKMHwkv5TJ3Ya lU59cjQjDT/Ize/7nV0SXn4MiNS+43XYVaJ7yg176zlzcQmvoZEkP2Ap7h6nlvUXiSGQ eMpA== X-Gm-Message-State: APjAAAXU7UkjsxaU3HXZGbBPi4gL6H4pI10CqpzVM8Gd2Zk6z3YgQFbJ 27k+hQBRMEO+CWQoSz5TNshHRGgb X-Google-Smtp-Source: APXvYqw/X9nljDcFtPZh+2gdtsM4ZR2xG73DIzXu/WJgTr7uyRMXRfCeJarUQ/IMO+KcD9MZLTHgMQ== X-Received: by 2002:a17:90a:1951:: with SMTP id 17mr27292811pjh.79.1560264795453; Tue, 11 Jun 2019 07:53:15 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:32d:: with SMTP id 42ls4890810pld.11.gmail; Tue, 11 Jun 2019 07:53:15 -0700 (PDT) X-Received: by 2002:a17:902:988a:: with SMTP id s10mr76927567plp.304.1560264795075; Tue, 11 Jun 2019 07:53:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560264795; cv=none; d=google.com; s=arc-20160816; b=maWmefk44UW9prhPR8JHUW5FmVLBLyIlKHtitmHBf24ZMuW0wK52EB0s+wq+m8hB0b T6q2kgZsfZFlOkrnH0KEua6LQPutqfgSCWPx+2zHfYDwx38ZtMJRBNmlt1KpHi3e63le EmP8lPUX/qz75J21O4HtUMqmJkNGvtZEhq0pYOuyEV6V7cTYlq0Tu+iduMdOdS0RLYEP PIBUovuH5YoE6pMigMDV3inWRxBCCMp1mOoYZtcRU6W8mmQEYZBC2q4BaSTDUy+mPAFm eIG02rlldE8VgA+/G0OLixRuFtyZVc+jGGD/MuUsesHY4IpYvOfEL1tChqVsuYAtny76 zk/g== 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=z5MNzPrJxUWALW+EgA6kZwKHJnbEGPJgsOoanu5Efa8=; b=qs7wpqzruCZf5UujQnIVTZ+yaCbr+AaEhtVhjhJ4E3NyjsUZNYEYxSaG18qGs3Yw19 PwePDioahs1yrf3ldcEUaVNis+YG/2+YyviiH9jccSSm2h7i/jp9s/jIRl7g1r0JqHaC oFt8zad3FT9eDn9Sic5uIZvyp72ZKsI0zDPxqTuWkiCT1o3DXIp4EY1U+YZrNdqQ4m9J Dkk5KeGzfObSqRqPIM2ATgu8iyyxNHXKJPRA9a5FbjNKyBo11aeVMj/+wa6mggeG68zy U/TDV3/JtSL9Q/ZFnwq7FEQIR67BsQ/d+2Txj6PwOi2EJrq3mYfIR4t1HNwm7VU+qHc3 MlZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=SwxAipMn; 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 t10sor3161187pjv.1.2019.06.11.07.53.15 for (Google Transport Security); Tue, 11 Jun 2019 07:53:15 -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:a17:90a:9a8d:: with SMTP id e13mr27630657pjp.77.1560264794707; Tue, 11 Jun 2019 07:53:14 -0700 (PDT) Received: from localhost.localdomain ([115.97.180.18]) by smtp.gmail.com with ESMTPSA id e9sm16206208pfn.154.2019.06.11.07.53.11 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Jun 2019 07:53:14 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , YouMin Chen , u-boot@lists.denx.de Cc: gajjar04akash@gmail.com, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH 21/92] ram: rk3399: Rename sys_reg with sys_reg2 Date: Tue, 11 Jun 2019 20:20:24 +0530 Message-Id: <20190611145135.21399-22-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190611145135.21399-1-jagan@amarulasolutions.com> References: <20190611145135.21399-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=SwxAipMn; 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 3241bc285e..4463fc84c8 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -1005,11 +1005,11 @@ static void set_ddrconfig(const struct chan_info *chan, static void dram_all_config(struct dram_info *dram, const struct rk3399_sdram_params *sdram_params) { - u32 sys_reg = 0; + u32 sys_reg2 = 0; unsigned int channel, idx; - sys_reg |= SYS_REG_ENC_DDRTYPE(sdram_params->base.dramtype); - sys_reg |= SYS_REG_ENC_NUM_CH(sdram_params->base.num_channels); + sys_reg2 |= SYS_REG_ENC_DDRTYPE(sdram_params->base.dramtype); + sys_reg2 |= SYS_REG_ENC_NUM_CH(sdram_params->base.num_channels); for (channel = 0, idx = 0; (idx < sdram_params->base.num_channels) && (channel < 2); channel++) { @@ -1021,15 +1021,15 @@ static void dram_all_config(struct dram_info *dram, if (sdram_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 = &sdram_params->ch[channel].noc_timings; @@ -1050,7 +1050,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, sdram_params->base.stride << 10);