From patchwork Mon Jun 17 07:31:26 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 584 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pl1-f198.google.com (mail-pl1-f198.google.com [209.85.214.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 3781F3F072 for ; Mon, 17 Jun 2019 09:37:06 +0200 (CEST) Received: by mail-pl1-f198.google.com with SMTP id 65sf2491154plf.16 for ; Mon, 17 Jun 2019 00:37:06 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1560757025; cv=pass; d=google.com; s=arc-20160816; b=KDG2uWw5ZF7TvnxfN1A1C8eWCujgJ/Ok1Djvt0AplEprpbUogPqSAnl7OG2RAmNh7Y +zYOQSFwJrarRKnuojqxn/QRnes1sVfX1DY4GTHbuz4oXKweK9dvKfXJv6WQN3V//EZZ 91s9kkuh++kRsOB7EwpGxcLuqKzDygCfSFVJ7ilhzL0D007WhQljJF7MI8epzOJwKNOA mh3KGlPz5LYe3Ils+CB1qRafLJzmGE4m9fVGT3XQLz6tGkeAY0MmlBME2X5oA5HcHK2R cRFpGO1wF9kn/ZR9UhHh/CF7GN86biURxMyABco0LjzxClaSvwD1kGuCdzP3mZEyNONo Q0Wg== 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=yKQu+Sro9lpR+hB16qbKgm2T48yttJXOyhpx3RZgIpc=; b=cu1D2mPFPcC7NW0cwvDVi0wXTkcrkc7eJl+12KEBZqrT2SuhGPxLViQeZSg3xL87EA qGBhQalrQ3NxUpIgkTKeDkRBb/Jn2Hoe0NvgIFOM3LxiDasqB+vNqwRRy+wX4428eEBK qRAFYp/wb6va5R3jv1Mzm/20QyPONv4cMxwTJbRt5r5m3VAU55keyOlEa00fzI3Gs6oh vXbXcMbrXeMcfsXTD4prwz76r/5Mw4VKcv6Dn6z1Zg1Qhho9h4NS+Uk2EAdHawfQVVc6 a8+vMjqWI9fbgmGnGvHi9Nfgz/PVMsBAan7vgxAeSGoatCbvUdQ2NgDBDNZ6t0tfxSip VGgw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=iW7uclNb; 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=yKQu+Sro9lpR+hB16qbKgm2T48yttJXOyhpx3RZgIpc=; b=NemHeYIwCxnhmjiYNcts/hxrEtk4B9eMIoLPjFvjMyaDs86qH+cRnpwxSoYSJGVtnr LOg05xSjdgox2HLgdU8Fu9aBf56K1414Cv+hZ99bh1T6c58dGyHBtDpJsszDtdAv2tOD qQJF3518U6yTnGC54tJVconODeQCmws8SfDEc= 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=yKQu+Sro9lpR+hB16qbKgm2T48yttJXOyhpx3RZgIpc=; b=rR8/2sATevH70ZvD0R2dtSnK3Jjy4AFaN1SsTuVlaozBxVsG8ybT/1ZMZYfNOrX2GM sl2b/TeGCglFENRrNQHTgk/zoOSGCg8vOabZYu/hIKKmDOruRipPeF6vov3jryMiJrLJ g3jTpVwHi5mGBAMOYsYSpX/bt0xTPkbeBXt6MskWUbslg4qfKbsBJ98tgxqNXLbmCTbf nouaGEX+XE84mfwST7v53gKPHxK+YavcNL3NRqGytuX48uXabcDrqU5xUJ0eqqyOZlPC U1JDkqCWJtiLzqWqh+brn3H06m3n5r/Hh/cYWY+cjv/muOGF2KQmgHqMleMWOeTLr35K WSvg== X-Gm-Message-State: APjAAAXgr5z9yHTrOn50D8f3eMS6LI11etaWBHigUrgV3KpFKamRHlae ITxqcpE20lKHS7WK8iJwcwUNOb1c X-Google-Smtp-Source: APXvYqy/U1/AWyqLLq3rihKuOtuQXHon/FdEKN8m0D2mT9O2SC1qidFlXDpqq5spdsjee20l5xhm7w== X-Received: by 2002:a65:6210:: with SMTP id d16mr46089855pgv.180.1560757024947; Mon, 17 Jun 2019 00:37:04 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:aa7:8115:: with SMTP id b21ls3367110pfi.12.gmail; Mon, 17 Jun 2019 00:37:04 -0700 (PDT) X-Received: by 2002:a65:404a:: with SMTP id h10mr6113965pgp.262.1560757024556; Mon, 17 Jun 2019 00:37:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560757024; cv=none; d=google.com; s=arc-20160816; b=J56/O3PIEDHzwTNtpZku2poO28+dvNOlEvEZAf/v0ZDxayZWrjiek5HqqkVjsBDYdg AHTX+niRlLOmc1RngMMdcym6fk0EkwvB5KHSgegD52jZ0cEhnpVli8uHyoKpf1JDs+4r rXrwPCPaARwlZcipo9wt3gXvL1ZG7chgGiIDUPz0qadn91L75pNrgsY71NGK4xPq0XiK 0AMt+rX88YR3ZaXcD+6queT9csTzUhuQWMTZlB/kqNNw4Vw5j4tp9/Vb/1wpW8IqvSIq XcLH8n5vg9Yb5/UBKaJZvj0w6FVr7IlnYioM8sDWxix4C3L2IW7f0arBf3vXsgRjLckt qslg== 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=EOwqiXpoaznAHvee34KmWSy0GSGmeg2o28ddX/DmTrQ=; b=i0/Yx1jknlrY5bAJy911D1lQX2eIyofPk+C31EdU1ZFFWYfCrGgc8wpZ34xL2JnPMU u6yKX2zTSTsk9oXZeWYWfTLApRZzSAGjQFzAc9NjQZQKpjXJqpt5J6AfJCm7YQPqdmUR 0GZzDPtawtQGKToxh+d7/VUsOn/56quE4O1Ls630iyrr2r9kH50aM5z2QsOOa4iF2v5g ZcYS6Osvp7B1KPcerb50ZIL1k3dFyWiRc6frlSf8PEqf6DdXFxjsA3RYCnmZyUHzgbJY n5M75kUAdg/IgD4OhV5aHk7Lcu5OqFW8MmuFtOD1ce7DIOQRYe8kbekITcPv1cRLtvzP 5OZQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=iW7uclNb; 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 i3sor12520288pje.3.2019.06.17.00.37.04 for (Google Transport Security); Mon, 17 Jun 2019 00:37:04 -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:aa81:: with SMTP id l1mr23682534pjq.55.1560757024260; Mon, 17 Jun 2019 00:37:04 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.245]) by smtp.gmail.com with ESMTPSA id m41sm15205998pje.18.2019.06.17.00.37.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jun 2019 00:37:03 -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 13/99] ram: rk3399: Add row_3_4 enc macro Date: Mon, 17 Jun 2019 13:01:26 +0530 Message-Id: <20190617073252.27810-14-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=iW7uclNb; 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 row_3_4. 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 a565f8d045..edb2ee50f4 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h @@ -33,6 +33,7 @@ #define SYS_REG_NUM_CH_MASK 1 #define SYS_REG_ROW_3_4_SHIFT(ch) (30 + (ch)) #define SYS_REG_ROW_3_4_MASK 1 +#define SYS_REG_ENC_ROW_3_4(n, ch) ((n) << (30 + (ch))) #define SYS_REG_CHINFO_SHIFT(ch) (28 + (ch)) #define SYS_REG_ENC_DDRTYPE(n) ((n) << SYS_REG_DDRTYPE_SHIFT) #define SYS_REG_ENC_NUM_CH(n) (((n) - SYS_REG_NUM_CH_MASK) << \ diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index ad2d03729d..26bbb4208a 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -1020,7 +1020,7 @@ static void dram_all_config(struct dram_info *dram, if (params->ch[channel].col == 0) continue; idx++; - sys_reg |= info->row_3_4 << SYS_REG_ROW_3_4_SHIFT(channel); + sys_reg |= SYS_REG_ENC_ROW_3_4(info->row_3_4, channel); sys_reg |= 1 << SYS_REG_CHINFO_SHIFT(channel); sys_reg |= (info->rank - 1) << SYS_REG_RANK_SHIFT(channel); sys_reg |= (info->col - 9) << SYS_REG_COL_SHIFT(channel);