From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C507D1CA8F; Mon, 1 Apr 2024 16:03:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711987381; cv=none; b=URBBBtESPqb854I7IFnKtHCHJTha+iwzRfiWz+r4/JMkgOmtYtNbMZKREWmxVUPcdvIvFp/qOH/aHCBy9XtNlHFd6kGbAXc7e7G1R+aeRJyeJzshLSgFW/iahjQ4DGJUCmtt8pjHZ4V9LRtpqVXbJqb3iihFKFpVcgogiC6Ynak= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711987381; c=relaxed/simple; bh=v+Vj0NQGO09c1IAx7woz277c8F2q4/jxJTIAnTZAVB0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=D/qcFy0sSrM7sMc84LZh+xp4u21Uz2ENFrn2mU5TrQ8AdVMSKnOgAYEgfmtyycWN8LNjN/Xgm4kSFHWlulr2D3UvYkobc3p6zNel1lsTV1x4G9qsIFEsujzwK4OeZ38bE6q4TfTrKKpiTZI0k1NErdzsj8VqcSA242Xpo1VW/KI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=DuLZoQb1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="DuLZoQb1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 509E1C433F1; Mon, 1 Apr 2024 16:03:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1711987381; bh=v+Vj0NQGO09c1IAx7woz277c8F2q4/jxJTIAnTZAVB0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DuLZoQb1RXIR2YHyQ4O2Ju6POTg8PYADBCycafpziGN+/KN/qY1Mn2PNyJ4lpRrHB qt0fBDbW4FCKWwMHfEAaGnSkEmd1Bj1QOphEFe+uWkOfY1r5ud0TJZ9wW1f9CWhUsd HlmxQfrKZQycBF0QX1mHsmWvrtl07uZ2jZhcma8E= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Zoltan HERPAI , =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= , Sasha Levin Subject: [PATCH 6.8 271/399] pwm: img: fix pwm clock lookup Date: Mon, 1 Apr 2024 17:43:57 +0200 Message-ID: <20240401152557.273837070@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240401152549.131030308@linuxfoundation.org> References: <20240401152549.131030308@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 6.8-stable review patch. If anyone has any objections, please let me know. ------------------ From: Zoltan HERPAI [ Upstream commit 9eb05877dbee03064d3d3483cd6702f610d5a358 ] 22e8e19 has introduced a regression in the imgchip->pwm_clk lookup, whereas the clock name has also been renamed to "imgchip". This causes the driver failing to load: [ 0.546905] img-pwm 18101300.pwm: failed to get imgchip clock [ 0.553418] img-pwm: probe of 18101300.pwm failed with error -2 Fix this lookup by reverting the clock name back to "pwm". Signed-off-by: Zoltan HERPAI Link: https://lore.kernel.org/r/20240320083602.81592-1-wigyori@uid0.hu Fixes: 22e8e19a46f7 ("pwm: img: Rename variable pointing to driver private data") Signed-off-by: Uwe Kleine-König Signed-off-by: Sasha Levin --- drivers/pwm/pwm-img.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/pwm/pwm-img.c b/drivers/pwm/pwm-img.c index 5965ac35b32ea..54dbafc51627e 100644 --- a/drivers/pwm/pwm-img.c +++ b/drivers/pwm/pwm-img.c @@ -284,9 +284,9 @@ static int img_pwm_probe(struct platform_device *pdev) return PTR_ERR(imgchip->sys_clk); } - imgchip->pwm_clk = devm_clk_get(&pdev->dev, "imgchip"); + imgchip->pwm_clk = devm_clk_get(&pdev->dev, "pwm"); if (IS_ERR(imgchip->pwm_clk)) { - dev_err(&pdev->dev, "failed to get imgchip clock\n"); + dev_err(&pdev->dev, "failed to get pwm clock\n"); return PTR_ERR(imgchip->pwm_clk); } -- 2.43.0