From patchwork Mon Jun 17 07:31:39 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 597 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f200.google.com (mail-pg1-f200.google.com [209.85.215.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 475403F353 for ; Mon, 17 Jun 2019 09:37:50 +0200 (CEST) Received: by mail-pg1-f200.google.com with SMTP id l184sf7187139pgd.18 for ; Mon, 17 Jun 2019 00:37:50 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1560757069; cv=pass; d=google.com; s=arc-20160816; b=mYORZQmb506hDCejopfwCGLVdW2jfuTdSBZ/9IrXHw/UhkfZxDEybm5R6HvhC7e1Sl Tyly/X8okbCCVt/saOd7ySfE2AR8qcZl0aP88altj2eUlDBNnQY30aUd1tTLmQG04se2 cy8hP3oNXnxRmwsjuvbTpWyWxFLlvzByKvgzL02Aa0Vzt8NEEX4sltz2Gt+7OvcD4Wqe dDdsWCiTM3f/2CpaxlJEAh5/gE1xvTS9TllZBHl2625qbro6hjpec/bxX6VzDndRYzQ2 g5TTmiZk2bVZcVZBXrwXeZ4aweXjH2ybjJI97bc+CXrB0e5uBPa1spBakLEzizA9Ryu8 jHXg== 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=+4D9Nsq032CZBW+xSJS5uYbRUMjNt+wKM5CFl04vFoY=; b=eH4R/0htGuNAr3cSutRIP0Zw3kt0F5ONiyhmXiHU6gPYFgtJom3guvon1T89qzqwaA 6PAZLRVVl4yyrOgNGPXO7VcFNANKJLuN1Y6E4ZgpiOoEgx/XAwye7L4Z1pViGvyM26ZR TMyvVpzaAwnu7Tk/aKMPL1/7OWe8PGePuiAIpV8v/SCaPsypsoASoIsOX6RlUhxSQZ5i F2zB5MMX3uKewN5Jf5nKDJKd4/O+VX29Fo3RxTkCwIFWvAQigVFWLvNJbUCqIhbGfWui ZXyVibJ31ZmLeIoIZx0rsQxh3JxXHYx12Hu5JgWxyl/ZIAGG0JlG+8TUbCVmD5EsoLXE JHbg== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Z5HSg61r; 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=+4D9Nsq032CZBW+xSJS5uYbRUMjNt+wKM5CFl04vFoY=; b=rfjfTytGHD3UYzWwVJtV9bnR451GEKTSSXCFHOcJk6K6mAxN1LBRd6P4eO3zpPqFBh D0RiHTV9UeFrgzlDEOHaSB4feL+CNyZ84v7uHdMohpt98CN7Tu5S9QJIWi+BbPqBinb/ oEalIe1mH9aHz9JcM/wlpGUQHkVmXANrXaALQ= 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=+4D9Nsq032CZBW+xSJS5uYbRUMjNt+wKM5CFl04vFoY=; b=mVqSV/DWTX6qbarAWA6lGD8Q0dMOMqBhHu14ZU6nLvDUiwy5cgG+GWcdliltrHCtCs XaBBh1Q9Qy2bATRTWkMKuzKciE93GeebrGip3QQ3tf3dxCmUm28bVuO10kcdbe5QQa53 iUzL7ZUF6k867Hwt6rGWoAusKo+FHduXRXQs3YKW3al2rd4GBbPgGDGwJfTxqU5Z9hIt eft9F5HJpPeEiL9aJZ+rFPu/Y2gANlBUf+2oSl+hFizn5tV3TVODF/hRPyRVzm4vgCa0 n8qKebkq6HoBUdrMEDlajjQmeEhafrcOooYlTph5RKz2l6mHr2ZvLOM5OMfYGeyJKzh/ gizA== X-Gm-Message-State: APjAAAUIx1jjXrPbeGmCOa6QjHLBtpGbng34n329OE5/7MRX8bNCGf+C HOlsZAtYlzGVDpUnPbP1k23ssnB+ X-Google-Smtp-Source: APXvYqzyK4CSYdPmwt0oLBm4XHEbJU8dJTGWXvpb4fHxaEsD81+BWi2VuYZfGW7LeLA6hcrgQqCYMQ== X-Received: by 2002:a65:484d:: with SMTP id i13mr46954707pgs.27.1560757069063; Mon, 17 Jun 2019 00:37:49 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:aa7:8e41:: with SMTP id d1ls3369367pfr.13.gmail; Mon, 17 Jun 2019 00:37:48 -0700 (PDT) X-Received: by 2002:a63:1b65:: with SMTP id b37mr47784117pgm.408.1560757068380; Mon, 17 Jun 2019 00:37:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560757068; cv=none; d=google.com; s=arc-20160816; b=tSkHIxyhYPihjqq/BbVbGvX++dqetdf7xPtf9Z69TCGoL8OCuPeVv7y6yIGyJOjm6g Krc2PX2EJ2v4ge+HF+G0hyujyLeVtPfb1TJz3hJ4YVhwYmJZy17jDr2ym+HF7YkqfMCy Mtmxw0zqCsjytOlwVnGZ78DAJGpSScXQ7up3xke0UbrvtUGry0/lPqCAkptfQl57QS7h ASgdsMRkBVOxnSsYwN4YH+owSklOmzCH1ghm2vVDh+uErMYj0qDoNSvVv6gpvvCUXCH9 BUljnp5yeGB9BKCRu+Tdo8UfxMvS8ix4Ohlw/yuKV/emz7YiIIk/NmnFAsqxFIbAzvmn DTzg== 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=Fg1MxXks7YSjvcHgM4erODCDQhcjzajkytS6dAAQeq0=; b=avyZriTFtThMByVAoev2vMQ81GN1R/cv8cEFznq/3uNpACFttJYMhMFXhV3bFOQKRd F3IhLxwAPTM6EOI6EnoT5wQo8u4rNqy3ZouYi3bpfnJyO27jPMz1WGyiJNtfHsekubMe SxYpWOi3ZYejQ/x5YwRgUzDVpdBG3V+3vGYkRwxe86eCETbVjjT07F4JdXypR1WvaSUk GwBo8iNGohKPCfi5K5E6sXFjHqDWysS9+NCagEqdbJA63NbM4r3qpZLBlpf+K9JiWqn+ uy6IxQsY+DpO3B18Ezl/MFIT3tReUFiQxogcIO6Qc5oTLTcUpfBUfLNvfdUz5rbuBRJE n3MQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=Z5HSg61r; 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 66sor12548330plc.7.2019.06.17.00.37.48 for (Google Transport Security); Mon, 17 Jun 2019 00:37:48 -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:4643:: with SMTP id o61mr53833255pld.101.1560757068121; Mon, 17 Jun 2019 00:37:48 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.245]) by smtp.gmail.com with ESMTPSA id m41sm15205998pje.18.2019.06.17.00.37.44 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jun 2019 00:37:47 -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 26/99] ram: rk3399: Add ddr version enc macro Date: Mon, 17 Jun 2019 13:01:39 +0530 Message-Id: <20190617073252.27810-27-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=Z5HSg61r; 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 ddr version number. Signed-off-by: Jagan Teki Signed-off-by: YouMin Chen --- arch/arm/include/asm/arch-rockchip/sdram_common.h | 2 ++ drivers/ram/rockchip/sdram_rk3399.c | 2 ++ 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 e5145422cc..0eb068dcc0 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h @@ -28,6 +28,7 @@ * [1:0] dbw_ch0 */ #define SYS_REG_DDRTYPE_SHIFT 13 +#define DDR_SYS_REG_VERSION 2 #define SYS_REG_DDRTYPE_MASK 7 #define SYS_REG_NUM_CH_SHIFT 12 #define SYS_REG_NUM_CH_MASK 1 @@ -61,6 +62,7 @@ #define SYS_REG_DBW_MASK 3 #define SYS_REG_ENC_DBW(n, ch) ((2 >> (n)) << SYS_REG_DBW_SHIFT(ch)) +#define SYS_REG_ENC_VERSION(n) ((n) << 28) #define SYS_REG_ENC_CS0_ROW(n, os_reg2, os_reg3, ch) do { \ (os_reg2) |= (((n) - 13) & 0x3) << (6 + 16 * (ch)); \ (os_reg3) |= ((((n) - 13) & 0x4) >> 2) << \ diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index 14e2afcbc4..a8100749b0 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -1032,7 +1032,9 @@ 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); + sys_reg3 |= SYS_REG_ENC_VERSION(DDR_SYS_REG_VERSION); ddr_msch_regs = dram->chan[channel].msch; noc_timing = ¶ms->ch[channel].noc_timings;