From patchwork Tue Jun 11 14:50:15 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 463 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 922CB3F08F for ; Tue, 11 Jun 2019 16:52:41 +0200 (CEST) Received: by mail-pf1-f200.google.com with SMTP id r142sf8477746pfc.2 for ; Tue, 11 Jun 2019 07:52:41 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1560264760; cv=pass; d=google.com; s=arc-20160816; b=DfvGOCu5Ahxjw8O4XDw9lQdhi/cr6b3pj7QJUdVvSpAKFJa/nryfZDC26k0x4b508T nzPs603nvwVVz8KOAa4A0GYVwtLV9/59FYitu9edf4E1ARpVcdvKgHg3Wvg/Ro8n5Kzd k8Pe2N7T2Ay+eJKmphkyWC2YGgNhXGAJvNXtJj8U/8llGmyMaALoB5f1GcUXMhkvQGYr h4Vr9mUFb8KQes2UahX83jNrqJ239qz5+5idYgwhdWTWF67HLKeDXXFK18BFPwDFHsa/ ySlC/zx97xGW9+BoU7MSNv6i2IenE/dOhgEc5bQ76Qp9iwGzfpAfVW9/bB7SNhe85Efi DQ2w== 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=L8SgEGlwmuWcsn43eCemGPLQxqIxpYMJ2ycRhx/ciZE=; b=PqJtf1ZfUJfjHJt7v9QlDYM4UT5zsAc014OHZJ7O9pTnbf6VD1CYBbgFaWdKVLi7tO qvDmuagfw+Daw27DRnXAPUNXagGFDooa4LTYlZmFH0rxS/EI15DmGbmxp6KYEn5d4gzp cpQmxN2r9ydcT/sFs9ixCC1pQKeVi1VNgxzvGqqKVTmFBqanMqyv8D0z/Tz/GLD2yegN r32wDJoE35tj9geF9dlILivtj0yD3BQLqhxJZx/LP+V8OHZecySPC0E/7TA+FZ0un9KE YnzLJB5LwSqkPXri03WsYPNc7nD/H36Rs+EWgxcksYUx2h6zhbgvD/t89zUp6ezkqgo1 go9Q== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=mncECj6C; 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=L8SgEGlwmuWcsn43eCemGPLQxqIxpYMJ2ycRhx/ciZE=; b=Hy062Jyd+Syqi/CuA03PF25v5oDp1E2GSLqzjgRvF7Orq5aEdoYMuIL5x+Uas/RmxO XhES00g8P11TEXFWZ55OI72AF6+xQGSEL4PoJLa1h5TxihrmVVzQHriUMoMd+9MrsZPr Y4zL8Syoz7UJtbensfJULDZxn4qAacGXfmcJg= 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=L8SgEGlwmuWcsn43eCemGPLQxqIxpYMJ2ycRhx/ciZE=; b=NtiFwMC3RYDUk7BZovhIhyIzJy21mk2c6Vzl5lfzd8I/ejNOmIeUWO7rnk/lq2cSvs 6ncO0qaGVptPqNhgPdUxyxmL7OyPAmoZ4MqlQVR8mGUmt7ChuMq8LR0XkT3kMAskip6i ELhpWG+4LwSZQ1pJvUMesPduc9KEkIvTadYhcF4DsVFVM1WJLI5MObML3oBJzldd3Pqb Pag187L6cFyr+xYiZjf//tcVH9z1WNl771zcLYSLvrtSP0phLuAwSoxZJjpTGXV0lyw2 wryenP6WXe8u2smfQIyLYmgROKa7elHmB/WQ/tspk7KpXWAYkA2lr5RVBaZ3ShsoSpnI 65sw== X-Gm-Message-State: APjAAAWuGTIQQVPNnrEDWpS0TroegFAH4NDy3JxDOyppW5b9QQFT0nq8 vEPF15E/9s3n5ebHSx0H7g9P0r2E X-Google-Smtp-Source: APXvYqxOb3ZnLpCAuazwIQlhcWnkozrzhGTVV5HVg85E5MVHIXm7XjfRjiufYzTlbkhkmf1D/Vv/zg== X-Received: by 2002:a63:234c:: with SMTP id u12mr20887342pgm.264.1560264760362; Tue, 11 Jun 2019 07:52:40 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:90a:8593:: with SMTP id m19ls859938pjn.2.canary-gmail; Tue, 11 Jun 2019 07:52:40 -0700 (PDT) X-Received: by 2002:a17:902:2ec5:: with SMTP id r63mr272981plb.21.1560264760013; Tue, 11 Jun 2019 07:52:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560264760; cv=none; d=google.com; s=arc-20160816; b=sQ0Kh0Cgb05042Zr+qtE9ct/d9cOZ2RoXgx4NXaYFUiNuEnkxyYQ/UwmpThEBZjclM xf0B8p3yEhJNuq+1c3yQkR7LGvFQyDJRc0eeZ6JafXrpz1oyUGCezohvLsRlh05g2dqM jUoNZfCTjJPZGFPCdoSoHtLrPnt1m5gSu83lESWIqFHtO1cS72IFrqSFaakrgrCRkLNB VzGcUgkC/I36Sa3Ff1SX6CBzI2Whh8g5GkJtp5cbWLxY3GIy/YLcaNqr5DRKmA4wxFbz dkUAxJuaCaf/WnyGvZsinAGnPKeMvqmm29vdhGsLh5JFW9FbJNuPuaxRcK4TO9gUwNV9 sw+Q== 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=lRP180Ipi3gVE2/vJfC3zMZ5wLFrHYhOkBITeXZ444Y=; b=cRb3IPlMaQVNZ6+ZNJWKW2e6Sb1CyIoZRCXFoNroOKnq+Z6WoIpMRPK19xSVWB5rNi 3bSxewNI+rYwA89eN3LLzsEVlmrpo4E00iBOV/AHvO8txWxugRtPdTm8kH8K77W4DVFl G2Jcwpxx5YYb522WS1ZdtyPvBHoVsWnm/87rXIO/60iNinuW6gSWHAXtNq6+PddlcP1s jsy9Wk86sTwmirDk9p7Iz2LENBNglzhNWYVVbgA7yRvuzeXmwyQiZAgnbMKGrGk8zGhy wMH/H1hR2SlqwwdU9PzjuAX0HORz48skZffsTASsmf3HzZBW6uCfIMhZgYdhikpMYr83 FyBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=mncECj6C; 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 q30sor3144203pjc.13.2019.06.11.07.52.39 for (Google Transport Security); Tue, 11 Jun 2019 07:52:40 -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:bc08:: with SMTP id w8mr27864299pjr.45.1560264759657; Tue, 11 Jun 2019 07:52:39 -0700 (PDT) Received: from localhost.localdomain ([115.97.180.18]) by smtp.gmail.com with ESMTPSA id e9sm16206208pfn.154.2019.06.11.07.52.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Jun 2019 07:52:38 -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 12/92] ram: rk3399: Add row_3_4 enc macro Date: Tue, 11 Jun 2019 20:20:15 +0530 Message-Id: <20190611145135.21399-13-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=mncECj6C; 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: , Add simplified and meaningful macro for row_3_4. Signed-off-by: Jagan Teki Signed-off-by: YouMin Chen --- arch/arm/include/asm/arch-rockchip/sdram_common.h | 1 + drivers/ram/rockchip/sdram_rk3399.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-rockchip/sdram_common.h b/arch/arm/include/asm/arch-rockchip/sdram_common.h index 38a8bb8642..49a5d14821 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h @@ -33,6 +33,7 @@ #define SYS_REG_NUM_CH_MASK 1 #define SYS_REG_ROW_3_4_SHIFT(ch) (30 + (ch)) #define SYS_REG_ROW_3_4_MASK 1 +#define SYS_REG_ENC_ROW_3_4(n, ch) ((n) << (30 + (ch))) #define SYS_REG_CHINFO_SHIFT(ch) (28 + (ch)) #define SYS_REG_ENC_DDRTYPE(n) ((n) << 13) #define SYS_REG_ENC_NUM_CH(n) (((n) - 1) << 12) diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index 3d2447a24e..0a7137784e 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -1021,7 +1021,7 @@ static void dram_all_config(struct dram_info *dram, if (sdram_params->ch[channel].col == 0) continue; idx++; - sys_reg |= info->row_3_4 << SYS_REG_ROW_3_4_SHIFT(channel); + sys_reg |= SYS_REG_ENC_ROW_3_4(info->row_3_4, channel); sys_reg |= 1 << SYS_REG_CHINFO_SHIFT(channel); sys_reg |= (info->rank - 1) << SYS_REG_RANK_SHIFT(channel); sys_reg |= (info->col - 9) << SYS_REG_COL_SHIFT(channel);