arm64: dts: qcom: align clocks in I2C/SPI with DT schema

The DT schema expects clocks core-iface order.  No functional change.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Link: https://lore.kernel.org/r/20220405063451.12011-3-krzysztof.kozlowski@linaro.org

diff --git a/arch/arm64/boot/dts/qcom/ipq6018.dtsi b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
index 87c28ffa44d308e6d4fb01bdbcd8a9d413b54042..8032d7933c660a77eef3ad581fbd8ff5ccdbcbce 100644 (file)
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
@@ -318,9 +318,9 @@
                        #size-cells = <0>;
                        reg = <0x0 0x078b6000 0x0 0x600>;
                        interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                               <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        clock-frequency  = <400000>;
                        dmas = <&blsp_dma 14>, <&blsp_dma 15>;
                        dma-names = "tx", "rx";
@@ -333,9 +333,9 @@
                        #size-cells = <0>;
                        reg = <0x0 0x078b7000 0x0 0x600>;
                        interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                               <&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        clock-frequency  = <400000>;
                        dmas = <&blsp_dma 16>, <&blsp_dma 17>;
                        dma-names = "tx", "rx";

diff --git a/arch/arm64/boot/dts/qcom/ipq8074.dtsi b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
index 2072638006a4ea97ddd2cfffb4507288a0f4b92e..8e41c910b8f9a726dee70a74ae7a0eca97ade0cf 100644 (file)
--- a/arch/arm64/boot/dts/qcom/ipq8074.dtsi
+++ b/arch/arm64/boot/dts/qcom/ipq8074.dtsi
@@ -467,9 +467,9 @@
                        #size-cells = <0>;
                        reg = <0x078b6000 0x600>;
                        interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                               <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        clock-frequency = <400000>;
                        dmas = <&blsp_dma 14>, <&blsp_dma 15>;
                        dma-names = "tx", "rx";
@@ -484,9 +484,9 @@
                        #size-cells = <0>;
                        reg = <0x078b7000 0x600>;
                        interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                               <&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        clock-frequency = <100000>;
                        dmas = <&blsp_dma 16>, <&blsp_dma 17>;
                        dma-names = "tx", "rx";
@@ -499,9 +499,9 @@
                        #size-cells = <0>;
                        reg = <0x78b9000 0x600>;
                        interrupts = <GIC_SPI 299 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP5_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP5_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        clock-frequency = <400000>;
                        dmas = <&blsp_dma 20>, <&blsp_dma 21>;
                        dma-names = "tx", "rx";
@@ -514,9 +514,9 @@
                        #size-cells = <0>;
                        reg = <0x078ba000 0x600>;
                        interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP6_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP6_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        clock-frequency = <100000>;
                        dmas = <&blsp_dma 22>, <&blsp_dma 23>;
                        dma-names = "tx", "rx";

diff --git a/arch/arm64/boot/dts/qcom/msm8916.dtsi b/arch/arm64/boot/dts/qcom/msm8916.dtsi
index e90e9eb22810d5b7c9ed61390ca911b808f411c2..c2713d3078337965e60afdcddc797e5f50244667 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8916.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8916.dtsi
@@ -1511,9 +1511,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x078b5000 0x500>;
                        interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP1_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP1_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&i2c1_default>;
                        pinctrl-1 = <&i2c1_sleep>;
@@ -1543,9 +1543,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x078b6000 0x500>;
                        interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&i2c2_default>;
                        pinctrl-1 = <&i2c2_sleep>;
@@ -1575,9 +1575,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x078b7000 0x500>;
                        interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&i2c3_default>;
                        pinctrl-1 = <&i2c3_sleep>;
@@ -1607,9 +1607,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x078b8000 0x500>;
                        interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP4_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP4_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&i2c4_default>;
                        pinctrl-1 = <&i2c4_sleep>;
@@ -1639,9 +1639,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x078b9000 0x500>;
                        interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP5_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP5_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&i2c5_default>;
                        pinctrl-1 = <&i2c5_sleep>;
@@ -1671,9 +1671,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x078ba000 0x500>;
                        interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP6_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP6_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&i2c6_default>;
                        pinctrl-1 = <&i2c6_sleep>;

