Update ADC dt-bindings file paths in QCOM ADC driver files to
match the dt-bindings change moving the files from 'iio' to
'iio/adc' folder.
Signed-off-by: Jishnu Prakash <[email protected]>
---
drivers/iio/adc/qcom-spmi-adc5-gen3.c | 2 +-
drivers/iio/adc/qcom-spmi-adc5.c | 2 +-
drivers/iio/adc/qcom-spmi-vadc.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/iio/adc/qcom-spmi-adc5-gen3.c b/drivers/iio/adc/qcom-spmi-adc5-gen3.c
index fe5515ee8451..78ece8fccbae 100644
--- a/drivers/iio/adc/qcom-spmi-adc5-gen3.c
+++ b/drivers/iio/adc/qcom-spmi-adc5-gen3.c
@@ -23,7 +23,7 @@
#include <linux/slab.h>
#include <linux/thermal.h>
-#include <dt-bindings/iio/qcom,spmi-vadc.h>
+#include <dt-bindings/iio/adc/qcom,spmi-vadc.h>
#define ADC5_GEN3_HS 0x45
#define ADC5_GEN3_HS_BUSY BIT(7)
diff --git a/drivers/iio/adc/qcom-spmi-adc5.c b/drivers/iio/adc/qcom-spmi-adc5.c
index 6cebeaa69a75..5dfcb770d663 100644
--- a/drivers/iio/adc/qcom-spmi-adc5.c
+++ b/drivers/iio/adc/qcom-spmi-adc5.c
@@ -21,7 +21,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 f5c6f1f27b2c..c3602c53968a 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
--
2.25.1
On Sat, 8 Jul 2023 12:58:33 +0530
Jishnu Prakash <[email protected]> wrote:
> Update ADC dt-bindings file paths in QCOM ADC driver files to
> match the dt-bindings change moving the files from 'iio' to
> 'iio/adc' folder.
>
> Signed-off-by: Jishnu Prakash <[email protected]>
Do the move in one go.
Diff rename detection will make the resulting patch more trivial
to look at than this multistep version.
Jonathan
> ---
> drivers/iio/adc/qcom-spmi-adc5-gen3.c | 2 +-
> drivers/iio/adc/qcom-spmi-adc5.c | 2 +-
> drivers/iio/adc/qcom-spmi-vadc.c | 2 +-
> 3 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/iio/adc/qcom-spmi-adc5-gen3.c b/drivers/iio/adc/qcom-spmi-adc5-gen3.c
> index fe5515ee8451..78ece8fccbae 100644
> --- a/drivers/iio/adc/qcom-spmi-adc5-gen3.c
> +++ b/drivers/iio/adc/qcom-spmi-adc5-gen3.c
> @@ -23,7 +23,7 @@
> #include <linux/slab.h>
> #include <linux/thermal.h>
>
> -#include <dt-bindings/iio/qcom,spmi-vadc.h>
> +#include <dt-bindings/iio/adc/qcom,spmi-vadc.h>
>
> #define ADC5_GEN3_HS 0x45
> #define ADC5_GEN3_HS_BUSY BIT(7)
> diff --git a/drivers/iio/adc/qcom-spmi-adc5.c b/drivers/iio/adc/qcom-spmi-adc5.c
> index 6cebeaa69a75..5dfcb770d663 100644
> --- a/drivers/iio/adc/qcom-spmi-adc5.c
> +++ b/drivers/iio/adc/qcom-spmi-adc5.c
> @@ -21,7 +21,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 f5c6f1f27b2c..c3602c53968a 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
Hi Jonathan,
On 7/8/2023 8:53 PM, Jonathan Cameron wrote:
> On Sat, 8 Jul 2023 12:58:33 +0530
> Jishnu Prakash <[email protected]> wrote:
>
>> Update ADC dt-bindings file paths in QCOM ADC driver files to
>> match the dt-bindings change moving the files from 'iio' to
>> 'iio/adc' folder.
>>
>> Signed-off-by: Jishnu Prakash <[email protected]>
> Do the move in one go.
>
> Diff rename detection will make the resulting patch more trivial
> to look at than this multistep version.
>
> Jonathan
Hi Jonathan,
Just to recap, in patches 8-11, the intention is to move the dt-binding
files used for QCOM ADCs from /dt-bindings/iio folder to the
/dt-bindings/iio/adc folder.
I'm just confirming, can we move the files and update documentation,
bindings, driver and devicetree files all in one patch? Or you mean one
patch for documentation, bindings and driver files and one patch for
devicetree files (based on the comment from Krzysztof for the next patch
10 in this series)?
Based on this patch series:
https://lore.kernel.org/all/[email protected]/,
I'm wondering if I should add the files in the new location first, do
the file path updates and then completely remove the files in the old
path to avoid breaking the kernel.....or is it possible to get the
devicetree changes picked along with the binding changes, to avoid any
problems with bisectability?
>> ---
>> drivers/iio/adc/qcom-spmi-adc5-gen3.c | 2 +-
>> drivers/iio/adc/qcom-spmi-adc5.c | 2 +-
>> drivers/iio/adc/qcom-spmi-vadc.c | 2 +-
>> 3 files changed, 3 insertions(+), 3 deletions(-)
>>
Thanks,
Jishnu
On Mon, 23 Oct 2023 at 09:17, Jishnu Prakash <[email protected]> wrote:
>
> Hi Jonathan,
>
> On 7/8/2023 8:53 PM, Jonathan Cameron wrote:
> > On Sat, 8 Jul 2023 12:58:33 +0530
> > Jishnu Prakash <[email protected]> wrote:
> >
> >> Update ADC dt-bindings file paths in QCOM ADC driver files to
> >> match the dt-bindings change moving the files from 'iio' to
> >> 'iio/adc' folder.
> >>
> >> Signed-off-by: Jishnu Prakash <[email protected]>
> > Do the move in one go.
> >
> > Diff rename detection will make the resulting patch more trivial
> > to look at than this multistep version.
> >
> > Jonathan
>
>
> Hi Jonathan,
>
> Just to recap, in patches 8-11, the intention is to move the dt-binding
> files used for QCOM ADCs from /dt-bindings/iio folder to the
> /dt-bindings/iio/adc folder.
>
> I'm just confirming, can we move the files and update documentation,
> bindings, driver and devicetree files all in one patch? Or you mean one
> patch for documentation, bindings and driver files and one patch for
> devicetree files (based on the comment from Krzysztof for the next patch
> 10 in this series)?
>
> Based on this patch series:
> https://lore.kernel.org/all/[email protected]/,
> I'm wondering if I should add the files in the new location first, do
> the file path updates and then completely remove the files in the old
> path to avoid breaking the kernel.....or is it possible to get the
> devicetree changes picked along with the binding changes, to avoid any
> problems with bisectability?
Perform git mv & fix all failing DT and drivers in a single commit.
You might also update guarding defines, if you wish. Perform all other
changes in a separate commit.
This way git diff will actually tell what has happened, instead of us
seeing a series of add files, perform changes, remove files. It is
impossible to review your changes otherwise.
>
>
> >> ---
> >> drivers/iio/adc/qcom-spmi-adc5-gen3.c | 2 +-
> >> drivers/iio/adc/qcom-spmi-adc5.c | 2 +-
> >> drivers/iio/adc/qcom-spmi-vadc.c | 2 +-
> >> 3 files changed, 3 insertions(+), 3 deletions(-)
> >>
> Thanks,
>
> Jishnu
>
--
With best wishes
Dmitry
Hi Jonathan and Dmitry,
On 10/23/2023 1:28 PM, Dmitry Baryshkov wrote:
> On Mon, 23 Oct 2023 at 09:17, Jishnu Prakash<[email protected]> wrote:
>> Hi Jonathan,
>>
>> On 7/8/2023 8:53 PM, Jonathan Cameron wrote:
>>> On Sat, 8 Jul 2023 12:58:33 +0530
>>> Jishnu Prakash<[email protected]> wrote:
>>>
>>>> Update ADC dt-bindings file paths in QCOM ADC driver files to
>>>> match the dt-bindings change moving the files from 'iio' to
>>>> 'iio/adc' folder.
>>>>
>>>> Signed-off-by: Jishnu Prakash<[email protected]>
>>> Do the move in one go.
>>>
>>> Diff rename detection will make the resulting patch more trivial
>>> to look at than this multistep version.
>>>
>>> Jonathan
>> Hi Jonathan,
>>
>> Just to recap, in patches 8-11, the intention is to move the dt-binding
>> files used for QCOM ADCs from /dt-bindings/iio folder to the
>> /dt-bindings/iio/adc folder.
>>
>> I'm just confirming, can we move the files and update documentation,
>> bindings, driver and devicetree files all in one patch? Or you mean one
>> patch for documentation, bindings and driver files and one patch for
>> devicetree files (based on the comment from Krzysztof for the next patch
>> 10 in this series)?
>>
>> Based on this patch series:
>> https://lore.kernel.org/all/[email protected]/,
>> I'm wondering if I should add the files in the new location first, do
>> the file path updates and then completely remove the files in the old
>> path to avoid breaking the kernel.....or is it possible to get the
>> devicetree changes picked along with the binding changes, to avoid any
>> problems with bisectability?
> Perform git mv & fix all failing DT and drivers in a single commit.
> You might also update guarding defines, if you wish. Perform all other
> changes in a separate commit.
>
> This way git diff will actually tell what has happened, instead of us
> seeing a series of add files, perform changes, remove files. It is
> impossible to review your changes otherwise.
Thanks for your suggestion - I'll make the change to move the files and
fix all resulting errors in one commit for now, and update further based
on comments on it.
Thanks,
Jishnu
>>>> ---
>>>> drivers/iio/adc/qcom-spmi-adc5-gen3.c | 2 +-
>>>> drivers/iio/adc/qcom-spmi-adc5.c | 2 +-
>>>> drivers/iio/adc/qcom-spmi-vadc.c | 2 +-
>>>> 3 files changed, 3 insertions(+), 3 deletions(-)
>>>>
>> Thanks,
>>
>> Jishnu
>>