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 685312BB1B; Fri, 15 Nov 2024 06:55:47 +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=1731653747; cv=none; b=hHC/w6JClyNsmb3FMfQtuKTqtTfSLvfxXnRM5EAHHISoyodYL1hJKpFJlE5lcFZpY6BbbN8PdCHOhzn9RD/+d5cZQw9HTJRrD1sh4JJ2GaLiN/b92Lim57zyCam1yyf1uDO5Pw2bRVtuaHOi83RKfH4ADpVeSJAd5cowC0QTlWk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731653747; c=relaxed/simple; bh=A3GgDCHYHBwB7urUhxMroi0jub7RGBbcSl38VPeMsmg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oLiDcEJI8oYs7tCzxwC5XcqyXBJtH1tSA6Cv18cgss4vRBCMHQfhWSUm7zUVvsPNE4GhypTBakhOdotW0GYJIDe667TKtyfcDZJkcEoB86xi9ViDua7Op3OEDX9pFNPCAxT0t4H+o+4wR1DtJJ69eEUxIZ9HPy+rYz6Wsm34ouk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=RJzqSXjf; 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="RJzqSXjf" Received: by smtp.kernel.org (Postfix) with ESMTPSA id AA844C4CECF; Fri, 15 Nov 2024 06:55:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1731653747; bh=A3GgDCHYHBwB7urUhxMroi0jub7RGBbcSl38VPeMsmg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RJzqSXjfgvvZscnqrYdD76W1DePJYdLj1Uwqzjx+5QSRBmuXfCKvN+NYgsV1kPHUY sGd2ZhcDFyr5bB9yWdE1dCo4Mg+SJBqS0sfIYPMp5utmtO8MhUL2bGU43pCqBmWCP1 NWD53PBLSFqr9wYwxRF7k8jpJdppOv6CAjDcuAnk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Manivannan Sadhasivam , Dragan Simic , Heiko Stuebner , Sasha Levin Subject: [PATCH 5.10 03/82] arm64: dts: rockchip: Fix bluetooth properties on Rock960 boards Date: Fri, 15 Nov 2024 07:37:40 +0100 Message-ID: <20241115063725.688292641@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241115063725.561151311@linuxfoundation.org> References: <20241115063725.561151311@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-Transfer-Encoding: 8bit 5.10-stable review patch. If anyone has any objections, please let me know. ------------------ From: Heiko Stuebner [ Upstream commit ea74528aaea5a1dfc8e3de09ef2af37530eca526 ] The expected clock-name is different, and extclk also is deprecated in favor of txco for clocks that are not crystals. So fix it to match the binding. Fixes: c72235c288c8 ("arm64: dts: rockchip: Add on-board WiFi/BT support for Rock960 boards") Cc: Manivannan Sadhasivam Reviewed-by: Dragan Simic Signed-off-by: Heiko Stuebner Link: https://lore.kernel.org/r/20241008203940.2573684-5-heiko@sntech.de Signed-off-by: Heiko Stuebner Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi index 5e3ac589bc54a..6fa94cb4d5f79 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi @@ -568,7 +568,7 @@ bluetooth { compatible = "brcm,bcm43438-bt"; clocks = <&rk808 1>; - clock-names = "ext_clock"; + clock-names = "txco"; device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>; host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>; shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>; -- 2.43.0