From patchwork Mon Nov 18 20:02:36 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 11251099 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 E6C556C1 for ; Tue, 19 Nov 2019 08:06:45 +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 CF1BC222C7 for ; Tue, 19 Nov 2019 08:06:45 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org CF1BC222C7 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 232496EBAC; Tue, 19 Nov 2019 08:04:48 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x142.google.com (mail-lf1-x142.google.com [IPv6:2a00:1450:4864:20::142]) by gabe.freedesktop.org (Postfix) with ESMTPS id 48F3A6E827 for ; Mon, 18 Nov 2019 20:05:50 +0000 (UTC) Received: by mail-lf1-x142.google.com with SMTP id l28so5405946lfj.1 for ; Mon, 18 Nov 2019 12:05:50 -0800 (PST) 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=elZWeE6UcuQp3DEzgdQgaL5jKLTt+cOSPUtF3y9TNa4=; b=AKlLZZn3kicedVYpCfOpaGS/CJlqWvvGoVsqDWqB5UikODrmCItd0X/8ypGw429t5X gUDsz+N879l5NJ/WyWNrgGoJsiWlsrEMMc0RtOiTPrbwfLiRAUhm9JtwfusfwflGbeY+ CvblDiY9/VGd62I2q6XJx/Us01iOa8MUCdtPOBF8XnY5lTRuLOMuTL9gJRvO9RV+O78e /v6wtWS8AgpHLxr2h86hmP4bBOG5vCC0r9BUc1qsW9++NgRZH5dK+SBzfg35Kn6DcnRz 9WRXF8Nigz+5HzKHbZhVFf0VUERKVPIgrQyYV0Lehbw/58sWIh0aAJ+tMuqQYdt/eNGr ccWA== X-Gm-Message-State: APjAAAWmsbHpzbr92KjRwJ/wjrwjRmVg9STZd9mm16xbxOmuCyoo9wiy IkozgkH5EsKthdT4ZJp3tVg= X-Google-Smtp-Source: APXvYqzeJRAE++Yzki9UJ98MMjtqUsLFff7ZYuUVv6qYq5NYvloMtXahcKAZxpKSThtQeJfpU/MEiQ== X-Received: by 2002:ac2:4a8a:: with SMTP id l10mr816734lfp.185.1574107548766; Mon, 18 Nov 2019 12:05:48 -0800 (PST) Received: from localhost.localdomain (79-139-233-37.dynamic.spd-mgts.ru. [79.139.233.37]) by smtp.gmail.com with ESMTPSA id j23sm9166942lji.41.2019.11.18.12.05.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Nov 2019 12:05:48 -0800 (PST) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , Peter De Schrijver , Mikko Perttunen , Georgi Djakov , Rob Herring Subject: [PATCH v1 18/29] memory: tegra20-emc: Continue probing if timings/IRQ are missing in device-tree Date: Mon, 18 Nov 2019 23:02:36 +0300 Message-Id: <20191118200247.3567-19-digetx@gmail.com> X-Mailer: git-send-email 2.23.0 In-Reply-To: <20191118200247.3567-1-digetx@gmail.com> References: <20191118200247.3567-1-digetx@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Tue, 19 Nov 2019 08:04:07 +0000 X-Mailman-Original-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=elZWeE6UcuQp3DEzgdQgaL5jKLTt+cOSPUtF3y9TNa4=; b=bdAg91BC7ySUYH4sCX/GvLhlH61/SVZBlLXA+AgeAWMbPzQ0WUMiXN1C//dc774oBe 0RlnlfFVzOCWhVgpOc+W+vMK7nCmF2auinzsygXORlxIe+MuqtgczrPzZFcLBKF/jBhI HJbogqZbGxbFOyC7nh+PyQ7MVpKLwSyMMyPDEp70t8veTacmaBkmisXAxE8RoyxHGacD iaKBk8MiKcCilSx09+6ya9laXjQC/RTYtiBFth/R22JjINQzQ3y/DXv/5SpAfY1UH78o ROHWKltjPZ7/jkhz1vUYzS3LOyaBksnJ+EY9/lg5nuzvGw5QaWIoZRCwN9eTZ2ZSw5WU usfg== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: linux-tegra@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-pm@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" EMC driver will become mandatory after making it interconnect provider because interconnect users like display controller driver will fail to probe using newer device-trees that have interconnect properties. Thus make driver to probe even if timings or IRQ are missing in device-tree, the frequency scaling won't be available in this case because there will be only one frequency available, the frequency that is left from bootloader. Signed-off-by: Dmitry Osipenko --- drivers/memory/tegra/tegra20-emc.c | 61 +++++++++++++++--------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/drivers/memory/tegra/tegra20-emc.c b/drivers/memory/tegra/tegra20-emc.c index d2efd0c658c0..28bd9fd4c3c9 100644 --- a/drivers/memory/tegra/tegra20-emc.c +++ b/drivers/memory/tegra/tegra20-emc.c @@ -381,6 +381,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); @@ -449,6 +454,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++) { @@ -484,38 +492,21 @@ 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"); - dev_err(&pdev->dev, "please update your device tree\n"); - 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; - } init_completion(&emc->clk_handshake_complete); 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)) @@ -525,11 +516,21 @@ static int tegra_emc_probe(struct platform_device *pdev) if (err) return err; - err = devm_request_irq(&pdev->dev, irq, tegra_emc_isr, 0, - dev_name(&pdev->dev), emc); - if (err) { - dev_err(&pdev->dev, "failed to request IRQ#%u: %d\n", irq, err); - return err; + irq = platform_get_irq(pdev, 0); + if (irq < 0) { + dev_err(&pdev->dev, "interrupt not specified\n"); + dev_err(&pdev->dev, "please update your device tree\n"); + dev_err(&pdev->dev, "frequency scaling disabled\n"); + + emc->num_timings = 0; + } else { + err = devm_request_irq(&pdev->dev, irq, tegra_emc_isr, 0, + dev_name(&pdev->dev), emc); + if (err) { + dev_err(&pdev->dev, "failed to request IRQ#%u: %d\n", + irq, err); + return err; + } } tegra20_clk_set_emc_round_callback(emc_round_rate, emc);