During msa311 accel IIO driver development
https://lore.kernel.org/linux-iio/[email protected]/
Andy requested to use proper units in the hz->ms calculation. Current
units.h header doesn't have milli, micro and nano HZ coefficients, so
some drivers (in the IIO subsystem) implement their own copies for that.
The current patchset resolves such a problem and intoduces general
MILLIHZ_PER_HZ, UHZ_PER_HZ and NHZ_PER_HZ definitions in the units.h, and
fixes all drivers which duplicate these units.
Changes v1->v2:
- changed MHZ_PER_HZ to a different name as Andy suggested
(suppose MILLIHZ_PER_HZ is good enough)
Dmitry Rokosov (3):
units: complement the set of Hz units
iio: accel: adxl345: use HZ macro from units.h
iio: common: scmi_sensors: use HZ macro from units.h
drivers/iio/accel/adxl345_core.c | 2 +-
drivers/iio/common/scmi_sensors/scmi_iio.c | 2 +-
include/linux/units.h | 3 +++
3 files changed, 5 insertions(+), 2 deletions(-)
--
2.36.0
Remove duplicated definition of NHZ_PER_HZ, because it's available in
the units.h.
Signed-off-by: Dmitry Rokosov <[email protected]>
---
drivers/iio/accel/adxl345_core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c
index 370bfec1275a..94189133fe8f 100644
--- a/drivers/iio/accel/adxl345_core.c
+++ b/drivers/iio/accel/adxl345_core.c
@@ -10,6 +10,7 @@
#include <linux/module.h>
#include <linux/property.h>
#include <linux/regmap.h>
+#include <linux/units.h>
#include <linux/iio/iio.h>
#include <linux/iio/sysfs.h>
@@ -32,7 +33,6 @@
#define ADXL345_BW_RATE GENMASK(3, 0)
#define ADXL345_BASE_RATE_NANO_HZ 97656250LL
-#define NHZ_PER_HZ 1000000000LL
#define ADXL345_POWER_CTL_MEASURE BIT(3)
#define ADXL345_POWER_CTL_STANDBY 0x00
--
2.36.0
Remove duplicated definition of UHZ_PER_HZ, because it's available in
the units.h.
Signed-off-by: Dmitry Rokosov <[email protected]>
---
drivers/iio/common/scmi_sensors/scmi_iio.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/iio/common/scmi_sensors/scmi_iio.c b/drivers/iio/common/scmi_sensors/scmi_iio.c
index 793d628db55f..c6d2cf5504cb 100644
--- a/drivers/iio/common/scmi_sensors/scmi_iio.c
+++ b/drivers/iio/common/scmi_sensors/scmi_iio.c
@@ -18,6 +18,7 @@
#include <linux/scmi_protocol.h>
#include <linux/time.h>
#include <linux/types.h>
+#include <linux/units.h>
#define SCMI_IIO_NUM_OF_AXIS 3
@@ -130,7 +131,6 @@ static const struct iio_buffer_setup_ops scmi_iio_buffer_ops = {
static int scmi_iio_set_odr_val(struct iio_dev *iio_dev, int val, int val2)
{
struct scmi_iio_priv *sensor = iio_priv(iio_dev);
- const unsigned long UHZ_PER_HZ = 1000000UL;
u64 sec, mult, uHz, sf;
u32 sensor_config;
char buf[32];
--
2.36.0
Currently, Hz units do not have milli, micro and nano Hz coefficients.
Some drivers (IIO especially) use their analogues to calculate
appropriate Hz values. This patch includes them to units.h definitions,
so they can be used from different kernel places.
Signed-off-by: Dmitry Rokosov <[email protected]>
---
include/linux/units.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/include/linux/units.h b/include/linux/units.h
index 681fc652e3d7..8bb83c6ea97d 100644
--- a/include/linux/units.h
+++ b/include/linux/units.h
@@ -20,6 +20,9 @@
#define PICO 1000000000000ULL
#define FEMTO 1000000000000000ULL
+#define NHZ_PER_HZ 1000000000UL
+#define UHZ_PER_HZ 1000000UL
+#define MILLIHZ_PER_HZ 1000UL
#define HZ_PER_KHZ 1000UL
#define KHZ_PER_MHZ 1000UL
#define HZ_PER_MHZ 1000000UL
--
2.36.0
On Fri, Jul 29, 2022 at 7:23 PM Dmitry Rokosov <[email protected]> wrote:
>
> Remove duplicated definition of NHZ_PER_HZ, because it's available in
> the units.h.
Fine to me in principle (whatever name it gets after all)
Reviewed-by: Andy Shevchenko <[email protected]>
> Signed-off-by: Dmitry Rokosov <[email protected]>
> ---
> drivers/iio/accel/adxl345_core.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iio/accel/adxl345_core.c b/drivers/iio/accel/adxl345_core.c
> index 370bfec1275a..94189133fe8f 100644
> --- a/drivers/iio/accel/adxl345_core.c
> +++ b/drivers/iio/accel/adxl345_core.c
> @@ -10,6 +10,7 @@
> #include <linux/module.h>
> #include <linux/property.h>
> #include <linux/regmap.h>
> +#include <linux/units.h>
>
> #include <linux/iio/iio.h>
> #include <linux/iio/sysfs.h>
> @@ -32,7 +33,6 @@
>
> #define ADXL345_BW_RATE GENMASK(3, 0)
> #define ADXL345_BASE_RATE_NANO_HZ 97656250LL
> -#define NHZ_PER_HZ 1000000000LL
>
> #define ADXL345_POWER_CTL_MEASURE BIT(3)
> #define ADXL345_POWER_CTL_STANDBY 0x00
> --
> 2.36.0
--
With Best Regards,
Andy Shevchenko
On Fri, Jul 29, 2022 at 7:23 PM Dmitry Rokosov <[email protected]> wrote:
>
> Remove duplicated definition of UHZ_PER_HZ, because it's available in
> the units.h.
Fine to me in principle (whatever name it gets after all)
Reviewed-by: Andy Shevchenko <[email protected]>
> Signed-off-by: Dmitry Rokosov <[email protected]>
> ---
> drivers/iio/common/scmi_sensors/scmi_iio.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/iio/common/scmi_sensors/scmi_iio.c b/drivers/iio/common/scmi_sensors/scmi_iio.c
> index 793d628db55f..c6d2cf5504cb 100644
> --- a/drivers/iio/common/scmi_sensors/scmi_iio.c
> +++ b/drivers/iio/common/scmi_sensors/scmi_iio.c
> @@ -18,6 +18,7 @@
> #include <linux/scmi_protocol.h>
> #include <linux/time.h>
> #include <linux/types.h>
> +#include <linux/units.h>
>
> #define SCMI_IIO_NUM_OF_AXIS 3
>
> @@ -130,7 +131,6 @@ static const struct iio_buffer_setup_ops scmi_iio_buffer_ops = {
> static int scmi_iio_set_odr_val(struct iio_dev *iio_dev, int val, int val2)
> {
> struct scmi_iio_priv *sensor = iio_priv(iio_dev);
> - const unsigned long UHZ_PER_HZ = 1000000UL;
> u64 sec, mult, uHz, sf;
> u32 sensor_config;
> char buf[32];
> --
> 2.36.0
--
With Best Regards,
Andy Shevchenko