arm64: dts: mediatek: Add missing xHCI clocks for mt8192 and mt8195

The MediaTek xHCI dt-binding expects a specific order for the clocks,
but the mt8192 and mt8195 devicetrees were skipping some of the middle
clocks. These clocks are wired to the controller hardware but aren't
controllable.

Add the missing clocks as handles to fixed clocks, so that the clock
order is respected and the dtbs_check warnings are gone.

Signed-off-by: Nícolas F. R. A. Prado <nfraprado@collabora.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20220708194314.56922-1-nfraprado@collabora.com
Signed-off-by: Matthias Brugger <matthias.bgg@gmail.com>

diff --git a/arch/arm64/boot/dts/mediatek/mt8192.dtsi b/arch/arm64/boot/dts/mediatek/mt8192.dtsi
index 64bf65b1b184ad22061c803ba742199e9a1195a7..6b20376191a75a6eef4e23c1caf7a8321f3f7c3d 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8192.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8192.dtsi
@@ -753,9 +753,12 @@
                        assigned-clock-parents = <&topckgen CLK_TOP_UNIVPLL_D5_D4>,
                                                 <&topckgen CLK_TOP_UNIVPLL_D5_D4>;
                        clocks = <&infracfg CLK_INFRA_SSUSB>,
-                                <&infracfg CLK_INFRA_SSUSB_XHCI>,
-                                <&apmixedsys CLK_APMIXED_USBPLL>;
-                       clock-names = "sys_ck", "xhci_ck", "ref_ck";
+                                <&apmixedsys CLK_APMIXED_USBPLL>,
+                                <&clk26m>,
+                                <&clk26m>,
+                                <&infracfg CLK_INFRA_SSUSB_XHCI>;
+                       clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck",
+                                     "xhci_ck";
                        wakeup-source;
                        mediatek,syscon-wakeup = <&pericfg 0x420 102>;
                        status = "disabled";

diff --git a/arch/arm64/boot/dts/mediatek/mt8195.dtsi b/arch/arm64/boot/dts/mediatek/mt8195.dtsi
index a50ebb5d145f7537bb8ba7ce301c8a4b5e33cc4e..905d1a90b406c31d37e24966c4e0cd3cd9152bce 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8195.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8195.dtsi
@@ -1058,8 +1058,10 @@
                        clocks = <&infracfg_ao CLK_INFRA_AO_SSUSB>,
                                 <&topckgen CLK_TOP_SSUSB_REF>,
                                 <&apmixedsys CLK_APMIXED_USB1PLL>,
+                                <&clk26m>,
                                 <&infracfg_ao CLK_INFRA_AO_SSUSB_XHCI>;
-                       clock-names = "sys_ck", "ref_ck", "mcu_ck", "xhci_ck";
+                       clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck",
+                                     "xhci_ck";
                        mediatek,syscon-wakeup = <&pericfg 0x400 103>;
                        wakeup-source;
                        status = "disabled";
@@ -1123,8 +1125,10 @@
                        clocks = <&pericfg_ao CLK_PERI_AO_SSUSB_1P_BUS>,
                                 <&topckgen CLK_TOP_SSUSB_P1_REF>,
                                 <&apmixedsys CLK_APMIXED_USB1PLL>,
+                                <&clk26m>,
                                 <&pericfg_ao CLK_PERI_AO_SSUSB_1P_XHCI>;
-                       clock-names = "sys_ck", "ref_ck", "mcu_ck","xhci_ck";
+                       clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck",
+                                     "xhci_ck";
                        mediatek,syscon-wakeup = <&pericfg 0x400 104>;
                        wakeup-source;
                        status = "disabled";
@@ -1144,8 +1148,11 @@
                                                 <&topckgen CLK_TOP_UNIVPLL_D5_D4>;
                        clocks = <&pericfg_ao CLK_PERI_AO_SSUSB_2P_BUS>,
                                 <&topckgen CLK_TOP_SSUSB_P2_REF>,
+                                <&clk26m>,
+                                <&clk26m>,
                                 <&pericfg_ao CLK_PERI_AO_SSUSB_2P_XHCI>;
-                       clock-names = "sys_ck", "ref_ck", "xhci_ck";
+                       clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck",
+                                     "xhci_ck";
                        mediatek,syscon-wakeup = <&pericfg 0x400 105>;
                        wakeup-source;
                        status = "disabled";
@@ -1165,8 +1172,11 @@
                                                 <&topckgen CLK_TOP_UNIVPLL_D5_D4>;
                        clocks = <&pericfg_ao CLK_PERI_AO_SSUSB_3P_BUS>,
                                 <&topckgen CLK_TOP_SSUSB_P3_REF>,
+                                <&clk26m>,
+                                <&clk26m>,
                                 <&pericfg_ao CLK_PERI_AO_SSUSB_3P_XHCI>;
-                       clock-names = "sys_ck", "ref_ck", "xhci_ck";
+                       clock-names = "sys_ck", "ref_ck", "mcu_ck", "dma_ck",
+                                     "xhci_ck";
                        mediatek,syscon-wakeup = <&pericfg 0x400 106>;
                        wakeup-source;
                        status = "disabled";