| Message ID | 20230401220810.3563708-11-dmitry.baryshkov@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | arm64: dts: qcom: remove duplication in PMIC declarations | expand |
On 2.04.2023 00:07, Dmitry Baryshkov wrote: > As stated in the commit 2d5cab9232ba ("arm64: dts: qcom: sc8280xp-pmics: > Specify interrupt parent explicitly"), we should not use bare interrupts > for our PMIC devices. Instead interrupts-extended should be used. Change > pmk8350.dtsi to use interrupts-extended propery. propery/property It's not about using the interrupts-extended itself, as it's functionally identical if it points to the same interrupt parent. The main point of this is to designate the SPMI host as the interrupt provider for these nodes, as that's what the DT spec expects. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- For the change: Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > arch/arm64/boot/dts/qcom/pmk8350.dtsi | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/pmk8350.dtsi b/arch/arm64/boot/dts/qcom/pmk8350.dtsi > index f26ff3daf119..87b8e4269c60 100644 > --- a/arch/arm64/boot/dts/qcom/pmk8350.dtsi > +++ b/arch/arm64/boot/dts/qcom/pmk8350.dtsi > @@ -33,14 +33,14 @@ LABEL(pon): pon@1300 { > > LABEL(pon_pwrkey): pwrkey { > compatible = "qcom,pmk8350-pwrkey"; > - interrupts = <PMIC_SID 0x13 0x7 IRQ_TYPE_EDGE_BOTH>; > + interrupts-extended = <&spmi_bus PMIC_SID 0x13 0x7 IRQ_TYPE_EDGE_BOTH>; > linux,code = <KEY_POWER>; > status = "disabled"; > }; > > LABEL(pon_resin): resin { > compatible = "qcom,pmk8350-resin"; > - interrupts = <PMIC_SID 0x13 0x6 IRQ_TYPE_EDGE_BOTH>; > + interrupts-extended = <&spmi_bus PMIC_SID 0x13 0x6 IRQ_TYPE_EDGE_BOTH>; > status = "disabled"; > }; > }; > @@ -50,14 +50,14 @@ LABEL(vadc): adc@3100 { > reg = <0x3100>; > #address-cells = <1>; > #size-cells = <0>; > - interrupts = <PMIC_SID 0x31 0x0 IRQ_TYPE_EDGE_RISING>; > + interrupts-extended = <&spmi_bus PMIC_SID 0x31 0x0 IRQ_TYPE_EDGE_RISING>; > #io-channel-cells = <1>; > }; > > LABEL(adc_tm): adc-tm@3400 { > compatible = "qcom,adc-tm7"; > reg = <0x3400>; > - interrupts = <PMIC_SID 0x34 0x0 IRQ_TYPE_EDGE_RISING>; > + interrupts-extended = <&spmi_bus PMIC_SID 0x34 0x0 IRQ_TYPE_EDGE_RISING>; > #address-cells = <1>; > #size-cells = <0>; > #thermal-sensor-cells = <1>; > @@ -68,7 +68,7 @@ LABEL(rtc): rtc@6100 { > compatible = "qcom,pmk8350-rtc"; > reg = <0x6100>, <0x6200>; > reg-names = "rtc", "alarm"; > - interrupts = <PMIC_SID 0x62 0x1 IRQ_TYPE_EDGE_RISING>; > + interrupts-extended = <&spmi_bus PMIC_SID 0x62 0x1 IRQ_TYPE_EDGE_RISING>; > status = "disabled"; > }; >
diff --git a/arch/arm64/boot/dts/qcom/pmk8350.dtsi b/arch/arm64/boot/dts/qcom/pmk8350.dtsi index f26ff3daf119..87b8e4269c60 100644 --- a/arch/arm64/boot/dts/qcom/pmk8350.dtsi +++ b/arch/arm64/boot/dts/qcom/pmk8350.dtsi @@ -33,14 +33,14 @@ LABEL(pon): pon@1300 { LABEL(pon_pwrkey): pwrkey { compatible = "qcom,pmk8350-pwrkey"; - interrupts = <PMIC_SID 0x13 0x7 IRQ_TYPE_EDGE_BOTH>; + interrupts-extended = <&spmi_bus PMIC_SID 0x13 0x7 IRQ_TYPE_EDGE_BOTH>; linux,code = <KEY_POWER>; status = "disabled"; }; LABEL(pon_resin): resin { compatible = "qcom,pmk8350-resin"; - interrupts = <PMIC_SID 0x13 0x6 IRQ_TYPE_EDGE_BOTH>; + interrupts-extended = <&spmi_bus PMIC_SID 0x13 0x6 IRQ_TYPE_EDGE_BOTH>; status = "disabled"; }; }; @@ -50,14 +50,14 @@ LABEL(vadc): adc@3100 { reg = <0x3100>; #address-cells = <1>; #size-cells = <0>; - interrupts = <PMIC_SID 0x31 0x0 IRQ_TYPE_EDGE_RISING>; + interrupts-extended = <&spmi_bus PMIC_SID 0x31 0x0 IRQ_TYPE_EDGE_RISING>; #io-channel-cells = <1>; }; LABEL(adc_tm): adc-tm@3400 { compatible = "qcom,adc-tm7"; reg = <0x3400>; - interrupts = <PMIC_SID 0x34 0x0 IRQ_TYPE_EDGE_RISING>; + interrupts-extended = <&spmi_bus PMIC_SID 0x34 0x0 IRQ_TYPE_EDGE_RISING>; #address-cells = <1>; #size-cells = <0>; #thermal-sensor-cells = <1>; @@ -68,7 +68,7 @@ LABEL(rtc): rtc@6100 { compatible = "qcom,pmk8350-rtc"; reg = <0x6100>, <0x6200>; reg-names = "rtc", "alarm"; - interrupts = <PMIC_SID 0x62 0x1 IRQ_TYPE_EDGE_RISING>; + interrupts-extended = <&spmi_bus PMIC_SID 0x62 0x1 IRQ_TYPE_EDGE_RISING>; status = "disabled"; };
As stated in the commit 2d5cab9232ba ("arm64: dts: qcom: sc8280xp-pmics: Specify interrupt parent explicitly"), we should not use bare interrupts for our PMIC devices. Instead interrupts-extended should be used. Change pmk8350.dtsi to use interrupts-extended propery. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- arch/arm64/boot/dts/qcom/pmk8350.dtsi | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)