From patchwork Mon Jul 12 06:04:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 473008 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp2696850jao; Mon, 12 Jul 2021 00:45:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJymlC0oSRphq5rgdrxxUr3Syy8glMTTbVjm8O4pcD728anrcjkUAEutPN52hSAY+ZMNuim/ X-Received: by 2002:a05:6402:2552:: with SMTP id l18mr64364132edb.363.1626075832134; Mon, 12 Jul 2021 00:43:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626075832; cv=none; d=google.com; s=arc-20160816; b=K13ro9+Nq4uD373yvXcOlTqJGaIyuR7+FplOnavpuj6dB8OPNpn6odODzbZmi6g2Po tNiPllF+GHBRX+AhBvn2M5TgDc+LO/C/Lao3SrfnNWJmSPOEm4iK+tlBNovYEPUQ9Gg2 G2P286hoTykWJhyJuE0VXwLws8hzBCY0YDo9hp7JQL7SlAL6Wk+0B4DI6tp2QxhYPf0o ItzSxCjnqHum208cmoShuIMGWIQvhGMtNvG+4eRZpb9g9FByNVgnJH3f375yDl06W70w VbomJRNNI6P9mvjEO+ZIchHD0UCwUyNXu/Xp0YVx3phTleHwtSTgVXEo3z1+2WmUUuYM By7w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=91DeOV1FpWz/0PefoOqsL0r7KHRB7uh1GEwdin7ascw=; b=Yaut9Q3DeIu6NBReegtxSG1ZsAjdqu0KpAWBd6jQr1M4C2vs1MQCiWnw9yxWurunQ3 0W4DaEduVEpozWUODqxgFH5jqUfs1mlOri/g8sIGPrh/GLPxnrsdNh6vFlNeQNwVT3p3 cbf8v3DKL1A2pr59Yon3bV/YlDNVlDzP+RFnOVPVrbFfDApSIJ4bWZIDnioqgJpqUeNC pT17sk7sEE+BqcaRSqenJwXB++Vl2DgQxnoMqzmAQgXbYS87sB7xkLu9yiv1ccI5mY2n 1UkM4SG15CscAUGZdc5voJIAseJTNg1RzbmR0CV/8D7WguMwmkWtXpoYnEPpw82hnVa/ 1ZnQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sHZUQsyI; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id n21si13642925eda.13.2021.07.12.00.43.51; Mon, 12 Jul 2021 00:43:52 -0700 (PDT) Received-SPF: pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sHZUQsyI; spf=pass (google.com: domain of stable-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349577AbhGLHoS (ORCPT + 12 others); Mon, 12 Jul 2021 03:44:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:49838 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1349308AbhGLHlx (ORCPT ); Mon, 12 Jul 2021 03:41:53 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id D65F760724; Mon, 12 Jul 2021 07:39:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1626075544; bh=1O+RB0jGz8d34aGUcynhQQb25IT28EtM/dWmHEG+1f8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sHZUQsyID3ZjzLCSCqqItHqBLmKhPstSTG7ElNcoxY295Zdd7zgvHtnqVuzmvmOX5 ng555So43Q7uVWk8OFPh4WxPSd+gl+mkZlwjBlp6rXmlCWuLEqPLx8nBn5EO7BCQoS QXFKqqp1Ot/4/b/1jRwL5rJCLG1C6pVDjVdKQB8s= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Shawn Guo , Bjorn Andersson , Jassi Brar , Sasha Levin Subject: [PATCH 5.13 260/800] mailbox: qcom: Use PLATFORM_DEVID_AUTO to register platform device Date: Mon, 12 Jul 2021 08:04:43 +0200 Message-Id: <20210712060951.062640785@linuxfoundation.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20210712060912.995381202@linuxfoundation.org> References: <20210712060912.995381202@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Shawn Guo [ Upstream commit 96e39e95c01283ff5695dafe659df88ada802159 ] In adding APCS clock support for MSM8939, the second clock registration fails due to duplicate device name like below. [ 0.519657] sysfs: cannot create duplicate filename '/bus/platform/devices/qcom-apcs-msm8916-clk' ... [ 0.661158] qcom_apcs_ipc b111000.mailbox: failed to register APCS clk This is because MSM8939 has 3 APCS instances for Cluster0 (little cores), Cluster1 (big cores) and CCI (Cache Coherent Interconnect). Although only APCS of Cluster0 and Cluster1 have IPC bits, each of 3 APCS has A53PLL clock control bits. That said, 3 'qcom-apcs-msm8916-clk' devices need to be registered to instantiate all 3 clocks. Use PLATFORM_DEVID_AUTO rather than PLATFORM_DEVID_NONE for platform_device_register_data() call to fix the issue above. Signed-off-by: Shawn Guo Reviewed-by: Bjorn Andersson Signed-off-by: Jassi Brar Signed-off-by: Sasha Levin --- drivers/mailbox/qcom-apcs-ipc-mailbox.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.30.2 diff --git a/drivers/mailbox/qcom-apcs-ipc-mailbox.c b/drivers/mailbox/qcom-apcs-ipc-mailbox.c index f25324d03842..15236d729625 100644 --- a/drivers/mailbox/qcom-apcs-ipc-mailbox.c +++ b/drivers/mailbox/qcom-apcs-ipc-mailbox.c @@ -132,7 +132,7 @@ static int qcom_apcs_ipc_probe(struct platform_device *pdev) if (apcs_data->clk_name) { apcs->clk = platform_device_register_data(&pdev->dev, apcs_data->clk_name, - PLATFORM_DEVID_NONE, + PLATFORM_DEVID_AUTO, NULL, 0); if (IS_ERR(apcs->clk)) dev_err(&pdev->dev, "failed to register APCS clk\n");