From patchwork Sun Jun 7 18:55:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 11592047 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F37EB13B1 for ; Sun, 7 Jun 2020 19:13:44 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D10A4206D5 for ; Sun, 7 Jun 2020 19:13:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="mMCbq5ZD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org D10A4206D5 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CD3806E3AA; Sun, 7 Jun 2020 19:13:03 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by gabe.freedesktop.org (Postfix) with ESMTPS id 975356E392 for ; Sun, 7 Jun 2020 18:57:51 +0000 (UTC) Received: by mail-lj1-x243.google.com with SMTP id z9so17737779ljh.13 for ; Sun, 07 Jun 2020 11:57:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=udNeen0ssD3fcWOv0b71XhfmKyQZQt4wAjykvZdMbYc=; b=mMCbq5ZDBmUQVzGo6jXjAMGCRnYqZ4TGBQlJC6QjMCJWvUiyQTfE5IZzMoJD9y7mRP 3rOIE9J8QBY1SfcVSqG6SCu+yl7+xqHB5AwhrOOUbzxVL/i4rDOwve48OGhCGqNwdeCI veub+G4fEIGZx2C6CAuHONwCZbYBiToVBnTgcfHvhRYY12goWyrvwXpWoP2XHPAM7Fq2 ETwiqBIzeXFR7Km1WwyWGKvWuP/SOPBwUZj/z4iiknRBt+Iq0847gDqrIX6/G6ZTHqL2 1ZWZVdkyZcQ4rOYre8uoJ2/zXcnpq4nEnMiXAKx8KbkuXkYMTFYlVAC1CWhM3mybvu8j CCOA== 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=udNeen0ssD3fcWOv0b71XhfmKyQZQt4wAjykvZdMbYc=; b=sA0DNbO66UUDZAZxJtmYPO1J7H/wp21DauCKsFuekT+MnEVhIVCnchsjWTh44Mz7z8 rvel/47gKdAwYQIegKyZYgT01qn6V3NYFyrKiJ9wDR5ddCWZbOE6PVOQ/0xj3XLrlGCK aSPs9mhWdtYeT42c4ykdb3YUIIC3uqomobD7SxZmf+H74ciR7vcfTtbwl5l6iOEVVcfh tlQFycxzb1XUXqi9B/kInvkNdMtCHfdk+fGE/zBDrRu42ZG19LGxV62ok+SNy7YWAaJW MmpwXodW2yjVQZiqVHruYTgaxeqjIsuNUyCBXQ+zvQp353Dk5fb2Ot3djmQv9z3DkmIq cFqQ== X-Gm-Message-State: AOAM533+vDnLl/n+MUAxLiU1t/Bk4ISk4q4QVTZZ5fu6ZpEQA/eP6HTY 5TOtpM8+w7zVpLPlEwK0aFo= X-Google-Smtp-Source: ABdhPJz0L4FkfrZB8WfqX+H2+IfrueRlzOv2rQYR4IWaKbNTrN5C8Lviz3xUu5O4MDQrfxi1Hj0t+g== X-Received: by 2002:a2e:6f13:: with SMTP id k19mr10268625ljc.364.1591556270092; Sun, 07 Jun 2020 11:57:50 -0700 (PDT) Received: from localhost.localdomain (79-139-237-54.dynamic.spd-mgts.ru. [79.139.237.54]) by smtp.gmail.com with ESMTPSA id e21sm3650953ljb.135.2020.06.07.11.57.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Jun 2020 11:57:49 -0700 (PDT) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , Georgi Djakov , Rob Herring , Michael Turquette , Stephen Boyd , Peter De Schrijver , MyungJoo Ham , Kyungmin Park , Chanwoo Choi , Mikko Perttunen Subject: [PATCH v3 30/39] memory: tegra20-emc: Continue probing if timings are missing in device-tree Date: Sun, 7 Jun 2020 21:55:21 +0300 Message-Id: <20200607185530.18113-31-digetx@gmail.com> X-Mailer: git-send-email 2.26.0 In-Reply-To: <20200607185530.18113-1-digetx@gmail.com> References: <20200607185530.18113-1-digetx@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Sun, 07 Jun 2020 19:13:00 +0000 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, =?utf-8?b?QXJ0dXIgxZp3aWdvxYQ=?= , linux-tegra@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" EMC driver will become mandatory after turning it into interconnect provider because interconnect users, like display controller driver, will fail to probe using newer device-trees that have interconnect properties. Thus make EMC driver to probe even if timings are missing in device-tree. Signed-off-by: Dmitry Osipenko --- drivers/memory/tegra/tegra20-emc.c | 34 ++++++++++++++---------------- 1 file changed, 16 insertions(+), 18 deletions(-) diff --git a/drivers/memory/tegra/tegra20-emc.c b/drivers/memory/tegra/tegra20-emc.c index 79fdae042b57..8d1967f4b4aa 100644 --- a/drivers/memory/tegra/tegra20-emc.c +++ b/drivers/memory/tegra/tegra20-emc.c @@ -386,6 +386,11 @@ tegra_emc_find_node_by_ram_code(struct device *dev) u32 value, ram_code; int err; + if (of_get_child_count(dev->of_node) == 0) { + dev_info(dev, "device-tree doesn't have memory timings\n"); + return NULL; + } + if (!of_property_read_bool(dev->of_node, "nvidia,use-ram-code")) return of_node_get(dev->of_node); @@ -454,6 +459,9 @@ static long emc_round_rate(unsigned long rate, struct tegra_emc *emc = arg; unsigned int i; + if (!emc->num_timings) + return clk_get_rate(emc->clk); + min_rate = min(min_rate, emc->timings[emc->num_timings - 1].rate); for (i = 0; i < emc->num_timings; i++) { @@ -691,13 +699,6 @@ static int tegra_emc_probe(struct platform_device *pdev) struct tegra_emc *emc; int irq, err; - /* driver has nothing to do in a case of memory timing absence */ - if (of_get_child_count(pdev->dev.of_node) == 0) { - dev_info(&pdev->dev, - "EMC device tree node doesn't have memory timings\n"); - return 0; - } - irq = platform_get_irq(pdev, 0); if (irq < 0) { dev_err(&pdev->dev, "interrupt not specified\n"); @@ -705,23 +706,20 @@ static int tegra_emc_probe(struct platform_device *pdev) return irq; } - np = tegra_emc_find_node_by_ram_code(&pdev->dev); - if (!np) - return -EINVAL; - emc = devm_kzalloc(&pdev->dev, sizeof(*emc), GFP_KERNEL); - if (!emc) { - of_node_put(np); + if (!emc) return -ENOMEM; - } emc->clk_nb.notifier_call = tegra_emc_clk_change_notify; emc->dev = &pdev->dev; - err = tegra_emc_load_timings_from_dt(emc, np); - of_node_put(np); - if (err) - return err; + np = tegra_emc_find_node_by_ram_code(&pdev->dev); + if (np) { + err = tegra_emc_load_timings_from_dt(emc, np); + of_node_put(np); + if (err) + return err; + } emc->regs = devm_platform_ioremap_resource(pdev, 0); if (IS_ERR(emc->regs))