From patchwork Mon Jun 17 07:31:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 588 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 650CA3F353 for ; Mon, 17 Jun 2019 09:37:19 +0200 (CEST) Received: by mail-pg1-f197.google.com with SMTP id c18sf7221000pgk.2 for ; Mon, 17 Jun 2019 00:37:19 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1560757038; cv=pass; d=google.com; s=arc-20160816; b=lAEmD/dYRk543mIaq5e4d8XwsaquleG48vQReNI7lmhkKQch5g5Yi4ZB70v0H8V1eF RNBAEWQt31XiokescUdQUnW+UDsXq3GFup+cLfsyURU4phMN76NUiz+NZIIra6LR/Td6 4CzyirP45bSzvUWoaO5UhKutYzxwSRLgfmsjvNyHUZImcKfnYsg16gQj+sswOv7o9Wvv REIqz9ezfqd9Rd7C3813266sILC14BYpevlR0SUOHhCQBw7WpTCurdlfHUbn08bpYqve h2OvTbbwORwAMD+PjN7iHaEUfByv1WKLKzMBbE6GCQV9W1MAFbwxlQiLgQn6Mk45+lHs obJw== 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=tlXs9KO45DRfFd3dacIgRVIY/q9uJSq0G661mRRqHMg=; b=Tt/VDrBgpN/j5z7Xhzc89nFYQp2VsXL5eM/phrQRtQuNVPdwfI0Xryflz7DJsbvuw1 9mKJ1BKmunIfuMN7v+EoV6H3oRF+lhmx56nr8m1i/sFEcgwY5r069FEzjXec9dx9M+dt MirfelipJPWbS14SCOwh6FGLzfXysM0nN9V8jnuryQVGqTsCmfNGaR9/Fb6oS5Zeffq7 PZFxOJFrfkDzCCJ7RnTVlkrr58nXSBcio9BtdxDDiDD+zp6DyT8OQ2vaKB6Ia8Mnovyk Qfr5y4OMpdMdHpXKs9NEDgWa2sNs7/9HszlVqfNgTbcUoft2Q5uhf5T81yWhRQCk+aht YKAQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MhtNauR+; 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=tlXs9KO45DRfFd3dacIgRVIY/q9uJSq0G661mRRqHMg=; b=CkkKpd8YRA+9x0BqLDCIBdKUPy5GOiSYFXXoxm6znKRMOm64t0SwbVhez6H7jE33N0 7rDki/HckmFCnlopR0HwbcfszwR/9Fc0UJVbMHpMO8ROvGSWO3JNqymvMLh/oq4gjEoi lqcEN0uV4kbON0H9HK2EHuRlSN4Fb5OGHjWHA= 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=tlXs9KO45DRfFd3dacIgRVIY/q9uJSq0G661mRRqHMg=; b=uEfdHpuQ+eQvxEBZeeZzFHZyckjF7KcmYTmRJ/Be3ck3kHIkeNxFoF9OTlhdy3Ppro mRLIsrV6pQ7LjhIP1y8OUg/R52XtxpBu7qKRZPguYV5wtjDiwyfaQ6zPud9JhUSvZXNl on9fyXU9+F/QGjVPclOvYuD48iupm6KwX8VkWmidX1AauaTZjtDHg0LWXBylsoxvmfWB tkHcZGZwgYhQ5eQWxj6Q4mp7icaaLx8r0Sbcy8JmIeC1b47ogmQtJ/g+3u01DMxFBmvC zbjsjHdEnPFw7WvteEdEtOawmL8OPy259chOWBpw1l3LYrLnKq647TMfBDHVQ03Lp5ja SJmA== X-Gm-Message-State: APjAAAW9BMfjtmGleNi44SGSzwXi6pAf+dAaBMHs5puC6O1WHqy9JAWT K1RglhW4yeeN8T/lvCLgVkwavfwU X-Google-Smtp-Source: APXvYqwX0tKwo29/IG8bwE6cFTyJ8qTvaH1sD1dBA5Aa/YN5Kardzp7fsJ5RE1RjAVbvxU3xsZUZlg== X-Received: by 2002:a17:90a:22aa:: with SMTP id s39mr10048259pjc.39.1560757038213; Mon, 17 Jun 2019 00:37:18 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a63:b21:: with SMTP id 33ls3590418pgl.1.gmail; Mon, 17 Jun 2019 00:37:18 -0700 (PDT) X-Received: by 2002:a63:dd53:: with SMTP id g19mr37599301pgj.3.1560757037788; Mon, 17 Jun 2019 00:37:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560757037; cv=none; d=google.com; s=arc-20160816; b=AhfcOvf02Fh+B5cK4w3j3vC6I0JT2Z35oWY8shdVDltpMTDH1Eg5kGYncj91OL73n9 hg249RyBUAhLgW65tIsx7mLYdbmHnEr9Vg7uwnTs/BAqlGzRwRm4ai9gIcKnSpkl2DX2 TOCGezZvlPG9QAc4r2ZtSMdyd4JDBnnLOPoRmoHikhumvk8kJZsuy9kPB56JAsikB1mi NRZPL43ZZt6SpbrvfoqOANbE0Ciq2qKiQ8TFFbCpYeo4JQEC1Ze34Y8MMQH3NtSt6bUm Q0p2A4ey6IsISAKKcBlRdsTLfmLYFGO/niOzFPHyLbpXuO15J5pN8HxJANJx+RjWdn8J 8yqg== 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=pIvg8hyhdUAWXbQ47u2vkaiJB/8L5xmhs2Hetbyr5tc=; b=GT1cckgbgPQz5wiPe8ELbtdWOgajDtdTFrQN8e5zrXeDNIS+jTTnJJjR3JnGaAjpRQ My7ic7bsGdY5tTN8VTJd+woK0pvLyUazqABt45qGjOPMqPoir+jp2h+hiecWbyuCidY8 yRslMkffxIRyL4kAWBMfsaRQKpGsXbu6UNrGVhf0qsd+VG8wlD3UWAVjEqjZT4ysBaEX N0LngizOs4mmPhqibuQ74+BG4apAVq6437pAe1qQEl13x8MEIUdb/iavvgmcFZ9g7JHr CqmlRl99jH7gSkE77+d8ffk6GrRfgFAG7kKGY4OJYUP512AIYx+rulBeQJ//4Vp/G8Vw GtWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=MhtNauR+; 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 n11sor12495732plg.68.2019.06.17.00.37.17 for (Google Transport Security); Mon, 17 Jun 2019 00:37:17 -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:9006:: with SMTP id a6mr101354616plp.305.1560757037517; Mon, 17 Jun 2019 00:37:17 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.245]) by smtp.gmail.com with ESMTPSA id m41sm15205998pje.18.2019.06.17.00.37.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jun 2019 00:37:17 -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 17/99] ram: rk3399: Add bk enc macro Date: Mon, 17 Jun 2019 13:01:30 +0530 Message-Id: <20190617073252.27810-18-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=MhtNauR+; 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 bk. 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 8cb564960d..78cca88121 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h @@ -48,6 +48,8 @@ #define SYS_REG_ENC_COL(n, ch) (((n) - 9) << SYS_REG_COL_SHIFT(ch)) #define SYS_REG_BK_SHIFT(ch) (8 + (ch) * 16) #define SYS_REG_BK_MASK 1 +#define SYS_REG_ENC_BK(n, ch) (((n) == 3 ? 0 : 1) << \ + SYS_REG_BK_SHIFT(ch)) #define SYS_REG_CS0_ROW_SHIFT(ch) (6 + (ch) * 16) #define SYS_REG_CS0_ROW_MASK 3 #define SYS_REG_CS1_ROW_SHIFT(ch) (4 + (ch) * 16) diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index ed2e0f54a2..77e7f92b5f 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -1024,7 +1024,7 @@ static void dram_all_config(struct dram_info *dram, sys_reg |= SYS_REG_ENC_CHINFO(channel); sys_reg |= SYS_REG_ENC_RANK(info->rank, channel); sys_reg |= SYS_REG_ENC_COL(info->col, channel); - sys_reg |= info->bk == 3 ? 0 : 1 << SYS_REG_BK_SHIFT(channel); + sys_reg |= SYS_REG_ENC_BK(info->bk, channel); sys_reg |= (info->cs0_row - 13) << SYS_REG_CS0_ROW_SHIFT(channel); sys_reg |= (info->cs1_row - 13) <<