The sc8280xp platform uses its own copy of PMIC declarations. This can easily end up with the issues that are fixed in the main PMIC include file, but are not fixed for sc8280xp (and vice versa). For example commit c0ee8e0ba5cc ("arm64: dts: qcom: pmk8350: Use the correct PON compatible") changed pmk8350 to use "qcom,pmk8350-pon" compat for the PON device, while sc8280xp-pmic.dtsi still has the incorrect "qcom,pm8998-pon". Another example is pm8280_2_temp_alarm device, which uses interrupts tied to SID 2, while having SID 3. This can be easily left unnoticed. Employ a small amount of C preprocessor magic to make sc8280xp-pmics.dtsi use standard PMIC include files. Dmitry Baryshkov (6): dt-bindings: iio: qcom,spmi-adc7-pmk8350.h: include sid into defines arm64: dts: qcom: pmk8350: rename pon label arm64: dts: qcom: use main pmk8350.dtsi for sc8280xp platform arm64: dts: qcom: pm8350: include SID into labels arm64: dts: qcom: sc8280xp*: use pm8350.dtsi arm64: dts: qcom: sc8280xp*: use pm8350c.dtsi and pmr735a.dtsi .../bindings/iio/adc/qcom,spmi-vadc.yaml | 2 +- .../bindings/thermal/qcom-spmi-adc-tm5.yaml | 4 +- arch/arm64/boot/dts/qcom/pm8350.dtsi | 31 ++- arch/arm64/boot/dts/qcom/pmk8350.dtsi | 13 +- arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 2 +- arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 2 +- arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 24 +- .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 52 ++--- arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 210 ++---------------- .../boot/dts/qcom/sm7225-fairphone-fp4.dts | 2 +- arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 8 +- .../dts/qcom/sm8350-sony-xperia-sagami.dtsi | 12 +- .../dts/qcom/sm8450-sony-xperia-nagara.dtsi | 8 +- .../dt-bindings/iio/qcom,spmi-adc7-pmk8350.h | 52 ++--- 14 files changed, 128 insertions(+), 294 deletions(-) -- 2.30.2