diff --git a/arch/arm64/boot/dts/qcom/msm8953.dtsi b/arch/arm64/boot/dts/qcom/msm8953.dtsi
index 431228faacdd71042bc4c9c424590c550c7d292f..2a70263a701ddbba75fad823ad6a0aac814e856e 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8953.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8953.dtsi
@@ -923,9 +923,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x78b5000 0x600>;
                        interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
-                       clock-names = "iface", "core";
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP1_I2C_APPS_CLK>;
+                       clock-names = "core", "iface";
+                       clocks = <&gcc GCC_BLSP1_QUP1_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
 
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&i2c_1_default>;
@@ -941,9 +941,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x78b6000 0x600>;
                        interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
-                       clock-names = "iface", "core";
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>;
+                       clock-names = "core", "iface";
+                       clocks = <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
 
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&i2c_2_default>;
@@ -959,9 +959,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x78b7000 0x600>;
                        interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
-                       clock-names = "iface", "core";
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>;
+                       clock-names = "core", "iface";
+                       clocks = <&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&i2c_3_default>;
                        pinctrl-1 = <&i2c_3_sleep>;
@@ -976,9 +976,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x78b8000 0x600>;
                        interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
-                       clock-names = "iface", "core";
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP4_I2C_APPS_CLK>;
+                       clock-names = "core", "iface";
+                       clocks = <&gcc GCC_BLSP1_QUP4_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&i2c_4_default>;
                        pinctrl-1 = <&i2c_4_sleep>;
@@ -993,9 +993,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x7af5000 0x600>;
                        interrupts = <GIC_SPI 299 IRQ_TYPE_LEVEL_HIGH>;
-                       clock-names = "iface", "core";
-                       clocks = <&gcc GCC_BLSP2_AHB_CLK>,
-                                <&gcc GCC_BLSP2_QUP1_I2C_APPS_CLK>;
+                       clock-names = "core", "iface";
+                       clocks = <&gcc GCC_BLSP2_QUP1_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP2_AHB_CLK>;
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&i2c_5_default>;
                        pinctrl-1 = <&i2c_5_sleep>;
@@ -1010,9 +1010,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x7af6000 0x600>;
                        interrupts = <GIC_SPI 300 IRQ_TYPE_LEVEL_HIGH>;
-                       clock-names = "iface", "core";
-                       clocks = <&gcc GCC_BLSP2_AHB_CLK>,
-                                <&gcc GCC_BLSP2_QUP2_I2C_APPS_CLK>;
+                       clock-names = "core", "iface";
+                       clocks = <&gcc GCC_BLSP2_QUP2_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP2_AHB_CLK>;
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&i2c_6_default>;
                        pinctrl-1 = <&i2c_6_sleep>;
@@ -1027,9 +1027,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x7af7000 0x600>;
                        interrupts = <GIC_SPI 301 IRQ_TYPE_LEVEL_HIGH>;
-                       clock-names = "iface", "core";
-                       clocks = <&gcc GCC_BLSP2_AHB_CLK>,
-                                <&gcc GCC_BLSP2_QUP3_I2C_APPS_CLK>;
+                       clock-names = "core", "iface";
+                       clocks = <&gcc GCC_BLSP2_QUP3_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP2_AHB_CLK>;
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&i2c_7_default>;
                        pinctrl-1 = <&i2c_7_sleep>;
@@ -1044,9 +1044,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x7af8000 0x600>;
                        interrupts = <GIC_SPI 302 IRQ_TYPE_LEVEL_HIGH>;
-                       clock-names = "iface", "core";
-                       clocks = <&gcc GCC_BLSP2_AHB_CLK>,
-                                <&gcc GCC_BLSP2_QUP4_I2C_APPS_CLK>;
+                       clock-names = "core", "iface";
+                       clocks = <&gcc GCC_BLSP2_QUP4_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP2_AHB_CLK>;
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&i2c_8_default>;
                        pinctrl-1 = <&i2c_8_sleep>;

diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi
index 8c1dc5155b7138097f551b96c315863d36e04962..209f9ef030e53e651f94adc5af517c82d1305f77 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8994.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi
@@ -519,9 +519,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0xf9923000 0x500>;
                        interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                               <&gcc GCC_BLSP1_QUP1_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP1_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        clock-frequency = <400000>;
                        dmas = <&blsp1_dma 12>, <&blsp1_dma 13>;
                        dma-names = "tx", "rx";
