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

arm64: dts: imx8-ss-conn: fix usb lpcg indices 

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

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



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

commit 808e7716edcdb39d3498b9f567ef6017858b49aa upstream.

usb2_lpcg: clock-controller@5b270000 {
	...                                                    Col1  Col2
	clocks = <&conn_ahb_clk>, <&conn_ipg_clk>;           // 0     6
	clock-indices = <IMX_LPCG_CLK_6>, <IMX_LPCG_CLK_7>;  // 0     7
        ...
};

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

usbotg1: usb@5b0d0000 {
	...
	clocks = <&usb2_lpcg 0>;
			     ^^
Should be:
	clocks = <&usb2_lpcg IMX_LPCG_CLK_6>;
};

usbphy1: usbphy@5b100000 {
	clocks = <&usb2_lpcg 1>;
			     ^^
SHould be:
	clocks = <&usb2_lpcg IMX_LPCG_CLK_7>;
};

Arg0 is divided by 4 in lpcg driver. So lpcg will do dummy enable. Fix it
by use correct clock indices.

Cc: stable@vger.kernel.org
Fixes: 8065fc93 ("arm64: dts: imx8dxl: add usb1 and usb2 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 d840962a

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

+2 −2
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ conn_subsys: bus@5b000000 { 
		interrupts = <GIC_SPI 267 IRQ_TYPE_LEVEL_HIGH>;

		fsl,usbphy = <&usbphy1>;

		fsl,usbmisc = <&usbmisc1 0>;

		clocks = <&usb2_lpcg 0>;

		clocks = <&usb2_lpcg IMX_LPCG_CLK_6>;

		ahb-burst-config = <0x0>;

		tx-burst-size-dword = <0x10>;

		rx-burst-size-dword = <0x10>;
@@ -58,7 +58,7 @@ conn_subsys: bus@5b000000 { 
	usbphy1: usbphy@5b100000 {

		compatible = "fsl,imx7ulp-usbphy";

		reg = <0x5b100000 0x1000>;

		clocks = <&usb2_lpcg 1>;

		clocks = <&usb2_lpcg IMX_LPCG_CLK_7>;

		power-domains = <&pd IMX_SC_R_USB_0_PHY>;

		status = "disabled";

	};