The at91 platforms have been DT only for a while, remove platform data.
Signed-off-by: Alexandre Belloni <[email protected]>
Reviewed-by: Ludovic Desroches <[email protected]>
---
drivers/iio/adc/at91_adc.c | 80 +++++++-------------------
include/linux/platform_data/at91_adc.h | 49 ----------------
2 files changed, 22 insertions(+), 107 deletions(-)
delete mode 100644 include/linux/platform_data/at91_adc.h
diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
index 9b2c548fae95..62bd35af8b13 100644
--- a/drivers/iio/adc/at91_adc.c
+++ b/drivers/iio/adc/at91_adc.c
@@ -22,8 +22,6 @@
#include <linux/slab.h>
#include <linux/wait.h>
-#include <linux/platform_data/at91_adc.h>
-
#include <linux/iio/iio.h>
#include <linux/iio/buffer.h>
#include <linux/iio/trigger.h>
@@ -153,6 +151,25 @@
#define TOUCH_SHTIM 0xa
#define TOUCH_SCTIM_US 10 /* 10us for the Touchscreen Switches Closure Time */
+enum atmel_adc_ts_type {
+ ATMEL_ADC_TOUCHSCREEN_NONE = 0,
+ ATMEL_ADC_TOUCHSCREEN_4WIRE = 4,
+ ATMEL_ADC_TOUCHSCREEN_5WIRE = 5,
+};
+
+/**
+ * struct at91_adc_trigger - description of triggers
+ * @name: name of the trigger advertised to the user
+ * @value: value to set in the ADC's trigger setup register
+ * to enable the trigger
+ * @is_external: Does the trigger rely on an external pin?
+ */
+struct at91_adc_trigger {
+ const char *name;
+ u8 value;
+ bool is_external;
+};
+
/**
* struct at91_adc_reg_desc - Various informations relative to registers
* @channel_base: Base offset for the channel data registers
@@ -875,9 +892,6 @@ static int at91_adc_probe_dt(struct iio_dev *idev,
int i = 0, ret;
u32 prop;
- if (!node)
- return -EINVAL;
-
st->caps = (struct at91_adc_caps *)
of_match_device(at91_adc_dt_ids, &pdev->dev)->data;
@@ -960,30 +974,6 @@ static int at91_adc_probe_dt(struct iio_dev *idev,
return ret;
}
-static int at91_adc_probe_pdata(struct at91_adc_state *st,
- struct platform_device *pdev)
-{
- struct at91_adc_data *pdata = pdev->dev.platform_data;
-
- if (!pdata)
- return -EINVAL;
-
- st->caps = (struct at91_adc_caps *)
- platform_get_device_id(pdev)->driver_data;
-
- st->use_external = pdata->use_external_triggers;
- st->vref_mv = pdata->vref;
- st->channels_mask = pdata->channels_used;
- st->num_channels = st->caps->num_channels;
- st->startup_time = pdata->startup_time;
- st->trigger_number = pdata->trigger_number;
- st->trigger_list = pdata->trigger_list;
- st->registers = &st->caps->registers;
- st->touchscreen_type = pdata->touchscreen_type;
-
- return 0;
-}
-
static const struct iio_info at91_adc_info = {
.read_raw = &at91_adc_read_raw,
};
@@ -1160,15 +1150,9 @@ static int at91_adc_probe(struct platform_device *pdev)
st = iio_priv(idev);
- if (pdev->dev.of_node)
- ret = at91_adc_probe_dt(idev, pdev);
- else
- ret = at91_adc_probe_pdata(st, pdev);
-
- if (ret) {
- dev_err(&pdev->dev, "No platform data available.\n");
- return -EINVAL;
- }
+ ret = at91_adc_probe_dt(idev, pdev);
+ if (ret)
+ return ret;
platform_set_drvdata(pdev, idev);
@@ -1444,29 +1428,9 @@ static const struct of_device_id at91_adc_dt_ids[] = {
};
MODULE_DEVICE_TABLE(of, at91_adc_dt_ids);
-static const struct platform_device_id at91_adc_ids[] = {
- {
- .name = "at91sam9260-adc",
- .driver_data = (unsigned long)&at91sam9260_caps,
- }, {
- .name = "at91sam9rl-adc",
- .driver_data = (unsigned long)&at91sam9rl_caps,
- }, {
- .name = "at91sam9g45-adc",
- .driver_data = (unsigned long)&at91sam9g45_caps,
- }, {
- .name = "at91sam9x5-adc",
- .driver_data = (unsigned long)&at91sam9x5_caps,
- }, {
- /* terminator */
- }
-};
-MODULE_DEVICE_TABLE(platform, at91_adc_ids);
-
static struct platform_driver at91_adc_driver = {
.probe = at91_adc_probe,
.remove = at91_adc_remove,
- .id_table = at91_adc_ids,
.driver = {
.name = DRIVER_NAME,
.of_match_table = of_match_ptr(at91_adc_dt_ids),
diff --git a/include/linux/platform_data/at91_adc.h b/include/linux/platform_data/at91_adc.h
deleted file mode 100644
index f20eaeb827ce..000000000000
--- a/include/linux/platform_data/at91_adc.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-/*
- * Copyright (C) 2011 Free Electrons
- */
-
-#ifndef _AT91_ADC_H_
-#define _AT91_ADC_H_
-
-enum atmel_adc_ts_type {
- ATMEL_ADC_TOUCHSCREEN_NONE = 0,
- ATMEL_ADC_TOUCHSCREEN_4WIRE = 4,
- ATMEL_ADC_TOUCHSCREEN_5WIRE = 5,
-};
-
-/**
- * struct at91_adc_trigger - description of triggers
- * @name: name of the trigger advertised to the user
- * @value: value to set in the ADC's trigger setup register
- to enable the trigger
- * @is_external: Does the trigger rely on an external pin?
- */
-struct at91_adc_trigger {
- const char *name;
- u8 value;
- bool is_external;
-};
-
-/**
- * struct at91_adc_data - platform data for ADC driver
- * @channels_used: channels in use on the board as a bitmask
- * @startup_time: startup time of the ADC in microseconds
- * @trigger_list: Triggers available in the ADC
- * @trigger_number: Number of triggers available in the ADC
- * @use_external_triggers: does the board has external triggers availables
- * @vref: Reference voltage for the ADC in millivolts
- * @touchscreen_type: If a touchscreen is connected, its type (4 or 5 wires)
- */
-struct at91_adc_data {
- unsigned long channels_used;
- u8 startup_time;
- struct at91_adc_trigger *trigger_list;
- u8 trigger_number;
- bool use_external_triggers;
- u16 vref;
- enum atmel_adc_ts_type touchscreen_type;
-};
-
-extern void __init at91_add_device_adc(struct at91_adc_data *data);
-#endif
--
2.28.0
On Tue, 17 Nov 2020 15:06:46 +0100
Alexandre Belloni <[email protected]> wrote:
> The at91 platforms have been DT only for a while, remove platform data.
>
> Signed-off-by: Alexandre Belloni <[email protected]>
> Reviewed-by: Ludovic Desroches <[email protected]>
Hi Alexandre,
I'd completely forgotten that we actually had a similar patch that
is already applied from Alexandru back in September.
Given vast majority matched, I've just changed your patch into one
that drops the id_table (which Alexandru didn't do).
So with that tweak applied to the togreg branch of iio.git.
Thanks,
Jonathan
> ---
> drivers/iio/adc/at91_adc.c | 80 +++++++-------------------
> include/linux/platform_data/at91_adc.h | 49 ----------------
> 2 files changed, 22 insertions(+), 107 deletions(-)
> delete mode 100644 include/linux/platform_data/at91_adc.h
>
> diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
> index 9b2c548fae95..62bd35af8b13 100644
> --- a/drivers/iio/adc/at91_adc.c
> +++ b/drivers/iio/adc/at91_adc.c
> @@ -22,8 +22,6 @@
> #include <linux/slab.h>
> #include <linux/wait.h>
>
> -#include <linux/platform_data/at91_adc.h>
> -
> #include <linux/iio/iio.h>
> #include <linux/iio/buffer.h>
> #include <linux/iio/trigger.h>
> @@ -153,6 +151,25 @@
> #define TOUCH_SHTIM 0xa
> #define TOUCH_SCTIM_US 10 /* 10us for the Touchscreen Switches Closure Time */
>
> +enum atmel_adc_ts_type {
> + ATMEL_ADC_TOUCHSCREEN_NONE = 0,
> + ATMEL_ADC_TOUCHSCREEN_4WIRE = 4,
> + ATMEL_ADC_TOUCHSCREEN_5WIRE = 5,
> +};
> +
> +/**
> + * struct at91_adc_trigger - description of triggers
> + * @name: name of the trigger advertised to the user
> + * @value: value to set in the ADC's trigger setup register
> + * to enable the trigger
> + * @is_external: Does the trigger rely on an external pin?
> + */
> +struct at91_adc_trigger {
> + const char *name;
> + u8 value;
> + bool is_external;
> +};
> +
> /**
> * struct at91_adc_reg_desc - Various informations relative to registers
> * @channel_base: Base offset for the channel data registers
> @@ -875,9 +892,6 @@ static int at91_adc_probe_dt(struct iio_dev *idev,
> int i = 0, ret;
> u32 prop;
>
> - if (!node)
> - return -EINVAL;
> -
> st->caps = (struct at91_adc_caps *)
> of_match_device(at91_adc_dt_ids, &pdev->dev)->data;
>
> @@ -960,30 +974,6 @@ static int at91_adc_probe_dt(struct iio_dev *idev,
> return ret;
> }
>
> -static int at91_adc_probe_pdata(struct at91_adc_state *st,
> - struct platform_device *pdev)
> -{
> - struct at91_adc_data *pdata = pdev->dev.platform_data;
> -
> - if (!pdata)
> - return -EINVAL;
> -
> - st->caps = (struct at91_adc_caps *)
> - platform_get_device_id(pdev)->driver_data;
> -
> - st->use_external = pdata->use_external_triggers;
> - st->vref_mv = pdata->vref;
> - st->channels_mask = pdata->channels_used;
> - st->num_channels = st->caps->num_channels;
> - st->startup_time = pdata->startup_time;
> - st->trigger_number = pdata->trigger_number;
> - st->trigger_list = pdata->trigger_list;
> - st->registers = &st->caps->registers;
> - st->touchscreen_type = pdata->touchscreen_type;
> -
> - return 0;
> -}
> -
> static const struct iio_info at91_adc_info = {
> .read_raw = &at91_adc_read_raw,
> };
> @@ -1160,15 +1150,9 @@ static int at91_adc_probe(struct platform_device *pdev)
>
> st = iio_priv(idev);
>
> - if (pdev->dev.of_node)
> - ret = at91_adc_probe_dt(idev, pdev);
> - else
> - ret = at91_adc_probe_pdata(st, pdev);
> -
> - if (ret) {
> - dev_err(&pdev->dev, "No platform data available.\n");
> - return -EINVAL;
> - }
> + ret = at91_adc_probe_dt(idev, pdev);
> + if (ret)
> + return ret;
>
> platform_set_drvdata(pdev, idev);
>
> @@ -1444,29 +1428,9 @@ static const struct of_device_id at91_adc_dt_ids[] = {
> };
> MODULE_DEVICE_TABLE(of, at91_adc_dt_ids);
>
> -static const struct platform_device_id at91_adc_ids[] = {
> - {
> - .name = "at91sam9260-adc",
> - .driver_data = (unsigned long)&at91sam9260_caps,
> - }, {
> - .name = "at91sam9rl-adc",
> - .driver_data = (unsigned long)&at91sam9rl_caps,
> - }, {
> - .name = "at91sam9g45-adc",
> - .driver_data = (unsigned long)&at91sam9g45_caps,
> - }, {
> - .name = "at91sam9x5-adc",
> - .driver_data = (unsigned long)&at91sam9x5_caps,
> - }, {
> - /* terminator */
> - }
> -};
> -MODULE_DEVICE_TABLE(platform, at91_adc_ids);
> -
> static struct platform_driver at91_adc_driver = {
> .probe = at91_adc_probe,
> .remove = at91_adc_remove,
> - .id_table = at91_adc_ids,
> .driver = {
> .name = DRIVER_NAME,
> .of_match_table = of_match_ptr(at91_adc_dt_ids),
> diff --git a/include/linux/platform_data/at91_adc.h b/include/linux/platform_data/at91_adc.h
> deleted file mode 100644
> index f20eaeb827ce..000000000000
> --- a/include/linux/platform_data/at91_adc.h
> +++ /dev/null
> @@ -1,49 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0-or-later */
> -/*
> - * Copyright (C) 2011 Free Electrons
> - */
> -
> -#ifndef _AT91_ADC_H_
> -#define _AT91_ADC_H_
> -
> -enum atmel_adc_ts_type {
> - ATMEL_ADC_TOUCHSCREEN_NONE = 0,
> - ATMEL_ADC_TOUCHSCREEN_4WIRE = 4,
> - ATMEL_ADC_TOUCHSCREEN_5WIRE = 5,
> -};
> -
> -/**
> - * struct at91_adc_trigger - description of triggers
> - * @name: name of the trigger advertised to the user
> - * @value: value to set in the ADC's trigger setup register
> - to enable the trigger
> - * @is_external: Does the trigger rely on an external pin?
> - */
> -struct at91_adc_trigger {
> - const char *name;
> - u8 value;
> - bool is_external;
> -};
> -
> -/**
> - * struct at91_adc_data - platform data for ADC driver
> - * @channels_used: channels in use on the board as a bitmask
> - * @startup_time: startup time of the ADC in microseconds
> - * @trigger_list: Triggers available in the ADC
> - * @trigger_number: Number of triggers available in the ADC
> - * @use_external_triggers: does the board has external triggers availables
> - * @vref: Reference voltage for the ADC in millivolts
> - * @touchscreen_type: If a touchscreen is connected, its type (4 or 5 wires)
> - */
> -struct at91_adc_data {
> - unsigned long channels_used;
> - u8 startup_time;
> - struct at91_adc_trigger *trigger_list;
> - u8 trigger_number;
> - bool use_external_triggers;
> - u16 vref;
> - enum atmel_adc_ts_type touchscreen_type;
> -};
> -
> -extern void __init at91_add_device_adc(struct at91_adc_data *data);
> -#endif
On Sat, 28 Nov 2020 15:23:42 +0100
Alexandre Belloni <[email protected]> wrote:
> Hi,
>
> On 28/11/2020 14:04:27+0000, Jonathan Cameron wrote:
> > On Tue, 17 Nov 2020 15:06:46 +0100
> > Alexandre Belloni <[email protected]> wrote:
> >
> > > The at91 platforms have been DT only for a while, remove platform data.
> > >
> > > Signed-off-by: Alexandre Belloni <[email protected]>
> > > Reviewed-by: Ludovic Desroches <[email protected]>
> >
> > Hi Alexandre,
> >
> > I'd completely forgotten that we actually had a similar patch that
> > is already applied from Alexandru back in September.
> >
>
> I actually have seen that yesterday too. I even reviewed them...
>
> > Given vast majority matched, I've just changed your patch into one
> > that drops the id_table (which Alexandru didn't do).
> >
> > So with that tweak applied to the togreg branch of iio.git.
> >
>
> Ok, thanks, I guess you didn't push yet, I wanted to check and I didn't
> find the patches on kernel.org.
I've actually just backed my try at this out. It gets a bit messy around
patch 6-7 so I'd rather you did a rebase.
Please rebase on current togreg branch.
Thanks,
Jonathan
>
>
>
> > Thanks,
> >
> > Jonathan
> >
> > > ---
> > > drivers/iio/adc/at91_adc.c | 80 +++++++-------------------
> > > include/linux/platform_data/at91_adc.h | 49 ----------------
> > > 2 files changed, 22 insertions(+), 107 deletions(-)
> > > delete mode 100644 include/linux/platform_data/at91_adc.h
> > >
> > > diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
> > > index 9b2c548fae95..62bd35af8b13 100644
> > > --- a/drivers/iio/adc/at91_adc.c
> > > +++ b/drivers/iio/adc/at91_adc.c
> > > @@ -22,8 +22,6 @@
> > > #include <linux/slab.h>
> > > #include <linux/wait.h>
> > >
> > > -#include <linux/platform_data/at91_adc.h>
> > > -
> > > #include <linux/iio/iio.h>
> > > #include <linux/iio/buffer.h>
> > > #include <linux/iio/trigger.h>
> > > @@ -153,6 +151,25 @@
> > > #define TOUCH_SHTIM 0xa
> > > #define TOUCH_SCTIM_US 10 /* 10us for the Touchscreen Switches Closure Time */
> > >
> > > +enum atmel_adc_ts_type {
> > > + ATMEL_ADC_TOUCHSCREEN_NONE = 0,
> > > + ATMEL_ADC_TOUCHSCREEN_4WIRE = 4,
> > > + ATMEL_ADC_TOUCHSCREEN_5WIRE = 5,
> > > +};
> > > +
> > > +/**
> > > + * struct at91_adc_trigger - description of triggers
> > > + * @name: name of the trigger advertised to the user
> > > + * @value: value to set in the ADC's trigger setup register
> > > + * to enable the trigger
> > > + * @is_external: Does the trigger rely on an external pin?
> > > + */
> > > +struct at91_adc_trigger {
> > > + const char *name;
> > > + u8 value;
> > > + bool is_external;
> > > +};
> > > +
> > > /**
> > > * struct at91_adc_reg_desc - Various informations relative to registers
> > > * @channel_base: Base offset for the channel data registers
> > > @@ -875,9 +892,6 @@ static int at91_adc_probe_dt(struct iio_dev *idev,
> > > int i = 0, ret;
> > > u32 prop;
> > >
> > > - if (!node)
> > > - return -EINVAL;
> > > -
> > > st->caps = (struct at91_adc_caps *)
> > > of_match_device(at91_adc_dt_ids, &pdev->dev)->data;
> > >
> > > @@ -960,30 +974,6 @@ static int at91_adc_probe_dt(struct iio_dev *idev,
> > > return ret;
> > > }
> > >
> > > -static int at91_adc_probe_pdata(struct at91_adc_state *st,
> > > - struct platform_device *pdev)
> > > -{
> > > - struct at91_adc_data *pdata = pdev->dev.platform_data;
> > > -
> > > - if (!pdata)
> > > - return -EINVAL;
> > > -
> > > - st->caps = (struct at91_adc_caps *)
> > > - platform_get_device_id(pdev)->driver_data;
> > > -
> > > - st->use_external = pdata->use_external_triggers;
> > > - st->vref_mv = pdata->vref;
> > > - st->channels_mask = pdata->channels_used;
> > > - st->num_channels = st->caps->num_channels;
> > > - st->startup_time = pdata->startup_time;
> > > - st->trigger_number = pdata->trigger_number;
> > > - st->trigger_list = pdata->trigger_list;
> > > - st->registers = &st->caps->registers;
> > > - st->touchscreen_type = pdata->touchscreen_type;
> > > -
> > > - return 0;
> > > -}
> > > -
> > > static const struct iio_info at91_adc_info = {
> > > .read_raw = &at91_adc_read_raw,
> > > };
> > > @@ -1160,15 +1150,9 @@ static int at91_adc_probe(struct platform_device *pdev)
> > >
> > > st = iio_priv(idev);
> > >
> > > - if (pdev->dev.of_node)
> > > - ret = at91_adc_probe_dt(idev, pdev);
> > > - else
> > > - ret = at91_adc_probe_pdata(st, pdev);
> > > -
> > > - if (ret) {
> > > - dev_err(&pdev->dev, "No platform data available.\n");
> > > - return -EINVAL;
> > > - }
> > > + ret = at91_adc_probe_dt(idev, pdev);
> > > + if (ret)
> > > + return ret;
> > >
> > > platform_set_drvdata(pdev, idev);
> > >
> > > @@ -1444,29 +1428,9 @@ static const struct of_device_id at91_adc_dt_ids[] = {
> > > };
> > > MODULE_DEVICE_TABLE(of, at91_adc_dt_ids);
> > >
> > > -static const struct platform_device_id at91_adc_ids[] = {
> > > - {
> > > - .name = "at91sam9260-adc",
> > > - .driver_data = (unsigned long)&at91sam9260_caps,
> > > - }, {
> > > - .name = "at91sam9rl-adc",
> > > - .driver_data = (unsigned long)&at91sam9rl_caps,
> > > - }, {
> > > - .name = "at91sam9g45-adc",
> > > - .driver_data = (unsigned long)&at91sam9g45_caps,
> > > - }, {
> > > - .name = "at91sam9x5-adc",
> > > - .driver_data = (unsigned long)&at91sam9x5_caps,
> > > - }, {
> > > - /* terminator */
> > > - }
> > > -};
> > > -MODULE_DEVICE_TABLE(platform, at91_adc_ids);
> > > -
> > > static struct platform_driver at91_adc_driver = {
> > > .probe = at91_adc_probe,
> > > .remove = at91_adc_remove,
> > > - .id_table = at91_adc_ids,
> > > .driver = {
> > > .name = DRIVER_NAME,
> > > .of_match_table = of_match_ptr(at91_adc_dt_ids),
> > > diff --git a/include/linux/platform_data/at91_adc.h b/include/linux/platform_data/at91_adc.h
> > > deleted file mode 100644
> > > index f20eaeb827ce..000000000000
> > > --- a/include/linux/platform_data/at91_adc.h
> > > +++ /dev/null
> > > @@ -1,49 +0,0 @@
> > > -/* SPDX-License-Identifier: GPL-2.0-or-later */
> > > -/*
> > > - * Copyright (C) 2011 Free Electrons
> > > - */
> > > -
> > > -#ifndef _AT91_ADC_H_
> > > -#define _AT91_ADC_H_
> > > -
> > > -enum atmel_adc_ts_type {
> > > - ATMEL_ADC_TOUCHSCREEN_NONE = 0,
> > > - ATMEL_ADC_TOUCHSCREEN_4WIRE = 4,
> > > - ATMEL_ADC_TOUCHSCREEN_5WIRE = 5,
> > > -};
> > > -
> > > -/**
> > > - * struct at91_adc_trigger - description of triggers
> > > - * @name: name of the trigger advertised to the user
> > > - * @value: value to set in the ADC's trigger setup register
> > > - to enable the trigger
> > > - * @is_external: Does the trigger rely on an external pin?
> > > - */
> > > -struct at91_adc_trigger {
> > > - const char *name;
> > > - u8 value;
> > > - bool is_external;
> > > -};
> > > -
> > > -/**
> > > - * struct at91_adc_data - platform data for ADC driver
> > > - * @channels_used: channels in use on the board as a bitmask
> > > - * @startup_time: startup time of the ADC in microseconds
> > > - * @trigger_list: Triggers available in the ADC
> > > - * @trigger_number: Number of triggers available in the ADC
> > > - * @use_external_triggers: does the board has external triggers availables
> > > - * @vref: Reference voltage for the ADC in millivolts
> > > - * @touchscreen_type: If a touchscreen is connected, its type (4 or 5 wires)
> > > - */
> > > -struct at91_adc_data {
> > > - unsigned long channels_used;
> > > - u8 startup_time;
> > > - struct at91_adc_trigger *trigger_list;
> > > - u8 trigger_number;
> > > - bool use_external_triggers;
> > > - u16 vref;
> > > - enum atmel_adc_ts_type touchscreen_type;
> > > -};
> > > -
> > > -extern void __init at91_add_device_adc(struct at91_adc_data *data);
> > > -#endif
> >
>
Hi,
On 28/11/2020 14:04:27+0000, Jonathan Cameron wrote:
> On Tue, 17 Nov 2020 15:06:46 +0100
> Alexandre Belloni <[email protected]> wrote:
>
> > The at91 platforms have been DT only for a while, remove platform data.
> >
> > Signed-off-by: Alexandre Belloni <[email protected]>
> > Reviewed-by: Ludovic Desroches <[email protected]>
>
> Hi Alexandre,
>
> I'd completely forgotten that we actually had a similar patch that
> is already applied from Alexandru back in September.
>
I actually have seen that yesterday too. I even reviewed them...
> Given vast majority matched, I've just changed your patch into one
> that drops the id_table (which Alexandru didn't do).
>
> So with that tweak applied to the togreg branch of iio.git.
>
Ok, thanks, I guess you didn't push yet, I wanted to check and I didn't
find the patches on kernel.org.
> Thanks,
>
> Jonathan
>
> > ---
> > drivers/iio/adc/at91_adc.c | 80 +++++++-------------------
> > include/linux/platform_data/at91_adc.h | 49 ----------------
> > 2 files changed, 22 insertions(+), 107 deletions(-)
> > delete mode 100644 include/linux/platform_data/at91_adc.h
> >
> > diff --git a/drivers/iio/adc/at91_adc.c b/drivers/iio/adc/at91_adc.c
> > index 9b2c548fae95..62bd35af8b13 100644
> > --- a/drivers/iio/adc/at91_adc.c
> > +++ b/drivers/iio/adc/at91_adc.c
> > @@ -22,8 +22,6 @@
> > #include <linux/slab.h>
> > #include <linux/wait.h>
> >
> > -#include <linux/platform_data/at91_adc.h>
> > -
> > #include <linux/iio/iio.h>
> > #include <linux/iio/buffer.h>
> > #include <linux/iio/trigger.h>
> > @@ -153,6 +151,25 @@
> > #define TOUCH_SHTIM 0xa
> > #define TOUCH_SCTIM_US 10 /* 10us for the Touchscreen Switches Closure Time */
> >
> > +enum atmel_adc_ts_type {
> > + ATMEL_ADC_TOUCHSCREEN_NONE = 0,
> > + ATMEL_ADC_TOUCHSCREEN_4WIRE = 4,
> > + ATMEL_ADC_TOUCHSCREEN_5WIRE = 5,
> > +};
> > +
> > +/**
> > + * struct at91_adc_trigger - description of triggers
> > + * @name: name of the trigger advertised to the user
> > + * @value: value to set in the ADC's trigger setup register
> > + * to enable the trigger
> > + * @is_external: Does the trigger rely on an external pin?
> > + */
> > +struct at91_adc_trigger {
> > + const char *name;
> > + u8 value;
> > + bool is_external;
> > +};
> > +
> > /**
> > * struct at91_adc_reg_desc - Various informations relative to registers
> > * @channel_base: Base offset for the channel data registers
> > @@ -875,9 +892,6 @@ static int at91_adc_probe_dt(struct iio_dev *idev,
> > int i = 0, ret;
> > u32 prop;
> >
> > - if (!node)
> > - return -EINVAL;
> > -
> > st->caps = (struct at91_adc_caps *)
> > of_match_device(at91_adc_dt_ids, &pdev->dev)->data;
> >
> > @@ -960,30 +974,6 @@ static int at91_adc_probe_dt(struct iio_dev *idev,
> > return ret;
> > }
> >
> > -static int at91_adc_probe_pdata(struct at91_adc_state *st,
> > - struct platform_device *pdev)
> > -{
> > - struct at91_adc_data *pdata = pdev->dev.platform_data;
> > -
> > - if (!pdata)
> > - return -EINVAL;
> > -
> > - st->caps = (struct at91_adc_caps *)
> > - platform_get_device_id(pdev)->driver_data;
> > -
> > - st->use_external = pdata->use_external_triggers;
> > - st->vref_mv = pdata->vref;
> > - st->channels_mask = pdata->channels_used;
> > - st->num_channels = st->caps->num_channels;
> > - st->startup_time = pdata->startup_time;
> > - st->trigger_number = pdata->trigger_number;
> > - st->trigger_list = pdata->trigger_list;
> > - st->registers = &st->caps->registers;
> > - st->touchscreen_type = pdata->touchscreen_type;
> > -
> > - return 0;
> > -}
> > -
> > static const struct iio_info at91_adc_info = {
> > .read_raw = &at91_adc_read_raw,
> > };
> > @@ -1160,15 +1150,9 @@ static int at91_adc_probe(struct platform_device *pdev)
> >
> > st = iio_priv(idev);
> >
> > - if (pdev->dev.of_node)
> > - ret = at91_adc_probe_dt(idev, pdev);
> > - else
> > - ret = at91_adc_probe_pdata(st, pdev);
> > -
> > - if (ret) {
> > - dev_err(&pdev->dev, "No platform data available.\n");
> > - return -EINVAL;
> > - }
> > + ret = at91_adc_probe_dt(idev, pdev);
> > + if (ret)
> > + return ret;
> >
> > platform_set_drvdata(pdev, idev);
> >
> > @@ -1444,29 +1428,9 @@ static const struct of_device_id at91_adc_dt_ids[] = {
> > };
> > MODULE_DEVICE_TABLE(of, at91_adc_dt_ids);
> >
> > -static const struct platform_device_id at91_adc_ids[] = {
> > - {
> > - .name = "at91sam9260-adc",
> > - .driver_data = (unsigned long)&at91sam9260_caps,
> > - }, {
> > - .name = "at91sam9rl-adc",
> > - .driver_data = (unsigned long)&at91sam9rl_caps,
> > - }, {
> > - .name = "at91sam9g45-adc",
> > - .driver_data = (unsigned long)&at91sam9g45_caps,
> > - }, {
> > - .name = "at91sam9x5-adc",
> > - .driver_data = (unsigned long)&at91sam9x5_caps,
> > - }, {
> > - /* terminator */
> > - }
> > -};
> > -MODULE_DEVICE_TABLE(platform, at91_adc_ids);
> > -
> > static struct platform_driver at91_adc_driver = {
> > .probe = at91_adc_probe,
> > .remove = at91_adc_remove,
> > - .id_table = at91_adc_ids,
> > .driver = {
> > .name = DRIVER_NAME,
> > .of_match_table = of_match_ptr(at91_adc_dt_ids),
> > diff --git a/include/linux/platform_data/at91_adc.h b/include/linux/platform_data/at91_adc.h
> > deleted file mode 100644
> > index f20eaeb827ce..000000000000
> > --- a/include/linux/platform_data/at91_adc.h
> > +++ /dev/null
> > @@ -1,49 +0,0 @@
> > -/* SPDX-License-Identifier: GPL-2.0-or-later */
> > -/*
> > - * Copyright (C) 2011 Free Electrons
> > - */
> > -
> > -#ifndef _AT91_ADC_H_
> > -#define _AT91_ADC_H_
> > -
> > -enum atmel_adc_ts_type {
> > - ATMEL_ADC_TOUCHSCREEN_NONE = 0,
> > - ATMEL_ADC_TOUCHSCREEN_4WIRE = 4,
> > - ATMEL_ADC_TOUCHSCREEN_5WIRE = 5,
> > -};
> > -
> > -/**
> > - * struct at91_adc_trigger - description of triggers
> > - * @name: name of the trigger advertised to the user
> > - * @value: value to set in the ADC's trigger setup register
> > - to enable the trigger
> > - * @is_external: Does the trigger rely on an external pin?
> > - */
> > -struct at91_adc_trigger {
> > - const char *name;
> > - u8 value;
> > - bool is_external;
> > -};
> > -
> > -/**
> > - * struct at91_adc_data - platform data for ADC driver
> > - * @channels_used: channels in use on the board as a bitmask
> > - * @startup_time: startup time of the ADC in microseconds
> > - * @trigger_list: Triggers available in the ADC
> > - * @trigger_number: Number of triggers available in the ADC
> > - * @use_external_triggers: does the board has external triggers availables
> > - * @vref: Reference voltage for the ADC in millivolts
> > - * @touchscreen_type: If a touchscreen is connected, its type (4 or 5 wires)
> > - */
> > -struct at91_adc_data {
> > - unsigned long channels_used;
> > - u8 startup_time;
> > - struct at91_adc_trigger *trigger_list;
> > - u8 trigger_number;
> > - bool use_external_triggers;
> > - u16 vref;
> > - enum atmel_adc_ts_type touchscreen_type;
> > -};
> > -
> > -extern void __init at91_add_device_adc(struct at91_adc_data *data);
> > -#endif
>
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
On 28/11/2020 15:26:45+0000, Jonathan Cameron wrote:
> On Sat, 28 Nov 2020 15:23:42 +0100
> Alexandre Belloni <[email protected]> wrote:
>
> > Hi,
> >
> > On 28/11/2020 14:04:27+0000, Jonathan Cameron wrote:
> > > On Tue, 17 Nov 2020 15:06:46 +0100
> > > Alexandre Belloni <[email protected]> wrote:
> > >
> > > > The at91 platforms have been DT only for a while, remove platform data.
> > > >
> > > > Signed-off-by: Alexandre Belloni <[email protected]>
> > > > Reviewed-by: Ludovic Desroches <[email protected]>
> > >
> > > Hi Alexandre,
> > >
> > > I'd completely forgotten that we actually had a similar patch that
> > > is already applied from Alexandru back in September.
> > >
> >
> > I actually have seen that yesterday too. I even reviewed them...
> >
> > > Given vast majority matched, I've just changed your patch into one
> > > that drops the id_table (which Alexandru didn't do).
> > >
> > > So with that tweak applied to the togreg branch of iio.git.
> > >
> >
> > Ok, thanks, I guess you didn't push yet, I wanted to check and I didn't
> > find the patches on kernel.org.
>
> I've actually just backed my try at this out. It gets a bit messy around
> patch 6-7 so I'd rather you did a rebase.
>
> Please rebase on current togreg branch.
Done!
--
Alexandre Belloni, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com