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 892C91CBE8F; Tue, 12 Nov 2024 10:33:09 +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=1731407589; cv=none; b=QEJvCUzIoqR6w13QBea7vxzrr0moFTfTD0sNhxGkVKSUO7ZgoaC/ssvPA77MmAK3KpsyjahIqGz0ya9XQMN8/GbONMD+f9HWrMHDcBQtneHmbPwQgEXU3P1m1nxZ7q2pAceRPI+6M/nf6XUtpx1s6WMjcISyoOoeBeKZmrW30Hs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1731407589; c=relaxed/simple; bh=7SgRX/AqaNHHT7+XIapkROQEGN6hHN28aFJu/sSnAqM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=o768uUwEGNHkN4QKgUDIIFDKq+t6p+A3n9KeNDCruFFwbefw5D9olf3Xhk3bpyrAYrOMceqS0XyfvE/qWI7t/Llyq7+faVkE1rNUClMKb8YVOkCGgkxvYbSZ4LW4l9lmcGySbJp7Dmv9P/5ruBc25MAp+D2zzVIGtHlSr8X0Sjs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Te+T3BE+; 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="Te+T3BE+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CC809C4CECD; Tue, 12 Nov 2024 10:33:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1731407589; bh=7SgRX/AqaNHHT7+XIapkROQEGN6hHN28aFJu/sSnAqM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Te+T3BE+YQFTlEC7ysm/PrR1zTflzmpx+QfM4+RkqpJMULm/rEbP0jewvYDmOCSlN 2PO99JpoGUsqrUD8lM/Bbt9rNUqZnYMlOYV4jDLX2rrNDh/Za6l77CG3yOuDRKGRTl iiw5hwsLi3gW6b08sKIoTjUVMMwl271wYYcrRNLw= 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 6.6 021/119] ARM: dts: rockchip: Fix the spi controller on rk3036 Date: Tue, 12 Nov 2024 11:20:29 +0100 Message-ID: <20241112101849.523905932@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241112101848.708153352@linuxfoundation.org> References: <20241112101848.708153352@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-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/rockchip/rk3036.dtsi | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/rockchip/rk3036.dtsi b/arch/arm/boot/dts/rockchip/rk3036.dtsi index 4e208528eebf2..5bdbadd879fe8 100644 --- a/arch/arm/boot/dts/rockchip/rk3036.dtsi +++ b/arch/arm/boot/dts/rockchip/rk3036.dtsi @@ -550,11 +550,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