From patchwork Fri Jan 15 14:01:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Osipenko X-Patchwork-Id: 364679 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.7 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH, MAILING_LIST_MULTI, SPF_HELO_NONE, SPF_PASS, USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 90981C433E0 for ; Fri, 15 Jan 2021 14:04:16 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (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 E169423884 for ; Fri, 15 Jan 2021 14:04:15 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E169423884 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=alsa-devel-bounces@alsa-project.org Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 0B1C417B5; Fri, 15 Jan 2021 15:03:21 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 0B1C417B5 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1610719451; bh=aF6A+s1j6Re9c6HUuFdCUeZSj2Yk0GN46w/f8tJ+4So=; h=From:To:Subject:Date:In-Reply-To:References:Cc:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:List-Subscribe: From; b=BEwvkPdNAmOYMebV85QemdMfxg+S4kJ90xOFr5a+5V8Yp4CKTkb1ejoPD3mocipWZ +vrUI0+ZgSxFfJpw7LtFoNai9eJx28vGiE7g93jSeslrhOFUMoW1d+3V0lppIv7XXJ Bq4hsXdQY12b9lTEselngH+G3RBcdsSL65kNkXxU= Received: from alsa1.perex.cz (localhost.localdomain [127.0.0.1]) by alsa1.perex.cz (Postfix) with ESMTP id 90299F8026D; Fri, 15 Jan 2021 15:02:35 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id A6199F80134; Fri, 15 Jan 2021 15:02:16 +0100 (CET) Received: from mail-lj1-x233.google.com (mail-lj1-x233.google.com [IPv6:2a00:1450:4864:20::233]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 437FFF801ED for ; Fri, 15 Jan 2021 15:02:06 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 437FFF801ED Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="CXksPrVB" Received: by mail-lj1-x233.google.com with SMTP id n11so10507389lji.5 for ; Fri, 15 Jan 2021 06:02:06 -0800 (PST) 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=Oos6t9KnWAkvLmqY7UEnRcS5qoHJdPePhQibi0JK0Fk=; b=CXksPrVBtpOPYasos+RFnMa8HIuUoHkEYbCEroNwYibR9bTJNtUvoRNrSzYu36DEn1 eao3RpbcqiV+JpkJts9mHFYWRTdQguJ2TNw9DzLD3PvGktuwFbmdbmRXd49m8PJQGXO3 FM0TugU1upHBWK69Vthxft5kLaxmsnJ288kwSQ8DtPCwwLn/FiJgAqlLq8MgDoFqqwB8 i+Puvq5kVi1HoasDq0YOLMQALDTMQls3ALPXMDTZEn2Pos1f+WnwaPgj7y+jFPCocEsN Y4zTzCroHWqsO+pu7H2kpWw3P0dZ7R/e9gRJ9EclaKA6a8dwkACQVLARM58Y/sV9kxS9 C26w== 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=Oos6t9KnWAkvLmqY7UEnRcS5qoHJdPePhQibi0JK0Fk=; b=RHM/29J6VY480ecvRetpRr46TCr4c0GZriJk4g623iW4+mfkB6yRYzdTgPYT7wu5jc iN+NhSku6kYvjzjCXRN/mGWRIc712QwAEA20Q3e51dZV9/Z9Kt7noBUpIG7nYpB5WBC1 7ZpkVg0POEInoj7xdtFQSJ0CH/IptU3lv+iCmyjXycNPsc47dRBTPok6RhMawwU2JyNc vJxgPapuu3d53f81YsywHysDwq8EvGQ6nBzHYlOsxNgUj3JnfVP9LnjXjAdCJ/AhpAC4 NvbOxbIzl77qUjAmrng0FBXa4HzV+rioyPtIZKZSJqdUtSmxz9GTMy9+piqnryIdjZ7P +VpA== X-Gm-Message-State: AOAM533wetNrCSrUv8KegnJhTZOxI6YGezV0xTmR5QWDccvR9KCmZZNJ zYYIDfWKl8b9oDAY+/iJFZg= X-Google-Smtp-Source: ABdhPJzKZFEU0dXZMmoXf0ObU514p9TyxmYrJ/j4GInoDGyRZKbcQvzng+BePBetQHLjGYAks7Dnag== X-Received: by 2002:a05:651c:1356:: with SMTP id j22mr5430362ljb.237.1610719326374; Fri, 15 Jan 2021 06:02:06 -0800 (PST) Received: from localhost.localdomain (109-252-192-57.dynamic.spd-mgts.ru. [109.252.192.57]) by smtp.gmail.com with ESMTPSA id f132sm906852lfd.252.2021.01.15.06.02.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Jan 2021 06:02:05 -0800 (PST) From: Dmitry Osipenko To: Thierry Reding , Jonathan Hunter , Sameer Pujar , Peter Geis , Nicolas Chauvet , Takashi Iwai , Jaroslav Kysela Subject: [PATCH v2 3/5] ASoC: tegra: ahub: Use of_reset_control_array_get_exclusive() Date: Fri, 15 Jan 2021 17:01:43 +0300 Message-Id: <20210115140145.10668-4-digetx@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210115140145.10668-1-digetx@gmail.com> References: <20210115140145.10668-1-digetx@gmail.com> MIME-Version: 1.0 Cc: linux-tegra@vger.kernel.org, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: "Alsa-devel" Some of resets are erroneously missed in the configlink_mods[], like APBIF for example. Use of_reset_control_array_get_exclusive() which requests all the resets. The problem was hidden by the clk driver which implicitly de-asserts the missing resets. Tested-by: Peter Geis Tested-by: Nicolas Chauvet Signed-off-by: Dmitry Osipenko --- sound/soc/tegra/tegra30_ahub.c | 66 +++++----------------------------- sound/soc/tegra/tegra30_ahub.h | 1 - 2 files changed, 9 insertions(+), 58 deletions(-) diff --git a/sound/soc/tegra/tegra30_ahub.c b/sound/soc/tegra/tegra30_ahub.c index 156e3b9d613c..8bd3e83b2c3b 100644 --- a/sound/soc/tegra/tegra30_ahub.c +++ b/sound/soc/tegra/tegra30_ahub.c @@ -323,41 +323,6 @@ int tegra30_ahub_unset_rx_cif_source(enum tegra30_ahub_rxcif rxcif) } EXPORT_SYMBOL_GPL(tegra30_ahub_unset_rx_cif_source); -#define MOD_LIST_MASK_TEGRA30 BIT(0) -#define MOD_LIST_MASK_TEGRA114 BIT(1) -#define MOD_LIST_MASK_TEGRA124 BIT(2) - -#define MOD_LIST_MASK_TEGRA30_OR_LATER \ - (MOD_LIST_MASK_TEGRA30 | MOD_LIST_MASK_TEGRA114 | \ - MOD_LIST_MASK_TEGRA124) -#define MOD_LIST_MASK_TEGRA114_OR_LATER \ - (MOD_LIST_MASK_TEGRA114 | MOD_LIST_MASK_TEGRA124) - -static const struct { - const char *rst_name; - u32 mod_list_mask; -} configlink_mods[] = { - { "i2s0", MOD_LIST_MASK_TEGRA30_OR_LATER }, - { "i2s1", MOD_LIST_MASK_TEGRA30_OR_LATER }, - { "i2s2", MOD_LIST_MASK_TEGRA30_OR_LATER }, - { "i2s3", MOD_LIST_MASK_TEGRA30_OR_LATER }, - { "i2s4", MOD_LIST_MASK_TEGRA30_OR_LATER }, - { "dam0", MOD_LIST_MASK_TEGRA30_OR_LATER }, - { "dam1", MOD_LIST_MASK_TEGRA30_OR_LATER }, - { "dam2", MOD_LIST_MASK_TEGRA30_OR_LATER }, - { "spdif", MOD_LIST_MASK_TEGRA30_OR_LATER }, - { "amx", MOD_LIST_MASK_TEGRA114_OR_LATER }, - { "adx", MOD_LIST_MASK_TEGRA114_OR_LATER }, - { "amx1", MOD_LIST_MASK_TEGRA124 }, - { "adx1", MOD_LIST_MASK_TEGRA124 }, - { "afc0", MOD_LIST_MASK_TEGRA124 }, - { "afc1", MOD_LIST_MASK_TEGRA124 }, - { "afc2", MOD_LIST_MASK_TEGRA124 }, - { "afc3", MOD_LIST_MASK_TEGRA124 }, - { "afc4", MOD_LIST_MASK_TEGRA124 }, - { "afc5", MOD_LIST_MASK_TEGRA124 }, -}; - #define LAST_REG(name) \ (TEGRA30_AHUB_##name + \ (TEGRA30_AHUB_##name##_STRIDE * TEGRA30_AHUB_##name##_COUNT) - 4) @@ -484,17 +449,14 @@ static const struct regmap_config tegra30_ahub_ahub_regmap_config = { }; static struct tegra30_ahub_soc_data soc_data_tegra30 = { - .mod_list_mask = MOD_LIST_MASK_TEGRA30, .set_audio_cif = tegra30_ahub_set_cif, }; static struct tegra30_ahub_soc_data soc_data_tegra114 = { - .mod_list_mask = MOD_LIST_MASK_TEGRA114, .set_audio_cif = tegra30_ahub_set_cif, }; static struct tegra30_ahub_soc_data soc_data_tegra124 = { - .mod_list_mask = MOD_LIST_MASK_TEGRA124, .set_audio_cif = tegra124_ahub_set_cif, }; @@ -510,7 +472,6 @@ static int tegra30_ahub_probe(struct platform_device *pdev) const struct of_device_id *match; const struct tegra30_ahub_soc_data *soc_data; struct reset_control *rst; - int i; struct resource *res0; void __iomem *regs_apbif, *regs_ahub; int ret = 0; @@ -528,26 +489,17 @@ static int tegra30_ahub_probe(struct platform_device *pdev) * operate correctly, all devices on this bus must be out of reset. * Ensure that here. */ - for (i = 0; i < ARRAY_SIZE(configlink_mods); i++) { - if (!(configlink_mods[i].mod_list_mask & - soc_data->mod_list_mask)) - continue; - - rst = reset_control_get_exclusive(&pdev->dev, - configlink_mods[i].rst_name); - if (IS_ERR(rst)) { - dev_err(&pdev->dev, "Can't get reset %s\n", - configlink_mods[i].rst_name); - ret = PTR_ERR(rst); - return ret; - } - - ret = reset_control_deassert(rst); - reset_control_put(rst); - if (ret) - return ret; + rst = of_reset_control_array_get_exclusive(pdev->dev.of_node); + if (IS_ERR(rst)) { + dev_err(&pdev->dev, "Can't get reset: %pe\n", rst); + return PTR_ERR(rst); } + ret = reset_control_deassert(rst); + reset_control_put(rst); + if (ret) + return ret; + ahub = devm_kzalloc(&pdev->dev, sizeof(struct tegra30_ahub), GFP_KERNEL); if (!ahub) diff --git a/sound/soc/tegra/tegra30_ahub.h b/sound/soc/tegra/tegra30_ahub.h index 6889c5f23d02..5a2500b4ea06 100644 --- a/sound/soc/tegra/tegra30_ahub.h +++ b/sound/soc/tegra/tegra30_ahub.h @@ -491,7 +491,6 @@ void tegra124_ahub_set_cif(struct regmap *regmap, unsigned int reg, struct tegra30_ahub_cif_conf *conf); struct tegra30_ahub_soc_data { - u32 mod_list_mask; void (*set_audio_cif)(struct regmap *regmap, unsigned int reg, struct tegra30_ahub_cif_conf *conf);