From patchwork Tue Jun 11 14:50:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jagan Teki X-Patchwork-Id: 464 Return-Path: X-Original-To: linux-amarula@patchwork.amarulasolutions.com Delivered-To: linux-amarula@patchwork.amarulasolutions.com Received: from mail-pf1-f198.google.com (mail-pf1-f198.google.com [209.85.210.198]) by ganimede.amarulasolutions.com (Postfix) with ESMTPS id 3479B3F08F for ; Tue, 11 Jun 2019 16:52:46 +0200 (CEST) Received: by mail-pf1-f198.google.com with SMTP id f1sf9775759pfb.0 for ; Tue, 11 Jun 2019 07:52:46 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1560264765; cv=pass; d=google.com; s=arc-20160816; b=zeAH12h7sUQGvnFLI1/XAY5QdouWNXFsun9Fb2jen+dqgOaPwzWJv7gvvWjiGJNt63 rRmkGSOQdlhLRJEzLh04czzZHb7z6jOu5iIdFJjv9y7JgovXQ9D/o2dBM0n16jCLePq6 +MEioZeU3qnzi4bQUFzQtIuR0vlj3TsQG7AlZM8H90iXgy7pC3O2z4j5tEH8IlKhOwAr K48BKOUQr7/qFM/eQgYGJ9CXjdNdbrt+kZ/4eYLV6TCAOiUCHvMlMP2qCg58zWMi2zyI Q5SpjPczxmxyHnqJzjb+oQrnsLu6ssVNLWPHehu/3kik/5gBHnsKCb3YiUqVHiQp9U4b 2GvQ== 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=TE39HXilHAqr4VXxNOk6Oz9IW8feLbHxFQa9Ht64Rd4=; b=c6+14ej1f4h/urLugfVpZuvDigyel5b25bn1+FmXI/flRvXUDmD6ryJ3frlRSvqmk/ RRYW7IBdQY53qCikDSCzUqORiTCNDCbpVyMYdM48ovSR6hJoX4G4s+cHuRO7ZzjHj9o2 e8zPiB6jfVgTSS1HvGdXOUpUnBpVXcoF2KmLEAbmmf9Ffq+quE0KhGe04POaHNbuQMlc caGNdlRlMrlGjPC/fKP1wlrYN/Mo8eH2zWFFhriLN5gECEsldW0lC8DmoAbNYtvshCfQ glCSt6dGEradSuj7upDEgCNNHQo2iBr7Y28KWi1Qcytv6q9siC3rvkMj0Lxt+oKnzSIv ZOeQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ASLb+1BI; 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=TE39HXilHAqr4VXxNOk6Oz9IW8feLbHxFQa9Ht64Rd4=; b=JUe2V0yWSc1HD6wDZ5WotzP8raWNi4D07vMJG3qB3ikJKozXkADp2E+dgd4Ks2P2xq T7ntgr9bTI4duj8nlZKEg2KCDJtQjdh7vhNmvBE3CviiWMS+33EAyZeYAfaoEdpLhcuU AE4+DRIdHj6yqO0z3b2UJ00eZZSjWGBAkpUY0= 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=TE39HXilHAqr4VXxNOk6Oz9IW8feLbHxFQa9Ht64Rd4=; b=bD5GRaYY/uwGv92w+nrPUfPmh2go4sZ81I174H72sOsbYIaw+Of/XNdzhbXJxqECmO YcGky1Y81OqfO9FrvImx5tdWyEjOby4v22i3VhOJq8FVpuOVaAzhpXXzKY1wlyKcM364 Mle/kN1eF3vU5RQ8qaBFzZNaxGP7+hNE7S+W7UPePM30Rl7F9FE4/kqaeeasaDcodrbq IHmZA4CDtoKvfVZXQbzzhMuY9JxwEPX7Dcg4j+p8Y28jr1TEvwB96YA/xauG6vF/XbVG jyJt0nQH/wU35SX9CcvIf5NldwFnnhdSEsZu4r/5GwTPcKB8o/0i/9mqLhhpAB5GK6Jx xuww== X-Gm-Message-State: APjAAAUk64l+NxrpEXJ3Od/s7w+raIkYw0+B+75wXcJGQOBeI5aZzxoQ ETz26fBLurIO+UqMEwxqGH7MXnkY X-Google-Smtp-Source: APXvYqy30tu6qxZFQJyh/aeuehO89wmgBFYV1f65E4sT7E3ehMgDugnXxj9pG05hUuEXi1v5beceDg== X-Received: by 2002:a63:2b92:: with SMTP id r140mr20926060pgr.363.1560264764341; Tue, 11 Jun 2019 07:52:44 -0700 (PDT) X-BeenThere: linux-amarula@amarulasolutions.com Received: by 2002:a63:2a57:: with SMTP id q84ls4512082pgq.15.gmail; Tue, 11 Jun 2019 07:52:44 -0700 (PDT) X-Received: by 2002:a62:198e:: with SMTP id 136mr77823823pfz.180.1560264763979; Tue, 11 Jun 2019 07:52:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1560264763; cv=none; d=google.com; s=arc-20160816; b=O9fBi+Z+gfd7KoKxDVzJXoX/woY1F9XZbHkRssqJvOfvIihYeurdoQyI2OnadkngFy ss0hVjF4ZgNVG4yEBR91NSIIYsqH8CCDVb6n9Tua+3opSnz7pZ8zTUuSQ9OTKh1Nginm pny+MiqQjmJII5d1U4QxZ3LCSP/cmP4TpqBk3wwZgELIMXGeoeXAsifsfl3Jg4MmqFFy JqttiXCzw/RIMaISex8fpmYphH/HA3GQxz0YtG+0QJEsTgFS7rP/BNLREbTjjTlrsbGE n6HBBUDanid3CesNTBNLgyd/h59N7c4vv8jmhvBmyneuU5sz4wR3PBUtzC+y2NJzW8Ih Wrnw== 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=IHluQoWa4h42xR+txLhRcp64NWWrhw7tiyZPWbXNKb0=; b=IbnVmO35T06z+NjGzhcyAGO5NefY+iYQxqmm0AMJBimI+lO6XtTFaPNeV5yWeWBVDJ kLRdaHATx3m6kQ6WtTnKLcaS5jwtP8YIjStqzwm1u1LgIBPcUqRQkTgT9VZIE3FQoXnc SAEJYcXjfXE1v6nC3A5K8FonenDpS9iABKDROFFDCWlF1edh0ZBwaDNP8fJ3O/BqBHyM n3/LU5ctfql5CdEe6NeHtEOsdfeNRpn2SiqPI8bAVPrTj2wU8gMSJl6QGU1MFjhS12D0 txzKrsB28l8EPgV+lp9zyR39qY+TLd75AvKEK5I7TPsyTdwJMzYW0PX58YSPtca7JLti 1G5A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@amarulasolutions.com header.s=google header.b=ASLb+1BI; 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 61sor8411854plb.56.2019.06.11.07.52.43 for (Google Transport Security); Tue, 11 Jun 2019 07:52:43 -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:a98b:: with SMTP id bh11mr50050749plb.8.1560264763691; Tue, 11 Jun 2019 07:52:43 -0700 (PDT) Received: from localhost.localdomain ([115.97.180.18]) by smtp.gmail.com with ESMTPSA id e9sm16206208pfn.154.2019.06.11.07.52.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Jun 2019 07:52:43 -0700 (PDT) From: Jagan Teki To: Simon Glass , Philipp Tomsich , Kever Yang , YouMin Chen , u-boot@lists.denx.de Cc: gajjar04akash@gmail.com, linux-rockchip@lists.infradead.org, linux-amarula@amarulasolutions.com, Jagan Teki Subject: [PATCH 13/92] ram: rk3399: Add chipinfo macro Date: Tue, 11 Jun 2019 20:20:16 +0530 Message-Id: <20190611145135.21399-14-jagan@amarulasolutions.com> X-Mailer: git-send-email 2.18.0.321.gffc6fa0e3 In-Reply-To: <20190611145135.21399-1-jagan@amarulasolutions.com> References: <20190611145135.21399-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=ASLb+1BI; 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 chip info. 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 49a5d14821..68ae8e8371 100644 --- a/arch/arm/include/asm/arch-rockchip/sdram_common.h +++ b/arch/arm/include/asm/arch-rockchip/sdram_common.h @@ -35,6 +35,7 @@ #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) << 13) #define SYS_REG_ENC_NUM_CH(n) (((n) - 1) << 12) #define SYS_REG_RANK_SHIFT(ch) (11 + (ch) * 16) diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c index 0a7137784e..0feb5d1e10 100644 --- a/drivers/ram/rockchip/sdram_rk3399.c +++ b/drivers/ram/rockchip/sdram_rk3399.c @@ -1022,7 +1022,7 @@ static void dram_all_config(struct dram_info *dram, continue; idx++; sys_reg |= SYS_REG_ENC_ROW_3_4(info->row_3_4, channel); - sys_reg |= 1 << SYS_REG_CHINFO_SHIFT(channel); + sys_reg |= SYS_REG_ENC_CHINFO(channel); sys_reg |= (info->rank - 1) << SYS_REG_RANK_SHIFT(channel); sys_reg |= (info->col - 9) << SYS_REG_COL_SHIFT(channel); sys_reg |= info->bk == 3 ? 0 : 1 << SYS_REG_BK_SHIFT(channel);