From patchwork Tue Jul 16 11:56:54 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 755 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f200.google.com (mail-pf1-f200.google.com [209.85.210.200]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 101693F08F for ; Tue, 16 Jul 2019 13:58:20 +0200 (CEST) Received: by mail-pf1-f200.google.com with SMTP id r142sf12218926pfc.2 for ; Tue, 16 Jul 2019 04:58:19 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1563278298; cv=pass; d=google.com; s=arc-20160816; b=V3gYuoHzZVMnXzOoU6BaJrIdgOqGBWM5JTRPTK/ryq71rNjp7F0lINFYN+smspj5jS ihjeJ8kf8KPm5bDkMrHD2n1WO9m055K01WewwgVgkBNKfYVgCqMnxlWfMbXGVDejp6qI ELC3yL/w40xnay/dTejsrRGCZI5fIOyOlEj+tAHyV+O9qpjjhwhqzCn+ozZv8+PHfp4y /Pw/409YyaclPYmKzqzftPiLbA4Os3UY57+c1I3w8pjqx8bFtlEj7GLAtzXI2XsjjfML X6ESYykxy5magtkzlg1C5L89bMOlWzda+lW+unI6HTiZghCLDxKnwGfKpSXrSsES1b2v SjBQ== 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=Ni3hDwS3rUU7livqtpt+XGU5+i3XeGrFt1UvG5aD5Bs=; b=sREiqmziry6OPeqRwWzunkhHF/Iyxe3OlAcektw2GYgcBFEtrX0WSoDRmK6wH9lzlb uZMh1XNI3XK704ekrLjrFG1yk8lL8NI+/BLBIGs51hR6xbfUwPlNglmiuyLZQFiXpcA7 1crAz4mZA6DEuD747PD0NjtqdMAvJkYOWxod4wt9aBGdW/687wfXgjyPbRYO8SpM5sRi 59EWqK4ZY3R+cnjvGnP8MyAgbcTFAcJnQGwro/9jQ5xujf44IysjRAUV44uItyRsfG/z u3nRn0/ybYAvyTyRWYITFyPaZSyP8wVW4PYk+8NWJWfKNZp52gKWJdQS6pfzgTEagweJ DKtw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ePYDBvji; 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=Ni3hDwS3rUU7livqtpt+XGU5+i3XeGrFt1UvG5aD5Bs=; b=FyYmthrdDrZomAdHHodgNy+9geVHC2xVMDjFb2yLvNgCh0sioF9xk8m3iLrAeNEFBA i9DnltBhB1f0/+Q6eShngrZFMFTM9ej7Q1CKXrnheP0FFUpZtE6sdKh0rkbpFrF3H/KK 1SwBN3iPFpDx5jmFhj/0VKF1Huj2cxgHP1LPk= 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=Ni3hDwS3rUU7livqtpt+XGU5+i3XeGrFt1UvG5aD5Bs=; b=gu7DCkRLHEfBysXlXK0lbg3FlFrAV0GRj9SRL2osBLQgrmzMgOZQeoe2JR8cI14inl 5XzVfJcin4BoyxBwmvE3n6EpfCzUVg5KuXRZfkuQ57xpzMy8iFU4lwc2oz18rcOMWQI+ SbS0NvHbiAPrVk6fFG9+oI8dcQu+BinEwVPmosPzheLlTC/0fpF4cOWV0wtSXE5Tocqt 2ycHqI5BrZLu0JsyUDBrnoXCKI4jqmyRkQmIsw0ltH1TriVxa+Yg2/zunowQVKJJ2JQN TVHrIiGxk8v1HEjxjuss0qStvozry2qqQhuXtexE/rC5p7g8+zjXgmRXF/5ZVyKIpo47 Pt7g== X-Gm-Message-State: APjAAAWFhn7FOpiMxVgcZucgKMzVuaKk4lw0fdEihgotHGiRalPpo8Ch S1NWsbiCHWvt8zLwEWa6PlbI5/ef X-Google-Smtp-Source: APXvYqxw0p+fqjgAa6yAlGxuF+aNrhqrnJafx/L+znOpEaplEzQ8Ux+TV8SxWeAERawd3Pir4Q+xrQ== X-Received: by 2002:a17:902:e306:: with SMTP id cg6mr34753507plb.263.1563278298861; Tue, 16 Jul 2019 04:58:18 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a17:902:b48c:: with SMTP id y12ls5464275plr.4.gmail; Tue, 16 Jul 2019 04:58:18 -0700 (PDT) X-Received: by 2002:a17:90a:8d0d:: with SMTP id c13mr34460266pjo.137.1563278298498; Tue, 16 Jul 2019 04:58:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1563278298; cv=none; d=google.com; s=arc-20160816; b=PSyeRIWAu70po6+V+x6AjcpfjVE8Lt0mSe1Gzq5FH//0aUtLHafw0Pk59I3I9/29IW B0RTcH+0p8j0VV2N8ZUVr3HDi60yFWo3iV4KVZBtX4UC1DHJnH+zBBas2xupRYryUr7j XTlj+cNDehnFcK7YVfx6LJHvOSbZzP0DD7WoCZPETGLAp9jxBZidSGjyRz7wqSHS480i 3hTbXdlj8n7lWvRrB14RQ8nAOMrdeU+Jgc979+6Xi8P+e4WUyCS2F7ADEk8Hx9HUxR3D uGY5SO7ou9sRc9/MDvZcm53rsuywIngTwEC3JLPRrVMFBWTbGuPYeXOsWPh9P+cmLxix nQpg== 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=TFvI0S4CfWwHtbl2JqDL7FjN6lCMyy3zZu+VBPL6t3Y=; b=Ecp9e25fTeRRcVI7m137eTDMhdb/28vTJ5SuFK9y/PpoPRNw3PIcfAmjQJu3hPhRo6 DEtOfFHR2HMBjmwR1HSxnZt6t5UM+bHFDgknPsNg2Y/lgJkx/dB/C2hSmw7fVkPdMZ9x qhzsRZhV1Vlgw6CDlLVHPoU0YdKhogbeppZT3TnaYcj09s7bSVwD6Cf2/qSsgS/TP9e7 /UeG6zvZcGXGBjniSKegtpDClWvig6Pn7E5xjgBNW1t7q6oATzBz32xMZyDFYl4+oTdk Rri3OAhLOgzHXWk3UnDjzYE0zX35Jk8IY6/RF8hHKWV2heN+4+BK6J34CpzdXMrdfhAS NYhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ePYDBvji; 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 x27sor10770650pfo.43.2019.07.16.04.58.18 for (Google Transport Security); Tue, 16 Jul 2019 04:58:18 -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:7a06:: with SMTP id v6mr33364967pgc.115.1563278298200; Tue, 16 Jul 2019 04:58:18 -0700 (PDT) Received: from localhost.localdomain ([49.206.201.107]) by smtp.gmail.com with ESMTPSA id z24sm36269566pfr.51.2019.07.16.04.58.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 04:58: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 v3 06/57] ram: rk3399: Add column enc macro Date: Tue, 16 Jul 2019 17:26:54 +0530 Message-Id: <20190716115745.12585-7-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190716115745.12585-1-jagan@amarulasolutions.com> References: <20190716115745.12585-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=ePYDBvji; 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 column. Signed-off-by: Jagan Teki Signed-off-by: YouMin Chen Reviewed-by: Kever Yang --- arch/arm/include/asm/arch-rockchip/sdram_common.h | 1 + drivers/ram/rockchip/sdram_rk3399.c | 3 +-- 2 files changed, 2 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 db9e30126f..e7f15a7cf9 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h @@ -83,6 +83,7 @@ struct sdram_base_params { SYS_REG_RANK_SHIFT(ch)) #define SYS_REG_COL_SHIFT(ch) (9 + (ch) * 16) #define SYS_REG_COL_MASK 3 +#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_CS0_ROW_SHIFT(ch) (6 + (ch) * 16) diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index c2390a771c..f6a83f2acf 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -1092,8 +1092,7 @@ static void dram_all_config(struct dram_info *dram, sys_reg |= SYS_REG_ENC_ROW_3_4(info->cap_info.row_3_4, channel); sys_reg |= SYS_REG_ENC_CHINFO(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 |= SYS_REG_ENC_COL(info->cap_info.col, channel); sys_reg |= info->cap_info.bk == 3 ? 0 : 1 << SYS_REG_BK_SHIFT(channel); sys_reg |= (info->cap_info.cs0_row - 13) <<