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 919212BB1B; Fri, 15 Nov 2024 06:56:08 +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=1731653768; cv=none; b=mLrdPgp7QGH7fdL8s4DBb0bVgqOnnUjNArkUY7OEvS79fbFo6AKHfQVdMau3EMgWYzW1cQFoPLNRAetAzx3o/Cg4lgCdQODoaOoY1SmEGXnR/iuOPL5CkGJtNIeLFbmPwC9sS2wTW+XjKaipcb8ZHSUhNGA2ADTeeiuQ9KYwmvA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731653768; c=relaxed/simple; bh=5elNoGdOORUMeeO1MUHXf2CsjaEMDssjwqFN7LvHb4c=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DKu7/GnFDXE+gcrpUYgVlW31R9iFiU8mzejVBSt9Pami4UI2HD2xd5G7a3WM5k5s+I45fL0wA5xFq3DsoGqz7QToxrAfRIlXwE82eRpBuqwDTEPDw2pZTWbbw83FFFUxlciwtWoXq7kWfEColb2OblIYBdJpE/MsACDU4vRPWPM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=gqj9BC5m; 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="gqj9BC5m" Received: by smtp.kernel.org (Postfix) with ESMTPSA id F210FC4CECF; Fri, 15 Nov 2024 06:56:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1731653768; bh=5elNoGdOORUMeeO1MUHXf2CsjaEMDssjwqFN7LvHb4c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=gqj9BC5mR5uArGX8GgEvquV0bgNq+JF+S/2ItKq5D9pFuQRpdayzLsF01sJnvQ3bM TdERxgZk++MzpD97lP/fPeHgXjBlet+5fAS43Z/z/sqdUcRvXGH9h1MXonHvBsKQuJ swA+JA2pZ0WIoFoaZOnJ4+3oKf1sMJnxgO/JUqQo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Caesar Wang , Dragan Simic , Heiko Stuebner , Sasha Levin Subject: [PATCH 5.10 09/82] ARM: dts: rockchip: Fix the spi controller on rk3036 Date: Fri, 15 Nov 2024 07:37:46 +0100 Message-ID: <20241115063725.902562820@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 8bade1ad1f0821aef31f6a8fb1027ae292566d85 ] Compatible and clock names did not match the existing binding. So set the correct values and re-order+rename the clocks. It looks like no rk3036 board did use the spi controller so far, so this was never detected on a running device yet. Fixes: f629fcfab2cd ("ARM: dts: rockchip: support the spi for rk3036") Cc: Caesar Wang Reviewed-by: Dragan Simic Signed-off-by: Heiko Stuebner Link: https://lore.kernel.org/r/20241008203940.2573684-14-heiko@sntech.de Signed-off-by: Heiko Stuebner Signed-off-by: Sasha Levin --- arch/arm/boot/dts/rk3036.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi index f8f9f1bffd9bc..5cd640ac0d1a4 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -488,11 +488,11 @@ }; spi: spi@20074000 { - compatible = "rockchip,rockchip-spi"; + compatible = "rockchip,rk3036-spi"; reg = <0x20074000 0x1000>; interrupts = ; - clocks = <&cru PCLK_SPI>, <&cru SCLK_SPI>; - clock-names = "apb-pclk","spi_pclk"; + clocks = <&cru SCLK_SPI>, <&cru PCLK_SPI>; + clock-names = "spiclk", "apb_pclk"; dmas = <&pdma 8>, <&pdma 9>; dma-names = "tx", "rx"; pinctrl-names = "default"; -- 2.43.0