From patchwork Sun Feb 6 13:58:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krzysztof Kozlowski X-Patchwork-Id: 12736555 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 7B2F0C433EF for ; Sun, 6 Feb 2022 14:01:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type: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:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=pr4QmpqNq9Eh9IlNfWtVPMYT9GTAVayomqjIsTEnAT8=; b=pqL/uZGOMJN8h6 uERluWRYLes789WINq4+eij6BqqwcTmIn3uQZ1fsjDLrFruZuhDFqnfSVa5ZnpWkKIw5i45MO+0pZ n4iQDfYv5VU3aJE3TYRA54fkYzT3B466schOawgwCCbCpf+WLQflLAnCtuqchT69Ag86rAUJ7zFHx nYUXQV9SQSO/vMJl26bcSCm29HVkCmiWj1ic/575LpFPsiXqlud5EvJAC/XcqdMmZbz5XrkYMPmWS /6OpmD4Dc/1h/C5qo3FUimHuz3dzkJa+ZqTIlK7SR2/u0eAxA+DCCdhFtz+ORqwHoRthrCVakEHHA IQReyGDF4SEWZ0+kwNtA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1nGi5I-008GLy-BP; Sun, 06 Feb 2022 14:00:08 +0000 Received: from smtp-relay-internal-1.canonical.com ([185.125.188.123]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1nGi3b-008FIz-9B for linux-arm-kernel@lists.infradead.org; Sun, 06 Feb 2022 13:58:25 +0000 Received: from mail-wm1-f72.google.com (mail-wm1-f72.google.com [209.85.128.72]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 96228402D7 for ; Sun, 6 Feb 2022 13:58:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1644155901; bh=SAhW/a84WS23pzYvstDyhGEwqpxke2RgUd70WOPmdjA=; h=From:To:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=anYClgjmCc8fCdLyIHIcrcZAS3QKJqxpqZI3Ws26kqGwNqJTY6IARq6Mh8QXNbGqN JJFY3Fry/eb0qC0GNup9HtlWfSbJqHHNOzBKVp/VCIxuKgmSXe/4CV9fZP5ufqtTo+ leX661KymSiNf1UANNBU3mTZ40yEX/AOQE93J6A8JJnYfyPIQoRh0nGCTcCd+riBcq wu06Av62vLMEvhBBchsty319gIJ4o7d+l7etehcf/cDHzIu5X/XLXyBq4TQcd+ken/ VrunzQ2cDpptMHP+DE4LFFP1aJbQ/YESrI6iF+nBIvNn++XnyZ6FBHozQsHwE4VtHQ oxIszmmq3vhZw== Received: by mail-wm1-f72.google.com with SMTP id n3-20020a05600c294300b0037bc685b717so156214wmd.8 for ; Sun, 06 Feb 2022 05:58:21 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=SAhW/a84WS23pzYvstDyhGEwqpxke2RgUd70WOPmdjA=; b=MMmYeU4NVjkJoqRFKPUu+eKs7ZtfjbSf0Wh7gHNUbvrzFFZC6f44QPQzDGxJV8u6cn 3V8cN1U/YeC02VMBhyOhDfdVMgk/nX977UDXzqY//YDxo4alFxU2fAN2oM6nCaH8upIa lcX5XoG6+xGQFQLs9cNe9kyGfa9i9y/s8UpYi/VOkNnh2Y0dethLmrSqnIv+yXrfq2qm 9OQZmCS2d23rRPqnwFavJwHIPJQVdZREc3SOhW9tr16m8bcx1TXz4FwcgyaQe3wKSYno eGlIW4yFdH6nUv26VAuQPS733bwYB6gPPxVd6OOpx5D80TTOyHxf9SJXim/r7oZlxAZB 8Y4A== X-Gm-Message-State: AOAM532OccAT4F6UwwdEIVh/s/OUsup8eynq67mGNSMNx2NZtCS3xYCv 3In3eTrDZgWc6sbwrQ2h8HDvJUZdW2jhHKP688HwO/jD79X1wGXZyX/GGy1PLc+8jXddUOcT2GR CDdwaCoB8PyL28XkpIS+x9oFoVCzRXzyHj1w8eadNEJO2PmuCAxMM X-Received: by 2002:a5d:5981:: with SMTP id n1mr6623853wri.354.1644155900208; Sun, 06 Feb 2022 05:58:20 -0800 (PST) X-Google-Smtp-Source: ABdhPJytvwW46TDkRhn6fTvRn7j0B7m4/zg+NDrjv6/9KG89d6habuNMjHscp6X1w/nZLrHXawIU3w== X-Received: by 2002:a5d:5981:: with SMTP id n1mr6623839wri.354.1644155900042; Sun, 06 Feb 2022 05:58:20 -0800 (PST) Received: from localhost.localdomain (xdsl-188-155-168-84.adslplus.ch. [188.155.168.84]) by smtp.gmail.com with ESMTPSA id e9sm8296888wrg.60.2022.02.06.05.58.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 06 Feb 2022 05:58:19 -0800 (PST) From: Krzysztof Kozlowski To: Krzysztof Kozlowski , Rob Herring , Lukasz Luba , Alim Akhtar , Dmitry Osipenko , linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-pm@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 7/8] memory: of: parse max-freq property Date: Sun, 6 Feb 2022 14:58:06 +0100 Message-Id: <20220206135807.211767-8-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20220206135807.211767-1-krzysztof.kozlowski@canonical.com> References: <20220206135807.211767-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220206_055823_477323_B5333438 X-CRM114-Status: GOOD ( 12.77 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Passing the memory timings maximum frequency as an unit address was a workaround and instead 'max-freq' is preferred. Look for 'max-freq' first and then fallback to 'reg'. Signed-off-by: Krzysztof Kozlowski Reviewed-by: Dmitry Osipenko Reviewed-by: Alim Akhtar --- drivers/memory/of_memory.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/memory/of_memory.c b/drivers/memory/of_memory.c index b94408954d85..bac5c7f34936 100644 --- a/drivers/memory/of_memory.c +++ b/drivers/memory/of_memory.c @@ -212,8 +212,10 @@ static int of_lpddr3_do_get_timings(struct device_node *np, { int ret; - /* The 'reg' param required since DT has changed, used as 'max-freq' */ - ret = of_property_read_u32(np, "reg", &tim->max_freq); + ret = of_property_read_u32(np, "max-freq", &tim->max_freq); + if (ret) + /* Deprecated way of passing max-freq as 'reg' */ + ret = of_property_read_u32(np, "reg", &tim->max_freq); ret |= of_property_read_u32(np, "min-freq", &tim->min_freq); ret |= of_property_read_u32(np, "tRFC", &tim->tRFC); ret |= of_property_read_u32(np, "tRRD", &tim->tRRD);