From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jagan Teki Subject: [PATCH v3 05/57] ram: rk3399: Add rank enc macro Date: Tue, 16 Jul 2019 17:26:53 +0530 Message-ID: <20190716115745.12585-6-jagan@amarulasolutions.com> References: <20190716115745.12585-1-jagan@amarulasolutions.com> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <20190716115745.12585-1-jagan@amarulasolutions.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" To: Simon Glass , Philipp Tomsich , Kever Yang , YouMin Chen , u-boot@lists.denx.de Cc: linux-rockchip@lists.infradead.org, gajjar04akash@gmail.com, linux-amarula@amarulasolutions.com, Manivannan Sadhasivam List-Id: linux-rockchip.vger.kernel.org QWRkIHNpbXBsaWZpZWQgYW5kIG1lYW5pbmdmdWwgbWFjcm8gZm9yIHJhbmsuCgpTaWduZWQtb2Zm LWJ5OiBKYWdhbiBUZWtpIDxqYWdhbkBhbWFydWxhc29sdXRpb25zLmNvbT4KU2lnbmVkLW9mZi1i eTogWW91TWluIENoZW4gPGN5bUByb2NrLWNoaXBzLmNvbT4KLS0tCiBhcmNoL2FybS9pbmNsdWRl L2FzbS9hcmNoLXJvY2tjaGlwL3NkcmFtX2NvbW1vbi5oIHwgMiArKwogZHJpdmVycy9yYW0vcm9j a2NoaXAvc2RyYW1fcmszMzk5LmMgICAgICAgICAgICAgICB8IDMgKy0tCiAyIGZpbGVzIGNoYW5n ZWQsIDMgaW5zZXJ0aW9ucygrKSwgMiBkZWxldGlvbnMoLSkKCmRpZmYgLS1naXQgYS9hcmNoL2Fy bS9pbmNsdWRlL2FzbS9hcmNoLXJvY2tjaGlwL3NkcmFtX2NvbW1vbi5oIGIvYXJjaC9hcm0vaW5j bHVkZS9hc20vYXJjaC1yb2NrY2hpcC9zZHJhbV9jb21tb24uaAppbmRleCAyZDBiZTkyMGQ5Li5k YjllMzAxMjZmIDEwMDY0NAotLS0gYS9hcmNoL2FybS9pbmNsdWRlL2FzbS9hcmNoLXJvY2tjaGlw L3NkcmFtX2NvbW1vbi5oCisrKyBiL2FyY2gvYXJtL2luY2x1ZGUvYXNtL2FyY2gtcm9ja2NoaXAv c2RyYW1fY29tbW9uLmgKQEAgLTc5LDYgKzc5LDggQEAgc3RydWN0IHNkcmFtX2Jhc2VfcGFyYW1z IHsKIAkJCQkJU1lTX1JFR19OVU1fQ0hfU0hJRlQpCiAjZGVmaW5lIFNZU19SRUdfUkFOS19TSElG VChjaCkJCSgxMSArIChjaCkgKiAxNikKICNkZWZpbmUgU1lTX1JFR19SQU5LX01BU0sJCTEKKyNk ZWZpbmUgU1lTX1JFR19FTkNfUkFOSyhuLCBjaCkJCSgoKG4pIC0gU1lTX1JFR19SQU5LX01BU0sp IDw8IFwKKwkJCQkJIFNZU19SRUdfUkFOS19TSElGVChjaCkpCiAjZGVmaW5lIFNZU19SRUdfQ09M X1NISUZUKGNoKQkJKDkgKyAoY2gpICogMTYpCiAjZGVmaW5lIFNZU19SRUdfQ09MX01BU0sJCTMK ICNkZWZpbmUgU1lTX1JFR19CS19TSElGVChjaCkJCSg4ICsgKGNoKSAqIDE2KQpkaWZmIC0tZ2l0 IGEvZHJpdmVycy9yYW0vcm9ja2NoaXAvc2RyYW1fcmszMzk5LmMgYi9kcml2ZXJzL3JhbS9yb2Nr Y2hpcC9zZHJhbV9yazMzOTkuYwppbmRleCA4NzRlODk2MzY5Li5jMjM5MGE3NzFjIDEwMDY0NAot LS0gYS9kcml2ZXJzL3JhbS9yb2NrY2hpcC9zZHJhbV9yazMzOTkuYworKysgYi9kcml2ZXJzL3Jh bS9yb2NrY2hpcC9zZHJhbV9yazMzOTkuYwpAQCAtMTA5MSw4ICsxMDkxLDcgQEAgc3RhdGljIHZv aWQgZHJhbV9hbGxfY29uZmlnKHN0cnVjdCBkcmFtX2luZm8gKmRyYW0sCiAJCWlkeCsrOwogCQlz eXNfcmVnIHw9IFNZU19SRUdfRU5DX1JPV18zXzQoaW5mby0+Y2FwX2luZm8ucm93XzNfNCwgY2hh bm5lbCk7CiAJCXN5c19yZWcgfD0gU1lTX1JFR19FTkNfQ0hJTkZPKGNoYW5uZWwpOwotCQlzeXNf cmVnIHw9IChpbmZvLT5jYXBfaW5mby5yYW5rIC0gMSkgPDwKLQkJCSAgIFNZU19SRUdfUkFOS19T SElGVChjaGFubmVsKTsKKwkJc3lzX3JlZyB8PSBTWVNfUkVHX0VOQ19SQU5LKGluZm8tPmNhcF9p bmZvLnJhbmssIGNoYW5uZWwpOwogCQlzeXNfcmVnIHw9IChpbmZvLT5jYXBfaW5mby5jb2wgLSA5 KSA8PAogCQkJICAgU1lTX1JFR19DT0xfU0hJRlQoY2hhbm5lbCk7CiAJCXN5c19yZWcgfD0gaW5m by0+Y2FwX2luZm8uYmsgPT0gMyA/IDAgOiAxIDw8Ci0tIAoyLjE4LjAuMzIxLmdmZmM2ZmEwZTMK Cl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClUtQm9vdCBt YWlsaW5nIGxpc3QKVS1Cb290QGxpc3RzLmRlbnguZGUKaHR0cHM6Ly9saXN0cy5kZW54LmRlL2xp c3RpbmZvL3UtYm9vdAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jagan Teki Date: Tue, 16 Jul 2019 17:26:53 +0530 Subject: [U-Boot] [PATCH v3 05/57] ram: rk3399: Add rank enc macro In-Reply-To: <20190716115745.12585-1-jagan@amarulasolutions.com> References: <20190716115745.12585-1-jagan@amarulasolutions.com> Message-ID: <20190716115745.12585-6-jagan@amarulasolutions.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de 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 | 3 +-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm/include/asm/arch-rockchip/sdram_common.h b/arch/arm/include/asm/arch-rockchip/sdram_common.h index 2d0be920d9..db9e30126f 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h @@ -79,6 +79,8 @@ struct sdram_base_params { 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 874e896369..c2390a771c 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -1091,8 +1091,7 @@ static void dram_all_config(struct dram_info *dram, idx++; sys_reg |= SYS_REG_ENC_ROW_3_4(info->cap_info.row_3_4, channel); sys_reg |= SYS_REG_ENC_CHINFO(channel); - sys_reg |= (info->cap_info.rank - 1) << - SYS_REG_RANK_SHIFT(channel); + sys_reg |= SYS_REG_ENC_RANK(info->cap_info.rank, channel); sys_reg |= (info->cap_info.col - 9) << SYS_REG_COL_SHIFT(channel); sys_reg |= info->cap_info.bk == 3 ? 0 : 1 << -- 2.18.0.321.gffc6fa0e3