Commit f3200f54 authored by Frank Li's avatar Frank Li Committed by Ma Wupeng
Browse files

arm64: dts: imx8-ss-dma: fix spi lpcg indices 

stable inclusion
from stable-v6.6.28
commit a156f37b8e3ca7afbccb3f1b6507e150a20ac892
bugzilla: https://gitee.com/openeuler/kernel/issues/I9MPZ8

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=a156f37b8e3ca7afbccb3f1b6507e150a20ac892



--------------------------------

commit f72b544a514c07d34a0d9d5380f5905b3731e647 upstream.

spi0_lpcg: clock-controller@5a400000 {
	...                                                  Col0   Col1
	clocks = <&clk IMX_SC_R_SPI_0 IMX_SC_PM_CLK_PER>,//   0      1
		 <&dma_ipg_clk>;                         //   1      4
	clock-indices = <IMX_LPCG_CLK_0>, <IMX_LPCG_CLK_4>;
};

Col1: index, which existing dts try to get.
Col2: actual index in lpcg driver.

lpspi0: spi@5a000000 {
	...
	clocks = <&spi0_lpcg 0>, <&spi0_lpcg 1>;
			     ^		     ^
Should be:
	clocks = <&spi0_lpcg IMX_LPCG_CLK_0>, <&spi0_lpcg IMX_LPCG_CLK_4>;
};

Arg0 is divided by 4 in lpcg driver. <&spi0_lpcg 0> and <&spi0_lpcg 1> are
IMX_SC_PM_CLK_PER. Although code can work, code logic is wrong. It should
use IMX_LPCG_CLK_0 and IMX_LPCG_CLK_4 for lpcg arg0.

Cc: stable@vger.kernel.org
Fixes: c4098885 ("arm64: dts: imx8dxl: add lpspi support")
Signed-off-by: default avatarFrank Li <Frank.Li@nxp.com>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarZhangPeng <zhangpeng362@huawei.com>
parent bf68dabf

arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi

+8 −8
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ dma_subsys: bus@5a000000 { 
		#size-cells = <0>;

		interrupts = <GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-parent = <&gic>;

		clocks = <&spi0_lpcg 0>,

			 <&spi0_lpcg 1>;

		clocks = <&spi0_lpcg IMX_LPCG_CLK_0>,

			 <&spi0_lpcg IMX_LPCG_CLK_4>;

		clock-names = "per", "ipg";

		assigned-clocks = <&clk IMX_SC_R_SPI_0 IMX_SC_PM_CLK_PER>;

		assigned-clock-rates = <60000000>;
@@ -43,8 +43,8 @@ dma_subsys: bus@5a000000 { 
		#size-cells = <0>;

		interrupts = <GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-parent = <&gic>;

		clocks = <&spi1_lpcg 0>,

			 <&spi1_lpcg 1>;

		clocks = <&spi1_lpcg IMX_LPCG_CLK_0>,

			 <&spi1_lpcg IMX_LPCG_CLK_4>;

		clock-names = "per", "ipg";

		assigned-clocks = <&clk IMX_SC_R_SPI_1 IMX_SC_PM_CLK_PER>;

		assigned-clock-rates = <60000000>;
@@ -59,8 +59,8 @@ dma_subsys: bus@5a000000 { 
		#size-cells = <0>;

		interrupts = <GIC_SPI 338 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-parent = <&gic>;

		clocks = <&spi2_lpcg 0>,

			 <&spi2_lpcg 1>;

		clocks = <&spi2_lpcg IMX_LPCG_CLK_0>,

			 <&spi2_lpcg IMX_LPCG_CLK_4>;

		clock-names = "per", "ipg";

		assigned-clocks = <&clk IMX_SC_R_SPI_2 IMX_SC_PM_CLK_PER>;

		assigned-clock-rates = <60000000>;
@@ -75,8 +75,8 @@ dma_subsys: bus@5a000000 { 
		#size-cells = <0>;

		interrupts = <GIC_SPI 339 IRQ_TYPE_LEVEL_HIGH>;

		interrupt-parent = <&gic>;

		clocks = <&spi3_lpcg 0>,

			 <&spi3_lpcg 1>;

		clocks = <&spi3_lpcg IMX_LPCG_CLK_0>,

			 <&spi3_lpcg IMX_LPCG_CLK_4>;

		clock-names = "per", "ipg";

		assigned-clocks = <&clk IMX_SC_R_SPI_3 IMX_SC_PM_CLK_PER>;

		assigned-clock-rates = <60000000>;