| Message ID | 20241030185854.4015348-2-quic_jprakash@quicinc.com |
|---|---|
| State | Needs Review / ACK |
| Headers | show |
| Series | Add support for QCOM SPMI PMIC5 Gen3 ADC | expand |
| Context | Check | Description |
|---|---|---|
| robh/checkpatch | warning | total: 0 errors, 2 warnings, 416 lines checked |
| robh/patch-applied | success | |
| robh/dt-meta-schema | fail | build log |
On Thu, 31 Oct 2024 00:28:51 +0530, Jishnu Prakash 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 <quic_jprakash@quicinc.com> > --- > 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/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/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 +- > .../arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.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 > 49 files changed, 63 insertions(+), 63 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%) > My bot found errors running 'make dt_binding_check' on your patch: yamllint warnings/errors: dtschema/dtc warnings/errors: In file included from Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.example.dts:80: ./scripts/dtc/include-prefixes/dt-bindings/iio/adc/qcom,spmi-adc7-pmk8350.h:13:10: fatal error: dt-bindings/iio/adc/qcom,spmi-vadc.h: No such file or directory 13 | #include <dt-bindings/iio/adc/qcom,spmi-vadc.h> | ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ compilation terminated. make[2]: *** [scripts/Makefile.dtbs:129: Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.example.dtb] Error 1 make[2]: *** Waiting for unfinished jobs.... make[1]: *** [/builds/robherring/dt-review-ci/linux/Makefile:1442: dt_binding_check] Error 2 make: *** [Makefile:224: __sub-make] Error 2 doc reference errors (make refcheckdocs): See https://patchwork.ozlabs.org/project/devicetree-bindings/patch/20241030185854.4015348-2-quic_jprakash@quicinc.com The base for the series is generally the latest rc1. A different dependency should be noted in *this* patch. If you already ran 'make dt_binding_check' and didn't see the above error(s), then make sure 'yamllint' is installed and dt-schema is up to date: pip3 install dtschema --upgrade Please check and re-submit after running the above command yourself. Note that DT_SCHEMA_FILES can be set to your schema file to speed up checking your schema. However, it must be unset to test all examples with your schema.
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 a2b2fbf77d5c..eed4f6d3c889 100644 --- a/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml +++ b/Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml @@ -274,7 +274,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 0094e0ef058b..38f329712079 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 a74a7ff660d2..206077d09d48 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/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 4aff437263a2..051c995e9f2e 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 fdc62f1b1c5a..b34c900439b9 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 4667e47a74bc..f376dbaeed2d 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/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-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index 83208b10f994..839204918fd4 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-pmics.dtsi b/arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi index 1e3babf2e40d..080ae9e037a2 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 2ee2561b57b1..b8609ad1bd86 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 a5cda478bd78..5308b1ef85b6 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 67443822653d..88f394dc4867 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