From patchwork Mon Jun 17 07:31:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 586 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 C3DE53F072 for ; Mon, 17 Jun 2019 09:37:12 +0200 (CEST) Received: by mail-pg1-f200.google.com with SMTP id x3sf7202956pgp.8 for ; Mon, 17 Jun 2019 00:37:12 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1560757031; cv=pass; d=google.com; s=arc-20160816; b=ZJ245TE3kAp/vDBQGDE6BfvSK+KXHAAPsx1oFUdEoPauePYin+qBNy5CnqkNEYINen HHYmTRMzKIOEZKmaehGNWzoujedSV0QA7YcqGeyi7LEYcZTk6RO2/UMkVeNoqbJsrs39 Sp7IsRFgW5nKsU94IG7wCDrIF51lsIoCQSEW4cy3tcmbpSFv6xRhnu9D9zQCf7KhiDTM 2kUcRz3GvL7iBvY7B0BCo0aAuMWqWsUSUJVXaZgo19thwgY9qwfDLQYCB3BAO9L+Jquk WK40m4wRECohwiCvPD3SSeKsKbjktWp3J2ExeOrprthT/phBSzuPlJ1rUJaF5wMEsKBx 4hKQ== 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=beJYmCkOAuhHmxEv+EmysFf7OQ3k3jb7p/d0Ocv+5fY=; b=IOXWqOlOi1/Ag3N87KJNhJE6cTyOodDyMLRN5qInyjEQJZzJFR6drceM4jseN2W/EH F0+Wm2BxP2Ld3Ebqxg1PBie3lIqbsX1QDE7QCf5h4xD3l7hmOSB1x4QoTtS9wVaUVujP EtXi5QLT+dVznt+JxHb2xefo9130CUYFD0W1Lq3ltwrFrQqT6pHvRDm6xOT0MXKVsMUv Oj57cs2fwSyvsrTtgUfqKSqKqNaa1SfiHhhVJlv5/Lwj6W6NBpNAW6kzx1zY5h4v+vtc Dp2+uenllU2w97Z5hpyrHXTvsUYHxf5QolhZSbDwvxul6/I7iKlwQYGO047el4vo8DTz vJzw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=WGmn47fQ; 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=beJYmCkOAuhHmxEv+EmysFf7OQ3k3jb7p/d0Ocv+5fY=; b=DrIFEfLBpZgnCqfsFrrr97Ks1QlJ7droV7eZ5yKTThdE6f0y+diyBTY3QS4oswAAO5 rbxeKe6zUMxU+kc9WODpYOKgS95qafcGgekVSoM2dIjTyxReKhhxLPhqbQ3D4sANoPZI 6oNNgio6VsYYpOSP/MyLnoVbLPdvJtYYgAF4Y= 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=beJYmCkOAuhHmxEv+EmysFf7OQ3k3jb7p/d0Ocv+5fY=; b=PtPYGEXdV5cFNGu1LNo8/DAzElKp/Kf0llNvWwYXqvwmpTuvGTT6Lg78MazDpqB87b SL7UwrFksgyHjYwRjhdlZ7izYo8BJVjeDPCEkMRTwJ4nWPHEe+T0WwXPNfpxi8QO02n0 ZFZZdeVOhuTQxeYuUKUBEVMUyoENILJSUqEsjycBRATLamKs9DEOduvsXpukcuPhxYeq DmiP2hwKA67pJKZuMJxFk8tE8WRcwJD0ML/D4pNFB0hcTUHaYS07HpgHWfOqx4l9CVLh 0hqigQYzRhUCrj1XYumxKJ0uOeegxpHHXoVhEf7YMSTK70GYrlbLaDxmMKUp65jBqnKo X8ig== X-Gm-Message-State: APjAAAVP+nL8ZjK4ngTHQiofNG6tE3kmJBq5wb1UxrZecuR/88pO53GL yOd6Mg5mgH5AilKAfxmLEuPeD1IX X-Google-Smtp-Source: APXvYqwwP2vQKZRTlXjU2VLOz1l7u9yUWesXP0qdMxGC26Xz062Tc7gP2p3o1y6ML+eoVaT2tQt5ZA== X-Received: by 2002:a63:e317:: with SMTP id f23mr34072267pgh.142.1560757031428; Mon, 17 Jun 2019 00:37:11 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:f081:: with SMTP id go1ls3748889plb.3.gmail; Mon, 17 Jun 2019 00:37:11 -0700 (PDT) X-Received: by 2002:a17:90a:9291:: with SMTP id n17mr24302477pjo.66.1560757031107; Mon, 17 Jun 2019 00:37:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560757031; cv=none; d=google.com; s=arc-20160816; b=WpW5wjoGjRvs2R1ZnTc+Ox0Ic+Ue0MFXkpTSJ5DgBuBD/VfzR/ThnTGonnpFucHRhP VRcWlN6z5l6OGzskjTSV2+I05aF/Nc1D9n6+YTS14K/NBg5BRDOtdEKtpsfxcgByi801 SXLmda95WYI4iIw3EzzpuRIWeByOc5lAaBojcnRmOh1SDFrHRAQBnjcO9WSPvJ//DFGl 5E4Q2M6ZrssrTVY4SAJg1QKoBH0oZrQNs5Mfi5WNsgYZzJTZUe9gNokL3ByXVy6cPi7P HXVH79Y3jcBz0klFNzLpbbgGyqJOtehqrk16C6OwzbUWbNIZFhKafkDTSV/v+mTRJKcT k+Mg== 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=7GVQ6MeWi0wTHocOqmKID+Eml8vdHp60v/A+s5GMBA8=; b=VGKrpYUQwLOrdgUHsUjq01cEkstxfWJ/Yko9/JngqAMaJeMv6XhwkgF7pGKR2DAmvj HpxTljyNwsE+JfcO01tiZdEvZEQZtLMbaoHp3tLT8uvR1dPTJTFTRmAVqHUebVY7WJyW vWADMcq7vo98R2hcstXP0hX4ZlwzRaIiJobIp6uSXknL/mteav/07Xu6S5bTUgcbuKyH 7vrhigAgoSEDwXNLGuo38A13aPxnUdhJ13n61qktntxR4mplLBryqaCYFQb3PqcWpIgJ BBv61Hcp+co0igLrHMobCptsIc67UOG9aBftaTZNwaKW21niwhiJbrIWw7Q6oi6xzkkT yBOQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=WGmn47fQ; 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 f41sor9692561pjg.15.2019.06.17.00.37.11 for (Google Transport Security); Mon, 17 Jun 2019 00:37:11 -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:29c5:: with SMTP id h63mr23743463pjd.83.1560757030816; Mon, 17 Jun 2019 00:37:10 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.245]) by smtp.gmail.com with ESMTPSA id m41sm15205998pje.18.2019.06.17.00.37.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jun 2019 00:37:10 -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 15/99] ram: rk3399: Add rank enc macro Date: Mon, 17 Jun 2019 13:01:28 +0530 Message-Id: <20190617073252.27810-16-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=WGmn47fQ; 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 rank. 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, 3 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 d7d44749de..e2173aeeea 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h @@ -41,6 +41,8 @@ SYS_REG_NUM_CH_SHIFT) #define SYS_REG_RANK_SHIFT(ch) (11 + (ch) * 16) #define SYS_REG_RANK_MASK 1 +#define SYS_REG_ENC_RANK(n, ch) (((n) - SYS_REG_RANK_MASK) << \ + SYS_REG_RANK_SHIFT(ch)) #define SYS_REG_COL_SHIFT(ch) (9 + (ch) * 16) #define SYS_REG_COL_MASK 3 #define SYS_REG_BK_SHIFT(ch) (8 + (ch) * 16) diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index 7d071f998b..acc8f17491 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -1022,7 +1022,7 @@ static void dram_all_config(struct dram_info *dram, idx++; sys_reg |= SYS_REG_ENC_ROW_3_4(info->row_3_4, channel); sys_reg |= SYS_REG_ENC_CHINFO(channel); - sys_reg |= (info->rank - 1) << SYS_REG_RANK_SHIFT(channel); + sys_reg |= SYS_REG_ENC_RANK(info->rank, channel); sys_reg |= (info->col - 9) << SYS_REG_COL_SHIFT(channel); sys_reg |= info->bk == 3 ? 0 : 1 << SYS_REG_BK_SHIFT(channel); sys_reg |= (info->cs0_row - 13) <<