From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jagan Teki Subject: [PATCH v3 01/57] ram: rk3399: Add ddrtype enc macro Date: Tue, 16 Jul 2019 17:26:49 +0530 Message-ID: <20190716115745.12585-2-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 QWRkIHNpbXBsaWZpZWQgYW5kIG1lYW5pbmdmdWwgbWFjcm8gZm9yIGRkcnR5cGUgbWFjcm8uCgpT aWduZWQtb2ZmLWJ5OiBKYWdhbiBUZWtpIDxqYWdhbkBhbWFydWxhc29sdXRpb25zLmNvbT4KU2ln bmVkLW9mZi1ieTogWW91TWluIENoZW4gPGN5bUByb2NrLWNoaXBzLmNvbT4KLS0tCiBhcmNoL2Fy bS9pbmNsdWRlL2FzbS9hcmNoLXJvY2tjaGlwL3NkcmFtX2NvbW1vbi5oIHwgMSArCiBkcml2ZXJz L3JhbS9yb2NrY2hpcC9zZHJhbV9yazMzOTkuYyAgICAgICAgICAgICAgIHwgMiArLQogMiBmaWxl cyBjaGFuZ2VkLCAyIGluc2VydGlvbnMoKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1naXQgYS9h cmNoL2FybS9pbmNsdWRlL2FzbS9hcmNoLXJvY2tjaGlwL3NkcmFtX2NvbW1vbi5oIGIvYXJjaC9h cm0vaW5jbHVkZS9hc20vYXJjaC1yb2NrY2hpcC9zZHJhbV9jb21tb24uaAppbmRleCBiNzU0OWY1 ZDhhLi45MmE0YzQ4NWMyIDEwMDY0NAotLS0gYS9hcmNoL2FybS9pbmNsdWRlL2FzbS9hcmNoLXJv Y2tjaGlwL3NkcmFtX2NvbW1vbi5oCisrKyBiL2FyY2gvYXJtL2luY2x1ZGUvYXNtL2FyY2gtcm9j a2NoaXAvc2RyYW1fY29tbW9uLmgKQEAgLTcyLDYgKzcyLDcgQEAgc3RydWN0IHNkcmFtX2Jhc2Vf cGFyYW1zIHsKICNkZWZpbmUgU1lTX1JFR19ST1dfM180X1NISUZUKGNoKQkoMzAgKyAoY2gpKQog I2RlZmluZSBTWVNfUkVHX1JPV18zXzRfTUFTSwkJMQogI2RlZmluZSBTWVNfUkVHX0NISU5GT19T SElGVChjaCkJKDI4ICsgKGNoKSkKKyNkZWZpbmUgU1lTX1JFR19FTkNfRERSVFlQRShuKQkJKChu KSA8PCBTWVNfUkVHX0REUlRZUEVfU0hJRlQpCiAjZGVmaW5lIFNZU19SRUdfUkFOS19TSElGVChj aCkJCSgxMSArIChjaCkgKiAxNikKICNkZWZpbmUgU1lTX1JFR19SQU5LX01BU0sJCTEKICNkZWZp bmUgU1lTX1JFR19DT0xfU0hJRlQoY2gpCQkoOSArIChjaCkgKiAxNikKZGlmZiAtLWdpdCBhL2Ry aXZlcnMvcmFtL3JvY2tjaGlwL3NkcmFtX3JrMzM5OS5jIGIvZHJpdmVycy9yYW0vcm9ja2NoaXAv c2RyYW1fcmszMzk5LmMKaW5kZXggOWE2MGMyNDEzNS4uZjU4ODM2YzAzNyAxMDA2NDQKLS0tIGEv ZHJpdmVycy9yYW0vcm9ja2NoaXAvc2RyYW1fcmszMzk5LmMKKysrIGIvZHJpdmVycy9yYW0vcm9j a2NoaXAvc2RyYW1fcmszMzk5LmMKQEAgLTEwNzYsNyArMTA3Niw3IEBAIHN0YXRpYyB2b2lkIGRy YW1fYWxsX2NvbmZpZyhzdHJ1Y3QgZHJhbV9pbmZvICpkcmFtLAogCXUzMiBzeXNfcmVnID0gMDsK IAl1bnNpZ25lZCBpbnQgY2hhbm5lbCwgaWR4OwogCi0Jc3lzX3JlZyB8PSBwYXJhbXMtPmJhc2Uu ZHJhbXR5cGUgPDwgU1lTX1JFR19ERFJUWVBFX1NISUZUOworCXN5c19yZWcgfD0gU1lTX1JFR19F TkNfRERSVFlQRShwYXJhbXMtPmJhc2UuZHJhbXR5cGUpOwogCXN5c19yZWcgfD0gKHBhcmFtcy0+ YmFzZS5udW1fY2hhbm5lbHMgLSAxKSA8PCBTWVNfUkVHX05VTV9DSF9TSElGVDsKIAogCWZvciAo Y2hhbm5lbCA9IDAsIGlkeCA9IDA7Ci0tIAoyLjE4LjAuMzIxLmdmZmM2ZmEwZTMKCl9fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fClUtQm9vdCBtYWlsaW5nIGxp c3QKVS1Cb290QGxpc3RzLmRlbnguZGUKaHR0cHM6Ly9saXN0cy5kZW54LmRlL2xpc3RpbmZvL3Ut Ym9vdAo= From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jagan Teki Date: Tue, 16 Jul 2019 17:26:49 +0530 Subject: [U-Boot] [PATCH v3 01/57] ram: rk3399: Add ddrtype enc macro In-Reply-To: <20190716115745.12585-1-jagan@amarulasolutions.com> References: <20190716115745.12585-1-jagan@amarulasolutions.com> Message-ID: <20190716115745.12585-2-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 ddrtype macro. 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 b7549f5d8a..92a4c485c2 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h @@ -72,6 +72,7 @@ struct sdram_base_params { #define SYS_REG_ROW_3_4_SHIFT(ch) (30 + (ch)) #define SYS_REG_ROW_3_4_MASK 1 #define SYS_REG_CHINFO_SHIFT(ch) (28 + (ch)) +#define SYS_REG_ENC_DDRTYPE(n) ((n) << SYS_REG_DDRTYPE_SHIFT) #define SYS_REG_RANK_SHIFT(ch) (11 + (ch) * 16) #define SYS_REG_RANK_MASK 1 #define SYS_REG_COL_SHIFT(ch) (9 + (ch) * 16) diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index 9a60c24135..f58836c037 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -1076,7 +1076,7 @@ static void dram_all_config(struct dram_info *dram, u32 sys_reg = 0; unsigned int channel, idx; - sys_reg |= params->base.dramtype << SYS_REG_DDRTYPE_SHIFT; + sys_reg |= SYS_REG_ENC_DDRTYPE(params->base.dramtype); sys_reg |= (params->base.num_channels - 1) << SYS_REG_NUM_CH_SHIFT; for (channel = 0, idx = 0; -- 2.18.0.321.gffc6fa0e3