From patchwork Tue Jul 16 11:56:52 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 11045893 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D948C14DB for ; Tue, 16 Jul 2019 12:00:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C77B51FF2D for ; Tue, 16 Jul 2019 12:00:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB8D028449; Tue, 16 Jul 2019 12:00:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5F9BA1FF2D for ; Tue, 16 Jul 2019 12:00:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=/YsDCZ6mmzGUFJuOs0WYd53m2ctHmzmRvRgR11uuHic=; b=nb/Q4eXgwTnkbH NCV6PX9Dv0fGFzWp6ywC0n2dMG50iMwy/7N7nDm7b+dc3DT7vYBXslX3erOQvcaeoEJqSk+RGWkeI MGphHZ/vgPM0eBlY74GzJce5kNN/IPCJAqgFzas/KjjzsCTXsZ0LzcnwgjA+qMJuAgls+NsmJDzai FH33J5WC1O2QFTb4b0cBDDTKq3iNNbkAOl9lq6T14qBDIw19/v0j2043Fw7bdFYhs+Un7/ULlUMLf TUg0Up6KQl1iolUHU1JYomk2EmKBuIAiIi+xw5/p4yHDS6BXKLQ5CbVL2tHuiW/Qhn1q2jUEGqocL 8gTUCFssw5frtPyVedYg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1hnM7t-0005ws-RX; Tue, 16 Jul 2019 12:00:10 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1hnM60-0003fr-2b for linux-rockchip@lists.infradead.org; Tue, 16 Jul 2019 11:58:14 +0000 Received: by mail-pf1-x441.google.com with SMTP id r1so8992688pfq.12 for ; Tue, 16 Jul 2019 04:58:11 -0700 (PDT) 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:content-transfer-encoding; bh=8BogZbqP3R80fB7AlTvCAG5t45Neo/pGqiO9GVcYGEA=; b=dCY0FXfsAfL8lBQ5n0g9QoQT08WDilAkmTOiscYTECDt/JWMA25cu8L/TTTGHvopHh Gw+JQ/awjrSvYxR7kpa9DcimdCCLSue5vCKOrfijL+oBjpViJ6G7mYgdUFXdewkHZiP0 DtdYYMViK89ZiAl/F9K4sggoPSufZhufI5iMI= 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:content-transfer-encoding; bh=8BogZbqP3R80fB7AlTvCAG5t45Neo/pGqiO9GVcYGEA=; b=HJPZc6ZWFKwBtmT6KSc+PMeflJ8lC+Tav3LFyfjHvkqQJ8VguyVb/6iCxZ9CQeP5qX RR/PzaYX01e4HVgh0D9wuh0air243YTVEBx9dZHOJCHPyY1zykiJwpmW01f4ui8ZD8Kq NMTRIAcgOhffmvjURxu/n7+gVfjwMPg9olHkQi9xbfCJx/eDvKQqFlGEdscTWEEe+eQY 4ss0qkjmX2l3DGFnZ605DIXCWxapGPQEU/U308z8hNPLBr+nal854W04O/nXBYFuBKVK ge3pLBQbKmG6FyzUYmRiKrOP1dKpEaN0pI/p9Dn+MtEdl29IFqPC/fwvsMZn8F42U+p1 3Ejw== X-Gm-Message-State: APjAAAW4r+/jcil9ifOakX12FVmzQJwI3TCy/6eB3vE5XwCmqeuYGAq1 Bm5VuJgrbCt4GjfErcxJCFOqf1dlJX+feQ== X-Google-Smtp-Source: APXvYqzi/lMPydWmL+MIuq9QKJi8XE0PaWpwrH1lbDt2EmfrI2Opfur3CY3dc51TAebfY0NAeOeTOA== X-Received: by 2002:a17:90a:8d09:: with SMTP id c9mr36387626pjo.131.1563278290740; Tue, 16 Jul 2019 04:58:10 -0700 (PDT) Received: from localhost.localdomain ([49.206.201.107]) by smtp.gmail.com with ESMTPSA id z24sm36269566pfr.51.2019.07.16.04.58.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Jul 2019 04:58:10 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , YouMin Chen , u-boot@lists.denx.de Subject: [PATCH v3 04/57] ram: rk3399: Add chipinfo macro Date: Tue, 16 Jul 2019 17:26:52 +0530 Message-Id: <20190716115745.12585-5-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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190716_045812_169725_CC91B2EF X-CRM114-Status: UNSURE ( 9.90 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-rockchip@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Upstream kernel work for Rockchip platforms List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-rockchip@lists.infradead.org, gajjar04akash@gmail.com, linux-amarula@amarulasolutions.com, Jagan Teki , Manivannan Sadhasivam Sender: "Linux-rockchip" Errors-To: linux-rockchip-bounces+patchwork-linux-rockchip=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP Add simplified and meaningful macro for chip info. 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 | 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 e5af3eab7e..2d0be920d9 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h @@ -73,6 +73,7 @@ struct sdram_base_params { #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_CHINFO(ch) (1 << SYS_REG_CHINFO_SHIFT(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) << \ SYS_REG_NUM_CH_SHIFT) diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index d97efb6996..874e896369 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -1090,7 +1090,7 @@ static void dram_all_config(struct dram_info *dram, continue; idx++; sys_reg |= SYS_REG_ENC_ROW_3_4(info->cap_info.row_3_4, channel); - sys_reg |= 1 << SYS_REG_CHINFO_SHIFT(channel); + sys_reg |= SYS_REG_ENC_CHINFO(channel); sys_reg |= (info->cap_info.rank - 1) << SYS_REG_RANK_SHIFT(channel); sys_reg |= (info->cap_info.col - 9) <<