From patchwork Mon Jun 17 07:31:38 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 596 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f199.google.com (mail-pf1-f199.google.com [209.85.210.199]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 732E83F353 for ; Mon, 17 Jun 2019 09:37:46 +0200 (CEST) Received: by mail-pf1-f199.google.com with SMTP id l4sf6566478pff.5 for ; Mon, 17 Jun 2019 00:37:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1560757065; cv=pass; d=google.com; s=arc-20160816; b=Y6fsqMIgUlm4eN2fRMddWzurO7hlYTAJXAlxtcc6YDidnD/eqTM2ie5kODVMsxxPdR sH5weDaoIElrQ0wIPuDxyLAIVRUf+09W/XLd1mLXA0LqmPTBiqe7tNCQhjbym3hmEwVg Po6NU42B0pwr1a+M21EN35TJxIZrFKBFIts9dRl6ElG0IOuZh6EDGeNQrGFI3P5JmqDq gYs8QX+h8tfPJQyd9A1A4GeAfPNlQEzU5XA5wajqPznxR8sy26hka/4VwiMrm9rmOWXg 4x/wo/XBrBSgwbkFPaFReXBvDOH0zmvi5wCHWt/m7HCap6Zs5yTC7t4ngSi8Do+2xNFp drXg== 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=IDSf1hVlvFo9bcRkPcYhGDZs2Csv0XtCTPnfxlKPdEc=; b=LLmJaEVv79EyMR0tn6AJuuL99wTEsQLVbN9HAdNB+WyX5whg/zSnf91P7UtK8Aq6Zb 1AvTfAiDT3lKYB9lqLYvYHtmMoHS5BD8IAZJ3YPjBvifknezNiS571MdU+NDgCyF7UHO GIAd6goZL5AqQWAJAHiACr7DeZAzTZZlheihybPkc2TI/+jE8SWRzVi9KmQ5OLxM4m/W u75M+NjboJ8BpAdamXcU5saiIKBBiiSEN+LKT5pR9KvfExwOTvADuD24ywvCcQvh7msa djqFozZqNHbI5znKZjxXZoGDg32JAtBIWUrx1ms5GmySpvH5iJVwK1WcC9ZRnz92LsuD tjWA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=WLIMK2IN; 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=IDSf1hVlvFo9bcRkPcYhGDZs2Csv0XtCTPnfxlKPdEc=; b=P4cbQZQCIqOSouBZS/jsNDBBsIP6O/zuRO5oLlmiDHmi2U7Y56e6okseYLvyoVdbbv UoLSUycqCZhA6D+3BKhHhG9uqBGSJ1zRzSiIBT8lUUsong8+PzUMiDcMKSQktxuC3ceD fyVFzXR7Wl05ba++KTZFJXsLxt8fua02/bGYw= 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=IDSf1hVlvFo9bcRkPcYhGDZs2Csv0XtCTPnfxlKPdEc=; b=sS0CzdM4RYV7ivqsq+vVzOiJfPhE1KXPOdxf3MCFbuDulfwHo9myJ2XDZp/7oQ5WXC T1Tz4c3TNDo/pvbUyeooZhU5i20/Cos1m1XzPQUVW3C1m1DQ1cuAw/IjMA61gOaFUhB5 MYi4DvHKmzbwxovimXfWbB2khsv3HVKlhLybKHxkpb1ysOR0KpmrPvTgMQYwa6PnUP9d yMmjq3wuybVyu4CI+PHwAgOJ9KCvBYa0UIbViyTDOjRMWT6utsWM5b76aU5POnrjs2uR nSMXcpZrlSXnW7LOdnmU3c5jYG3vbDcgM92+8bOUKymCAPa+YBNh6xFrMljm9ObZsgdk eYsg== X-Gm-Message-State: APjAAAVtUV+cwCaLNk3tygzOJOFXqTfEoNqDzCSRztgjdlyPljz/Xulk Dzqvzu8fAD5OTM+CYC3ziW5pQiuN X-Google-Smtp-Source: APXvYqw9X9WQUkBrXru0o8Z5OFqqZ8qyTnI9FBUpG3S6nRU23gDHfGr+JTNs1ulvQzoKnp6xh1R8pw== X-Received: by 2002:a17:90a:a00d:: with SMTP id q13mr24496063pjp.80.1560757065297; Mon, 17 Jun 2019 00:37:45 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a62:3483:: with SMTP id b125ls3367735pfa.11.gmail; Mon, 17 Jun 2019 00:37:45 -0700 (PDT) X-Received: by 2002:a63:a36f:: with SMTP id v47mr45208732pgn.117.1560757064947; Mon, 17 Jun 2019 00:37:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560757064; cv=none; d=google.com; s=arc-20160816; b=oHXhbNrsLRY/iFLK3JHRbOkGNCXEU0Hpjw482AkANRsObGNhR5r2qv/EbEVueWo4cf igOoo/79AGN1Y0QrN3gQf55qp2mAht1PV+s7yU1Q6P9vycFvCiDPd46PSglIC0w+v24L WcrDgOgertUS75zvyWD9Yx8IVT4zjoQEwEGfCUbJxb3LKS2ZR/GPA9SBCn+anp0bj5+V ffC78MC3whWTxElWNjeWdGbRrirmEedN3jLbFRqaN6UPLiAviUxDRL2RcMwq60vyF3iF kCQYrAyI86vWlIt+xhLYcUaeu7kwC1U21pDJGC1Jdrt5Pn4jV1ys1h8v+Bvcr6MUV6YL 5Yow== 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=K2cEX89nJyyFIMB3xn2R5xrY1IHrIl9vY6ukCGCAZR4=; b=iB4VBNOpiL1l+Xqwf9ZkIUi9KA3sx+3N6acJiEEAM4gjZYKo9EQ0fS3DeJumpoxqq4 ITPiteIFbapZotbe7Og1NOmgCTtXcRitGBKPQBBZzFoR+pr41/TeXfCw8TEp9rcmmu66 pbUMor7O3p+gNsTDNRBDWTb4KdPK3Lgv/IzyxU4ijLS7y96ODxkhgZh21Ti1MDq2YeKs LY+nL/COO3+1urPm6qN4uF7OY1J5E1+UMB8B5vKkUWWXSjsCqQK0GV3yfbmu4ORJ5+uQ jFVlKNUvSZdA6Cozw/gSlgxPZqlEIvpbNPwB4Rj7fKbaesbv8HrIb+G8dCTqdiJHzpoi OWkQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=WLIMK2IN; 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 m37sor12767015pla.6.2019.06.17.00.37.44 for (Google Transport Security); Mon, 17 Jun 2019 00:37:44 -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:902:2006:: with SMTP id n6mr49795650pla.232.1560757064697; Mon, 17 Jun 2019 00:37:44 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.245]) by smtp.gmail.com with ESMTPSA id m41sm15205998pje.18.2019.06.17.00.37.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jun 2019 00:37:44 -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 25/99] ram: rk3399: Add cs1_col enc macro Date: Mon, 17 Jun 2019 13:01:38 +0530 Message-Id: <20190617073252.27810-26-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=WLIMK2IN; 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 dram config macro for handling cs1 column. Signed-off-by: Jagan Teki Signed-off-by: YouMin Chen --- arch/arm/include/asm/arch-rockchip/sdram_common.h | 3 +++ drivers/ram/rockchip/sdram_rk3399.c | 1 + 2 files changed, 4 insertions(+) diff --git a/arch/arm/include/asm/arch-rockchip/sdram_common.h b/arch/arm/include/asm/arch-rockchip/sdram_common.h index 7062cb57d9..e5145422cc 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h @@ -75,6 +75,9 @@ (4 + 2 * (ch)); \ } while (0) +#define SYS_REG_CS1_COL_SHIFT(ch) (0 + 2 * (ch)) +#define SYS_REG_ENC_CS1_COL(n, ch) (((n) - 9) << SYS_REG_CS1_COL_SHIFT(ch)) + /* Get sdram size decode from reg */ size_t rockchip_sdram_size(phys_addr_t reg); diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index 21c1c6566a..14e2afcbc4 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -1032,6 +1032,7 @@ static void dram_all_config(struct dram_info *dram, if (info->cs1_row) SYS_REG_ENC_CS1_ROW(info->cs1_row, sys_reg2, sys_reg3, channel); + sys_reg3 |= SYS_REG_ENC_CS1_COL(info->col, channel); ddr_msch_regs = dram->chan[channel].msch; noc_timing = ¶ms->ch[channel].noc_timings;