| Message ID | 20230827005920.898719-1-dmitry.baryshkov@linaro.org |
|---|---|
| Headers | show |
| Series | ARM: dts: qcom: cleanup PMIC usage | expand |
On Sun, 27 Aug 2023 at 14:12, Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> wrote: > > On 27/08/2023 12:42, Dmitry Baryshkov wrote: > > On Sun, 27 Aug 2023 at 11:35, Krzysztof Kozlowski > > <krzysztof.kozlowski@linaro.org> wrote: > >> > >> On 27/08/2023 02:58, Dmitry Baryshkov wrote: > >>> Allow using interrupts-extended, which is a preferred form of interrupts > >>> specification compared to the interrupt-parrent + interrupts pair. > >>> > >>> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > >>> --- > >>> Documentation/devicetree/bindings/mfd/qcom-pm8xxx.yaml | 10 +++++++++- > >>> 1 file changed, 9 insertions(+), 1 deletion(-) > >>> > >>> diff --git a/Documentation/devicetree/bindings/mfd/qcom-pm8xxx.yaml b/Documentation/devicetree/bindings/mfd/qcom-pm8xxx.yaml > >>> index 7fe3875a5996..33d9615e63c8 100644 > >>> --- a/Documentation/devicetree/bindings/mfd/qcom-pm8xxx.yaml > >>> +++ b/Documentation/devicetree/bindings/mfd/qcom-pm8xxx.yaml > >>> @@ -37,6 +37,9 @@ properties: > >>> interrupts: > >>> maxItems: 1 > >>> > >>> + interrupts-extended: > >>> + maxItems: 1 > >> > >> The entire patch is not needed. At least should not be needed. What > >> problem are you trying to solve here? > > > > The main problem is the next chunk, which (currently) explicitly > > requires `interrupts' property. My goal is to allow > > `interrupts-extended' in addition to `interrupts'. > > They are allowed. Why do you think they aren't? That's why I don't > understand what real problem is here. qcom-pm8xxx.yaml lists `interrupts' property under the `required' clause. So I can not simply replace it with `interrupts-extended'
On 27/08/2023 14:57, Dmitry Baryshkov wrote: >>>>>> >>>>>> The entire patch is not needed. At least should not be needed. What >>>>>> problem are you trying to solve here? >>>>> >>>>> The main problem is the next chunk, which (currently) explicitly >>>>> requires `interrupts' property. My goal is to allow >>>>> `interrupts-extended' in addition to `interrupts'. >>>> >>>> They are allowed. Why do you think they aren't? That's why I don't >>>> understand what real problem is here. >>> >>> qcom-pm8xxx.yaml lists `interrupts' property under the `required' >>> clause. So I can not simply replace it with `interrupts-extended' >> >> Since when? So again: The entire patch is not needed. > > Hmm, interesting. I'm pretty sure that I saw the issue, but now I can > no longer reproduce it. Maybe I misinterpreted some other warning > which I saw while this was WIP. > I see that it is handled by the `fixup_interrupts` in dtschema itself. If interrupts were brought by some other schema and that one did not evaluate, then you could see errors about interrupt-extended. But that's not the case here. Best regards, Krzysztof
While reviewing APQ8064 CPUFreq patchset, Konrad pointed out that PMICs are not a part of SoC and as such do not belong to the per-SoC files. Cleanup the way 32-bit Qualcomm platforms treat PMICs: - Move SSBI PMICs to separate files (as a bonus merging two different instances of PM8921, benefitting both platforms). - Include such PMIC files only from the board files, keeping SoC file generic. - Move RPM regulator definitions to board files too. They do not belong to the SoC dtsi files for the same reason. - Move PMIC-specific GPIOs and supply properties to individual board files. Note, enabling DT schema triggers warnings for pmic:led@48 in qcom-apq8060-dragonboard.dts. This node uses custom ('cm3605') trigger to make the LED follow the state of the proximity / ALS device. Previously [1] Rob pointed out that this is not the best way and the device should be switched to `trigger-sources' instead. However as I do not have this device, I'm not brave enough to introduce these changes. Note2: DT binding changes are largely independent from the DTS changes, they can be applied separately. [1] https://lore.kernel.org/linux-arm-msm/20221205220709.GA2713165-robh@kernel.org Changes since v3: - Moved PMIC interrupts to board DT files, they are not a property of the board, not the SoC. - Dropped qcom, prefix from ssbi node names in ipq8064 and mdm9615 DT files. Changes since v2: - Rebased on top of linux-next to fix conflict - Picked up dt-bindings patches from old, not-fully merged series. - qcom,pm8921-keypad: droped the no-autorepeat property (Rob, Dmitry) - Moved qcom,ssbi to /bus/ (Krzysztof) Changes since v1: - To ease reviewing break cleanups from the "split PMIC" patches (Konrad). Dmitry Baryshkov (38): dt-bindings: input: qcom,pm8921-keypad: convert to YAML format dt-bindings: mfd: qcom-pm8xxx: add missing child nodes dt-bindings: mfd: qcom-pm8xxx: allow using interrupts-extended ARM: dts: qcom: apq8064: correct XOADC register address ARM: dts: qcom: msm8960: introduce label for PMIC keypad ARM: dts: qcom: msm8660-surf: use keypad label directly ARM: dts: qcom: apq8064-nexus7: move sdcc1 node to proper place ARM: dts: qcom: mdm9615-wp8548-mangoh-green: group include clauses ARM: dts: qcom: strip prefix from PMIC files ARM: dts: qcom: apq8064: fix PMIC node labels ARM: dts: qcom: mdm9615: fix PMIC node labels ARM: dts: qcom: msm8660: fix PMIC node labels ARM: dts: qcom: msm8960: fix PMIC node labels ARM: dts: qcom: apq8064: move PMIC interrupts to the board files ARM: dts: qcom: mdm9615: move PMIC interrupts to the board files ARM: dts: qcom: msm8660: move PMIC interrupts to the board files ARM: dts: qcom: msm8960: move PMIC interrupts to the board files ARM: dts: qcom: msm8960: split PMIC to separate dtsi files ARM: dts: qcom: apq8064: split PMICs to separate dtsi files ARM: dts: qcom: mdm9615: split PMIC to separate dtsi files ARM: dts: qcom: msm8660: split PMIC to separate dtsi files ARM: dts: qcom: pm8058: reorder nodes ARM: dts: qcom: pm8921: reorder nodes ARM: dts: qcom: pm8018: move reg property ARM: dts: qcom: pm8921: move reg property ARM: dts: qcom: pm8058: use defined IRQ flags ARM: dts: qcom: pm8921: switch to interrupts-extended ARM: dts: qcom: pm8018: switch to interrupts-extended ARM: dts: qcom: pm8058: switch to interrupts-extended ARM: dts: qcom: apq8064: move RPM regulators to board files ARM: dts: qcom: mdm9615: move RPM regulators to board files ARM: dts: qcom: msm8660: move RPM regulators to board files ARM: dts: qcom: msm8960: drop useless rpm regulators node ARM: dts: qcom: msm8974: move regulators to board files ARM: dts: qcom: pm8921: Disable keypad by default ARM: dts: qcom: apq8060-dragonboard: rename mpp ADC channels to adc-channel ARM: dts: qcom: ipq8064: drop qcom, prefix from SSBI node name ARM: dts: qcom: mdm9615: drop qcom, prefix from SSBI node name .../bindings/input/qcom,pm8921-keypad.yaml | 89 +++++++ .../bindings/input/qcom,pm8xxx-keypad.txt | 90 -------- .../devicetree/bindings/mfd/qcom-pm8xxx.yaml | 36 ++- arch/arm/boot/dts/qcom/pm8018.dtsi | 55 +++++ arch/arm/boot/dts/qcom/pm8058.dtsi | 159 +++++++++++++ .../qcom/{qcom-pm8226.dtsi => pm8226.dtsi} | 0 arch/arm/boot/dts/qcom/pm8821.dtsi | 22 ++ .../qcom/{qcom-pm8841.dtsi => pm8841.dtsi} | 0 arch/arm/boot/dts/qcom/pm8921.dtsi | 137 +++++++++++ .../qcom/{qcom-pm8941.dtsi => pm8941.dtsi} | 0 .../qcom/{qcom-pma8084.dtsi => pma8084.dtsi} | 0 .../dts/qcom/{qcom-pmx55.dtsi => pmx55.dtsi} | 0 .../dts/qcom/{qcom-pmx65.dtsi => pmx65.dtsi} | 0 .../dts/qcom/qcom-apq8026-asus-sparrow.dts | 2 +- .../dts/qcom/qcom-apq8026-huawei-sturgeon.dts | 2 +- .../boot/dts/qcom/qcom-apq8026-lg-lenok.dts | 2 +- .../qcom-apq8026-samsung-matisse-wifi.dts | 2 +- .../dts/qcom/qcom-apq8060-dragonboard.dts | 164 ++++++++----- .../dts/qcom/qcom-apq8064-asus-nexus7-flo.dts | 70 +++--- .../boot/dts/qcom/qcom-apq8064-cm-qs600.dts | 35 ++- .../boot/dts/qcom/qcom-apq8064-ifc6410.dts | 42 ++-- .../qcom-apq8064-sony-xperia-lagan-yuga.dts | 111 +++++---- arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 201 +--------------- .../dts/qcom/qcom-apq8074-dragonboard.dts | 31 ++- .../boot/dts/qcom/qcom-apq8084-ifc6540.dts | 2 +- arch/arm/boot/dts/qcom/qcom-apq8084-mtp.dts | 2 +- arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi | 2 +- .../qcom/qcom-mdm9615-wp8548-mangoh-green.dts | 4 +- .../boot/dts/qcom/qcom-mdm9615-wp8548.dtsi | 143 +++++++++++- arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi | 183 +-------------- arch/arm/boot/dts/qcom/qcom-msm8660-surf.dts | 61 +++-- arch/arm/boot/dts/qcom/qcom-msm8660.dtsi | 217 +----------------- arch/arm/boot/dts/qcom/qcom-msm8960-cdp.dts | 27 ++- .../qcom/qcom-msm8960-samsung-expressatt.dts | 7 +- arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 45 +--- .../qcom-msm8974-lge-nexus5-hammerhead.dts | 31 ++- .../qcom/qcom-msm8974-sony-xperia-rhine.dtsi | 31 ++- arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 27 --- .../qcom/qcom-msm8974pro-fairphone-fp2.dts | 31 ++- .../qcom/qcom-msm8974pro-oneplus-bacon.dts | 31 ++- .../dts/qcom/qcom-msm8974pro-samsung-klte.dts | 12 +- ...-msm8974pro-sony-xperia-shinano-castor.dts | 31 ++- arch/arm/boot/dts/qcom/qcom-sdx55-mtp.dts | 2 +- arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts | 2 +- .../dts/qcom/qcom-sdx55-telit-fn980-tlb.dts | 2 +- arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts | 2 +- 46 files changed, 1171 insertions(+), 974 deletions(-) create mode 100644 Documentation/devicetree/bindings/input/qcom,pm8921-keypad.yaml delete mode 100644 Documentation/devicetree/bindings/input/qcom,pm8xxx-keypad.txt create mode 100644 arch/arm/boot/dts/qcom/pm8018.dtsi create mode 100644 arch/arm/boot/dts/qcom/pm8058.dtsi rename arch/arm/boot/dts/qcom/{qcom-pm8226.dtsi => pm8226.dtsi} (100%) create mode 100644 arch/arm/boot/dts/qcom/pm8821.dtsi rename arch/arm/boot/dts/qcom/{qcom-pm8841.dtsi => pm8841.dtsi} (100%) create mode 100644 arch/arm/boot/dts/qcom/pm8921.dtsi rename arch/arm/boot/dts/qcom/{qcom-pm8941.dtsi => pm8941.dtsi} (100%) rename arch/arm/boot/dts/qcom/{qcom-pma8084.dtsi => pma8084.dtsi} (100%) rename arch/arm/boot/dts/qcom/{qcom-pmx55.dtsi => pmx55.dtsi} (100%) rename arch/arm/boot/dts/qcom/{qcom-pmx65.dtsi => pmx65.dtsi} (100%)