| Message ID | 20250509110959.3384306-1-jishnu.prakash@oss.qualcomm.com |
|---|---|
| Headers | show |
| Series | Add support for QCOM SPMI PMIC5 Gen3 ADC | expand |
On Fri, 9 May 2025 16:39:55 +0530 Jishnu Prakash <jishnu.prakash@oss.qualcomm.com> wrote: > There are several files containing QCOM ADC macros for channel names right now > in the include/dt-bindings/iio folder. Since all of these are specifically for > adc, move the files to the include/dt-bindings/iio/adc folder. > > Also update all affected devicetree and driver files to fix compilation errors > seen with this move and update documentation files to fix dtbinding check errors > for the same. > > Acked-by: Lee Jones <lee@kernel.org> > Acked-by: Rob Herring <robh@kernel.org> > Signed-off-by: Jishnu Prakash <jishnu.prakash@oss.qualcomm.com> Hi. So this seems like it's going to be messy to apply except via the appropriate QC tree. So I'll assume it goes that way (unlike the driver changes) Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > Changes since v5: > - Updated one more devicetree file requiring this change. > Ran full dt_binding_check and dtbs_check and verified that no > errors were reported related to this patch. > > Mentioning this explicitly as there was an invalid error reported on > this patch in the last two patch series, from upstream kernel > automation: > > fatal error: dt-bindings/iio/adc/qcom,spmi-vadc.h: No such file or directory > > The error is invalid as this file does get added in this patch, in > previous patch series too. > > Links to discussion for same in v5: > https://lore.kernel.org/all/cc328ade-a05e-4b1d-a8f0-55b18b4a0873@oss.qualcomm.com/ > https://lore.kernel.org/all/9f24e85d-f762-4c29-a58f-ed7652f50919@oss.qualcomm.com/ > > Links to discussion for same in v4: > https://lore.kernel.org/all/16aaae04-4fe8-4227-9374-0919960a4ca2@quicinc.com/ > > Changes since v4: > - Updated some more devicetree files requiring this change. > > Changes since v3: > - Updated files affected by adc file path change in /arch/arm, which > were missed earlier. Updated some more new devicetree files requiring > this change in /arch/arm64. > > Changes since v2: > - Updated some more new devicetree files requiring this change. > > .../devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml | 8 ++++---- > Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 2 +- > .../devicetree/bindings/thermal/qcom-spmi-adc-tm-hc.yaml | 2 +- > .../devicetree/bindings/thermal/qcom-spmi-adc-tm5.yaml | 6 +++--- > arch/arm/boot/dts/qcom/pm8226.dtsi | 2 +- > arch/arm/boot/dts/qcom/pm8941.dtsi | 2 +- > arch/arm/boot/dts/qcom/pma8084.dtsi | 2 +- > arch/arm/boot/dts/qcom/pmx55.dtsi | 2 +- > arch/arm64/boot/dts/qcom/pm4125.dtsi | 2 +- > arch/arm64/boot/dts/qcom/pm6125.dtsi | 2 +- > arch/arm64/boot/dts/qcom/pm6150.dtsi | 2 +- > arch/arm64/boot/dts/qcom/pm6150l.dtsi | 2 +- > arch/arm64/boot/dts/qcom/pm660.dtsi | 2 +- > arch/arm64/boot/dts/qcom/pm660l.dtsi | 2 +- > arch/arm64/boot/dts/qcom/pm7250b.dtsi | 2 +- > arch/arm64/boot/dts/qcom/pm8150.dtsi | 2 +- > arch/arm64/boot/dts/qcom/pm8150b.dtsi | 2 +- > arch/arm64/boot/dts/qcom/pm8150l.dtsi | 2 +- > arch/arm64/boot/dts/qcom/pm8916.dtsi | 2 +- > arch/arm64/boot/dts/qcom/pm8937.dtsi | 2 +- > arch/arm64/boot/dts/qcom/pm8950.dtsi | 2 +- > arch/arm64/boot/dts/qcom/pm8953.dtsi | 2 +- > arch/arm64/boot/dts/qcom/pm8994.dtsi | 2 +- > arch/arm64/boot/dts/qcom/pm8998.dtsi | 2 +- > arch/arm64/boot/dts/qcom/pmi632.dtsi | 2 +- > arch/arm64/boot/dts/qcom/pmi8950.dtsi | 2 +- > arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi | 2 +- > arch/arm64/boot/dts/qcom/pmp8074.dtsi | 2 +- > arch/arm64/boot/dts/qcom/pms405.dtsi | 2 +- > arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 4 ++-- > arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts | 4 ++-- > arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 4 ++-- > arch/arm64/boot/dts/qcom/sc7280-idp.dts | 2 +- > arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 2 +- > arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 4 ++-- > arch/arm64/boot/dts/qcom/sc8180x-pmics.dtsi | 2 +- > arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts | 2 +- > .../arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 2 +- > arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts | 2 +- > arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 6 +++--- > arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 2 +- > arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts | 6 +++--- > arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 8 ++++---- > drivers/iio/adc/qcom-spmi-adc5.c | 2 +- > drivers/iio/adc/qcom-spmi-vadc.c | 2 +- > include/dt-bindings/iio/{ => adc}/qcom,spmi-adc7-pm7325.h | 2 +- > include/dt-bindings/iio/{ => adc}/qcom,spmi-adc7-pm8350.h | 2 +- > .../dt-bindings/iio/{ => adc}/qcom,spmi-adc7-pm8350b.h | 2 +- > .../dt-bindings/iio/{ => adc}/qcom,spmi-adc7-pmk8350.h | 2 +- > .../dt-bindings/iio/{ => adc}/qcom,spmi-adc7-pmr735a.h | 2 +- > .../dt-bindings/iio/{ => adc}/qcom,spmi-adc7-pmr735b.h | 2 +- > .../dt-bindings/iio/{ => adc}/qcom,spmi-adc7-smb139x.h | 2 +- > include/dt-bindings/iio/{ => adc}/qcom,spmi-vadc.h | 0 > 53 files changed, 68 insertions(+), 68 deletions(-) > rename include/dt-bindings/iio/{ => adc}/qcom,spmi-adc7-pm7325.h (98%) > rename include/dt-bindings/iio/{ => adc}/qcom,spmi-adc7-pm8350.h (98%) > rename include/dt-bindings/iio/{ => adc}/qcom,spmi-adc7-pm8350b.h (99%) > rename include/dt-bindings/iio/{ => adc}/qcom,spmi-adc7-pmk8350.h (97%) > rename include/dt-bindings/iio/{ => adc}/qcom,spmi-adc7-pmr735a.h (95%) > rename include/dt-bindings/iio/{ => adc}/qcom,spmi-adc7-pmr735b.h (95%) > rename include/dt-bindings/iio/{ => adc}/qcom,spmi-adc7-smb139x.h (93%) > rename include/dt-bindings/iio/{ => adc}/qcom,spmi-vadc.h (100%) > > diff --git a/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml b/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml > index c28db0d635a0..a4f72c0c1ec6 100644 > --- a/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml > +++ b/Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml > @@ -70,9 +70,9 @@ patternProperties: > maxItems: 1 > description: | > ADC channel number. > - See include/dt-bindings/iio/qcom,spmi-vadc.h > + See include/dt-bindings/iio/adc/qcom,spmi-vadc.h > For PMIC7 ADC, the channel numbers are specified separately per PMIC > - in the PMIC-specific files in include/dt-bindings/iio/. > + in the PMIC-specific files in include/dt-bindings/iio/adc. > > label: > description: | > @@ -276,8 +276,8 @@ examples: > }; > > - | > - #include <dt-bindings/iio/qcom,spmi-adc7-pmk8350.h> > - #include <dt-bindings/iio/qcom,spmi-adc7-pm8350.h> > + #include <dt-bindings/iio/adc/qcom,spmi-adc7-pmk8350.h> > + #include <dt-bindings/iio/adc/qcom,spmi-adc7-pm8350.h> > #include <dt-bindings/interrupt-controller/irq.h> > > pmic { > diff --git a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml > index 078a6886f8b1..11da55644262 100644 > --- a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml > +++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml > @@ -276,7 +276,7 @@ examples: > #include <dt-bindings/input/input.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/interrupt-controller/arm-gic.h> > - #include <dt-bindings/iio/qcom,spmi-vadc.h> > + #include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/spmi/spmi.h> > > pmic@0 { > diff --git a/Documentation/devicetree/bindings/thermal/qcom-spmi-adc-tm-hc.yaml b/Documentation/devicetree/bindings/thermal/qcom-spmi-adc-tm-hc.yaml > index bfad8130a042..65b8c8cf802f 100644 > --- a/Documentation/devicetree/bindings/thermal/qcom-spmi-adc-tm-hc.yaml > +++ b/Documentation/devicetree/bindings/thermal/qcom-spmi-adc-tm-hc.yaml > @@ -110,7 +110,7 @@ unevaluatedProperties: false > > examples: > - | > - #include <dt-bindings/iio/qcom,spmi-vadc.h> > + #include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/interrupt-controller/irq.h> > > pmic { > diff --git a/Documentation/devicetree/bindings/thermal/qcom-spmi-adc-tm5.yaml b/Documentation/devicetree/bindings/thermal/qcom-spmi-adc-tm5.yaml > index 4470a5942fb2..5d19a82b0319 100644 > --- a/Documentation/devicetree/bindings/thermal/qcom-spmi-adc-tm5.yaml > +++ b/Documentation/devicetree/bindings/thermal/qcom-spmi-adc-tm5.yaml > @@ -163,7 +163,7 @@ unevaluatedProperties: false > > examples: > - | > - #include <dt-bindings/iio/qcom,spmi-vadc.h> > + #include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/interrupt-controller/irq.h> > > pmic { > @@ -204,8 +204,8 @@ examples: > }; > > - | > - #include <dt-bindings/iio/qcom,spmi-adc7-pmk8350.h> > - #include <dt-bindings/iio/qcom,spmi-adc7-pm8350.h> > + #include <dt-bindings/iio/adc/qcom,spmi-adc7-pmk8350.h> > + #include <dt-bindings/iio/adc/qcom,spmi-adc7-pm8350.h> > #include <dt-bindings/interrupt-controller/irq.h> > > pmic { > diff --git a/arch/arm/boot/dts/qcom/pm8226.dtsi b/arch/arm/boot/dts/qcom/pm8226.dtsi > index 2fd4f135ed84..774120aa50bc 100644 > --- a/arch/arm/boot/dts/qcom/pm8226.dtsi > +++ b/arch/arm/boot/dts/qcom/pm8226.dtsi > @@ -1,5 +1,5 @@ > // SPDX-License-Identifier: BSD-3-Clause > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/input/linux-event-codes.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/spmi/spmi.h> > diff --git a/arch/arm/boot/dts/qcom/pm8941.dtsi b/arch/arm/boot/dts/qcom/pm8941.dtsi > index aca0052a02b7..d995cc6eaebf 100644 > --- a/arch/arm/boot/dts/qcom/pm8941.dtsi > +++ b/arch/arm/boot/dts/qcom/pm8941.dtsi > @@ -1,5 +1,5 @@ > // SPDX-License-Identifier: GPL-2.0 > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/spmi/spmi.h> > > diff --git a/arch/arm/boot/dts/qcom/pma8084.dtsi b/arch/arm/boot/dts/qcom/pma8084.dtsi > index 309f5256754b..f8790bbc225e 100644 > --- a/arch/arm/boot/dts/qcom/pma8084.dtsi > +++ b/arch/arm/boot/dts/qcom/pma8084.dtsi > @@ -1,5 +1,5 @@ > // SPDX-License-Identifier: GPL-2.0 > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/input/linux-event-codes.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/spmi/spmi.h> > diff --git a/arch/arm/boot/dts/qcom/pmx55.dtsi b/arch/arm/boot/dts/qcom/pmx55.dtsi > index da0851173c69..af05ec5a009c 100644 > --- a/arch/arm/boot/dts/qcom/pmx55.dtsi > +++ b/arch/arm/boot/dts/qcom/pmx55.dtsi > @@ -5,7 +5,7 @@ > * Copyright (c) 2020, Linaro Limited > */ > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/spmi/spmi.h> > > diff --git a/arch/arm64/boot/dts/qcom/pm4125.dtsi b/arch/arm64/boot/dts/qcom/pm4125.dtsi > index cf8c822e80ce..db175a55035c 100644 > --- a/arch/arm64/boot/dts/qcom/pm4125.dtsi > +++ b/arch/arm64/boot/dts/qcom/pm4125.dtsi > @@ -3,7 +3,7 @@ > * Copyright (c) 2023, Linaro Ltd > */ > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/input/input.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/spmi/spmi.h> > diff --git a/arch/arm64/boot/dts/qcom/pm6125.dtsi b/arch/arm64/boot/dts/qcom/pm6125.dtsi > index d0db28336fa9..2bc669e8763b 100644 > --- a/arch/arm64/boot/dts/qcom/pm6125.dtsi > +++ b/arch/arm64/boot/dts/qcom/pm6125.dtsi > @@ -1,6 +1,6 @@ > // SPDX-License-Identifier: BSD-3-Clause > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/input/input.h> > #include <dt-bindings/input/linux-event-codes.h> > #include <dt-bindings/interrupt-controller/irq.h> > diff --git a/arch/arm64/boot/dts/qcom/pm6150.dtsi b/arch/arm64/boot/dts/qcom/pm6150.dtsi > index 59524609fb1e..24fbfee8de79 100644 > --- a/arch/arm64/boot/dts/qcom/pm6150.dtsi > +++ b/arch/arm64/boot/dts/qcom/pm6150.dtsi > @@ -3,7 +3,7 @@ > * Copyright (c) 2019, The Linux Foundation. All rights reserved. > */ > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/input/linux-event-codes.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/spmi/spmi.h> > diff --git a/arch/arm64/boot/dts/qcom/pm6150l.dtsi b/arch/arm64/boot/dts/qcom/pm6150l.dtsi > index 334f976f1154..5c0ae7a06bd0 100644 > --- a/arch/arm64/boot/dts/qcom/pm6150l.dtsi > +++ b/arch/arm64/boot/dts/qcom/pm6150l.dtsi > @@ -3,7 +3,7 @@ > * Copyright (c) 2019, The Linux Foundation. All rights reserved. > */ > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/spmi/spmi.h> > > diff --git a/arch/arm64/boot/dts/qcom/pm660.dtsi b/arch/arm64/boot/dts/qcom/pm660.dtsi > index 156b2ddff0dc..0ae38647ec49 100644 > --- a/arch/arm64/boot/dts/qcom/pm660.dtsi > +++ b/arch/arm64/boot/dts/qcom/pm660.dtsi > @@ -3,7 +3,7 @@ > * Copyright (c) 2020, Konrad Dybcio > */ > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/input/linux-event-codes.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/spmi/spmi.h> > diff --git a/arch/arm64/boot/dts/qcom/pm660l.dtsi b/arch/arm64/boot/dts/qcom/pm660l.dtsi > index 3f8b9eafe164..585d206b02be 100644 > --- a/arch/arm64/boot/dts/qcom/pm660l.dtsi > +++ b/arch/arm64/boot/dts/qcom/pm660l.dtsi > @@ -3,7 +3,7 @@ > * Copyright (c) 2020, Konrad Dybcio > */ > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/input/linux-event-codes.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/spmi/spmi.h> > diff --git a/arch/arm64/boot/dts/qcom/pm7250b.dtsi b/arch/arm64/boot/dts/qcom/pm7250b.dtsi > index 0761e6b5fd8d..6ad46722ae38 100644 > --- a/arch/arm64/boot/dts/qcom/pm7250b.dtsi > +++ b/arch/arm64/boot/dts/qcom/pm7250b.dtsi > @@ -3,7 +3,7 @@ > * Copyright (C) 2022 Luca Weiss <luca.weiss@fairphone.com> > */ > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/spmi/spmi.h> > > diff --git a/arch/arm64/boot/dts/qcom/pm8150.dtsi b/arch/arm64/boot/dts/qcom/pm8150.dtsi > index d2568686a098..caf952e19d60 100644 > --- a/arch/arm64/boot/dts/qcom/pm8150.dtsi > +++ b/arch/arm64/boot/dts/qcom/pm8150.dtsi > @@ -7,7 +7,7 @@ > #include <dt-bindings/input/input.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/spmi/spmi.h> > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > > / { > thermal-zones { > diff --git a/arch/arm64/boot/dts/qcom/pm8150b.dtsi b/arch/arm64/boot/dts/qcom/pm8150b.dtsi > index 3f7b0b6a1d10..5192ab94e75e 100644 > --- a/arch/arm64/boot/dts/qcom/pm8150b.dtsi > +++ b/arch/arm64/boot/dts/qcom/pm8150b.dtsi > @@ -4,7 +4,7 @@ > * Copyright (c) 2019, Linaro Limited > */ > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/spmi/spmi.h> > > diff --git a/arch/arm64/boot/dts/qcom/pm8150l.dtsi b/arch/arm64/boot/dts/qcom/pm8150l.dtsi > index 3911d6d0d2e2..7822214f07b0 100644 > --- a/arch/arm64/boot/dts/qcom/pm8150l.dtsi > +++ b/arch/arm64/boot/dts/qcom/pm8150l.dtsi > @@ -4,7 +4,7 @@ > * Copyright (c) 2019, Linaro Limited > */ > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/spmi/spmi.h> > > diff --git a/arch/arm64/boot/dts/qcom/pm8916.dtsi b/arch/arm64/boot/dts/qcom/pm8916.dtsi > index f8e4829ff7f7..3a709095cda7 100644 > --- a/arch/arm64/boot/dts/qcom/pm8916.dtsi > +++ b/arch/arm64/boot/dts/qcom/pm8916.dtsi > @@ -1,5 +1,5 @@ > // SPDX-License-Identifier: GPL-2.0 > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/input/linux-event-codes.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/spmi/spmi.h> > diff --git a/arch/arm64/boot/dts/qcom/pm8937.dtsi b/arch/arm64/boot/dts/qcom/pm8937.dtsi > index 77809c3534a7..e54a92839c71 100644 > --- a/arch/arm64/boot/dts/qcom/pm8937.dtsi > +++ b/arch/arm64/boot/dts/qcom/pm8937.dtsi > @@ -3,7 +3,7 @@ > * Copyright (c) 2023, Dang Huynh <danct12@riseup.net> > */ > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/input/linux-event-codes.h> > #include <dt-bindings/spmi/spmi.h> > > diff --git a/arch/arm64/boot/dts/qcom/pm8950.dtsi b/arch/arm64/boot/dts/qcom/pm8950.dtsi > index ed72c6101813..c1462d659ff2 100644 > --- a/arch/arm64/boot/dts/qcom/pm8950.dtsi > +++ b/arch/arm64/boot/dts/qcom/pm8950.dtsi > @@ -5,7 +5,7 @@ > * Copyright (c) 2022, Marijn Suijten <marijn.suijten@somainline.org> > */ > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/input/linux-event-codes.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/pinctrl/qcom,pmic-mpp.h> > diff --git a/arch/arm64/boot/dts/qcom/pm8953.dtsi b/arch/arm64/boot/dts/qcom/pm8953.dtsi > index 64258505f9ba..9427062b8af5 100644 > --- a/arch/arm64/boot/dts/qcom/pm8953.dtsi > +++ b/arch/arm64/boot/dts/qcom/pm8953.dtsi > @@ -1,7 +1,7 @@ > // SPDX-License-Identifier: BSD-3-Clause > /* Copyright (c) 2022, The Linux Foundation. All rights reserved. */ > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/input/linux-event-codes.h> > #include <dt-bindings/spmi/spmi.h> > diff --git a/arch/arm64/boot/dts/qcom/pm8994.dtsi b/arch/arm64/boot/dts/qcom/pm8994.dtsi > index 353e4a6bd088..26cbcfd06d05 100644 > --- a/arch/arm64/boot/dts/qcom/pm8994.dtsi > +++ b/arch/arm64/boot/dts/qcom/pm8994.dtsi > @@ -1,5 +1,5 @@ > // SPDX-License-Identifier: GPL-2.0 > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/input/linux-event-codes.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/spmi/spmi.h> > diff --git a/arch/arm64/boot/dts/qcom/pm8998.dtsi b/arch/arm64/boot/dts/qcom/pm8998.dtsi > index 3ecb330590e5..b948b98835a9 100644 > --- a/arch/arm64/boot/dts/qcom/pm8998.dtsi > +++ b/arch/arm64/boot/dts/qcom/pm8998.dtsi > @@ -1,7 +1,7 @@ > // SPDX-License-Identifier: (GPL-2.0+ OR MIT) > /* Copyright 2018 Google LLC. */ > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/input/linux-event-codes.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/spmi/spmi.h> > diff --git a/arch/arm64/boot/dts/qcom/pmi632.dtsi b/arch/arm64/boot/dts/qcom/pmi632.dtsi > index 8c899d148e46..eff176851b83 100644 > --- a/arch/arm64/boot/dts/qcom/pmi632.dtsi > +++ b/arch/arm64/boot/dts/qcom/pmi632.dtsi > @@ -3,7 +3,7 @@ > * Copyright (C) 2023 Luca Weiss <luca@z3ntu.xyz> > */ > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/spmi/spmi.h> > > diff --git a/arch/arm64/boot/dts/qcom/pmi8950.dtsi b/arch/arm64/boot/dts/qcom/pmi8950.dtsi > index 3d3b1cd97cc3..9bd5b895cd58 100644 > --- a/arch/arm64/boot/dts/qcom/pmi8950.dtsi > +++ b/arch/arm64/boot/dts/qcom/pmi8950.dtsi > @@ -1,7 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0 > // Copyright (c) 2019, AngeloGioacchino Del Regno <kholk11@gmail.com> > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/spmi/spmi.h> > > diff --git a/arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi b/arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi > index 5084de66fc46..3dd3adfa096b 100644 > --- a/arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi > +++ b/arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi > @@ -6,7 +6,7 @@ > #include <dt-bindings/input/input.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/spmi/spmi.h> > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > > / { > thermal-zones { > diff --git a/arch/arm64/boot/dts/qcom/pmp8074.dtsi b/arch/arm64/boot/dts/qcom/pmp8074.dtsi > index 0d0a846ac8d9..9f3e4121d834 100644 > --- a/arch/arm64/boot/dts/qcom/pmp8074.dtsi > +++ b/arch/arm64/boot/dts/qcom/pmp8074.dtsi > @@ -1,7 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0-only OR BSD-3-Clause > > #include <dt-bindings/spmi/spmi.h> > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > > &spmi_bus { > pmic@0 { > diff --git a/arch/arm64/boot/dts/qcom/pms405.dtsi b/arch/arm64/boot/dts/qcom/pms405.dtsi > index 3f9100c7eff4..86c17094a92a 100644 > --- a/arch/arm64/boot/dts/qcom/pms405.dtsi > +++ b/arch/arm64/boot/dts/qcom/pms405.dtsi > @@ -5,7 +5,7 @@ > > #include <dt-bindings/spmi/spmi.h> > #include <dt-bindings/input/linux-event-codes.h> > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > #include <dt-bindings/thermal/thermal.h> > > / { > diff --git a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts > index 0f1c83822f66..33c3f2577161 100644 > --- a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts > +++ b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts > @@ -9,8 +9,8 @@ > #define PM7250B_SID 8 > #define PM7250B_SID1 9 > > -#include <dt-bindings/iio/qcom,spmi-adc7-pm7325.h> > -#include <dt-bindings/iio/qcom,spmi-adc7-pmk8350.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pm7325.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pmk8350.h> > #include <dt-bindings/leds/common.h> > #include <dt-bindings/pinctrl/qcom,pmic-gpio.h> > #include <dt-bindings/regulator/qcom,rpmh-regulator.h> > diff --git a/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts b/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts > index 712f29fbe85e..fb0c483d7850 100644 > --- a/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts > +++ b/arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts > @@ -9,8 +9,8 @@ > #define PM7250B_SID 8 > #define PM7250B_SID1 9 > > -#include <dt-bindings/iio/qcom,spmi-adc7-pm7325.h> > -#include <dt-bindings/iio/qcom,spmi-adc7-pmk8350.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pm7325.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pmk8350.h> > #include <dt-bindings/leds/common.h> > #include <dt-bindings/pinctrl/qcom,pmic-gpio.h> > #include <dt-bindings/regulator/qcom,rpmh-regulator.h> > diff --git a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts > index 5fbcd48f2e2d..2bb279ab55d4 100644 > --- a/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts > +++ b/arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts > @@ -9,8 +9,8 @@ > #define PM7250B_SID 8 > #define PM7250B_SID1 9 > > -#include <dt-bindings/iio/qcom,spmi-adc7-pmk8350.h> > -#include <dt-bindings/iio/qcom,spmi-adc7-pm7325.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pmk8350.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pm7325.h> > #include <dt-bindings/leds/common.h> > #include <dt-bindings/pinctrl/qcom,pmic-gpio.h> > #include <dt-bindings/regulator/qcom,rpmh-regulator.h> > diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dts b/arch/arm64/boot/dts/qcom/sc7280-idp.dts > index b5fe7356be48..1dd4aa300f7f 100644 > --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dts > +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dts > @@ -7,7 +7,7 @@ > > /dts-v1/; > > -#include <dt-bindings/iio/qcom,spmi-adc7-pmr735a.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pmr735a.h> > #include "sc7280-idp.dtsi" > #include "pmr735a.dtsi" > > diff --git a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi > index 7370aa0dbf0e..00d68a9588d3 100644 > --- a/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7280-idp.dtsi > @@ -5,7 +5,7 @@ > * Copyright (c) 2021, The Linux Foundation. All rights reserved. > */ > > -#include <dt-bindings/iio/qcom,spmi-adc7-pmk8350.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pmk8350.h> > #include <dt-bindings/input/linux-event-codes.h> > #include "sc7280.dtsi" > #include "pm7325.dtsi" > diff --git a/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi b/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi > index 7d1d5bbbbbd9..8fcd3e1bb815 100644 > --- a/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi > @@ -11,8 +11,8 @@ > * Copyright 2022 Google LLC. > */ > > -#include <dt-bindings/iio/qcom,spmi-adc7-pmk8350.h> > -#include <dt-bindings/iio/qcom,spmi-adc7-pmr735a.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pmk8350.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pmr735a.h> > #include <dt-bindings/pinctrl/qcom,pmic-gpio.h> > #include <dt-bindings/regulator/qcom,rpmh-regulator.h> > > diff --git a/arch/arm64/boot/dts/qcom/sc8180x-pmics.dtsi b/arch/arm64/boot/dts/qcom/sc8180x-pmics.dtsi > index 451c9b984f1f..ed1fcfdc3584 100644 > --- a/arch/arm64/boot/dts/qcom/sc8180x-pmics.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc8180x-pmics.dtsi > @@ -7,7 +7,7 @@ > #include <dt-bindings/input/input.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/spmi/spmi.h> > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > > / { > thermal-zones { > diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts b/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts > index 1667c7157057..22fb116330a2 100644 > --- a/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts > +++ b/arch/arm64/boot/dts/qcom/sc8280xp-huawei-gaokun3.dts > @@ -11,7 +11,7 @@ > > /dts-v1/; > > -#include <dt-bindings/iio/qcom,spmi-adc7-pm8350.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pm8350.h> > #include <dt-bindings/gpio/gpio.h> > #include <dt-bindings/input/gpio-keys.h> > #include <dt-bindings/input/input.h> > diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts > index d36fc1ebe50e..7f6bfb3a561c 100644 > --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts > +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts > @@ -6,7 +6,7 @@ > > /dts-v1/; > > -#include <dt-bindings/iio/qcom,spmi-adc7-pm8350.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pm8350.h> > #include <dt-bindings/gpio/gpio.h> > #include <dt-bindings/input/gpio-keys.h> > #include <dt-bindings/input/input.h> > diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts > index 812251324002..2c1dbb30814d 100644 > --- a/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts > +++ b/arch/arm64/boot/dts/qcom/sc8280xp-microsoft-blackrock.dts > @@ -8,7 +8,7 @@ > > /dts-v1/; > > -#include <dt-bindings/iio/qcom,spmi-adc7-pm8350.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pm8350.h> > #include <dt-bindings/gpio/gpio.h> > #include <dt-bindings/input/gpio-keys.h> > #include <dt-bindings/input/input.h> > diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi > index 307df1d3dcd2..f7633730eaa2 100644 > --- a/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi > +++ b/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi > @@ -3,9 +3,9 @@ > * Copyright (c) 2022, Linaro Limited > */ > > -#include <dt-bindings/iio/qcom,spmi-adc7-pm8350.h> > -#include <dt-bindings/iio/qcom,spmi-adc7-pmk8350.h> > -#include <dt-bindings/iio/qcom,spmi-adc7-pmr735a.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pm8350.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pmk8350.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pmr735a.h> > #include <dt-bindings/input/input.h> > #include <dt-bindings/interrupt-controller/irq.h> > #include <dt-bindings/spmi/spmi.h> > diff --git a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts > index 52b16a4fdc43..dcf51d57d9c4 100644 > --- a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts > +++ b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts > @@ -14,7 +14,7 @@ > > #include <dt-bindings/firmware/qcom,scm.h> > #include <dt-bindings/gpio/gpio.h> > -#include <dt-bindings/iio/qcom,spmi-adc7-pmk8350.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pmk8350.h> > #include <dt-bindings/input/input.h> > #include <dt-bindings/leds/common.h> > #include <dt-bindings/pinctrl/qcom,pmic-gpio.h> > diff --git a/arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts b/arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts > index 85a928f98077..9c38bdd8f18e 100644 > --- a/arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts > +++ b/arch/arm64/boot/dts/qcom/sm7325-nothing-spacewar.dts > @@ -8,9 +8,9 @@ > > #include <dt-bindings/arm/qcom,ids.h> > #include <dt-bindings/gpio/gpio.h> > -#include <dt-bindings/iio/qcom,spmi-adc7-pm7325.h> > -#include <dt-bindings/iio/qcom,spmi-adc7-pm8350b.h> > -#include <dt-bindings/iio/qcom,spmi-adc7-pmk8350.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pm7325.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pm8350b.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pmk8350.h> > #include <dt-bindings/leds/common.h> > #include <dt-bindings/pinctrl/qcom,pmic-gpio.h> > #include <dt-bindings/regulator/qcom,rpmh-regulator.h> > diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts > index 2ff40a120aad..cadf4e2f534e 100644 > --- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts > +++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts > @@ -6,10 +6,10 @@ > /dts-v1/; > > #include <dt-bindings/regulator/qcom,rpmh-regulator.h> > -#include <dt-bindings/iio/qcom,spmi-adc7-pm8350.h> > -#include <dt-bindings/iio/qcom,spmi-adc7-pm8350b.h> > -#include <dt-bindings/iio/qcom,spmi-adc7-pmk8350.h> > -#include <dt-bindings/iio/qcom,spmi-adc7-pmr735a.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pm8350.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pm8350b.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pmk8350.h> > +#include <dt-bindings/iio/adc/qcom,spmi-adc7-pmr735a.h> > #include <dt-bindings/sound/qcom,q6dsp-lpass-ports.h> > #include "sm8450.dtsi" > #include "pm8350.dtsi" > diff --git a/drivers/iio/adc/qcom-spmi-adc5.c b/drivers/iio/adc/qcom-spmi-adc5.c > index af3c2f659f5e..389454edbf75 100644 > --- a/drivers/iio/adc/qcom-spmi-adc5.c > +++ b/drivers/iio/adc/qcom-spmi-adc5.c > @@ -20,7 +20,7 @@ > #include <linux/regmap.h> > #include <linux/slab.h> > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > > #define ADC5_USR_REVISION1 0x0 > #define ADC5_USR_STATUS1 0x8 > diff --git a/drivers/iio/adc/qcom-spmi-vadc.c b/drivers/iio/adc/qcom-spmi-vadc.c > index 00a7f0982025..e4878770f88c 100644 > --- a/drivers/iio/adc/qcom-spmi-vadc.c > +++ b/drivers/iio/adc/qcom-spmi-vadc.c > @@ -20,7 +20,7 @@ > #include <linux/slab.h> > #include <linux/log2.h> > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > > /* VADC register and bit definitions */ > #define VADC_REVISION2 0x1 > diff --git a/include/dt-bindings/iio/qcom,spmi-adc7-pm7325.h b/include/dt-bindings/iio/adc/qcom,spmi-adc7-pm7325.h > similarity index 98% > rename from include/dt-bindings/iio/qcom,spmi-adc7-pm7325.h > rename to include/dt-bindings/iio/adc/qcom,spmi-adc7-pm7325.h > index 96908014e09e..f0ab57078ca4 100644 > --- a/include/dt-bindings/iio/qcom,spmi-adc7-pm7325.h > +++ b/include/dt-bindings/iio/adc/qcom,spmi-adc7-pm7325.h > @@ -10,7 +10,7 @@ > #define PM7325_SID 1 > #endif > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > > /* ADC channels for PM7325_ADC for PMIC7 */ > #define PM7325_ADC7_REF_GND (PM7325_SID << 8 | ADC7_REF_GND) > diff --git a/include/dt-bindings/iio/qcom,spmi-adc7-pm8350.h b/include/dt-bindings/iio/adc/qcom,spmi-adc7-pm8350.h > similarity index 98% > rename from include/dt-bindings/iio/qcom,spmi-adc7-pm8350.h > rename to include/dt-bindings/iio/adc/qcom,spmi-adc7-pm8350.h > index 5d98f7d48a1e..ef818248ec8c 100644 > --- a/include/dt-bindings/iio/qcom,spmi-adc7-pm8350.h > +++ b/include/dt-bindings/iio/adc/qcom,spmi-adc7-pm8350.h > @@ -6,7 +6,7 @@ > #ifndef _DT_BINDINGS_QCOM_SPMI_VADC_PM8350_H > #define _DT_BINDINGS_QCOM_SPMI_VADC_PM8350_H > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > > /* ADC channels for PM8350_ADC for PMIC7 */ > #define PM8350_ADC7_REF_GND(sid) ((sid) << 8 | ADC7_REF_GND) > diff --git a/include/dt-bindings/iio/qcom,spmi-adc7-pm8350b.h b/include/dt-bindings/iio/adc/qcom,spmi-adc7-pm8350b.h > similarity index 99% > rename from include/dt-bindings/iio/qcom,spmi-adc7-pm8350b.h > rename to include/dt-bindings/iio/adc/qcom,spmi-adc7-pm8350b.h > index 57c7977666d3..d841bf00b7b0 100644 > --- a/include/dt-bindings/iio/qcom,spmi-adc7-pm8350b.h > +++ b/include/dt-bindings/iio/adc/qcom,spmi-adc7-pm8350b.h > @@ -10,7 +10,7 @@ > #define PM8350B_SID 3 > #endif > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > > /* ADC channels for PM8350B_ADC for PMIC7 */ > #define PM8350B_ADC7_REF_GND (PM8350B_SID << 8 | ADC7_REF_GND) > diff --git a/include/dt-bindings/iio/qcom,spmi-adc7-pmk8350.h b/include/dt-bindings/iio/adc/qcom,spmi-adc7-pmk8350.h > similarity index 97% > rename from include/dt-bindings/iio/qcom,spmi-adc7-pmk8350.h > rename to include/dt-bindings/iio/adc/qcom,spmi-adc7-pmk8350.h > index 3d1a41a22cef..161b211ec126 100644 > --- a/include/dt-bindings/iio/qcom,spmi-adc7-pmk8350.h > +++ b/include/dt-bindings/iio/adc/qcom,spmi-adc7-pmk8350.h > @@ -10,7 +10,7 @@ > #define PMK8350_SID 0 > #endif > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > > /* ADC channels for PMK8350_ADC for PMIC7 */ > #define PMK8350_ADC7_REF_GND (PMK8350_SID << 8 | ADC7_REF_GND) > diff --git a/include/dt-bindings/iio/qcom,spmi-adc7-pmr735a.h b/include/dt-bindings/iio/adc/qcom,spmi-adc7-pmr735a.h > similarity index 95% > rename from include/dt-bindings/iio/qcom,spmi-adc7-pmr735a.h > rename to include/dt-bindings/iio/adc/qcom,spmi-adc7-pmr735a.h > index c5adfa82b20d..fedc9e3882b8 100644 > --- a/include/dt-bindings/iio/qcom,spmi-adc7-pmr735a.h > +++ b/include/dt-bindings/iio/adc/qcom,spmi-adc7-pmr735a.h > @@ -10,7 +10,7 @@ > #define PMR735A_SID 4 > #endif > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > > /* ADC channels for PMR735A_ADC for PMIC7 */ > #define PMR735A_ADC7_REF_GND (PMR735A_SID << 8 | ADC7_REF_GND) > diff --git a/include/dt-bindings/iio/qcom,spmi-adc7-pmr735b.h b/include/dt-bindings/iio/adc/qcom,spmi-adc7-pmr735b.h > similarity index 95% > rename from include/dt-bindings/iio/qcom,spmi-adc7-pmr735b.h > rename to include/dt-bindings/iio/adc/qcom,spmi-adc7-pmr735b.h > index fdb8dd9ae541..812f33872e5e 100644 > --- a/include/dt-bindings/iio/qcom,spmi-adc7-pmr735b.h > +++ b/include/dt-bindings/iio/adc/qcom,spmi-adc7-pmr735b.h > @@ -10,7 +10,7 @@ > #define PMR735B_SID 5 > #endif > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > > /* ADC channels for PMR735B_ADC for PMIC7 */ > #define PMR735B_ADC7_REF_GND (PMR735B_SID << 8 | ADC7_REF_GND) > diff --git a/include/dt-bindings/iio/qcom,spmi-adc7-smb139x.h b/include/dt-bindings/iio/adc/qcom,spmi-adc7-smb139x.h > similarity index 93% > rename from include/dt-bindings/iio/qcom,spmi-adc7-smb139x.h > rename to include/dt-bindings/iio/adc/qcom,spmi-adc7-smb139x.h > index c0680d1285cf..750a526af2c1 100644 > --- a/include/dt-bindings/iio/qcom,spmi-adc7-smb139x.h > +++ b/include/dt-bindings/iio/adc/qcom,spmi-adc7-smb139x.h > @@ -6,7 +6,7 @@ > #ifndef _DT_BINDINGS_QCOM_SPMI_VADC_SMB139X_H > #define _DT_BINDINGS_QCOM_SPMI_VADC_SMB139X_H > > -#include <dt-bindings/iio/qcom,spmi-vadc.h> > +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h> > > #define SMB139x_1_ADC7_SMB_TEMP (SMB139x_1_SID << 8 | ADC7_SMB_TEMP) > #define SMB139x_1_ADC7_ICHG_SMB (SMB139x_1_SID << 8 | ADC7_ICHG_SMB) > diff --git a/include/dt-bindings/iio/qcom,spmi-vadc.h b/include/dt-bindings/iio/adc/qcom,spmi-vadc.h > similarity index 100% > rename from include/dt-bindings/iio/qcom,spmi-vadc.h > rename to include/dt-bindings/iio/adc/qcom,spmi-vadc.h
On Fri, 9 May 2025 16:39:57 +0530 Jishnu Prakash <jishnu.prakash@oss.qualcomm.com> wrote: > For the PMIC5-Gen3 type PMICs, ADC peripheral is present in HW for the > following PMICs: PMK8550, PM8550, PM8550B and PM8550VX PMICs. > > It is similar to PMIC5-Gen2, with SW communication to ADCs on all PMICs > going through PBS(Programmable Boot Sequence) firmware through a single > register interface. This interface is implemented on SDAM (Shared > Direct Access Memory) peripherals on the master PMIC PMK8550 rather > than a dedicated ADC peripheral. > > Add documentation for PMIC5 Gen3 ADC and macro definitions for ADC > channels and virtual channels (combination of ADC channel number and > PMIC SID number) per PMIC, to be used by clients of this device. > > Signed-off-by: Jishnu Prakash <jishnu.prakash@oss.qualcomm.com> This looks fine to me. The dependencies on previous two patches make this a little tricky to handle though. I don't like splitting the path the binding and the driver take to upstream but in this case we probably either have to merge them in different cycles or this needs to go with those code movement patches. It looked like an immutable branch would be very messy given additions that the 1st patch touches probably mean an immutable would have to include a lot of stuff that is queued up in the Qualcomm SoC tree. If the rest of the necessary reviews turn up this cycle to get everything in this cycle merge (seems unlikely) then I don't thing routing this via the SoC tree will be a problem. To enable that Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> I suspect given timing best we can hope for is patches 1 and 2 go via the SoC tree asap and we deal with the rest at start of next cycle but I like to be optimistic :) Jonathan
On Fri, 9 May 2025 16:39:59 +0530 Jishnu Prakash <jishnu.prakash@oss.qualcomm.com> wrote: > Add support for ADC_TM part of PMIC5 Gen3. > > This is an auxiliary driver under the Gen3 ADC driver, which implements the > threshold setting and interrupt generating functionalities of QCOM ADC_TM > drivers, used to support thermal trip points. > > Signed-off-by: Jishnu Prakash <jishnu.prakash@oss.qualcomm.com> Hi Jishnu, A few minor things inline. Jonathan > diff --git a/drivers/thermal/qcom/qcom-spmi-adc-tm5-gen3.c b/drivers/thermal/qcom/qcom-spmi-adc-tm5-gen3.c > new file mode 100644 > index 000000000000..c63822635f10 > --- /dev/null > +++ b/drivers/thermal/qcom/qcom-spmi-adc-tm5-gen3.c > +static int adc_tm5_register_tzd(struct adc_tm5_gen3_chip *adc_tm5) > +{ > + unsigned int i, channel; > + struct thermal_zone_device *tzd; > + > + for (i = 0; i < adc_tm5->nchannels; i++) { > + channel = V_CHAN(adc_tm5->chan_props[i].common_props); > + tzd = devm_thermal_of_zone_register(adc_tm5->dev, channel, > + &adc_tm5->chan_props[i], > + &adc_tm_ops); > + > + if (IS_ERR(tzd)) { > + if (PTR_ERR(tzd) == -ENODEV) { > + dev_warn(adc_tm5->dev, > + "thermal sensor on channel %d is not used\n", > + channel); > + continue; > + } > + return dev_err_probe(adc_tm5->dev, PTR_ERR(tzd), > + "Error registering TZ zone:%ld for channel:%d\n", > + PTR_ERR(tzd), channel); > + } > + adc_tm5->chan_props[i].tzd = tzd; > + devm_thermal_add_hwmon_sysfs(adc_tm5->dev, tzd); Can fail so unusual not to see an error check. Add a comment if intended. > + } > + return 0; > +} > + > +static int adc_tm5_probe(struct auxiliary_device *aux_dev, > + const struct auxiliary_device_id *id) > +{ > + struct adc_tm5_gen3_chip *adc_tm5; > + struct tm5_aux_dev_wrapper *aux_dev_wrapper; > + struct device *dev = &aux_dev->dev; > + int i, ret; > + > + adc_tm5 = devm_kzalloc(&aux_dev->dev, sizeof(*adc_tm5), GFP_KERNEL); Use dev > + if (!adc_tm5) > + return -ENOMEM; > + > + aux_dev_wrapper = container_of(aux_dev, struct tm5_aux_dev_wrapper, > + aux_dev); > + > + adc_tm5->dev = dev; > + adc_tm5->dev_data = aux_dev_wrapper->dev_data; > + adc_tm5->nchannels = aux_dev_wrapper->n_tm_channels; > + adc_tm5->chan_props = devm_kcalloc(adc_tm5->dev, aux_dev_wrapper->n_tm_channels, Might as well use dev here too. > + sizeof(*adc_tm5->chan_props), GFP_KERNEL); > + if (!adc_tm5->chan_props) > + return -ENOMEM; > + > + for (i = 0; i < adc_tm5->nchannels; i++) { > + adc_tm5->chan_props[i].common_props = aux_dev_wrapper->tm_props[i]; > + adc_tm5->chan_props[i].timer = MEAS_INT_1S; > + adc_tm5->chan_props[i].sdam_index = (i + 1) / 8; > + adc_tm5->chan_props[i].tm_chan_index = (i + 1) % 8; > + adc_tm5->chan_props[i].chip = adc_tm5; > + } > + > + ret = devm_add_action_or_reset(adc_tm5->dev, adc5_gen3_disable, adc_tm5); > + if (ret) > + return ret; > + > + INIT_WORK(&adc_tm5->tm_handler_work, tm_handler_work); > + > + /* > + * Skipping first SDAM IRQ as it is requested in parent driver. > + * If there is a TM violation on that IRQ, the parent driver calls > + * the notifier (tm_event_notify) exposed from this driver to handle it. > + */ > + for (i = 1; i < adc_tm5->dev_data->num_sdams; i++) { > + ret = devm_request_threaded_irq(adc_tm5->dev, > + adc_tm5->dev_data->base[i].irq, > + NULL, adctm5_gen3_isr, IRQF_ONESHOT, > + adc_tm5->dev_data->base[i].irq_name, > + adc_tm5); > + if (ret < 0) > + return ret; > + } > + > + /* > + * This drvdata is only used in the function (adctm_event_handler) > + * called by parent ADC driver in case of TM violation on the first SDAM. > + */ > + auxiliary_set_drvdata(aux_dev, adc_tm5); > + > + ret = devm_add_action(adc_tm5->dev, adc5_gen3_clear_work, adc_tm5); I'd add a comment on what this is undoing as normally devm clean up matches something being started and there is no obvious sign of what that is here. > + if (ret) > + return ret; > + > + ret = adc_tm5_register_tzd(adc_tm5); return adc_tm5... > + if (ret) > + return ret; > + > + return 0; > +} > +static int __init adctm5_init_module(void) > +{ > + return auxiliary_driver_register(&adctm5gen3_auxiliary_drv.adrv); > +} > + > +static void __exit adctm5_exit_module(void) > +{ > + auxiliary_driver_unregister(&adctm5gen3_auxiliary_drv.adrv); > +} > + > +module_init(adctm5_init_module); > +module_exit(adctm5_exit_module); module_auxiliary_driver() not work for some reason? > + > +MODULE_DESCRIPTION("SPMI PMIC Thermal Monitor ADC driver"); > +MODULE_LICENSE("GPL"); > +MODULE_IMPORT_NS("QCOM_SPMI_ADC5_GEN3");
PMIC5 Gen3 has a similar ADC architecture to that on PMIC5 Gen2, with all SW communication to ADC going through PMK8550 which communicates with other PMICs through PBS. The major difference is that the register interface used here is that of an SDAM present on PMK8550, rather than a dedicated ADC peripheral. There may be more than one SDAM used for ADC5 Gen3. Each ADC SDAM has eight channels, each of which may be used for either immediate reads (same functionality as previous PMIC5 and PMIC5 Gen2 ADC peripherals) or recurring measurements (same as PMIC5 and PMIC5 Gen2 ADC_TM functionality). In this case, we have VADC and ADC_TM functionality combined into the same driver. Patch 1 is a cleanup, to move the QCOM ADC dt-bindings files from dt-bindings/iio to dt-bindings/iio/adc folder, as they are specifically for ADC devices. It also fixes all compilation errors with this change in driver and devicetree files and similar errors in documentation for dtbinding check. Patch 2 splits out the common ADC channel properties used on older VADC devices, which would also be reused on ADC5 Gen3. Patch 3 adds bindings for ADC5 Gen3 peripheral. Patch 4 adds the main driver for ADC5 Gen3. Patch 5 adds the auxiliary thermal driver which supports the ADC_TM functionality of ADC5 Gen3. Changes since v5: - Addressed some reviewer comments in documentation and driver patches. - Link to v5: https://lore.kernel.org/all/20250131183242.3653595-1-jishnu.prakash@oss.qualcomm.com/ Changes since v4: - Split common ADC channel properties out into a separate file to use as ref for ADC5 Gen3 and moved ADC5 Gen3 documentation into a separate file as suggested by reviewers. - Addressed few reviewer comments in driver patches. - Link to v4: https://lore.kernel.org/all/20241030185854.4015348-1-quic_jprakash@quicinc.com/ Changes since v3: - Updated files affected by adc file path change in /arch/arm folder, which were missed earlier. - Added ADC5 Gen3 documentation changes in existing qcom,spmi-vadc.yaml file instead of adding separate file and addressed reviewer comments for all bindings. - Addressed review comments in driver patch. Split out TM functionality into auxiliary driver in separate patch and added required changes in main driver. - Link to v3: https://lore.kernel.org/all/20231231171237.3322376-1-quic_jprakash@quicinc.com/ Changes since v2: - Reordered patches to keep cleanup change for ADC files first. - Moved ADC5 Gen3 documentation into a separate file Changes since v1: - Dropped patches 1-5 for changing 'ADC7' peripheral name to 'ADC5 Gen2'. - Addressed reviewer comments for binding and driver patches for ADC5 Gen3. - Combined patches 8-11 into a single patch as requested by reviewers to make the change clearer and made all fixes required in same patch. Jishnu Prakash (5): dt-bindings: iio/adc: Move QCOM ADC bindings to iio/adc folder dt-bindings: iio: adc: Split out QCOM VADC channel properties dt-bindings: iio: adc: Add support for QCOM PMIC5 Gen3 ADC iio: adc: Add support for QCOM PMIC5 Gen3 ADC thermal: qcom: add support for PMIC5 Gen3 ADC thermal monitoring .../bindings/iio/adc/qcom,spmi-adc5-gen3.yaml | 155 ++++ .../iio/adc/qcom,spmi-vadc-common.yaml | 87 ++ .../bindings/iio/adc/qcom,spmi-vadc.yaml | 81 +- .../bindings/mfd/qcom,spmi-pmic.yaml | 2 +- .../bindings/thermal/qcom-spmi-adc-tm-hc.yaml | 2 +- .../bindings/thermal/qcom-spmi-adc-tm5.yaml | 6 +- arch/arm/boot/dts/qcom/pm8226.dtsi | 2 +- arch/arm/boot/dts/qcom/pm8941.dtsi | 2 +- arch/arm/boot/dts/qcom/pma8084.dtsi | 2 +- arch/arm/boot/dts/qcom/pmx55.dtsi | 2 +- arch/arm64/boot/dts/qcom/pm4125.dtsi | 2 +- arch/arm64/boot/dts/qcom/pm6125.dtsi | 2 +- arch/arm64/boot/dts/qcom/pm6150.dtsi | 2 +- arch/arm64/boot/dts/qcom/pm6150l.dtsi | 2 +- arch/arm64/boot/dts/qcom/pm660.dtsi | 2 +- arch/arm64/boot/dts/qcom/pm660l.dtsi | 2 +- arch/arm64/boot/dts/qcom/pm7250b.dtsi | 2 +- arch/arm64/boot/dts/qcom/pm8150.dtsi | 2 +- arch/arm64/boot/dts/qcom/pm8150b.dtsi | 2 +- arch/arm64/boot/dts/qcom/pm8150l.dtsi | 2 +- arch/arm64/boot/dts/qcom/pm8916.dtsi | 2 +- arch/arm64/boot/dts/qcom/pm8937.dtsi | 2 +- arch/arm64/boot/dts/qcom/pm8950.dtsi | 2 +- arch/arm64/boot/dts/qcom/pm8953.dtsi | 2 +- arch/arm64/boot/dts/qcom/pm8994.dtsi | 2 +- arch/arm64/boot/dts/qcom/pm8998.dtsi | 2 +- arch/arm64/boot/dts/qcom/pmi632.dtsi | 2 +- arch/arm64/boot/dts/qcom/pmi8950.dtsi | 2 +- arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi | 2 +- arch/arm64/boot/dts/qcom/pmp8074.dtsi | 2 +- arch/arm64/boot/dts/qcom/pms405.dtsi | 2 +- .../boot/dts/qcom/qcm6490-fairphone-fp5.dts | 4 +- .../boot/dts/qcom/qcm6490-shift-otter.dts | 4 +- arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 4 +- arch/arm64/boot/dts/qcom/sc7280-idp.dts | 2 +- arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 2 +- arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 4 +- arch/arm64/boot/dts/qcom/sc8180x-pmics.dtsi | 2 +- .../boot/dts/qcom/sc8280xp-huawei-gaokun3.dts | 2 +- .../qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 2 +- .../dts/qcom/sc8280xp-microsoft-blackrock.dts | 2 +- arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 6 +- .../boot/dts/qcom/sm7225-fairphone-fp4.dts | 2 +- .../boot/dts/qcom/sm7325-nothing-spacewar.dts | 6 +- arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 8 +- drivers/iio/adc/Kconfig | 30 + drivers/iio/adc/Makefile | 2 + drivers/iio/adc/qcom-adc5-gen3-common.c | 104 +++ drivers/iio/adc/qcom-spmi-adc5-gen3.c | 763 ++++++++++++++++++ drivers/iio/adc/qcom-spmi-adc5.c | 2 +- drivers/iio/adc/qcom-spmi-vadc.c | 2 +- drivers/thermal/qcom/Kconfig | 9 + drivers/thermal/qcom/Makefile | 1 + drivers/thermal/qcom/qcom-spmi-adc-tm5-gen3.c | 531 ++++++++++++ .../iio/adc/qcom,pm8550-adc5-gen3.h | 46 ++ .../iio/adc/qcom,pm8550b-adc5-gen3.h | 85 ++ .../iio/adc/qcom,pm8550vx-adc5-gen3.h | 22 + .../iio/adc/qcom,pmk8550-adc5-gen3.h | 52 ++ .../iio/{ => adc}/qcom,spmi-adc7-pm7325.h | 2 +- .../iio/{ => adc}/qcom,spmi-adc7-pm8350.h | 2 +- .../iio/{ => adc}/qcom,spmi-adc7-pm8350b.h | 2 +- .../iio/{ => adc}/qcom,spmi-adc7-pmk8350.h | 2 +- .../iio/{ => adc}/qcom,spmi-adc7-pmr735a.h | 2 +- .../iio/{ => adc}/qcom,spmi-adc7-pmr735b.h | 2 +- .../iio/{ => adc}/qcom,spmi-adc7-smb139x.h | 2 +- .../iio/{ => adc}/qcom,spmi-vadc.h | 81 ++ include/linux/iio/adc/qcom-adc5-gen3-common.h | 193 +++++ 67 files changed, 2231 insertions(+), 139 deletions(-) create mode 100644 Documentation/devicetree/bindings/iio/adc/qcom,spmi-adc5-gen3.yaml create mode 100644 Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc-common.yaml create mode 100644 drivers/iio/adc/qcom-adc5-gen3-common.c create mode 100644 drivers/iio/adc/qcom-spmi-adc5-gen3.c create mode 100644 drivers/thermal/qcom/qcom-spmi-adc-tm5-gen3.c create mode 100644 include/dt-bindings/iio/adc/qcom,pm8550-adc5-gen3.h create mode 100644 include/dt-bindings/iio/adc/qcom,pm8550b-adc5-gen3.h create mode 100644 include/dt-bindings/iio/adc/qcom,pm8550vx-adc5-gen3.h create mode 100644 include/dt-bindings/iio/adc/qcom,pmk8550-adc5-gen3.h rename include/dt-bindings/iio/{ => adc}/qcom,spmi-adc7-pm7325.h (98%) rename include/dt-bindings/iio/{ => adc}/qcom,spmi-adc7-pm8350.h (98%) rename include/dt-bindings/iio/{ => adc}/qcom,spmi-adc7-pm8350b.h (99%) rename include/dt-bindings/iio/{ => adc}/qcom,spmi-adc7-pmk8350.h (97%) rename include/dt-bindings/iio/{ => adc}/qcom,spmi-adc7-pmr735a.h (95%) rename include/dt-bindings/iio/{ => adc}/qcom,spmi-adc7-pmr735b.h (95%) rename include/dt-bindings/iio/{ => adc}/qcom,spmi-adc7-smb139x.h (93%) rename include/dt-bindings/iio/{ => adc}/qcom,spmi-vadc.h (77%) create mode 100644 include/linux/iio/adc/qcom-adc5-gen3-common.h base-commit: 393d0c54cae31317deaa9043320c5fd9454deabc