| Message ID | 20221212163532.142533-7-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Accepted |
| Commit | 25da76a92f88b57331946e98f659b2626d512ea2 |
| Headers | show |
| Series | [01/12] dt-bindings: watchdog: qcom-wdt: require fallback for IPQ4019 | expand |
On 12.12.2022 17:35, Krzysztof Kozlowski wrote: > The most specific compatible should be upfront. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > arch/arm/boot/dts/qcom-apq8064.dtsi | 4 ++-- > arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +- > arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 ++-- > arch/arm/boot/dts/qcom-msm8960.dtsi | 4 ++-- > 4 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi > index 0da9623ea084..79575d6b3a81 100644 > --- a/arch/arm/boot/dts/qcom-apq8064.dtsi > +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi > @@ -375,8 +375,8 @@ intc: interrupt-controller@2000000 { > }; > > timer@200a000 { > - compatible = "qcom,kpss-timer", > - "qcom,kpss-wdt-apq8064", "qcom,msm-timer"; > + compatible = "qcom,kpss-wdt-apq8064", "qcom,kpss-timer", > + "qcom,msm-timer"; > interrupts = <1 1 0x301>, > <1 2 0x301>, > <1 3 0x301>; > diff --git a/arch/arm/boot/dts/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom-ipq4019.dtsi > index acb08dcf9442..a73c3a17b6a4 100644 > --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi > +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi > @@ -400,7 +400,7 @@ blsp1_uart2: serial@78b0000 { > }; > > watchdog: watchdog@b017000 { > - compatible = "qcom,kpss-wdt", "qcom,kpss-wdt-ipq4019"; > + compatible = "qcom,kpss-wdt-ipq4019", "qcom,kpss-wdt"; > reg = <0xb017000 0x40>; > clocks = <&sleep_clk>; > timeout-sec = <10>; > diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi > index 7e784b0995da..9daafe9de02a 100644 > --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi > +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi > @@ -549,8 +549,8 @@ intc: interrupt-controller@2000000 { > }; > > timer@200a000 { > - compatible = "qcom,kpss-timer", > - "qcom,kpss-wdt-ipq8064", "qcom,msm-timer"; > + compatible = "qcom,kpss-wdt-ipq8064", "qcom,kpss-timer", > + "qcom,msm-timer"; > interrupts = <GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(2) | > IRQ_TYPE_EDGE_RISING)>, > <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(2) | > diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi > index 7debf9db7cb1..63c3c40fe9a2 100644 > --- a/arch/arm/boot/dts/qcom-msm8960.dtsi > +++ b/arch/arm/boot/dts/qcom-msm8960.dtsi > @@ -103,8 +103,8 @@ intc: interrupt-controller@2000000 { > }; > > timer@200a000 { > - compatible = "qcom,kpss-timer", > - "qcom,kpss-wdt-msm8960", "qcom,msm-timer"; > + compatible = "qcom,kpss-wdt-msm8960", "qcom,kpss-timer", > + "qcom,msm-timer"; > interrupts = <GIC_PPI 1 0x301>, > <GIC_PPI 2 0x301>, > <GIC_PPI 3 0x301>;
diff --git a/arch/arm/boot/dts/qcom-apq8064.dtsi b/arch/arm/boot/dts/qcom-apq8064.dtsi index 0da9623ea084..79575d6b3a81 100644 --- a/arch/arm/boot/dts/qcom-apq8064.dtsi +++ b/arch/arm/boot/dts/qcom-apq8064.dtsi @@ -375,8 +375,8 @@ intc: interrupt-controller@2000000 { }; timer@200a000 { - compatible = "qcom,kpss-timer", - "qcom,kpss-wdt-apq8064", "qcom,msm-timer"; + compatible = "qcom,kpss-wdt-apq8064", "qcom,kpss-timer", + "qcom,msm-timer"; interrupts = <1 1 0x301>, <1 2 0x301>, <1 3 0x301>; diff --git a/arch/arm/boot/dts/qcom-ipq4019.dtsi b/arch/arm/boot/dts/qcom-ipq4019.dtsi index acb08dcf9442..a73c3a17b6a4 100644 --- a/arch/arm/boot/dts/qcom-ipq4019.dtsi +++ b/arch/arm/boot/dts/qcom-ipq4019.dtsi @@ -400,7 +400,7 @@ blsp1_uart2: serial@78b0000 { }; watchdog: watchdog@b017000 { - compatible = "qcom,kpss-wdt", "qcom,kpss-wdt-ipq4019"; + compatible = "qcom,kpss-wdt-ipq4019", "qcom,kpss-wdt"; reg = <0xb017000 0x40>; clocks = <&sleep_clk>; timeout-sec = <10>; diff --git a/arch/arm/boot/dts/qcom-ipq8064.dtsi b/arch/arm/boot/dts/qcom-ipq8064.dtsi index 7e784b0995da..9daafe9de02a 100644 --- a/arch/arm/boot/dts/qcom-ipq8064.dtsi +++ b/arch/arm/boot/dts/qcom-ipq8064.dtsi @@ -549,8 +549,8 @@ intc: interrupt-controller@2000000 { }; timer@200a000 { - compatible = "qcom,kpss-timer", - "qcom,kpss-wdt-ipq8064", "qcom,msm-timer"; + compatible = "qcom,kpss-wdt-ipq8064", "qcom,kpss-timer", + "qcom,msm-timer"; interrupts = <GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_EDGE_RISING)>, <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(2) | diff --git a/arch/arm/boot/dts/qcom-msm8960.dtsi b/arch/arm/boot/dts/qcom-msm8960.dtsi index 7debf9db7cb1..63c3c40fe9a2 100644 --- a/arch/arm/boot/dts/qcom-msm8960.dtsi +++ b/arch/arm/boot/dts/qcom-msm8960.dtsi @@ -103,8 +103,8 @@ intc: interrupt-controller@2000000 { }; timer@200a000 { - compatible = "qcom,kpss-timer", - "qcom,kpss-wdt-msm8960", "qcom,msm-timer"; + compatible = "qcom,kpss-wdt-msm8960", "qcom,kpss-timer", + "qcom,msm-timer"; interrupts = <GIC_PPI 1 0x301>, <GIC_PPI 2 0x301>, <GIC_PPI 3 0x301>;
The most specific compatible should be upfront. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- arch/arm/boot/dts/qcom-apq8064.dtsi | 4 ++-- arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +- arch/arm/boot/dts/qcom-ipq8064.dtsi | 4 ++-- arch/arm/boot/dts/qcom-msm8960.dtsi | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-)