lkml.org 
[lkml]   [2022]   [Aug]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.18 41/53] arm64: dts: qcom: add missing AOSS QMP compatible fallback
    Date
    From: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

    [ Upstream commit 6ba93ba9f63fbc44c3a6af7fe6f2536d009cfd5a ]

    The AOSS QMP bindings expect all compatibles to be followed by fallback
    "qcom,aoss-qmp" because all of these are actually compatible with each
    other. This fixes dtbs_check warnings like:

    sm8250-hdk.dtb: power-controller@c300000: compatible: ['qcom,sm8250-aoss-qmp'] is too short

    Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
    Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
    Link: https://lore.kernel.org/r/20220504131923.214367-6-krzysztof.kozlowski@linaro.org
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm64/boot/dts/qcom/sc7180.dtsi | 2 +-
    arch/arm64/boot/dts/qcom/sc7280.dtsi | 2 +-
    arch/arm64/boot/dts/qcom/sm8150.dtsi | 2 +-
    arch/arm64/boot/dts/qcom/sm8250.dtsi | 2 +-
    arch/arm64/boot/dts/qcom/sm8350.dtsi | 2 +-
    5 files changed, 5 insertions(+), 5 deletions(-)

    diff --git a/arch/arm64/boot/dts/qcom/sc7180.dtsi b/arch/arm64/boot/dts/qcom/sc7180.dtsi
    index e9fb3c9a2d6e..120db2d0a309 100644
    --- a/arch/arm64/boot/dts/qcom/sc7180.dtsi
    +++ b/arch/arm64/boot/dts/qcom/sc7180.dtsi
    @@ -3219,7 +3219,7 @@ aoss_reset: reset-controller@c2a0000 {
    };

    aoss_qmp: power-controller@c300000 {
    - compatible = "qcom,sc7180-aoss-qmp";
    + compatible = "qcom,sc7180-aoss-qmp", "qcom,aoss-qmp";
    reg = <0 0x0c300000 0 0x400>;
    interrupts = <GIC_SPI 389 IRQ_TYPE_EDGE_RISING>;
    mboxes = <&apss_shared 0>;
    diff --git a/arch/arm64/boot/dts/qcom/sc7280.dtsi b/arch/arm64/boot/dts/qcom/sc7280.dtsi
    index 8a4fd614d0a1..7925c8561117 100644
    --- a/arch/arm64/boot/dts/qcom/sc7280.dtsi
    +++ b/arch/arm64/boot/dts/qcom/sc7280.dtsi
    @@ -3467,7 +3467,7 @@ aoss_reset: reset-controller@c2a0000 {
    };

    aoss_qmp: power-controller@c300000 {
    - compatible = "qcom,sc7280-aoss-qmp";
    + compatible = "qcom,sc7280-aoss-qmp", "qcom,aoss-qmp";
    reg = <0 0x0c300000 0 0x400>;
    interrupts-extended = <&ipcc IPCC_CLIENT_AOP
    IPCC_MPROC_SIGNAL_GLINK_QMP
    diff --git a/arch/arm64/boot/dts/qcom/sm8150.dtsi b/arch/arm64/boot/dts/qcom/sm8150.dtsi
    index d4f288edf3c9..6edb3986a473 100644
    --- a/arch/arm64/boot/dts/qcom/sm8150.dtsi
    +++ b/arch/arm64/boot/dts/qcom/sm8150.dtsi
    @@ -3382,7 +3382,7 @@ camnoc_virt: interconnect@ac00000 {
    };

    aoss_qmp: power-controller@c300000 {
    - compatible = "qcom,sm8150-aoss-qmp";
    + compatible = "qcom,sm8150-aoss-qmp", "qcom,aoss-qmp";
    reg = <0x0 0x0c300000 0x0 0x400>;
    interrupts = <GIC_SPI 389 IRQ_TYPE_EDGE_RISING>;
    mboxes = <&apss_shared 0>;
    diff --git a/arch/arm64/boot/dts/qcom/sm8250.dtsi b/arch/arm64/boot/dts/qcom/sm8250.dtsi
    index ed4e288c921f..1d62b2130e04 100644
    --- a/arch/arm64/boot/dts/qcom/sm8250.dtsi
    +++ b/arch/arm64/boot/dts/qcom/sm8250.dtsi
    @@ -3475,7 +3475,7 @@ tsens1: thermal-sensor@c265000 {
    };

    aoss_qmp: power-controller@c300000 {
    - compatible = "qcom,sm8250-aoss-qmp";
    + compatible = "qcom,sm8250-aoss-qmp", "qcom,aoss-qmp";
    reg = <0 0x0c300000 0 0x400>;
    interrupts-extended = <&ipcc IPCC_CLIENT_AOP
    IPCC_MPROC_SIGNAL_GLINK_QMP
    diff --git a/arch/arm64/boot/dts/qcom/sm8350.dtsi b/arch/arm64/boot/dts/qcom/sm8350.dtsi
    index d843a550314a..ee6c202ab68c 100644
    --- a/arch/arm64/boot/dts/qcom/sm8350.dtsi
    +++ b/arch/arm64/boot/dts/qcom/sm8350.dtsi
    @@ -1537,7 +1537,7 @@ tsens1: thermal-sensor@c265000 {
    };

    aoss_qmp: power-controller@c300000 {
    - compatible = "qcom,sm8350-aoss-qmp";
    + compatible = "qcom,sm8350-aoss-qmp", "qcom,aoss-qmp";
    reg = <0 0x0c300000 0 0x400>;
    interrupts-extended = <&ipcc IPCC_CLIENT_AOP IPCC_MPROC_SIGNAL_GLINK_QMP
    IRQ_TYPE_EDGE_RISING>;
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-08-08 03:44    [W:4.164 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site