@@ -555,9 +555,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0xf9924000 0x500>;
                        interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                               <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        clock-frequency = <400000>;
                        dmas = <&blsp1_dma 14>, <&blsp1_dma 15>;
                        dma-names = "tx", "rx";
@@ -575,9 +575,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0xf9926000 0x500>;
                        interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                               <&gcc GCC_BLSP1_QUP4_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP4_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        clock-frequency = <400000>;
                        dmas = <&blsp1_dma 18>, <&blsp1_dma 19>;
                        dma-names = "tx", "rx";
@@ -593,9 +593,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0xf9927000 0x500>;
                        interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                               <&gcc GCC_BLSP1_QUP5_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP5_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        clock-frequency = <400000>;
                        dmas = <&blsp2_dma 20>, <&blsp2_dma 21>;
                        dma-names = "tx", "rx";
@@ -611,9 +611,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0xf9928000 0x500>;
                        interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                               <&gcc GCC_BLSP1_QUP6_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP6_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        clock-frequency = <400000>;
                        dmas = <&blsp1_dma 22>, <&blsp1_dma 23>;
                        dma-names = "tx", "rx";
@@ -657,9 +657,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0xf9963000 0x500>;
                        interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP2_AHB_CLK>,
-                                       <&gcc GCC_BLSP2_QUP1_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP2_QUP1_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP2_AHB_CLK>;
+                       clock-names = "core", "iface";
                        clock-frequency = <400000>;
                        dmas = <&blsp2_dma 12>, <&blsp2_dma 13>;
                        dma-names = "tx", "rx";
@@ -693,9 +693,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0xf9967000 0x500>;
                        interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP2_AHB_CLK>,
-                                               <&gcc GCC_BLSP2_QUP5_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP2_QUP5_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP2_AHB_CLK>;
+                       clock-names = "core", "iface";
                        clock-frequency = <355000>;
                        dmas = <&blsp2_dma 20>, <&blsp2_dma 21>;
                        dma-names = "tx", "rx";

diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
index fa491f2271ff667eb8b86927318956caf331762e..db3eb160d1bb34c7b2b067149b7232e88a53e27f 100644 (file)
--- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
@@ -2787,9 +2787,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x07577000 0x1000>;
                        interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                               <&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&blsp1_i2c3_default>;
                        pinctrl-1 = <&blsp1_i2c3_sleep>;
@@ -2835,9 +2835,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x075b5000 0x1000>;
                        interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP2_AHB_CLK>,
-                               <&gcc GCC_BLSP2_QUP1_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP2_QUP1_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP2_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&blsp2_i2c1_default>;
                        pinctrl-1 = <&blsp2_i2c1_sleep>;
@@ -2852,9 +2852,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x075b6000 0x1000>;
                        interrupts = <GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP2_AHB_CLK>,
-                               <&gcc GCC_BLSP2_QUP2_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP2_QUP2_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP2_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&blsp2_i2c2_default>;
                        pinctrl-1 = <&blsp2_i2c2_sleep>;
@@ -2869,9 +2869,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x075b7000 0x1000>;
                        interrupts = <GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP2_AHB_CLK>,
-                               <&gcc GCC_BLSP2_QUP3_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP2_QUP3_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP2_AHB_CLK>;
+                       clock-names = "core", "iface";
                        clock-frequency = <400000>;
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&blsp2_i2c3_default>;
@@ -2887,9 +2887,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x75b9000 0x1000>;
                        interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP2_AHB_CLK>,
-                               <&gcc GCC_BLSP2_QUP5_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP2_QUP5_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP2_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default";
                        pinctrl-0 = <&blsp2_i2c5_default>;
                        dmas = <&blsp2_dma 20>, <&blsp2_dma 21>;
@@ -2903,9 +2903,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x75ba000 0x1000>;
                        interrupts = <GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP2_AHB_CLK>,
-                               <&gcc GCC_BLSP2_QUP6_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP2_QUP6_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP2_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default", "sleep";
                        pinctrl-0 = <&blsp2_i2c6_default>;
                        pinctrl-1 = <&blsp2_i2c6_sleep>;

