From patchwork Mon Jun 17 07:31:33 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 591 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id A587D3F353 for ; Mon, 17 Jun 2019 09:37:29 +0200 (CEST) Received: by mail-pf1-f197.google.com with SMTP id d190sf3255086pfa.0 for ; Mon, 17 Jun 2019 00:37:29 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1560757048; cv=pass; d=google.com; s=arc-20160816; b=oxIOU2LEliRUG4pqiSLyKqLrRhxF3QrY4jcADX6PDisp8jL7d4M8uMDmvvyJgd39cB Q+GM39JaFoa7V6bFoh69OEdD/pJPcVOX7AR5ksb68FIWtzYGYljtuAwEXd4/2ShmfjdG ckvLE7YQY+tiOf6nqQ5iCJBr3vhudC18WKg11eodtxZSpYa1XBaK2wA95CrPuYSeqHDV 55GP9JcJ6aRWbqW0OLkVAouaZ5XPktTk6w69uHrK9PsvL+I8tad0jkZfBbYNfSIuhzHB OdmURWLP+d6lD/nytuN5l/mc+fgXexKcGbdi80hkiCfAnPLwKC4oK3lCzdRC93G+674M aRUw== 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=HYehGDi5STXIaEztxB6PFkAvKD/l/5viF2DucXqJK18=; b=KZLZUsRvxypT3N4l65uOgWGUq+DrJhgxE6wrXkpmXRItR9+oAakJtmRwJ4elSKQl2K 6rt+yXPvzLfIlMVz/EAxvu6mlxG+AE6e2sZg3GVIQ2g6no7IuEhL4By8ZACz6etEBiCO apgIiDWrIEwBlBlwO/gVobtgRPRiiSWVGIW1SLimaxspNIEgPsECy9Sis5PxD7e0GEvJ yV6EYbjpFifxJkXUzkWQ+qsXp7bJBJ76xvnqKkXn6xTMhzGGDrjelBdq7dS5JGpnGW5N pJse797IXCescLFiaJymqxV689ARsiZm1ZvGuhem/6UkKz8+nDjZztnrZmT1bPOjm+0C 9ytQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=J2hosM0A; 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=HYehGDi5STXIaEztxB6PFkAvKD/l/5viF2DucXqJK18=; b=KcQIvKu0fcMGkgpaAHdIPqnDCkwr3eLBcZzvj5B14XqFDo9+hZSPTuzJ0F1CqtUBOI XtP1h9UiXOHrAT5iHJ6KP17qfaOpdgcMgFKcIyR+PTSW0Iv0fX21jBLzPLldVi2wE9dJ Es9PKMSMiwPpXhS3bfPZdRq+lPXx6wq1yg4dE= 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=HYehGDi5STXIaEztxB6PFkAvKD/l/5viF2DucXqJK18=; b=Es7QGtYigZwH6aEM1DirOAFWgALTE/7uXoyQfFWGqo9ewxS98klZlfxxWh+T/vCihf EMFD7FKfvfrSswOQ/3SA7yOJs43WkDzrQZ9iB9VKP9ACg7Ps8QfXaPzF8NkmCXhwARfc YYVh1UZvQRrVwAnbaNO2bXkFLT9b9YaiXfKAP7A99deHraFNzt3guHmdQzdhr/lgw/je vIbtBZQ8bKJZPxlN/gMMC/7P5MtIk4U0wASxA2DH45wPeIoLS1rBkdGDiuMKb2Q1agaB A4MWRYIrMerCDW2Ep3Yoq6mECnePrWLJ1YilHsxxqB2WasyDTT8FCtZMNb1bSJN551RB fAYA== X-Gm-Message-State: APjAAAUY95vO+qjkpsTmMO3BSDvXNBhV7N7RitnooDXJjXHoJODaVXwV EqtVBZM/1qjxrIOTwgrsSUNxlLt5 X-Google-Smtp-Source: APXvYqwf5xwNbHC7Pd252MPng8bzYSykiqLNy28gfDckTGXt/NqjWy80hLh5cPoJO3cmbAoUOMaEeg== X-Received: by 2002:a63:5202:: with SMTP id g2mr1455134pgb.386.1560757048390; Mon, 17 Jun 2019 00:37:28 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:1021:: with SMTP id b30ls3753924pla.1.gmail; Mon, 17 Jun 2019 00:37:28 -0700 (PDT) X-Received: by 2002:a17:902:30a3:: with SMTP id v32mr107708713plb.6.1560757048060; Mon, 17 Jun 2019 00:37:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560757048; cv=none; d=google.com; s=arc-20160816; b=Cj5FY7eZeaReOiA1OzD2mrESEv5qRUuWoqdCz9KA8dwRFU+RqWNWf61009gKqFWJ2u vroZz/DlrnfB6Pd0qnZcjmz53nH/YsiUaViyAMs1VKvHQgq+N0mAmXLepzNVJpKGNkXU oPShkyG0NY1JAv6/REHgFWLCcrhgaEgE8tBZ/Vx8sp8dL3jP/BSj7wwXBza00Golxmgk R+U9AzukJtZLZjjPuIjOIl3WKkPDtgxg7FytimpiUOQKnTOX1qSVIhTBZA8jGFy3zaGJ 42ZKAFMwEeVSX+Hi4fJTa2RsC/E8LQs4lIjXzKz2DbCXYErAmixSeYHObH/d2yy+SzYg EOuQ== 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=Q3ZUYGZAIT9Vot7SJ8lFJ5oYpTV+Zc69aZooDMsUqjQ=; b=wH95fMGL+cG4snMrB+n3b7zqsjY0lbYKzr5eO39zAFLDiAmG626x09e0zffi543KY5 WX8NXLVZgYjuIu5HwmmITA1QUU7lTjwrqEnEH10Ska5HpfuDKivP/UeqTUZ9TdV3NDnZ gvCLc/6m202ZXnYieLFQtjqwZJTStZWVt/nK3DeemUCoLrd01xiXVjCOHshJGhDhYVqW J8fo/9S+Nj0bojFblGWQ7YS+0H1LtMvjGkYT/7hSBzkbAiFcvJWSW/gINgJuL5PjAg7B pW8qhF1oO//lEBQvlu6S6vjxq1eNIYFbECp2JIj60aFF885RRAaboQ3SU8o4+NHP5Odx QzMA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=J2hosM0A; 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 v196sor10278255pgb.58.2019.06.17.00.37.28 for (Google Transport Security); Mon, 17 Jun 2019 00:37:28 -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:a63:1b07:: with SMTP id b7mr19607142pgb.133.1560757047745; Mon, 17 Jun 2019 00:37:27 -0700 (PDT) Received: from localhost.localdomain ([49.206.203.245]) by smtp.gmail.com with ESMTPSA id m41sm15205998pje.18.2019.06.17.00.37.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 17 Jun 2019 00:37:27 -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 20/99] ram: rk3399: Add cs1_rw macro Date: Mon, 17 Jun 2019 13:01:33 +0530 Message-Id: <20190617073252.27810-21-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=J2hosM0A; 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 cs1_rw. 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 2b4745acbf..bac3efac09 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h @@ -56,6 +56,8 @@ SYS_REG_CS0_ROW_SHIFT(ch)) #define SYS_REG_CS1_ROW_SHIFT(ch) (4 + (ch) * 16) #define SYS_REG_CS1_ROW_MASK 3 +#define SYS_REG_ENC_CS1_ROW(n, ch) (((n) - 13) << \ + SYS_REG_CS1_ROW_SHIFT(ch)) #define SYS_REG_BW_SHIFT(ch) (2 + (ch) * 16) #define SYS_REG_BW_MASK 3 #define SYS_REG_DBW_SHIFT(ch) ((ch) * 16) diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index 1907fc9eac..988672672f 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -1026,8 +1026,7 @@ static void dram_all_config(struct dram_info *dram, sys_reg |= SYS_REG_ENC_COL(info->col, channel); sys_reg |= SYS_REG_ENC_BK(info->bk, channel); sys_reg |= SYS_REG_ENC_CS0_ROW(info->cs0_row, channel); - sys_reg |= (info->cs1_row - 13) << - SYS_REG_CS1_ROW_SHIFT(channel); + sys_reg |= SYS_REG_ENC_CS1_ROW(info->cs1_row, channel); sys_reg |= (2 >> info->bw) << SYS_REG_BW_SHIFT(channel); sys_reg |= SYS_REG_ENC_DBW(info->dbw, channel);