From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 5D0ACC4332F for ; Sun, 11 Dec 2022 16:33:51 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 14ED6853C6; Sun, 11 Dec 2022 17:32:59 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Ul6Bgti5"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id C5649853A7; Sun, 11 Dec 2022 17:32:50 +0100 (CET) Received: from mail-ej1-x633.google.com (mail-ej1-x633.google.com [IPv6:2a00:1450:4864:20::633]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 0D813853AA for ; Sun, 11 Dec 2022 17:32:46 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=jernej.skrabec@gmail.com Received: by mail-ej1-x633.google.com with SMTP id b2so22452832eja.7 for ; Sun, 11 Dec 2022 08:32:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lTjQVvi3mgJdiqOCFVldvpGTRZfEKwM5ojPkfkiJAmw=; b=Ul6Bgti5T4lIZnGOvEm5XuruXCVZoG11eFN+3VzaR0UCdi2IoIYkYVBk02dTgT4MdD 9zlEHZ0UKcw3shaTZI22kc/H2kI5H+0874L3bMoerBYS+he9zhweajtCuoeUiiAoVo0t r1tnzJ4DuL0t7U1oYWP9nnlfhfUP8PKZ9AJ5srAWNAquUmzrjVZPFyPgy0p4vVrspjFc kGfL3OPXITa7FXwZ6ZbSL9cxbGUKN26NhmZRBDrrNE8Jhj4LRWteKazORJ5m22RNDsgU iMyHtyA7gL7gqg7QZt4aIw/o78PKS3dnmcqK7NyrKeNb2OLjCdV/h4e8Lwp+pxefFJr8 iyeQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lTjQVvi3mgJdiqOCFVldvpGTRZfEKwM5ojPkfkiJAmw=; b=yRDhW4o6J4GEP0+Q5iOGMtMk9j/kXHqSe567CG7asLt5YP8RrfjPMBN2gai2vqe+AO URqyNjA0fWm/iOoivupPhYs7hrRmx0XSf0ZLjEF0KXl02bXQJMf3X7XTlE7Gcjw5n+Zw NiYntIFaVjoWCN+xudPF4nJRXu2L9hpq55/zW680r4dZ1r6KV/Z2V1Zal+MXkETpTnzP R8VuAtZlnUWQRNcE5kN/kgzoPx4NFvypjmtsC18fqfUrjG7hYQ1hQtodhIWHbu759xsn aBYHjuK+XhLsM69tH7vdyso0Rb9CqKAagyfBwWQzgvxtrunHiSF8N34ZJJ5VxNsKFQ5e F5Rw== X-Gm-Message-State: ANoB5plltdAAI+CoLO22MlF1m2S8a+8Yk5fPMgELZT37n7cnvejo+LkX A/7J/YidPKCuq9Fqs51C2ijrNQTGAIY= X-Google-Smtp-Source: AA0mqf4ltTnUXuNnX5w/H3rH0K8Oyp+9a/TAvJ9j5UtuKO9Kbn/CyMndoW4SWiS3X9rCubLbCCpvXQ== X-Received: by 2002:a17:906:4e8e:b0:7c1:458b:a946 with SMTP id v14-20020a1709064e8e00b007c1458ba946mr7112242eju.0.1670776365571; Sun, 11 Dec 2022 08:32:45 -0800 (PST) Received: from localhost.localdomain (82-149-19-102.dynamic.telemach.net. [82.149.19.102]) by smtp.gmail.com with ESMTPSA id qu27-20020a170907111b00b007c0d41736c0sm2243564ejb.39.2022.12.11.08.32.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 11 Dec 2022 08:32:45 -0800 (PST) From: Jernej Skrabec To: andre.przywara@arm.com, jagan@amarulasolutions.com Cc: u-boot@lists.denx.de, Jernej Skrabec Subject: [PATCH 5/8] sunxi: Always configure ODT on H616 DRAM Date: Sun, 11 Dec 2022 17:32:10 +0100 Message-Id: <20221211163213.98540-6-jernej.skrabec@gmail.com> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221211163213.98540-1-jernej.skrabec@gmail.com> References: <20221211163213.98540-1-jernej.skrabec@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean Vendor H616 DRAM code always configure part which we call ODT configuration. Let's reflect that here too. Signed-off-by: Jernej Skrabec --- arch/arm/mach-sunxi/Kconfig | 2 +- arch/arm/mach-sunxi/dram_sun50i_h616.c | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig index abcbd0fb9061..778304b77e26 100644 --- a/arch/arm/mach-sunxi/Kconfig +++ b/arch/arm/mach-sunxi/Kconfig @@ -488,12 +488,12 @@ config DRAM_ZQ config DRAM_ODT_EN bool "sunxi dram odt enable" + depends on !MACH_SUN50I_H616 default y if MACH_SUN8I_A23 default y if MACH_SUNXI_H3_H5 default y if MACH_SUN8I_R40 default y if MACH_SUN50I default y if MACH_SUN50I_H6 - default y if MACH_SUN50I_H616 ---help--- Select this to enable dram odt (on die termination). diff --git a/arch/arm/mach-sunxi/dram_sun50i_h616.c b/arch/arm/mach-sunxi/dram_sun50i_h616.c index 14a01a3c4e54..bf5b4ddfb5c2 100644 --- a/arch/arm/mach-sunxi/dram_sun50i_h616.c +++ b/arch/arm/mach-sunxi/dram_sun50i_h616.c @@ -736,8 +736,7 @@ static bool mctl_phy_init(struct dram_para *para) writel(0x80, SUNXI_DRAM_PHY0_BASE + 0x3dc); writel(0x80, SUNXI_DRAM_PHY0_BASE + 0x45c); - if (IS_ENABLED(CONFIG_DRAM_ODT_EN)) - mctl_phy_configure_odt(para); + mctl_phy_configure_odt(para); clrsetbits_le32(SUNXI_DRAM_PHY0_BASE + 4, 7, 0xa); -- 2.38.1