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 X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 A90BCC33CB1 for ; Thu, 16 Jan 2020 16:45:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7C5BC20663 for ; Thu, 16 Jan 2020 16:45:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579193152; bh=XE2klW2Xr95+dG2ep4W7epYAmE+ecpW6fcCc9rcxbBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iFRsCGBnjhQELEOVIY5EJYBGIGz/2H/3SKwifGKOOJlqfewiP3hal08LdY66jcjrz EsfoN5sj+9nQXQak9Q/Otn549iZ2EQskt5XzTfrcs+2QHBOPsrNC559Qrr3xmx7tXq h/NnSgg7M2jMkL39QKGUX6PclwWmf3VOyYVcTgyk= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729678AbgAPQpv (ORCPT ); Thu, 16 Jan 2020 11:45:51 -0500 Received: from mail.kernel.org ([198.145.29.99]:54782 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729652AbgAPQps (ORCPT ); Thu, 16 Jan 2020 11:45:48 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7A22920663; Thu, 16 Jan 2020 16:45:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579193147; bh=XE2klW2Xr95+dG2ep4W7epYAmE+ecpW6fcCc9rcxbBU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oQCZjiTiE6M8wGsqd+Km871d8geYdviEvQ2bWqdb5bCgBCK9FcdPLH6r9Vfuqf+Rn yh0oQrk3VbMrU4T+T7ho5Ydsadj94wU4z0holo5351flDWTPyleMUL2dN8l186ihQ2 DP43sY08nyK6Ewy2sDAxQTxyAVvdjKyjIDI4HeOs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Stephen Boyd , Venkata Narendra Kumar Gutta , Evan Green , Bjorn Andersson , Sasha Levin , linux-arm-msm@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 034/205] soc: qcom: llcc: Name regmaps to avoid collisions Date: Thu, 16 Jan 2020 11:40:09 -0500 Message-Id: <20200116164300.6705-34-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116164300.6705-1-sashal@kernel.org> References: <20200116164300.6705-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Stephen Boyd [ Upstream commit 2bfd3e7651addcaf48f12d4f11ea9d8fca6c3aa8 ] We'll end up with debugfs collisions if we don't give names to the regmaps created by this driver. Change the name of the config before registering it so we don't collide in debugfs. Fixes: 7f9c136216c7 ("soc: qcom: Add broadcast base for Last Level Cache Controller (LLCC)") Cc: Venkata Narendra Kumar Gutta Reviewed-by: Evan Green Signed-off-by: Stephen Boyd Signed-off-by: Bjorn Andersson Signed-off-by: Sasha Levin --- drivers/soc/qcom/llcc-slice.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/soc/qcom/llcc-slice.c b/drivers/soc/qcom/llcc-slice.c index 9090ea12eaf3..4a6111635f82 100644 --- a/drivers/soc/qcom/llcc-slice.c +++ b/drivers/soc/qcom/llcc-slice.c @@ -48,7 +48,7 @@ static struct llcc_drv_data *drv_data = (void *) -EPROBE_DEFER; -static const struct regmap_config llcc_regmap_config = { +static struct regmap_config llcc_regmap_config = { .reg_bits = 32, .reg_stride = 4, .val_bits = 32, @@ -323,6 +323,7 @@ static struct regmap *qcom_llcc_init_mmio(struct platform_device *pdev, if (IS_ERR(base)) return ERR_CAST(base); + llcc_regmap_config.name = name; return devm_regmap_init_mmio(&pdev->dev, base, &llcc_regmap_config); } -- 2.20.1