This series is a split of the following patch:
https://lkml.org/lkml/2019/6/18/268
To fix Enric comments from https://lkml.org/lkml/2019/6/25/949
I extract it from the other serie to speed up acceptance because
other patches need it to be upstreamed.
Fabien Lahoudere (2):
iio: common: cros_ec_sensors: determine protocol version
iio: common: cros_ec_sensors: set default frequencies
.../cros_ec_sensors/cros_ec_sensors_core.c | 80 ++++++++++++++++++-
.../linux/iio/common/cros_ec_sensors_core.h | 3 +
2 files changed, 82 insertions(+), 1 deletion(-)
--
2.20.1
Version 3 of the EC protocol provides min and max frequencies for EC sensors.
Default frequencies are provided for earlier protocol.
Signed-off-by: Fabien Lahoudere <[email protected]>
Signed-off-by: Nick Vaccaro <[email protected]>
---
.../cros_ec_sensors/cros_ec_sensors_core.c | 44 +++++++++++++++++++
.../linux/iio/common/cros_ec_sensors_core.h | 3 ++
2 files changed, 47 insertions(+)
diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
index 2e0f97448e64..72f56d54cccd 100644
--- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
+++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
@@ -50,6 +50,37 @@ static int cros_ec_get_host_cmd_version_mask(struct cros_ec_device *ec_dev,
return ret;
}
+static void get_default_min_max_freq(enum motionsensor_type type,
+ u32 *min_freq,
+ u32 *max_freq)
+{
+ switch (type) {
+ case MOTIONSENSE_TYPE_ACCEL:
+ case MOTIONSENSE_TYPE_GYRO:
+ *min_freq = 12500;
+ *max_freq = 100000;
+ break;
+ case MOTIONSENSE_TYPE_MAG:
+ *min_freq = 5000;
+ *max_freq = 25000;
+ break;
+ case MOTIONSENSE_TYPE_PROX:
+ case MOTIONSENSE_TYPE_LIGHT:
+ *min_freq = 100;
+ *max_freq = 50000;
+ break;
+ case MOTIONSENSE_TYPE_BARO:
+ *min_freq = 250;
+ *max_freq = 20000;
+ break;
+ case MOTIONSENSE_TYPE_ACTIVITY:
+ default:
+ *min_freq = 0;
+ *max_freq = 0;
+ break;
+ }
+}
+
int cros_ec_sensors_core_init(struct platform_device *pdev,
struct iio_dev *indio_dev,
bool physical_device)
@@ -100,6 +131,19 @@ int cros_ec_sensors_core_init(struct platform_device *pdev,
}
state->type = state->resp->info.type;
state->loc = state->resp->info.location;
+
+ /* Value to stop the device */
+ state->frequencies[0] = 0;
+ if (state->msg->version < 3) {
+ get_default_min_max_freq(state->resp->info.type,
+ &state->frequencies[1],
+ &state->frequencies[2]);
+ } else {
+ state->frequencies[1] =
+ state->resp->info_3.min_frequency;
+ state->frequencies[2] =
+ state->resp->info_3.max_frequency;
+ }
}
return 0;
diff --git a/include/linux/iio/common/cros_ec_sensors_core.h b/include/linux/iio/common/cros_ec_sensors_core.h
index 0c636b9fe8d7..94c87da22c04 100644
--- a/include/linux/iio/common/cros_ec_sensors_core.h
+++ b/include/linux/iio/common/cros_ec_sensors_core.h
@@ -70,6 +70,9 @@ struct cros_ec_sensors_core_state {
unsigned long scan_mask, s16 *data);
int curr_sampl_freq;
+
+ /* Disable, Min and Max Sampling Frequency in mHz */
+ int frequencies[3];
};
/**
--
2.20.1
Hi Fabien,
On 27/6/19 16:04, Fabien Lahoudere wrote:
> Version 3 of the EC protocol provides min and max frequencies for EC sensors.
> Default frequencies are provided for earlier protocol.
>
This patch should really go together with a respin of your previous patchset to
'Expose cros_ec_sensors frequency range via iio sysfs' [1]
[1] https://www.spinics.net/lists/linux-iio/msg44963.html
> Signed-off-by: Fabien Lahoudere <[email protected]>
> Signed-off-by: Nick Vaccaro <[email protected]>
> ---
> .../cros_ec_sensors/cros_ec_sensors_core.c | 44 +++++++++++++++++++
> .../linux/iio/common/cros_ec_sensors_core.h | 3 ++
> 2 files changed, 47 insertions(+)
>
> diff --git a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
> index 2e0f97448e64..72f56d54cccd 100644
> --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
> +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
> @@ -50,6 +50,37 @@ static int cros_ec_get_host_cmd_version_mask(struct cros_ec_device *ec_dev,
> return ret;
> }
>
> +static void get_default_min_max_freq(enum motionsensor_type type,
> + u32 *min_freq,
> + u32 *max_freq)
> +{
> + switch (type) {
> + case MOTIONSENSE_TYPE_ACCEL:
> + case MOTIONSENSE_TYPE_GYRO:
> + *min_freq = 12500;
> + *max_freq = 100000;
> + break;
> + case MOTIONSENSE_TYPE_MAG:
> + *min_freq = 5000;
> + *max_freq = 25000;
> + break;
> + case MOTIONSENSE_TYPE_PROX:
> + case MOTIONSENSE_TYPE_LIGHT:
> + *min_freq = 100;
> + *max_freq = 50000;
> + break;
> + case MOTIONSENSE_TYPE_BARO:
> + *min_freq = 250;
> + *max_freq = 20000;
> + break;
> + case MOTIONSENSE_TYPE_ACTIVITY:
> + default:
> + *min_freq = 0;
> + *max_freq = 0;
> + break;
> + }
> +}
> +
> int cros_ec_sensors_core_init(struct platform_device *pdev,
> struct iio_dev *indio_dev,
> bool physical_device)
> @@ -100,6 +131,19 @@ int cros_ec_sensors_core_init(struct platform_device *pdev,
> }
> state->type = state->resp->info.type;
> state->loc = state->resp->info.location;
> +
> + /* Value to stop the device */
> + state->frequencies[0] = 0;
> + if (state->msg->version < 3) {
> + get_default_min_max_freq(state->resp->info.type,
> + &state->frequencies[1],
> + &state->frequencies[2]);
> + } else {
> + state->frequencies[1] =
> + state->resp->info_3.min_frequency;
> + state->frequencies[2] =
> + state->resp->info_3.max_frequency;
> + }
> }
>
> return 0;
> diff --git a/include/linux/iio/common/cros_ec_sensors_core.h b/include/linux/iio/common/cros_ec_sensors_core.h
> index 0c636b9fe8d7..94c87da22c04 100644
> --- a/include/linux/iio/common/cros_ec_sensors_core.h
> +++ b/include/linux/iio/common/cros_ec_sensors_core.h
> @@ -70,6 +70,9 @@ struct cros_ec_sensors_core_state {
> unsigned long scan_mask, s16 *data);
>
> int curr_sampl_freq;
> +
> + /* Disable, Min and Max Sampling Frequency in mHz */
> + int frequencies[3];
> };
>
> /**
>
Hi Enric
Le jeudi 27 juin 2019 à 17:48 +0200, Enric Balletbo i Serra a écrit :
> Hi Fabien,
>
> On 27/6/19 16:04, Fabien Lahoudere wrote:
> > Version 3 of the EC protocol provides min and max frequencies for
> > EC sensors.
> > Default frequencies are provided for earlier protocol.
> >
>
> This patch should really go together with a respin of your previous
> patchset to
> 'Expose cros_ec_sensors frequency range via iio sysfs' [1]
>
> [1] https://www.spinics.net/lists/linux-iio/msg44963.html
>
I agree, you're right. I will send only the first patch with Gwendal
comments for v2.
Thanks
> > Signed-off-by: Fabien Lahoudere <[email protected]>
> > Signed-off-by: Nick Vaccaro <[email protected]>
> > ---
> > .../cros_ec_sensors/cros_ec_sensors_core.c | 44
> > +++++++++++++++++++
> > .../linux/iio/common/cros_ec_sensors_core.h | 3 ++
> > 2 files changed, 47 insertions(+)
> >
> > diff --git
> > a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
> > b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
> > index 2e0f97448e64..72f56d54cccd 100644
> > --- a/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
> > +++ b/drivers/iio/common/cros_ec_sensors/cros_ec_sensors_core.c
> > @@ -50,6 +50,37 @@ static int
> > cros_ec_get_host_cmd_version_mask(struct cros_ec_device *ec_dev,
> > return ret;
> > }
> >
> > +static void get_default_min_max_freq(enum motionsensor_type type,
> > + u32 *min_freq,
> > + u32 *max_freq)
> > +{
> > + switch (type) {
> > + case MOTIONSENSE_TYPE_ACCEL:
> > + case MOTIONSENSE_TYPE_GYRO:
> > + *min_freq = 12500;
> > + *max_freq = 100000;
> > + break;
> > + case MOTIONSENSE_TYPE_MAG:
> > + *min_freq = 5000;
> > + *max_freq = 25000;
> > + break;
> > + case MOTIONSENSE_TYPE_PROX:
> > + case MOTIONSENSE_TYPE_LIGHT:
> > + *min_freq = 100;
> > + *max_freq = 50000;
> > + break;
> > + case MOTIONSENSE_TYPE_BARO:
> > + *min_freq = 250;
> > + *max_freq = 20000;
> > + break;
> > + case MOTIONSENSE_TYPE_ACTIVITY:
> > + default:
> > + *min_freq = 0;
> > + *max_freq = 0;
> > + break;
> > + }
> > +}
> > +
> > int cros_ec_sensors_core_init(struct platform_device *pdev,
> > struct iio_dev *indio_dev,
> > bool physical_device)
> > @@ -100,6 +131,19 @@ int cros_ec_sensors_core_init(struct
> > platform_device *pdev,
> > }
> > state->type = state->resp->info.type;
> > state->loc = state->resp->info.location;
> > +
> > + /* Value to stop the device */
> > + state->frequencies[0] = 0;
> > + if (state->msg->version < 3) {
> > + get_default_min_max_freq(state->resp-
> > >info.type,
> > + &state-
> > >frequencies[1],
> > + &state-
> > >frequencies[2]);
> > + } else {
> > + state->frequencies[1] =
> > + state->resp->info_3.min_frequency;
> > + state->frequencies[2] =
> > + state->resp->info_3.max_frequency;
> > + }
> > }
> >
> > return 0;
> > diff --git a/include/linux/iio/common/cros_ec_sensors_core.h
> > b/include/linux/iio/common/cros_ec_sensors_core.h
> > index 0c636b9fe8d7..94c87da22c04 100644
> > --- a/include/linux/iio/common/cros_ec_sensors_core.h
> > +++ b/include/linux/iio/common/cros_ec_sensors_core.h
> > @@ -70,6 +70,9 @@ struct cros_ec_sensors_core_state {
> > unsigned long scan_mask, s16
> > *data);
> >
> > int curr_sampl_freq;
> > +
> > + /* Disable, Min and Max Sampling Frequency in mHz */
> > + int frequencies[3];
> > };
> >
> > /**
> >