diff --git a/arch/arm64/boot/dts/qcom/qcs404.dtsi b/arch/arm64/boot/dts/qcom/qcs404.dtsi
index 6b3a8e1006d007457e8e7dde9320d8d514660405..acf120f91b42d394ace73c3cadafc8338c983560 100644 (file)
--- a/arch/arm64/boot/dts/qcom/qcs404.dtsi
+++ b/arch/arm64/boot/dts/qcom/qcs404.dtsi
@@ -914,9 +914,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x078b5000 0x600>;
                        interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP0_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP0_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default";
                        pinctrl-0 = <&blsp1_i2c0_default>;
                        #address-cells = <1>;
@@ -928,9 +928,9 @@
                        compatible = "qcom,spi-qup-v2.2.1";
                        reg = <0x078b5000 0x600>;
                        interrupts = <GIC_SPI 95 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP0_SPI_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP0_SPI_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default";
                        pinctrl-0 = <&blsp1_spi0_default>;
                        #address-cells = <1>;
@@ -942,9 +942,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x078b6000 0x600>;
                        interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP1_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP1_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default";
                        pinctrl-0 = <&blsp1_i2c1_default>;
                        #address-cells = <1>;
@@ -956,9 +956,9 @@
                        compatible = "qcom,spi-qup-v2.2.1";
                        reg = <0x078b6000 0x600>;
                        interrupts = <GIC_SPI 96 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP1_SPI_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP1_SPI_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default";
                        pinctrl-0 = <&blsp1_spi1_default>;
                        #address-cells = <1>;
@@ -970,9 +970,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x078b7000 0x600>;
                        interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP2_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default";
                        pinctrl-0 = <&blsp1_i2c2_default>;
                        #address-cells = <1>;
@@ -984,9 +984,9 @@
                        compatible = "qcom,spi-qup-v2.2.1";
                        reg = <0x078b7000 0x600>;
                        interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP2_SPI_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP2_SPI_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default";
                        pinctrl-0 = <&blsp1_spi2_default>;
                        #address-cells = <1>;
@@ -998,9 +998,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x078b8000 0x600>;
                        interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP3_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default";
                        pinctrl-0 = <&blsp1_i2c3_default>;
                        #address-cells = <1>;
@@ -1012,9 +1012,9 @@
                        compatible = "qcom,spi-qup-v2.2.1";
                        reg = <0x078b8000 0x600>;
                        interrupts = <GIC_SPI 98 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP3_SPI_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP3_SPI_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default";
                        pinctrl-0 = <&blsp1_spi3_default>;
                        #address-cells = <1>;
@@ -1026,9 +1026,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x078b9000 0x600>;
                        interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP4_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP4_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default";
                        pinctrl-0 = <&blsp1_i2c4_default>;
                        #address-cells = <1>;
@@ -1040,9 +1040,9 @@
                        compatible = "qcom,spi-qup-v2.2.1";
                        reg = <0x078b9000 0x600>;
                        interrupts = <GIC_SPI 99 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP1_AHB_CLK>,
-                                <&gcc GCC_BLSP1_QUP4_SPI_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP1_QUP4_SPI_APPS_CLK>,
+                                <&gcc GCC_BLSP1_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default";
                        pinctrl-0 = <&blsp1_spi4_default>;
                        #address-cells = <1>;
@@ -1078,9 +1078,9 @@
                        compatible = "qcom,i2c-qup-v2.2.1";
                        reg = <0x07af5000 0x600>;
                        interrupts = <GIC_SPI 299 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP2_AHB_CLK>,
-                                <&gcc GCC_BLSP2_QUP0_I2C_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP2_QUP0_I2C_APPS_CLK>,
+                                <&gcc GCC_BLSP2_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default";
                        pinctrl-0 = <&blsp2_i2c0_default>;
                        #address-cells = <1>;
@@ -1092,9 +1092,9 @@
                        compatible = "qcom,spi-qup-v2.2.1";
                        reg = <0x07af5000 0x600>;
                        interrupts = <GIC_SPI 299 IRQ_TYPE_LEVEL_HIGH>;
-                       clocks = <&gcc GCC_BLSP2_AHB_CLK>,
-                                <&gcc GCC_BLSP2_QUP0_SPI_APPS_CLK>;
-                       clock-names = "iface", "core";
+                       clocks = <&gcc GCC_BLSP2_QUP0_SPI_APPS_CLK>,
+                                <&gcc GCC_BLSP2_AHB_CLK>;
+                       clock-names = "core", "iface";
                        pinctrl-names = "default";
                        pinctrl-0 = <&blsp2_spi0_default>;
                        #address-cells = <1>;