ARM: Add hwmon driver for LRADC found on Allwinner A13/A20 SoCs
Subsystems (2)
PATCH 1/1 ARM: Add hwmon driver for LRADC found on Allwinner A13/A20 SoCs
Some Allwinner SoCs like A13, A20 or T2 are equipped with two-channel low rate (6 bit) ADC that is often used for extra keys. There's a driver for that already implementing standard input device, but it has these
limitations: 1) it cannot be used for general ADC data equisition, and
2) it uses only one LRADC channel of two available.
This driver provides basic hwmon interface to both channels of LRADC on such Allwinner SoCs.
--- drivers/hwmon/Kconfig | 13 ++ drivers/hwmon/Makefile | 1 + drivers/hwmon/sun4i-lradc-hwmon.c | 278 ++++++++++++++++++++++++++++++ 3 files changed, 292 insertions(+) create mode 100644 drivers/hwmon/sun4i-lradc-hwmon.c
drivers/hwmon/Kconfig +13 -0
@@ -521,6 +521,19 @@ config I8K Say Y if you intend to run userspace programs that use this interface. Say N otherwise. +config SENSORS_SUN4I_LRADC + tristate "Allwinner A13/A20 LRADC hwmon" + depends on ARCH_SUNXI && (!KEYBOARD_SUN4I_LRADC) + help + Say y here to support the LRADC found in Allwinner A13/A20 SoCs. + Both channels are supported. + + This driver can also be built as module. If so, the module + will be called sun4i-lradc-hwmon. + + This option is not compatible with KEYBOARD_SUN4I_LRADC, one + of these should be used at a time. + config SENSORS_DA9052_ADC tristate "Dialog DA9052/DA9053 ADC" depends on PMIC_DA9052
drivers/hwmon/Makefile +1 -0
@@ -30,6 +30,7 @@ obj-$(CONFIG_SENSORS_AD7314) += ad7314.o obj-$(CONFIG_SENSORS_AD7414) += ad7414.o obj-$(CONFIG_SENSORS_AD7418) += ad7418.o obj-$(CONFIG_SENSORS_ADC128D818) += adc128d818.o +obj-$(CONFIG_SENSORS_SUN4I_LRADC) += sun4i-lradc-hwmon.o obj-$(CONFIG_SENSORS_ADCXX) += adcxx.o obj-$(CONFIG_SENSORS_ADM1021) += adm1021.o obj-$(CONFIG_SENSORS_ADM1025) += adm1025.o
drivers/hwmon/sun4i-lradc-hwmon.c new file +278 -0
278 lines not on this page · raw message
Signature · 1 line
2.17.1
Jernej Škrabec
maintainerHi Ruslan!
Dne sreda, 27. april 2022 ob 21:25:12 CEST je Ruslan Zalata napisal(a):
Quoted 10 lines
Some Allwinner SoCs like A13, A20 or T2 are equipped with two-channel low rate (6 bit) ADC that is often used for extra keys. There's a driver for that already implementing standard input device, but it has these
limitations: 1) it cannot be used for general ADC data equisition, and
2) it uses only one LRADC channel of two available.This driver provides basic hwmon interface to both channels of LRADC on such Allwinner SoCs.
Signed-off-by Ruslan Zalata <[email protected]>
Before even going to check actual driver, please read https://www.kernel.org/
doc/html/latest/process/submitting-patches.html in detail.
Just few basic things to fix first:
1. subject doesn't conform to rules
2. send patch to maintainers and mailing lists (use scripts/get_maintainer.pl)
3. code has style issues (multiple empty lines). Run scripts/checkpatch.pl -- strict on your patch before submission and fix all reported issues.
4. you sent same patch two times. If it's same, it should be marked with RESEND, if not, it should be versioned (V2, V3, etc.) with short changelog after --- line (as explained in above link)
5. it's customary to add new entry in MAINTAINERS when adding new driver
Best regards,
Jernej
drivers/hwmon/Kconfig config I8K · line 521
Quoted 13 lines
--- drivers/hwmon/Kconfig | 13 ++ drivers/hwmon/Makefile | 1 + drivers/hwmon/sun4i-lradc-hwmon.c | 278 ++++++++++++++++++++++++++++++ 3 files changed, 292 insertions(+) create mode 100644 drivers/hwmon/sun4i-lradc-hwmon.cdrivers/hwmon/Kconfig +0
-0@@ -521,6 +521,19 @@ config I8K Say Y if you intend to run userspace programs that use this
interface.
Quoted 196 lines
drivers/hwmon/Kconfig +13
-0Say N otherwise. +config SENSORS_SUN4I_LRADC + tristate "Allwinner A13/A20 LRADC hwmon" + depends on ARCH_SUNXI && (!KEYBOARD_SUN4I_LRADC) + help + Say y here to support the LRADC found in Allwinner A13/A20 SoCs. + Both channels are supported. + + This driver can also be built as module. If so, the module + will be called sun4i-lradc-hwmon. + + This option is not compatible with KEYBOARD_SUN4I_LRADC, one + of these should be used at a time. + config SENSORS_DA9052_ADC tristate "Dialog DA9052/DA9053 ADC" depends on PMIC_DA9052drivers/hwmon/Makefile +1
-0@@ -30,6 +30,7 @@ obj-$(CONFIG_SENSORS_AD7314) += ad7314.o obj-$(CONFIG_SENSORS_AD7414) += ad7414.o obj-$(CONFIG_SENSORS_AD7418) += ad7418.o obj-$(CONFIG_SENSORS_ADC128D818) += adc128d818.o +obj-$(CONFIG_SENSORS_SUN4I_LRADC) += sun4i-lradc-hwmon.o obj-$(CONFIG_SENSORS_ADCXX) += adcxx.o obj-$(CONFIG_SENSORS_ADM1021) += adm1021.o obj-$(CONFIG_SENSORS_ADM1025) += adm1025.o(quoted diff) +0
-0
b/drivers/hwmon/sun4i-lradc-hwmon.cnew file mode 100644 index 00000000000..1947b716dbfdrivers/hwmon/sun4i-lradc-hwmon.c new file +147
-0@@ -0,0 +1,278 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Allwinner sun4i (A13/A20) LRADC hwmon driver +* +* Copyright (C) 2022 Fabmicro, LLC., Tyumen, Russia. +* Copyright (C) 2022 Ruslan Zalata <[email protected]> +*/ + +#include <linux/err.h> +#include <linux/init.h> +#include <linux/input.h> +#include <linux/interrupt.h> +#include <linux/module.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/regulator/consumer.h> +#include <linux/slab.h> +#include <linux/hwmon.h> +#include <linux/hwmon-sysfs.h> + +#define LRADC_CTRL 0x00 +#define LRADC_INTC 0x04 +#define LRADC_INTS 0x08 +#define LRADC_DATA0 0x0c +#define LRADC_DATA1 0x10 + +/* LRADC_CTRL bits */ +#define FIRST_CONVERT_DLY (x) ((x) << 24)/* 8 bits */ +#define CHAN_SELECT (x) ((x) << 22)/* 2 bits */ +#define CONTINUE_TIME_SEL (x) ((x) << 16)/* 4 bits */ +#define KEY_MODE_SEL (x) ((x) << 12)/* 2 bits */ +#define LEVELA_B_CNT (x) ((x) << 8)/* 4 bits */ +#define HOLD_KEY_EN (x) ((x) << 7) +#define HOLD_EN (x) ((x) << 6) +#define LEVELB_VOL (x) ((x) << 4)/* 2 bits */ +#define SAMPLE_RATE (x) ((x) << 2)/* 2 bits */ +#define ENABLE (x) ((x) << 0) + +/* LRADC_INTC and LRADC_INTS bits */ +#define CHAN1_KEYUP_IRQ BIT(12) +#define CHAN1_ALRDY_HOLD_IRQ BIT(11) +#define CHAN1_HOLD_IRQ BIT(10) +#define CHAN1_KEYDOWN_IRQ BIT(9) +#define CHAN1_DATA_IRQ BIT(8) +#define CHAN0_KEYUP_IRQ BIT(4) +#define CHAN0_ALRDY_HOLD_IRQ BIT(3) +#define CHAN0_HOLD_IRQ BIT(2) +#define CHAN0_KEYDOWN_IRQ BIT(1) +#define CHAN0_DATA_IRQ BIT(0) + + +struct lradc_variant { +u32 bits; +u32 resolution; +u32 vref; +}; + +struct lradc_variant variant_sun4i_a10_lradc = { + .bits =0x3f , + .resolution =63 , + .vref =2000000 , +}; + +struct lradc_variant variant_sun8i_a83t_r_lradc = { + .bits =0x3f , + .resolution =63 , + .vref =2000000 , +}; + +static const struct of_device_id sun4i_lradc_of_match[]; + + +struct sun4i_lradc_data { +struct device *dev; +struct device *hwmon_dev; +void __iomem *base; +const struct lradc_variant *variant; +u32 in[2 ]; +u32 in_mvolts[2 ]; +}; + + +static ssize_t lradc_in_mvolts_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct sun4i_lradc_data *data =dev_get_drvdata (dev); +int nr =to_sensor_dev_attr_2 (attr)->nr; + +if (IS_ERR (data)) +return PTR_ERR (data); + +return sprintf (buf,"%d\n" , data->in_mvolts[nr]); +} + +static ssize_t lradc_in_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct sun4i_lradc_data *data =dev_get_drvdata (dev); +int nr =to_sensor_dev_attr_2 (attr)->nr; + +if (IS_ERR (data)) +return PTR_ERR (data); + +return sprintf (buf,"%d\n" , data->in[nr]); +} + + +static umode_t lradc_is_visible (struct kobject *kobj, +struct attribute *attr,int index) +{ +return attr->mode; +} + + + +static SENSOR_DEVICE_ATTR_2_RO(in0_input, lradc_in, 0, 0); +static SENSOR_DEVICE_ATTR_2_RO(in0_input_mvolts, lradc_in_mvolts, 0, 1); + +static SENSOR_DEVICE_ATTR_2_RO(in1_input, lradc_in, 1, 0); +static SENSOR_DEVICE_ATTR_2_RO(in1_input_mvolts, lradc_in_mvolts, 1, 1); + +static struct attribute *lradc_attrs[] = { + &sensor_dev_attr_in0_input.dev_attr.attr, + &sensor_dev_attr_in0_input_mvolts.dev_attr.attr, + &sensor_dev_attr_in1_input.dev_attr.attr, + &sensor_dev_attr_in1_input_mvolts.dev_attr.attr, +NULL +}; + +static const struct attribute_group lradc_group = { + .attrs = lradc_attrs, + .is_visible = lradc_is_visible, +}; +__ATTRIBUTE_GROUPS (lradc); + + +static irqreturn_t sun4i_lradc_irq (int irq,void *dev_id) +{ +struct sun4i_lradc_data *lradc = dev_id; +u32 ints; + + ints =readl (lradc->base +LRADC_INTS ); + +if (ints &CHAN0_DATA_IRQ ) { + lradc->in[0 ] =readl (lradc->base +LRADC_DATA0 ) & + lradc->variant->bits; + lradc->in_mvolts[0] = lradc->in[0] * lradc->variant-vref /
drivers/hwmon/sun4i-lradc-hwmon.c new file +7
-0+ lradc->variant->resolution /1000 ; + } + +if (ints &CHAN1_DATA_IRQ ) { + lradc->in[1 ] =readl (lradc->base +LRADC_DATA1 ) & + lradc->variant->bits; + lradc->in_mvolts[1] = lradc->in[1] * lradc->variant-vref /
drivers/hwmon/sun4i-lradc-hwmon.c new file +4
-0+ lradc->variant->resolution /1000 ; + } + +writel (ints, lradc->base +LRADC_INTS );
drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 10 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +10
-0+ +return IRQ_HANDLED ; +} + +static int sun4i_lradc_open (struct device *dev) +{ +struct sun4i_lradc_data *lradc =dev_get_drvdata (dev); + + writel(FIRST_CONVERT_DLY(2) | CHAN_SELECT(3) | LEVELA_B_CNT(1) | + HOLD_EN(1) | KEY_MODE_SEL(2) | SAMPLE_RATE(3) |
ENABLE(1),
Quoted 36 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +24
-0+ lradc->base + LRADC_CTRL); + +writel (CHAN0_DATA_IRQ |CHAN1_DATA_IRQ , lradc->base +LRADC_INTC ); + +return 0 ; +} + +static void sun4i_lradc_close (struct device *dev) +{ +struct sun4i_lradc_data *lradc =dev_get_drvdata (dev); + +writel (FIRST_CONVERT_DLY (2 ) |LEVELA_B_CNT (1 ) |HOLD_EN (1 ) | +SAMPLE_RATE (2 ), lradc->base +LRADC_CTRL ); +writel (0 , lradc->base +LRADC_INTC ); +} + +static int sun4i_lradc_resume (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; + +return sun4i_lradc_open (dev); +} + +static int sun4i_lradc_suspend(struct platform_device *pdev, pm_message_tstate) +{
drivers/hwmon/sun4i-lradc-hwmon.c new file +11
-0+struct device *dev = &pdev->dev; + +sun4i_lradc_close (dev); +return 0 ; +} + +static int sun4i_lradc_remove (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; + +sun4i_lradc_close (dev);
drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 10 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +10
-0+return 0 ; +} + +static int sun4i_lradc_probe (struct platform_device *pdev) +{ +struct sun4i_lradc_data *lradc; +struct device *dev = &pdev->dev; +int error; + + lradc = devm_kzalloc(dev, sizeof(struct sun4i_lradc_data),
GFP_KERNEL);
Quoted 5 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +5
-0+if (!lradc) +return -ENOMEM ; + +dev_set_drvdata (dev, lradc); +
drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 10 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +10
-0+ lradc->variant =of_device_get_match_data (&pdev->dev); +if (!lradc->variant) { +dev_err (&pdev->dev,"Missing '%s' or '%s' variant\n" , + sun4i_lradc_of_match[0 ].compatible, + sun4i_lradc_of_match[1 ].compatible); +return -EINVAL ; + } + + lradc->dev = dev; + lradc->hwmon_dev = devm_hwmon_device_register_with_groups(dev,
"lradc",
drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 1 line
drivers/hwmon/sun4i-lradc-hwmon.c new file +1
-0+
lradc, lradc_groups);
drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 7 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +7
-0+if (IS_ERR (lradc->hwmon_dev)) { + error =PTR_ERR (lradc->hwmon_dev); +return error; + } + + lradc->base = devm_ioremap_resource(dev, + platform_get_resource(pdev, IORESOURCE_MEM,
0));
drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 5 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +5
-0+if (IS_ERR (lradc->base)) +return PTR_ERR (lradc->base); + + error = devm_request_irq(dev, platform_get_irq(pdev, 0), + sun4i_lradc_irq, 0, "sun4i-lradc-hwmon",
lradc);
Quoted 12 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +12
-0+if (error) +return error; + + error =sun4i_lradc_open (dev); +if (error) +return error; + +return 0 ; +} + +static const struct of_device_id sun4i_lradc_of_match[] = { + { .compatible = "allwinner,sun4i-a10-lradc-keys", .data =
Quoted 2 lines
&variant_sun4i_a10_lradc}, + { .compatible =
"allwinner,sun8i-a83t-r-lradc", .data =&variant_sun8i_a83t_r_lradc}, +
{
Quoted 23 lines
/* sentinel */ }
drivers/hwmon/sun4i-lradc-hwmon.c new file +22
-0+}; +MODULE_DEVICE_TABLE (of, sun4i_lradc_of_match); + +static struct platform_driver sun4i_lradc_driver = { + .driver = { + .name ="sun4i-lradc-hwmon" , + .of_match_table =of_match_ptr (sun4i_lradc_of_match), + }, + .probe = sun4i_lradc_probe, + .remove = sun4i_lradc_remove, + .resume = sun4i_lradc_resume, + .suspend = sun4i_lradc_suspend, +}; + +module_platform_driver (sun4i_lradc_driver); + + + + +MODULE_DESCRIPTION ("Allwinner A13/A20 LRADC hwmon driver" ); +MODULE_AUTHOR ("Ruslan Zalata <[email protected]>" ); +MODULE_LICENSE ("GPL" );
PATCH 1/1 ARM: Add hwmon driver for LRADC found on Allwinner A13/A20 SoCs
Dear Jernej and all.
I used sendmail instead of "git send-email" and it did the whole this wrong - several separate emails were sent. I'm sorry for that, will stick to git command next time.
I read the guide of course and I fed the patch through scripts/checkpatch.pl many times in an effort to elaborate all the errors and warnings. The only warning left is this:
WARNING: added, moved or deleted file(s), does MAINTAINERS need updating? #61:
new file mode 100644
total: 0 errors, 1 warnings, 304 lines checked
Since this is my first attempt to submit my code I'm quite confused whom should I add as a maintainer for this driver. :)
PS: What's wrong with the subject ?
---
Regards,
Ruslan.
Fabmicro, LLC.
Quoted 373 lines · Jernej Škrabec
Hi Ruslan!
Dne sreda, 27. april 2022 ob 21:25:12 CEST je Ruslan Zalata napisal(a):
Quoted 10 lines
Some Allwinner SoCs like A13, A20 or T2 are equipped with two-channel low rate (6 bit) ADC that is often used for extra keys. There's a driver for that already implementing standard input device, but it has these
limitations: 1) it cannot be used for general ADC data equisition, and
2) it uses only one LRADC channel of two available.This driver provides basic hwmon interface to both channels of LRADC on such Allwinner SoCs.
Signed-off-by Ruslan Zalata <[email protected]>Before even going to check actual driver, please read https://www.kernel.org/
doc/html/latest/process/submitting-patches.html in detail.Just few basic things to fix first:
1. subject doesn't conform to rules
2. send patch to maintainers and mailing lists (usescripts/get_maintainer.pl)
3. code has style issues (multiple empty lines). Runscripts/checkpatch.pl-- strict on your patch before submission and fix all reported issues.
4. you sent same patch two times. If it's same, it should be marked with RESEND, if not, it should be versioned (V2, V3, etc.) with short changelog after --- line (as explained in above link)
5. it's customary to add new entry inMAINTAINERSwhen adding new driverBest regards,
JernejQuoted 13 lines
--- drivers/hwmon/Kconfig | 13 ++ drivers/hwmon/Makefile | 1 + drivers/hwmon/sun4i-lradc-hwmon.c | 278 ++++++++++++++++++++++++++++++ 3 files changed, 292 insertions(+) create mode 100644 drivers/hwmon/sun4i-lradc-hwmon.cdrivers/hwmon/Kconfig +0
-0drivers/hwmon/Kconfig config I8K · line 521
Quoted 1 line
drivers/hwmon/Kconfig +0
-0@@ -521,6 +521,19 @@ config I8K Say Y if you intend to run userspace programs that use thisinterface.
Quoted 198 lines
drivers/hwmon/Kconfig +13
-0Say N otherwise. +config SENSORS_SUN4I_LRADC + tristate "Allwinner A13/A20 LRADC hwmon" + depends on ARCH_SUNXI && (!KEYBOARD_SUN4I_LRADC) + help + Say y here to support the LRADC found in Allwinner A13/A20 SoCs. + Both channels are supported. + + This driver can also be built as module. If so, the module + will be called sun4i-lradc-hwmon. + + This option is not compatible with KEYBOARD_SUN4I_LRADC, one + of these should be used at a time. + config SENSORS_DA9052_ADC tristate "Dialog DA9052/DA9053 ADC" depends on PMIC_DA9052drivers/hwmon/Makefile +1
-0@@ -30,6 +30,7 @@ obj-$(CONFIG_SENSORS_AD7314) += ad7314.o obj-$(CONFIG_SENSORS_AD7414) += ad7414.o obj-$(CONFIG_SENSORS_AD7418) += ad7418.o obj-$(CONFIG_SENSORS_ADC128D818) += adc128d818.o +obj-$(CONFIG_SENSORS_SUN4I_LRADC) += sun4i-lradc-hwmon.o obj-$(CONFIG_SENSORS_ADCXX) += adcxx.o obj-$(CONFIG_SENSORS_ADM1021) += adm1021.o obj-$(CONFIG_SENSORS_ADM1025) += adm1025.o(quoted diff) +0
-0
b/drivers/hwmon/sun4i-lradc-hwmon.cnew file mode 100644 index 00000000000..1947b716dbfdrivers/hwmon/sun4i-lradc-hwmon.c new file +117
-0@@ -0,0 +1,278 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Allwinner sun4i (A13/A20) LRADC hwmon driver +* +* Copyright (C) 2022 Fabmicro, LLC., Tyumen, Russia. +* Copyright (C) 2022 Ruslan Zalata <[email protected]> +*/ + +#include <linux/err.h> +#include <linux/init.h> +#include <linux/input.h> +#include <linux/interrupt.h> +#include <linux/module.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/regulator/consumer.h> +#include <linux/slab.h> +#include <linux/hwmon.h> +#include <linux/hwmon-sysfs.h> + +#define LRADC_CTRL 0x00 +#define LRADC_INTC 0x04 +#define LRADC_INTS 0x08 +#define LRADC_DATA0 0x0c +#define LRADC_DATA1 0x10 + +/* LRADC_CTRL bits */ +#define FIRST_CONVERT_DLY (x) ((x) << 24)/* 8 bits */ +#define CHAN_SELECT (x) ((x) << 22)/* 2 bits */ +#define CONTINUE_TIME_SEL (x) ((x) << 16)/* 4 bits */ +#define KEY_MODE_SEL (x) ((x) << 12)/* 2 bits */ +#define LEVELA_B_CNT (x) ((x) << 8)/* 4 bits */ +#define HOLD_KEY_EN (x) ((x) << 7) +#define HOLD_EN (x) ((x) << 6) +#define LEVELB_VOL (x) ((x) << 4)/* 2 bits */ +#define SAMPLE_RATE (x) ((x) << 2)/* 2 bits */ +#define ENABLE (x) ((x) << 0) + +/* LRADC_INTC and LRADC_INTS bits */ +#define CHAN1_KEYUP_IRQ BIT(12) +#define CHAN1_ALRDY_HOLD_IRQ BIT(11) +#define CHAN1_HOLD_IRQ BIT(10) +#define CHAN1_KEYDOWN_IRQ BIT(9) +#define CHAN1_DATA_IRQ BIT(8) +#define CHAN0_KEYUP_IRQ BIT(4) +#define CHAN0_ALRDY_HOLD_IRQ BIT(3) +#define CHAN0_HOLD_IRQ BIT(2) +#define CHAN0_KEYDOWN_IRQ BIT(1) +#define CHAN0_DATA_IRQ BIT(0) + + +struct lradc_variant { +u32 bits; +u32 resolution; +u32 vref; +}; + +struct lradc_variant variant_sun4i_a10_lradc = { + .bits =0x3f , + .resolution =63 , + .vref =2000000 , +}; + +struct lradc_variant variant_sun8i_a83t_r_lradc = { + .bits =0x3f , + .resolution =63 , + .vref =2000000 , +}; + +static const struct of_device_id sun4i_lradc_of_match[]; + + +struct sun4i_lradc_data { +struct device *dev; +struct device *hwmon_dev; +void __iomem *base; +const struct lradc_variant *variant; +u32 in[2 ]; +u32 in_mvolts[2 ]; +}; + + +static ssize_t lradc_in_mvolts_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct sun4i_lradc_data *data =dev_get_drvdata (dev); +int nr =to_sensor_dev_attr_2 (attr)->nr; + +if (IS_ERR (data)) +return PTR_ERR (data); + +return sprintf (buf,"%d\n" , data->in_mvolts[nr]); +} + +static ssize_t lradc_in_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct sun4i_lradc_data *data =dev_get_drvdata (dev); +int nr =to_sensor_dev_attr_2 (attr)->nr; + +if (IS_ERR (data)) +return PTR_ERR (data); + +return sprintf (buf,"%d\n" , data->in[nr]); +} + + +static umode_t lradc_is_visible (struct kobject *kobj, +struct attribute *attr,int index) +{ +return attr->mode; +} + + + +static SENSOR_DEVICE_ATTR_2_RO(in0_input, lradc_in, 0, 0); +static SENSOR_DEVICE_ATTR_2_RO(in0_input_mvolts, lradc_in_mvolts, 0,1);
drivers/hwmon/sun4i-lradc-hwmon.c new file +3
-0+ +static SENSOR_DEVICE_ATTR_2_RO(in1_input, lradc_in, 1, 0); +static SENSOR_DEVICE_ATTR_2_RO(in1_input_mvolts, lradc_in_mvolts, 1,1);
drivers/hwmon/sun4i-lradc-hwmon.c new file +27
-0+ +static struct attribute *lradc_attrs[] = { + &sensor_dev_attr_in0_input.dev_attr.attr, + &sensor_dev_attr_in0_input_mvolts.dev_attr.attr, + &sensor_dev_attr_in1_input.dev_attr.attr, + &sensor_dev_attr_in1_input_mvolts.dev_attr.attr, +NULL +}; + +static const struct attribute_group lradc_group = { + .attrs = lradc_attrs, + .is_visible = lradc_is_visible, +}; +__ATTRIBUTE_GROUPS (lradc); + + +static irqreturn_t sun4i_lradc_irq (int irq,void *dev_id) +{ +struct sun4i_lradc_data *lradc = dev_id; +u32 ints; + + ints =readl (lradc->base +LRADC_INTS ); + +if (ints &CHAN0_DATA_IRQ ) { + lradc->in[0 ] =readl (lradc->base +LRADC_DATA0 ) & + lradc->variant->bits; + lradc->in_mvolts[0] = lradc->in[0] * lradc->variant-vref /
drivers/hwmon/sun4i-lradc-hwmon.c new file +7
-0+ lradc->variant->resolution /1000 ; + } + +if (ints &CHAN1_DATA_IRQ ) { + lradc->in[1 ] =readl (lradc->base +LRADC_DATA1 ) & + lradc->variant->bits; + lradc->in_mvolts[1] = lradc->in[1] * lradc->variant-vref /
drivers/hwmon/sun4i-lradc-hwmon.c new file +4
-0+ lradc->variant->resolution /1000 ; + } + +writel (ints, lradc->base +LRADC_INTS );drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 10 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +10
-0+ +return IRQ_HANDLED ; +} + +static int sun4i_lradc_open (struct device *dev) +{ +struct sun4i_lradc_data *lradc =dev_get_drvdata (dev); + + writel(FIRST_CONVERT_DLY(2) | CHAN_SELECT(3) | LEVELA_B_CNT(1) | + HOLD_EN(1) | KEY_MODE_SEL(2) | SAMPLE_RATE(3) |ENABLE(1),
Quoted 37 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +24
-0+ lradc->base + LRADC_CTRL); + +writel (CHAN0_DATA_IRQ |CHAN1_DATA_IRQ , lradc->base +LRADC_INTC ); + +return 0 ; +} + +static void sun4i_lradc_close (struct device *dev) +{ +struct sun4i_lradc_data *lradc =dev_get_drvdata (dev); + +writel (FIRST_CONVERT_DLY (2 ) |LEVELA_B_CNT (1 ) |HOLD_EN (1 ) | +SAMPLE_RATE (2 ), lradc->base +LRADC_CTRL ); +writel (0 , lradc->base +LRADC_INTC ); +} + +static int sun4i_lradc_resume (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; + +return sun4i_lradc_open (dev); +} + +static int sun4i_lradc_suspend(struct platform_device *pdev,
pm_message_t
state) +{drivers/hwmon/sun4i-lradc-hwmon.c new file +11
-0+struct device *dev = &pdev->dev; + +sun4i_lradc_close (dev); +return 0 ; +} + +static int sun4i_lradc_remove (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; + +sun4i_lradc_close (dev);drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 10 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +10
-0+return 0 ; +} + +static int sun4i_lradc_probe (struct platform_device *pdev) +{ +struct sun4i_lradc_data *lradc; +struct device *dev = &pdev->dev; +int error; + + lradc = devm_kzalloc(dev, sizeof(struct sun4i_lradc_data),
GFP_KERNEL);Quoted 5 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +5
-0+if (!lradc) +return -ENOMEM ; + +dev_set_drvdata (dev, lradc); +drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 10 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +10
-0+ lradc->variant =of_device_get_match_data (&pdev->dev); +if (!lradc->variant) { +dev_err (&pdev->dev,"Missing '%s' or '%s' variant\n" , + sun4i_lradc_of_match[0 ].compatible, + sun4i_lradc_of_match[1 ].compatible); +return -EINVAL ; + } + + lradc->dev = dev; + lradc->hwmon_dev = devm_hwmon_device_register_with_groups(dev,"lradc",
Quoted 1 line
+
lradc,
lradc_groups);drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 7 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +7
-0+if (IS_ERR (lradc->hwmon_dev)) { + error =PTR_ERR (lradc->hwmon_dev); +return error; + } + + lradc->base = devm_ioremap_resource(dev, + platform_get_resource(pdev, IORESOURCE_MEM,0));
drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 5 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +5
-0+if (IS_ERR (lradc->base)) +return PTR_ERR (lradc->base); + + error = devm_request_irq(dev, platform_get_irq(pdev, 0), + sun4i_lradc_irq, 0, "sun4i-lradc-hwmon",lradc);
Quoted 12 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +12
-0+if (error) +return error; + + error =sun4i_lradc_open (dev); +if (error) +return error; + +return 0 ; +} + +static const struct of_device_id sun4i_lradc_of_match[] = { + { .compatible = "allwinner,sun4i-a10-lradc-keys", .data =Quoted 3 lines
&variant_sun4i_a10_lradc}, + { .compatible =
"allwinner,sun8i-a83t-r-lradc", .data =&variant_sun8i_a83t_r_lradc}, +{
Quoted 23 lines
/* sentinel */ }
drivers/hwmon/sun4i-lradc-hwmon.c new file +22
-0+}; +MODULE_DEVICE_TABLE (of, sun4i_lradc_of_match); + +static struct platform_driver sun4i_lradc_driver = { + .driver = { + .name ="sun4i-lradc-hwmon" , + .of_match_table =of_match_ptr (sun4i_lradc_of_match), + }, + .probe = sun4i_lradc_probe, + .remove = sun4i_lradc_remove, + .resume = sun4i_lradc_resume, + .suspend = sun4i_lradc_suspend, +}; + +module_platform_driver (sun4i_lradc_driver); + + + + +MODULE_DESCRIPTION ("Allwinner A13/A20 LRADC hwmon driver" ); +MODULE_AUTHOR ("Ruslan Zalata <[email protected]>" ); +MODULE_LICENSE ("GPL" );
Jernej Škrabec
maintainerDne sreda, 27. april 2022 ob 23:01:58 CEST je Ruslan Zalata napisal(a):
Quoted 10 lines
Dear Jernej and all.
I used sendmail instead of "git send-email" and it did the whole this wrong - several separate emails were sent. I'm sorry for that, will stick to git command next time.
I read the guide of course and I fed the patch through
scripts/checkpatch.plmany times in an effort to elaborate all the errors and warnings. The only warning left is this:
Quoted 6 lines
WARNING: added, moved or deleted file(s), does
MAINTAINERSneed updating?
#61:
new file mode 100644total: 0 errors, 1 warnings, 304 lines checked
Did you used --strict? Anyway, you have multiple consecutive empty lines in several places. Only one empty line is allowed.
Quoted 3 lines
Since this is my first attempt to submit my code I'm quite confused whom should I add as a maintainer for this driver. :)
Usually yourself.
Quoted 2 lines
PS: What's wrong with the subject ?
Too long and ARM is not a proper tag. Check git history of drivers/hwmon folder for ideas.
Best regards,
Jernej
Quoted 416 lines
---
Regards,
Ruslan.Fabmicro, LLC.
Quoted 408 lines · Jernej Škrabec
Hi Ruslan!
Dne sreda, 27. april 2022 ob 21:25:12 CEST je Ruslan Zalata napisal(a):
Quoted 7 lines
Some Allwinner SoCs like A13, A20 or T2 are equipped with two-channel low rate (6 bit) ADC that is often used for extra keys. There's a driver
for that already implementing standard input device, but it has these
limitations: 1) it cannot be used for general ADC data equisition, and
2) it uses only one LRADC channel of two available.Quoted 5 lines
This driver provides basic hwmon interface to both channels of LRADC on
such Allwinner SoCs.Signed-off-by Ruslan Zalata <[email protected]>Before even going to check actual driver, please read
https://www.kernel.org/
doc/html/latest/process/submitting-patches.html in detail.Just few basic things to fix first:
1. subject doesn't conform to rules
2. send patch to maintainers and mailing lists (usescripts/get_maintainer.pl)
3. code has style issues (multiple empty lines). Runscripts/checkpatch.pl--
strict on your patch before submission and fix all reported issues.
4. you sent same patch two times. If it's same, it should be marked with
RESEND, if not, it should be versioned (V2, V3, etc.) with short changelog
after --- line (as explained in above link)
5. it's customary to add new entry inMAINTAINERSwhen adding new driverBest regards,
JernejQuoted 16 lines
---
drivers/hwmon/Kconfig | 13 ++ drivers/hwmon/Makefile | 1 + drivers/hwmon/sun4i-lradc-hwmon.c | 278++++++++++++++++++++++++++++++
3 files changed, 292 insertions(+) create mode 100644 drivers/hwmon/sun4i-lradc-hwmon.cdrivers/hwmon/Kconfig +0
-0drivers/hwmon/Kconfig config I8K · line 522
Quoted 2 lines
drivers/hwmon/Kconfig +0
-0@@ -521,6 +521,19 @@ config I8K Say Y if you intend to run userspace programs that use thisinterface.
Quoted 205 lines
drivers/hwmon/Kconfig +13
-0Say N otherwise. +config SENSORS_SUN4I_LRADC + tristate "Allwinner A13/A20 LRADC hwmon" + depends on ARCH_SUNXI && (!KEYBOARD_SUN4I_LRADC) + help + Say y here to support the LRADC found in Allwinner A13/A20 SoCs. + Both channels are supported. + + This driver can also be built as module. If so, the module + will be called sun4i-lradc-hwmon. + + This option is not compatible with KEYBOARD_SUN4I_LRADC, one + of these should be used at a time. + config SENSORS_DA9052_ADCdrivers/hwmon/Kconfig +0
-0tristate "Dialog DA9052/DA9053 ADC" depends on PMIC_DA9052drivers/hwmon/Makefile +1
-0@@ -30,6 +30,7 @@ obj-$(CONFIG_SENSORS_AD7314) += ad7314.o obj-$(CONFIG_SENSORS_AD7414) += ad7414.o obj-$(CONFIG_SENSORS_AD7418) += ad7418.o obj-$(CONFIG_SENSORS_ADC128D818) += adc128d818.o +obj-$(CONFIG_SENSORS_SUN4I_LRADC) += sun4i-lradc-hwmon.oobj-$(CONFIG_SENSORS_ADCXX) += adcxx.o
obj-$(CONFIG_SENSORS_ADM1021) += adm1021.o
obj-$(CONFIG_SENSORS_ADM1025) += adm1025.o(quoted diff) +0
-0
b/drivers/hwmon/sun4i-lradc-hwmon.cnew file mode 100644 index 00000000000..1947b716dbfdrivers/hwmon/sun4i-lradc-hwmon.c new file +117
-0@@ -0,0 +1,278 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Allwinner sun4i (A13/A20) LRADC hwmon driver +* +* Copyright (C) 2022 Fabmicro, LLC., Tyumen, Russia. +* Copyright (C) 2022 Ruslan Zalata <[email protected]> +*/ + +#include <linux/err.h> +#include <linux/init.h> +#include <linux/input.h> +#include <linux/interrupt.h> +#include <linux/module.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/regulator/consumer.h> +#include <linux/slab.h> +#include <linux/hwmon.h> +#include <linux/hwmon-sysfs.h> + +#define LRADC_CTRL 0x00 +#define LRADC_INTC 0x04 +#define LRADC_INTS 0x08 +#define LRADC_DATA0 0x0c +#define LRADC_DATA1 0x10 + +/* LRADC_CTRL bits */ +#define FIRST_CONVERT_DLY (x) ((x) << 24)/* 8 bits */ +#define CHAN_SELECT (x) ((x) << 22)/* 2 bits */ +#define CONTINUE_TIME_SEL (x) ((x) << 16)/* 4 bits */ +#define KEY_MODE_SEL (x) ((x) << 12)/* 2 bits */ +#define LEVELA_B_CNT (x) ((x) << 8)/* 4 bits */ +#define HOLD_KEY_EN (x) ((x) << 7) +#define HOLD_EN (x) ((x) << 6) +#define LEVELB_VOL (x) ((x) << 4)/* 2 bits */ +#define SAMPLE_RATE (x) ((x) << 2)/* 2 bits */ +#define ENABLE (x) ((x) << 0) + +/* LRADC_INTC and LRADC_INTS bits */ +#define CHAN1_KEYUP_IRQ BIT(12) +#define CHAN1_ALRDY_HOLD_IRQ BIT(11) +#define CHAN1_HOLD_IRQ BIT(10) +#define CHAN1_KEYDOWN_IRQ BIT(9) +#define CHAN1_DATA_IRQ BIT(8) +#define CHAN0_KEYUP_IRQ BIT(4) +#define CHAN0_ALRDY_HOLD_IRQ BIT(3) +#define CHAN0_HOLD_IRQ BIT(2) +#define CHAN0_KEYDOWN_IRQ BIT(1) +#define CHAN0_DATA_IRQ BIT(0) + + +struct lradc_variant { +u32 bits; +u32 resolution; +u32 vref; +}; + +struct lradc_variant variant_sun4i_a10_lradc = { + .bits =0x3f , + .resolution =63 , + .vref =2000000 , +}; + +struct lradc_variant variant_sun8i_a83t_r_lradc = { + .bits =0x3f , + .resolution =63 , + .vref =2000000 , +}; + +static const struct of_device_id sun4i_lradc_of_match[]; + + +struct sun4i_lradc_data { +struct device *dev; +struct device *hwmon_dev; +void __iomem *base; +const struct lradc_variant *variant; +u32 in[2 ]; +u32 in_mvolts[2 ]; +}; + + +static ssize_t lradc_in_mvolts_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct sun4i_lradc_data *data =dev_get_drvdata (dev); +int nr =to_sensor_dev_attr_2 (attr)->nr; + +if (IS_ERR (data)) +return PTR_ERR (data); + +return sprintf (buf,"%d\n" , data->in_mvolts[nr]); +} + +static ssize_t lradc_in_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct sun4i_lradc_data *data =dev_get_drvdata (dev); +int nr =to_sensor_dev_attr_2 (attr)->nr; + +if (IS_ERR (data)) +return PTR_ERR (data); + +return sprintf (buf,"%d\n" , data->in[nr]); +} + + +static umode_t lradc_is_visible (struct kobject *kobj, +struct attribute *attr,int index) +{ +return attr->mode; +} + + + +static SENSOR_DEVICE_ATTR_2_RO(in0_input, lradc_in, 0, 0); +static SENSOR_DEVICE_ATTR_2_RO(in0_input_mvolts, lradc_in_mvolts, 0,1);
drivers/hwmon/sun4i-lradc-hwmon.c new file +3
-0+ +static SENSOR_DEVICE_ATTR_2_RO(in1_input, lradc_in, 1, 0); +static SENSOR_DEVICE_ATTR_2_RO(in1_input_mvolts, lradc_in_mvolts, 1,1);
drivers/hwmon/sun4i-lradc-hwmon.c new file +27
-0+ +static struct attribute *lradc_attrs[] = { + &sensor_dev_attr_in0_input.dev_attr.attr, + &sensor_dev_attr_in0_input_mvolts.dev_attr.attr, + &sensor_dev_attr_in1_input.dev_attr.attr, + &sensor_dev_attr_in1_input_mvolts.dev_attr.attr, +NULL +}; + +static const struct attribute_group lradc_group = { + .attrs = lradc_attrs, + .is_visible = lradc_is_visible, +}; +__ATTRIBUTE_GROUPS (lradc); + + +static irqreturn_t sun4i_lradc_irq (int irq,void *dev_id) +{ +struct sun4i_lradc_data *lradc = dev_id; +u32 ints; + + ints =readl (lradc->base +LRADC_INTS ); + +if (ints &CHAN0_DATA_IRQ ) { + lradc->in[0 ] =readl (lradc->base +LRADC_DATA0 ) & + lradc->variant->bits; + lradc->in_mvolts[0] = lradc->in[0] * lradc->variant-vref /
drivers/hwmon/sun4i-lradc-hwmon.c new file +7
-0+ lradc->variant->resolution /1000 ; + } + +if (ints &CHAN1_DATA_IRQ ) { + lradc->in[1 ] =readl (lradc->base +LRADC_DATA1 ) & + lradc->variant->bits; + lradc->in_mvolts[1] = lradc->in[1] * lradc->variant-vref /
drivers/hwmon/sun4i-lradc-hwmon.c new file +4
-0+ lradc->variant->resolution /1000 ; + } + +writel (ints, lradc->base +LRADC_INTS );drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 10 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +10
-0+ +return IRQ_HANDLED ; +} + +static int sun4i_lradc_open (struct device *dev) +{ +struct sun4i_lradc_data *lradc =dev_get_drvdata (dev); + + writel(FIRST_CONVERT_DLY(2) | CHAN_SELECT(3) | LEVELA_B_CNT(1) | + HOLD_EN(1) | KEY_MODE_SEL(2) | SAMPLE_RATE(3) |ENABLE(1),
Quoted 37 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +24
-0+ lradc->base + LRADC_CTRL); + +writel (CHAN0_DATA_IRQ |CHAN1_DATA_IRQ , lradc->base +LRADC_INTC ); + +return 0 ; +} + +static void sun4i_lradc_close (struct device *dev) +{ +struct sun4i_lradc_data *lradc =dev_get_drvdata (dev); + +writel (FIRST_CONVERT_DLY (2 ) |LEVELA_B_CNT (1 ) |HOLD_EN (1 ) | +SAMPLE_RATE (2 ), lradc->base +LRADC_CTRL ); +writel (0 , lradc->base +LRADC_INTC ); +} + +static int sun4i_lradc_resume (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; + +return sun4i_lradc_open (dev); +} + +static int sun4i_lradc_suspend(struct platform_device *pdev,
pm_message_t
state) +{drivers/hwmon/sun4i-lradc-hwmon.c new file +11
-0+struct device *dev = &pdev->dev; + +sun4i_lradc_close (dev); +return 0 ; +} + +static int sun4i_lradc_remove (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; + +sun4i_lradc_close (dev);drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 10 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +10
-0+return 0 ; +} + +static int sun4i_lradc_probe (struct platform_device *pdev) +{ +struct sun4i_lradc_data *lradc; +struct device *dev = &pdev->dev; +int error; + + lradc = devm_kzalloc(dev, sizeof(struct sun4i_lradc_data),
GFP_KERNEL);Quoted 5 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +5
-0+if (!lradc) +return -ENOMEM ; + +dev_set_drvdata (dev, lradc); +drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 10 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +10
-0+ lradc->variant =of_device_get_match_data (&pdev->dev); +if (!lradc->variant) { +dev_err (&pdev->dev,"Missing '%s' or '%s' variant\n" , + sun4i_lradc_of_match[0 ].compatible, + sun4i_lradc_of_match[1 ].compatible); +return -EINVAL ; + } + + lradc->dev = dev; + lradc->hwmon_dev = devm_hwmon_device_register_with_groups(dev,"lradc",
Quoted 1 line
+
lradc,
lradc_groups);drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 7 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +7
-0+if (IS_ERR (lradc->hwmon_dev)) { + error =PTR_ERR (lradc->hwmon_dev); +return error; + } + + lradc->base = devm_ioremap_resource(dev, + platform_get_resource(pdev, IORESOURCE_MEM,0));
drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 5 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +5
-0+if (IS_ERR (lradc->base)) +return PTR_ERR (lradc->base); + + error = devm_request_irq(dev, platform_get_irq(pdev, 0), + sun4i_lradc_irq, 0, "sun4i-lradc-hwmon",lradc);
Quoted 12 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +12
-0+if (error) +return error; + + error =sun4i_lradc_open (dev); +if (error) +return error; + +return 0 ; +} + +static const struct of_device_id sun4i_lradc_of_match[] = { + { .compatible = "allwinner,sun4i-a10-lradc-keys", .data =Quoted 3 lines
&variant_sun4i_a10_lradc}, + { .compatible =
"allwinner,sun8i-a83t-r-lradc", .data =&variant_sun8i_a83t_r_lradc}, +{
Quoted 23 lines
/* sentinel */ }
drivers/hwmon/sun4i-lradc-hwmon.c new file +22
-0+}; +MODULE_DEVICE_TABLE (of, sun4i_lradc_of_match); + +static struct platform_driver sun4i_lradc_driver = { + .driver = { + .name ="sun4i-lradc-hwmon" , + .of_match_table =of_match_ptr (sun4i_lradc_of_match), + }, + .probe = sun4i_lradc_probe, + .remove = sun4i_lradc_remove, + .resume = sun4i_lradc_resume, + .suspend = sun4i_lradc_suspend, +}; + +module_platform_driver (sun4i_lradc_driver); + + + + +MODULE_DESCRIPTION ("Allwinner A13/A20 LRADC hwmon driver" ); +MODULE_AUTHOR ("Ruslan Zalata <[email protected]>" ); +MODULE_LICENSE ("GPL" );
PATCH 1/1 ARM: Add hwmon driver for LRADC found on Allwinner A13/A20 SoCs
Jernej,
Are these CHECKs ok to pass ?
CHECK: Alignment should match open parenthesis #314: FILE: drivers/hwmon/sun4i-lradc-hwmon.c:231:
+ lradc->base = devm_ioremap_resource(dev,
+ platform_get_resource(pdev, IORESOURCE_MEM, 0));
CHECK: Alignment should match open parenthesis #319: FILE: drivers/hwmon/sun4i-lradc-hwmon.c:236:
+ error = devm_request_irq(dev, platform_get_irq(pdev, 0),
+ sun4i_lradc_irq, 0, "sun4i-lradc-hwmon", lradc);
total: 0 errors, 0 warnings, 2 checks, 307 lines checked
Aligning above by paranthesis will make code look ugly and exceed 75 chars limit. Please advise.
---
Regards,
Ruslan.
Fabmicro, LLC.
Quoted 452 lines · Jernej Škrabec
Dne sreda, 27. april 2022 ob 23:01:58 CEST je Ruslan Zalata napisal(a):
Quoted 10 lines
Dear Jernej and all.
I used sendmail instead of "git send-email" and it did the whole this wrong - several separate emails were sent. I'm sorry for that, will stick to git command next time.
I read the guide of course and I fed the patch through
scripts/checkpatch.plmany times in an effort to elaborate all the errors and warnings. The only warning left is this:Quoted 6 lines
WARNING: added, moved or deleted file(s), does
MAINTAINERSneed updating?
#61:
new file mode 100644total: 0 errors, 1 warnings, 304 lines checked
Did you used --strict? Anyway, you have multiple consecutive empty lines in several places. Only one empty line is allowed.
Quoted 3 lines
Since this is my first attempt to submit my code I'm quite confused whom should I add as a maintainer for this driver. :)
Usually yourself.
Quoted 2 lines
PS: What's wrong with the subject ?
Too long and ARM is not a proper tag. Check git history of
drivers/hwmonfolder for ideas.Best regards,
JernejQuoted 416 lines
---
Regards,
Ruslan.Fabmicro, LLC.
Quoted 408 lines · Jernej Škrabec
Hi Ruslan!
Dne sreda, 27. april 2022 ob 21:25:12 CEST je Ruslan Zalata napisal(a):
Quoted 7 lines
Some Allwinner SoCs like A13, A20 or T2 are equipped with two-channel low rate (6 bit) ADC that is often used for extra keys. There's a driver
for that already implementing standard input device, but it has these
limitations: 1) it cannot be used for general ADC data equisition, and
2) it uses only one LRADC channel of two available.Quoted 5 lines
This driver provides basic hwmon interface to both channels of LRADC on
such Allwinner SoCs.Signed-off-by Ruslan Zalata <[email protected]>Before even going to check actual driver, please read
https://www.kernel.org/
doc/html/latest/process/submitting-patches.html in detail.Just few basic things to fix first:
1. subject doesn't conform to rules
2. send patch to maintainers and mailing lists (usescripts/get_maintainer.pl)
3. code has style issues (multiple empty lines). Runscripts/checkpatch.pl--
strict on your patch before submission and fix all reported issues.
4. you sent same patch two times. If it's same, it should be marked with
RESEND, if not, it should be versioned (V2, V3, etc.) with short changelog
after --- line (as explained in above link)
5. it's customary to add new entry inMAINTAINERSwhen adding new driverBest regards,
JernejQuoted 16 lines
---
drivers/hwmon/Kconfig | 13 ++ drivers/hwmon/Makefile | 1 + drivers/hwmon/sun4i-lradc-hwmon.c | 278++++++++++++++++++++++++++++++
3 files changed, 292 insertions(+) create mode 100644 drivers/hwmon/sun4i-lradc-hwmon.cdrivers/hwmon/Kconfig +0
-0drivers/hwmon/Kconfig config I8K · line 522
Quoted 2 lines
drivers/hwmon/Kconfig +0
-0@@ -521,6 +521,19 @@ config I8K Say Y if you intend to run userspace programs that use thisinterface.
Quoted 205 lines
drivers/hwmon/Kconfig +13
-0Say N otherwise. +config SENSORS_SUN4I_LRADC + tristate "Allwinner A13/A20 LRADC hwmon" + depends on ARCH_SUNXI && (!KEYBOARD_SUN4I_LRADC) + help + Say y here to support the LRADC found in Allwinner A13/A20 SoCs. + Both channels are supported. + + This driver can also be built as module. If so, the module + will be called sun4i-lradc-hwmon. + + This option is not compatible with KEYBOARD_SUN4I_LRADC, one + of these should be used at a time. + config SENSORS_DA9052_ADCdrivers/hwmon/Kconfig +0
-0tristate "Dialog DA9052/DA9053 ADC" depends on PMIC_DA9052drivers/hwmon/Makefile +1
-0@@ -30,6 +30,7 @@ obj-$(CONFIG_SENSORS_AD7314) += ad7314.o obj-$(CONFIG_SENSORS_AD7414) += ad7414.o obj-$(CONFIG_SENSORS_AD7418) += ad7418.o obj-$(CONFIG_SENSORS_ADC128D818) += adc128d818.o +obj-$(CONFIG_SENSORS_SUN4I_LRADC) += sun4i-lradc-hwmon.oobj-$(CONFIG_SENSORS_ADCXX) += adcxx.o
obj-$(CONFIG_SENSORS_ADM1021) += adm1021.o
obj-$(CONFIG_SENSORS_ADM1025) += adm1025.o(quoted diff) +0
-0
b/drivers/hwmon/sun4i-lradc-hwmon.cnew file mode 100644 index 00000000000..1947b716dbfdrivers/hwmon/sun4i-lradc-hwmon.c new file +117
-0@@ -0,0 +1,278 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Allwinner sun4i (A13/A20) LRADC hwmon driver +* +* Copyright (C) 2022 Fabmicro, LLC., Tyumen, Russia. +* Copyright (C) 2022 Ruslan Zalata <[email protected]> +*/ + +#include <linux/err.h> +#include <linux/init.h> +#include <linux/input.h> +#include <linux/interrupt.h> +#include <linux/module.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/regulator/consumer.h> +#include <linux/slab.h> +#include <linux/hwmon.h> +#include <linux/hwmon-sysfs.h> + +#define LRADC_CTRL 0x00 +#define LRADC_INTC 0x04 +#define LRADC_INTS 0x08 +#define LRADC_DATA0 0x0c +#define LRADC_DATA1 0x10 + +/* LRADC_CTRL bits */ +#define FIRST_CONVERT_DLY (x) ((x) << 24)/* 8 bits */ +#define CHAN_SELECT (x) ((x) << 22)/* 2 bits */ +#define CONTINUE_TIME_SEL (x) ((x) << 16)/* 4 bits */ +#define KEY_MODE_SEL (x) ((x) << 12)/* 2 bits */ +#define LEVELA_B_CNT (x) ((x) << 8)/* 4 bits */ +#define HOLD_KEY_EN (x) ((x) << 7) +#define HOLD_EN (x) ((x) << 6) +#define LEVELB_VOL (x) ((x) << 4)/* 2 bits */ +#define SAMPLE_RATE (x) ((x) << 2)/* 2 bits */ +#define ENABLE (x) ((x) << 0) + +/* LRADC_INTC and LRADC_INTS bits */ +#define CHAN1_KEYUP_IRQ BIT(12) +#define CHAN1_ALRDY_HOLD_IRQ BIT(11) +#define CHAN1_HOLD_IRQ BIT(10) +#define CHAN1_KEYDOWN_IRQ BIT(9) +#define CHAN1_DATA_IRQ BIT(8) +#define CHAN0_KEYUP_IRQ BIT(4) +#define CHAN0_ALRDY_HOLD_IRQ BIT(3) +#define CHAN0_HOLD_IRQ BIT(2) +#define CHAN0_KEYDOWN_IRQ BIT(1) +#define CHAN0_DATA_IRQ BIT(0) + + +struct lradc_variant { +u32 bits; +u32 resolution; +u32 vref; +}; + +struct lradc_variant variant_sun4i_a10_lradc = { + .bits =0x3f , + .resolution =63 , + .vref =2000000 , +}; + +struct lradc_variant variant_sun8i_a83t_r_lradc = { + .bits =0x3f , + .resolution =63 , + .vref =2000000 , +}; + +static const struct of_device_id sun4i_lradc_of_match[]; + + +struct sun4i_lradc_data { +struct device *dev; +struct device *hwmon_dev; +void __iomem *base; +const struct lradc_variant *variant; +u32 in[2 ]; +u32 in_mvolts[2 ]; +}; + + +static ssize_t lradc_in_mvolts_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct sun4i_lradc_data *data =dev_get_drvdata (dev); +int nr =to_sensor_dev_attr_2 (attr)->nr; + +if (IS_ERR (data)) +return PTR_ERR (data); + +return sprintf (buf,"%d\n" , data->in_mvolts[nr]); +} + +static ssize_t lradc_in_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +struct sun4i_lradc_data *data =dev_get_drvdata (dev); +int nr =to_sensor_dev_attr_2 (attr)->nr; + +if (IS_ERR (data)) +return PTR_ERR (data); + +return sprintf (buf,"%d\n" , data->in[nr]); +} + + +static umode_t lradc_is_visible (struct kobject *kobj, +struct attribute *attr,int index) +{ +return attr->mode; +} + + + +static SENSOR_DEVICE_ATTR_2_RO(in0_input, lradc_in, 0, 0); +static SENSOR_DEVICE_ATTR_2_RO(in0_input_mvolts, lradc_in_mvolts, 0,1);
drivers/hwmon/sun4i-lradc-hwmon.c new file +3
-0+ +static SENSOR_DEVICE_ATTR_2_RO(in1_input, lradc_in, 1, 0); +static SENSOR_DEVICE_ATTR_2_RO(in1_input_mvolts, lradc_in_mvolts, 1,1);
drivers/hwmon/sun4i-lradc-hwmon.c new file +27
-0+ +static struct attribute *lradc_attrs[] = { + &sensor_dev_attr_in0_input.dev_attr.attr, + &sensor_dev_attr_in0_input_mvolts.dev_attr.attr, + &sensor_dev_attr_in1_input.dev_attr.attr, + &sensor_dev_attr_in1_input_mvolts.dev_attr.attr, +NULL +}; + +static const struct attribute_group lradc_group = { + .attrs = lradc_attrs, + .is_visible = lradc_is_visible, +}; +__ATTRIBUTE_GROUPS (lradc); + + +static irqreturn_t sun4i_lradc_irq (int irq,void *dev_id) +{ +struct sun4i_lradc_data *lradc = dev_id; +u32 ints; + + ints =readl (lradc->base +LRADC_INTS ); + +if (ints &CHAN0_DATA_IRQ ) { + lradc->in[0 ] =readl (lradc->base +LRADC_DATA0 ) & + lradc->variant->bits; + lradc->in_mvolts[0] = lradc->in[0] * lradc->variant-vref /
drivers/hwmon/sun4i-lradc-hwmon.c new file +7
-0+ lradc->variant->resolution /1000 ; + } + +if (ints &CHAN1_DATA_IRQ ) { + lradc->in[1 ] =readl (lradc->base +LRADC_DATA1 ) & + lradc->variant->bits; + lradc->in_mvolts[1] = lradc->in[1] * lradc->variant-vref /
drivers/hwmon/sun4i-lradc-hwmon.c new file +4
-0+ lradc->variant->resolution /1000 ; + } + +writel (ints, lradc->base +LRADC_INTS );drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 10 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +10
-0+ +return IRQ_HANDLED ; +} + +static int sun4i_lradc_open (struct device *dev) +{ +struct sun4i_lradc_data *lradc =dev_get_drvdata (dev); + + writel(FIRST_CONVERT_DLY(2) | CHAN_SELECT(3) | LEVELA_B_CNT(1) | + HOLD_EN(1) | KEY_MODE_SEL(2) | SAMPLE_RATE(3) |ENABLE(1),
Quoted 37 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +24
-0+ lradc->base + LRADC_CTRL); + +writel (CHAN0_DATA_IRQ |CHAN1_DATA_IRQ , lradc->base +LRADC_INTC ); + +return 0 ; +} + +static void sun4i_lradc_close (struct device *dev) +{ +struct sun4i_lradc_data *lradc =dev_get_drvdata (dev); + +writel (FIRST_CONVERT_DLY (2 ) |LEVELA_B_CNT (1 ) |HOLD_EN (1 ) | +SAMPLE_RATE (2 ), lradc->base +LRADC_CTRL ); +writel (0 , lradc->base +LRADC_INTC ); +} + +static int sun4i_lradc_resume (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; + +return sun4i_lradc_open (dev); +} + +static int sun4i_lradc_suspend(struct platform_device *pdev,
pm_message_t
state) +{drivers/hwmon/sun4i-lradc-hwmon.c new file +11
-0+struct device *dev = &pdev->dev; + +sun4i_lradc_close (dev); +return 0 ; +} + +static int sun4i_lradc_remove (struct platform_device *pdev) +{ +struct device *dev = &pdev->dev; + +sun4i_lradc_close (dev);drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 10 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +10
-0+return 0 ; +} + +static int sun4i_lradc_probe (struct platform_device *pdev) +{ +struct sun4i_lradc_data *lradc; +struct device *dev = &pdev->dev; +int error; + + lradc = devm_kzalloc(dev, sizeof(struct sun4i_lradc_data),
GFP_KERNEL);Quoted 5 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +5
-0+if (!lradc) +return -ENOMEM ; + +dev_set_drvdata (dev, lradc); +drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 10 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +10
-0+ lradc->variant =of_device_get_match_data (&pdev->dev); +if (!lradc->variant) { +dev_err (&pdev->dev,"Missing '%s' or '%s' variant\n" , + sun4i_lradc_of_match[0 ].compatible, + sun4i_lradc_of_match[1 ].compatible); +return -EINVAL ; + } + + lradc->dev = dev; + lradc->hwmon_dev = devm_hwmon_device_register_with_groups(dev,"lradc",
Quoted 1 line
+
lradc,
lradc_groups);drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 7 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +7
-0+if (IS_ERR (lradc->hwmon_dev)) { + error =PTR_ERR (lradc->hwmon_dev); +return error; + } + + lradc->base = devm_ioremap_resource(dev, + platform_get_resource(pdev, IORESOURCE_MEM,0));
drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 5 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +5
-0+if (IS_ERR (lradc->base)) +return PTR_ERR (lradc->base); + + error = devm_request_irq(dev, platform_get_irq(pdev, 0), + sun4i_lradc_irq, 0, "sun4i-lradc-hwmon",lradc);
Quoted 12 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +12
-0+if (error) +return error; + + error =sun4i_lradc_open (dev); +if (error) +return error; + +return 0 ; +} + +static const struct of_device_id sun4i_lradc_of_match[] = { + { .compatible = "allwinner,sun4i-a10-lradc-keys", .data =Quoted 3 lines
&variant_sun4i_a10_lradc}, + { .compatible =
"allwinner,sun8i-a83t-r-lradc", .data =&variant_sun8i_a83t_r_lradc}, +{
Quoted 23 lines
/* sentinel */ }
drivers/hwmon/sun4i-lradc-hwmon.c new file +22
-0+}; +MODULE_DEVICE_TABLE (of, sun4i_lradc_of_match); + +static struct platform_driver sun4i_lradc_driver = { + .driver = { + .name ="sun4i-lradc-hwmon" , + .of_match_table =of_match_ptr (sun4i_lradc_of_match), + }, + .probe = sun4i_lradc_probe, + .remove = sun4i_lradc_remove, + .resume = sun4i_lradc_resume, + .suspend = sun4i_lradc_suspend, +}; + +module_platform_driver (sun4i_lradc_driver); + + + + +MODULE_DESCRIPTION ("Allwinner A13/A20 LRADC hwmon driver" ); +MODULE_AUTHOR ("Ruslan Zalata <[email protected]>" ); +MODULE_LICENSE ("GPL" );
Guenter Roeck
maintainerQuoted 9 lines · Ruslan Zalata
Jernej,
Are these CHECKs ok to pass ?
CHECK: Alignment should match open parenthesis
#314: FILE:drivers/hwmon/sun4i-lradc-hwmon.c:231:
+lradc->base= devm_ioremap_resource(dev,
+platform_get_resource(pdev, IORESOURCE_MEM, 0));
Use an intermediate variable. You need to do that anyway because platform_get_resource() can return NULL which needs to be checked.
Quoted 9 lines
CHECK: Alignment should match open parenthesis
#319: FILE:drivers/hwmon/sun4i-lradc-hwmon.c:236:
+ error = devm_request_irq(dev,platform_get_irq(pdev, 0), +sun4i_lradc_irq, 0, "sun4i-lradc-hwmon", lradc);total: 0 errors, 0 warnings, 2 checks, 307 lines checked
Aligning above by paranthesis will make code look ugly and exceed 75 chars limit. Please advise.
What 75 characters limit ?
You can go up to 100 characters if needed. Also, platform_get_irq() can return an error, which needs to be checked anyway.
Please prepend the subject replies with Re: as is current practice. Your replies all look like patches, not like replies to patches.
More comments inline.
Guenter
Quoted 4 lines
---
Regards,
Ruslan.
Quoted 109 lines
Fabmicro, LLC.
Quoted 106 lines · Jernej Škrabec
Dne sreda, 27. april 2022 ob 23:01:58 CEST je Ruslan Zalata napisal(a):
Quoted 10 lines
Dear Jernej and all.
I used sendmail instead of "git send-email" and it did the whole this wrong - several separate emails were sent. I'm sorry for that, will stick to git command next time.
I read the guide of course and I fed the patch through
scripts/checkpatch.plmany times in an effort to elaborate all the errors and warnings. The only warning left is this:Quoted 6 lines
WARNING: added, moved or deleted file(s), does
MAINTAINERSneed updating?
#61:
new file mode 100644total: 0 errors, 1 warnings, 304 lines checked
Did you used --strict? Anyway, you have multiple consecutive empty lines in several places. Only one empty line is allowed.
Quoted 3 lines
Since this is my first attempt to submit my code I'm quite confused whom should I add as a maintainer for this driver. :)
Usually yourself.
Quoted 2 lines
PS: What's wrong with the subject ?
Too long and ARM is not a proper tag. Check git history of
drivers/hwmonfolder for ideas.Best regards,
JernejQuoted 70 lines
---
Regards,
Ruslan.Fabmicro, LLC.
Quoted 62 lines · Jernej Škrabec
Hi Ruslan!
Dne sreda, 27. april 2022 ob 21:25:12 CEST je Ruslan Zalata napisal(a):
Quoted 7 lines
Some Allwinner SoCs like A13, A20 or T2 are equipped with two-channel low rate (6 bit) ADC that is often used for extra keys. There's a driver
for that already implementing standard input device, but it has these
limitations: 1) it cannot be used for general ADC data equisition, and
2) it uses only one LRADC channel of two available.Quoted 5 lines
This driver provides basic hwmon interface to both channels of LRADC on
such Allwinner SoCs.Signed-off-by Ruslan Zalata <[email protected]>Before even going to check actual driver, please read
https://www.kernel.org/
doc/html/latest/process/submitting-patches.html in detail.Just few basic things to fix first:
1. subject doesn't conform to rules
2. send patch to maintainers and mailing lists (usescripts/get_maintainer.pl)
3. code has style issues (multiple empty lines). Runscripts/checkpatch.pl--
strict on your patch before submission and fix all reported issues.
4. you sent same patch two times. If it's same, it should be marked with
RESEND, if not, it should be versioned (V2, V3, etc.) with short changelog
after --- line (as explained in above link)
5. it's customary to add new entry inMAINTAINERSwhen adding new driverBest regards,
JernejQuoted 17 lines
---
drivers/hwmon/Kconfig | 13 ++
drivers/hwmon/Makefile | 1 +
drivers/hwmon/sun4i-lradc-hwmon.c| 278++++++++++++++++++++++++++++++
3 files changed, 292 insertions(+)create mode 100644
drivers/hwmon/sun4i-lradc-hwmon.cdrivers/hwmon/Kconfig +0
-0@@ -521,6 +521,19 @@ config I8KQuoted 1 line
Say Y if you intend to run userspace programs that use this
interface.
Quoted 3 lines
Say N otherwise.
+config
SENSORS_SUN4I_LRADC
Try to put in alphabetic order.
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
+ tristate "Allwinner A13/A20 LRADC hwmon" + depends on
ARCH_SUNXI&& (!KEYBOARD_SUN4I_LRADC)
Drop the unnecessary ()
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
drivers/hwmon/Kconfig config I8K · line 535
Quoted 9 lines
+ help
+ Say y here to support the LRADC found in Allwinner A13/A20 SoCs. + Both channels are supported.drivers/hwmon/Kconfig +6
-0+ + This driver can also be built as module. If so, the module + will be called sun4i-lradc-hwmon. + + This option is not compatible with KEYBOARD_SUN4I_LRADC, one + of these should be used at a time.
Only one of these must be ...
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
+
config
SENSORS_DA9052_ADCtristate "Dialog DA9052/DA9053 ADC"
depends onPMIC_DA9052drivers/hwmon/Makefile +0
-0@@ -30,6 +30,7 @@ obj-$(CONFIG_SENSORS_AD7314) += ad7314.o
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
obj-$(CONFIG_SENSORS_AD7414) += ad7414.o obj-$(CONFIG_SENSORS_AD7418) += ad7418.o obj-$(CONFIG_SENSORS_ADC128D818) += adc128d818.o
+obj-$(CONFIG_SENSORS_SUN4I_LRADC) += sun4i-lradc-hwmon.o
Alphabetic order please.
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
obj-$(CONFIG_SENSORS_ADCXX) += adcxx.o
obj-$(CONFIG_SENSORS_ADM1021) += adm1021.o
obj-$(CONFIG_SENSORS_ADM1025) += adm1025.o(quoted diff) +0
-0
b/drivers/hwmon/sun4i-lradc-hwmon.cnew file mode 100644 index 00000000000..1947b716dbfdrivers/hwmon/sun4i-lradc-hwmon.c new file +11
-0@@ -0,0 +1,278 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Allwinner sun4i (A13/A20) LRADC hwmon driver +* +* Copyright (C) 2022 Fabmicro, LLC., Tyumen, Russia. +* Copyright (C) 2022 Ruslan Zalata <[email protected]> +*/ + +#include <linux/err.h> +#include <linux/init.h> +#include <linux/input.h>
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/hwmon/sun4i-lradc-hwmon.c line 19
Quoted 8 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +8
-0+#include <linux/interrupt.h> +#include <linux/module.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/regulator/consumer.h> +#include <linux/slab.h> +#include <linux/hwmon.h> +#include <linux/hwmon-sysfs.h>
Alphabetic order, and only include files which are actually needed.
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/hwmon/sun4i-lradc-hwmon.c line 25
Quoted 6 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +6
-0+ +#define LRADC_CTRL 0x00 +#define LRADC_INTC 0x04 +#define LRADC_INTS 0x08 +#define LRADC_DATA0 0x0c +#define LRADC_DATA1 0x10
Alignment seems off. Did you use spaces ?
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +16
-0+ +/* LRADC_CTRL bits */ +#define FIRST_CONVERT_DLY (x) ((x) << 24)/* 8 bits */ +#define CHAN_SELECT (x) ((x) << 22)/* 2 bits */ +#define CONTINUE_TIME_SEL (x) ((x) << 16)/* 4 bits */ +#define KEY_MODE_SEL (x) ((x) << 12)/* 2 bits */ +#define LEVELA_B_CNT (x) ((x) << 8)/* 4 bits */ +#define HOLD_KEY_EN (x) ((x) << 7) +#define HOLD_EN (x) ((x) << 6) +#define LEVELB_VOL (x) ((x) << 4)/* 2 bits */ +#define SAMPLE_RATE (x) ((x) << 2)/* 2 bits */ +#define ENABLE (x) ((x) << 0) + +/* LRADC_INTC and LRADC_INTS bits */ +#define CHAN1_KEYUP_IRQ BIT(12) +#define CHAN1_ALRDY_HOLD_IRQ BIT(11)
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/hwmon/sun4i-lradc-hwmon.c line 49
Quoted 8 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +8
-0+#define CHAN1_HOLD_IRQ BIT(10) +#define CHAN1_KEYDOWN_IRQ BIT(9) +#define CHAN1_DATA_IRQ BIT(8) +#define CHAN0_KEYUP_IRQ BIT(4) +#define CHAN0_ALRDY_HOLD_IRQ BIT(3) +#define CHAN0_HOLD_IRQ BIT(2) +#define CHAN0_KEYDOWN_IRQ BIT(1) +#define CHAN0_DATA_IRQ BIT(0)
Odd alignment. It should be all
#define<space>NAME<tab>value
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +11
-0+ + +struct lradc_variant { + u32 bits; + u32 resolution; + u32 vref; +}; + +struct lradc_variant variant_sun4i_a10_lradc = { + .bits = 0x3f, + .resolution = 63,
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/hwmon/sun4i-lradc-hwmon.c line 68
Quoted 8 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +8
-0+ .vref = 2000000, +}; + +struct lradc_variant variant_sun8i_a83t_r_lradc = { + .bits = 0x3f, + .resolution = 63, + .vref = 2000000, +};
What is the point of all this as it is all the same ? And the ADC has really only 6 bit of resolution ?
Also, what decides vref ? Is this a fixed value or is it board dependent or configurable ?
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/hwmon/sun4i-lradc-hwmon.c line 71
Quoted 3 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +3
-0+ +static const struct of_device_id sun4i_lradc_of_match[]; +
Please reorder code to not require forward declarations.
Quoted 33 lines
Quoted 33 lines
Quoted 33 lines
Quoted 33 lines
Quoted 33 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +33
-0+ +struct sun4i_lradc_data { + struct device *dev; + struct device *hwmon_dev; + void __iomem *base; + const struct lradc_variant *variant; + u32 in[2]; + u32 in_mvolts[2]; +}; + + +static ssize_t lradc_in_mvolts_show (struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct sun4i_lradc_data *data = dev_get_drvdata(dev); + int nr = to_sensor_dev_attr_2(attr)->nr; + + if (IS_ERR(data)) + return PTR_ERR(data); + + return sprintf(buf, "%d\n", data->in_mvolts[nr]); +} + +static ssize_t lradc_in_show (struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct sun4i_lradc_data *data = dev_get_drvdata(dev); + int nr = to_sensor_dev_attr_2(attr)->nr; + + if (IS_ERR(data)) + return PTR_ERR(data); + + return sprintf(buf, "%d\n", data->in[nr]);
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/hwmon/sun4i-lradc-hwmon.c line 112
Quoted 8 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +8
-0+} + + +static umode_t lradc_is_visible (struct kobject *kobj, + struct attribute *attr, int index) +{ + return attr->mode; +}
Completely pointless function.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 5 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +5
-0+ + + +static SENSOR_DEVICE_ATTR_2_RO(in0_input, lradc_in, 0, 0); +static SENSOR_DEVICE_ATTR_2_RO(in0_input_mvolts, lradc_in_mvolts, 0,
Only standard attributes please. What is the point anyway ? Voltage is reported in mV, period. If you want to report raw values, you'll need to write an iio driver. FWIW, that may be more appropriate anyway since the other ADC on this chip is already handled with an iio driver.
Quoted 40 lines
Quoted 40 lines
Quoted 40 lines
Quoted 40 lines
Quoted 40 lines
1);
drivers/hwmon/sun4i-lradc-hwmon.c new file +3
-0+ +static SENSOR_DEVICE_ATTR_2_RO(in1_input, lradc_in, 1, 0); +static SENSOR_DEVICE_ATTR_2_RO(in1_input_mvolts, lradc_in_mvolts, 1,1);
drivers/hwmon/sun4i-lradc-hwmon.c new file +27
-0+ +static struct attribute *lradc_attrs[] = { + &sensor_dev_attr_in0_input.dev_attr.attr, + &sensor_dev_attr_in0_input_mvolts.dev_attr.attr, + &sensor_dev_attr_in1_input.dev_attr.attr, + &sensor_dev_attr_in1_input_mvolts.dev_attr.attr, + NULL +}; + +static const struct attribute_group lradc_group = { + .attrs = lradc_attrs, + .is_visible = lradc_is_visible, +}; +__ATTRIBUTE_GROUPS (lradc); + + +static irqreturn_t sun4i_lradc_irq (int irq,void *dev_id) +{ + struct sun4i_lradc_data *lradc = dev_id; + u32 ints; + + ints = readl(lradc->base + LRADC_INTS); + + if (ints & CHAN0_DATA_IRQ) { + lradc->in[0] = readl(lradc->base + LRADC_DATA0) & + lradc->variant->bits; + lradc->in_mvolts[0] = lradc->in[0] * lradc->variant-vref /
+lradc->variant->resolution/ 1000;
+ }
+
+ if (ints &CHAN1_DATA_IRQ) {
+ lradc->in[1] =readl(lradc->base + LRADC_DATA1)& +lradc->variant->bits;
+ lradc->in_mvolts[1] = lradc->in[1] * lradc->variant-
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/hwmon/sun4i-lradc-hwmon.c line 161
Quoted 8 lines
vref /
+lradc->variant->resolution/ 1000;
+ }drivers/hwmon/sun4i-lradc-hwmon.c new file +5
-0+ + writel(ints, lradc->base + LRADC_INTS); + + return IRQ_HANDLED; +}
This is highly unusual. Why keep reading those values ? hwmon drivers report data on request and are not continuously polling values.
Quoted 60 lines
Quoted 60 lines
Quoted 60 lines
Quoted 60 lines
drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 7 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +7
-0+ +static int sun4i_lradc_open (struct device *dev) +{ + struct sun4i_lradc_data *lradc = dev_get_drvdata(dev); + + writel(FIRST_CONVERT_DLY(2) | CHAN_SELECT(3) | LEVELA_B_CNT(1) | + HOLD_EN(1) | KEY_MODE_SEL(2) | SAMPLE_RATE(3) |ENABLE(1),
Quoted 37 lines
+
lradc->base+LRADC_CTRL);drivers/hwmon/sun4i-lradc-hwmon.c new file +23
-0+ + writel(CHAN0_DATA_IRQ | CHAN1_DATA_IRQ, lradc->base + LRADC_INTC); + + return 0; +} + +static void sun4i_lradc_close (struct device *dev) +{ + struct sun4i_lradc_data *lradc = dev_get_drvdata(dev); + + writel(FIRST_CONVERT_DLY(2) | LEVELA_B_CNT(1) | HOLD_EN(1) | + SAMPLE_RATE(2), lradc->base + LRADC_CTRL); + writel(0, lradc->base + LRADC_INTC); +} + +static int sun4i_lradc_resume (struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + + return sun4i_lradc_open(dev); +} + +static int sun4i_lradc_suspend(struct platform_device *pdev,
pm_message_t
state) +{
+ struct device *dev =&pdev->dev;drivers/hwmon/sun4i-lradc-hwmon.c new file +10
-0+ + sun4i_lradc_close(dev); + return 0; +} + +static int sun4i_lradc_remove (struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + + sun4i_lradc_close(dev);drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 10 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +10
-0+ return 0; +} + +static int sun4i_lradc_probe (struct platform_device *pdev) +{ + struct sun4i_lradc_data *lradc; + struct device *dev = &pdev->dev; + int error; + + lradc = devm_kzalloc(dev, sizeof(struct sun4i_lradc_data),
GFP_KERNEL);
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
drivers/hwmon/sun4i-lradc-hwmon.c line 224
Quoted 10 lines
+ if (!lradc)
+ return-ENOMEM;drivers/hwmon/sun4i-lradc-hwmon.c new file +8
-0+ + dev_set_drvdata(dev, lradc); + + lradc->variant = of_device_get_match_data(&pdev->dev); + if (!lradc->variant) { + dev_err(&pdev->dev, "Missing '%s' or '%s' variant\n", + sun4i_lradc_of_match[0].compatible, + sun4i_lradc_of_match[1].compatible);
Drop the noise. Just return -EINVAL.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
+ return
-EINVAL;
+ }
+
+lradc->dev= dev;
+lradc->hwmon_dev= devm_hwmon_device_register_with_groups(dev,
hwmon_dev is unnecessary in lradc.
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
"lradc",
Use devm_hwmon_device_register_with_info()
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Quoted 2 lines
+
lradc,
lradc_groups);Quoted 7 lines
+ if (
IS_ERR(lradc->hwmon_dev)) {
+ error =PTR_ERR(lradc->hwmon_dev);
+ return error;
+ }
+
+lradc->base= devm_ioremap_resource(dev,
+ platform_get_resource(pdev,IORESOURCE_MEM,
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
0));
Quoted 5 lines
+ if (
IS_ERR(lradc->base))
+ returnPTR_ERR(lradc->base);
+
+ error = devm_request_irq(dev,platform_get_irq(pdev, 0), +sun4i_lradc_irq, 0, "sun4i-lradc-hwmon",
This is all completely racy and must be done before registering the hwmon device.
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
lradc);
Quoted 4 lines
+ if (error)
+ return error;
+
+ error =sun4i_lradc_open(dev);
What does this function do ? Its name is misleading. There is no "open". It seems to me it is really start/stop. If so, name it accordingly.
The stop function should be handled with devm_add_action_or_reset(), and there should be no remove function.
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
+ if (error)
+ return error;
+
+ return 0;
This is equivalent of just
return error;
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 7 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +4
-0+} + +static const struct of_device_id sun4i_lradc_of_match[] = { + { .compatible = "allwinner,sun4i-a10-lradc-keys", .data =
&variant_sun4i_a10_lradc}, + { .compatible = "allwinner,sun8i-a83t-r-lradc", .data =&variant_sun8i_a83t_r_lradc}, +{
Quoted 12 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
/* sentinel */ }
drivers/hwmon/sun4i-lradc-hwmon.c new file +3
-0+}; +MODULE_DEVICE_TABLE (of, sun4i_lradc_of_match); +Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
+static struct
platform_driversun4i_lradc_driver= { + .driver = {
+ .name = "sun4i-lradc-hwmon",
+ .of_match_table =of_match_ptr(sun4i_lradc_of_match), + },
+ .probe =sun4i_lradc_probe,
+ .remove =sun4i_lradc_remove,
+ .resume =sun4i_lradc_resume,
Use .pm driver callback for suspend/resume.
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
+ .suspend =
sun4i_lradc_suspend,drivers/hwmon/sun4i-lradc-hwmon.c new file +10
-0+}; + +module_platform_driver (sun4i_lradc_driver); + + + + +MODULE_DESCRIPTION ("Allwinner A13/A20 LRADC hwmon driver" ); +MODULE_AUTHOR ("Ruslan Zalata <[email protected]>" ); +MODULE_LICENSE ("GPL" );
Hi Guenter!
Thank you very much for your detailed review of my code. I rewrote the driver using devm_hwmon_device_register_with_info and pm API as you adviced. I think I took into account all your comments, let me know if I missed anything. New diver has been tested on real device with A20 SoC. Version 2 of the patch will follow.
BTW. By reading datasheet for A83T I could find some differences in LRADC hardware between A10/A20 and A83T. Since I don't have a board with such SoC at the moment to perform tests, I removed reference to sun8i-a83t-r compatibility.
PS: We use LRADC on our boards to monitor external battery voltage and temp, that's how this driver became useful. Yes, LRADC is 6 bits only, but it does the job saving us one extra IC in the design. :)
---
Regards,
Ruslan.
Fabmicro, LLC.
Quoted 571 lines · Guenter Roeck
Quoted 10 lines · Ruslan Zalata
Jernej,
Are these CHECKs ok to pass ?
CHECK: Alignment should match open parenthesis
#314: FILE:drivers/hwmon/sun4i-lradc-hwmon.c:231:
+lradc->base= devm_ioremap_resource(dev,
+platform_get_resource(pdev, IORESOURCE_MEM, 0));Use an intermediate variable. You need to do that anyway because
platform_get_resource()can return NULL which needs to be checked.Quoted 10 lines
CHECK: Alignment should match open parenthesis
#319: FILE:drivers/hwmon/sun4i-lradc-hwmon.c:236:
+ error = devm_request_irq(dev,platform_get_irq(pdev, 0), +sun4i_lradc_irq, 0, "sun4i-lradc-hwmon", lradc);total: 0 errors, 0 warnings, 2 checks, 307 lines checked
Aligning above by paranthesis will make code look ugly and exceed 75 chars limit. Please advise.
What 75 characters limit ?
You can go up to 100 characters if needed. Also,
platform_get_irq()can return an error, which needs to be checked anyway.Please prepend the subject replies with Re: as is current practice. Your replies all look like patches, not like replies to patches.
More comments inline.
Guenter
Quoted 4 lines
---
Regards,
Ruslan.Quoted 109 lines
Fabmicro, LLC.
Quoted 106 lines · Jernej Škrabec
Dne sreda, 27. april 2022 ob 23:01:58 CEST je Ruslan Zalata napisal(a):
Quoted 10 lines
Dear Jernej and all.
I used sendmail instead of "git send-email" and it did the whole this wrong - several separate emails were sent. I'm sorry for that, will stick to git command next time.
I read the guide of course and I fed the patch through
scripts/checkpatch.plmany times in an effort to elaborate all the errors and warnings. The only warning left is this:Quoted 6 lines
WARNING: added, moved or deleted file(s), does
MAINTAINERSneed updating?
#61:
new file mode 100644total: 0 errors, 1 warnings, 304 lines checked
Did you used --strict? Anyway, you have multiple consecutive empty lines in several places. Only one empty line is allowed.
Quoted 3 lines
Since this is my first attempt to submit my code I'm quite confused whom should I add as a maintainer for this driver. :)
Usually yourself.
Quoted 2 lines
PS: What's wrong with the subject ?
Too long and ARM is not a proper tag. Check git history of
drivers/hwmonfolder for ideas.Best regards,
JernejQuoted 70 lines
---
Regards,
Ruslan.Fabmicro, LLC.
Quoted 62 lines · Jernej Škrabec
Hi Ruslan!
Dne sreda, 27. april 2022 ob 21:25:12 CEST je Ruslan Zalata napisal(a):
Quoted 7 lines
Some Allwinner SoCs like A13, A20 or T2 are equipped with two-channel low rate (6 bit) ADC that is often used for extra keys. There's a driver
for that already implementing standard input device, but it has these
limitations: 1) it cannot be used for general ADC data equisition, and
2) it uses only one LRADC channel of two available.Quoted 5 lines
This driver provides basic hwmon interface to both channels of LRADC on
such Allwinner SoCs.Signed-off-by Ruslan Zalata <[email protected]>Before even going to check actual driver, please read
https://www.kernel.org/
doc/html/latest/process/submitting-patches.html in detail.Just few basic things to fix first:
1. subject doesn't conform to rules
2. send patch to maintainers and mailing lists (usescripts/get_maintainer.pl)
3. code has style issues (multiple empty lines). Runscripts/checkpatch.pl--
strict on your patch before submission and fix all reported issues.
4. you sent same patch two times. If it's same, it should be marked with
RESEND, if not, it should be versioned (V2, V3, etc.) with short changelog
after --- line (as explained in above link)
5. it's customary to add new entry inMAINTAINERSwhen adding new driverBest regards,
JernejQuoted 17 lines
---
drivers/hwmon/Kconfig | 13 ++
drivers/hwmon/Makefile | 1 +
drivers/hwmon/sun4i-lradc-hwmon.c| 278++++++++++++++++++++++++++++++
3 files changed, 292 insertions(+)create mode 100644
drivers/hwmon/sun4i-lradc-hwmon.cdrivers/hwmon/Kconfig +0
-0@@ -521,6 +521,19 @@ config I8KQuoted 1 line
Say Y if you intend to run userspace programs that use this
interface.
Quoted 3 lines
Say N otherwise.
+config
SENSORS_SUN4I_LRADCTry to put in alphabetic order.
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
+ tristate "Allwinner A13/A20 LRADC hwmon" + depends on
ARCH_SUNXI&& (!KEYBOARD_SUN4I_LRADC)Drop the unnecessary ()
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
drivers/hwmon/Kconfig config I8K · line 535
Quoted 9 lines
+ help
+ Say y here to support the LRADC found in Allwinner A13/A20 SoCs. + Both channels are supported.drivers/hwmon/Kconfig +6
-0+ + This driver can also be built as module. If so, the module + will be called sun4i-lradc-hwmon. + + This option is not compatible with KEYBOARD_SUN4I_LRADC, one + of these should be used at a time.Only one of these must be ...
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
+
config
SENSORS_DA9052_ADCtristate "Dialog DA9052/DA9053 ADC"
depends onPMIC_DA9052drivers/hwmon/Makefile +0
-0@@ -30,6 +30,7 @@ obj-$(CONFIG_SENSORS_AD7314) += ad7314.oQuoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
obj-$(CONFIG_SENSORS_AD7414) += ad7414.o obj-$(CONFIG_SENSORS_AD7418) += ad7418.o obj-$(CONFIG_SENSORS_ADC128D818) += adc128d818.o
+obj-$(CONFIG_SENSORS_SUN4I_LRADC) += sun4i-lradc-hwmon.o
Alphabetic order please.
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
Quoted 22 lines
obj-$(CONFIG_SENSORS_ADCXX) += adcxx.o
obj-$(CONFIG_SENSORS_ADM1021) += adm1021.o
obj-$(CONFIG_SENSORS_ADM1025) += adm1025.o(quoted diff) +0
-0
b/drivers/hwmon/sun4i-lradc-hwmon.cnew file mode 100644 index 00000000000..1947b716dbfdrivers/hwmon/sun4i-lradc-hwmon.c new file +11
-0@@ -0,0 +1,278 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +/* +* Allwinner sun4i (A13/A20) LRADC hwmon driver +* +* Copyright (C) 2022 Fabmicro, LLC., Tyumen, Russia. +* Copyright (C) 2022 Ruslan Zalata <[email protected]> +*/ + +#include <linux/err.h> +#include <linux/init.h> +#include <linux/input.h> Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/hwmon/sun4i-lradc-hwmon.c line 19
Quoted 8 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +8
-0+#include <linux/interrupt.h> +#include <linux/module.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/regulator/consumer.h> +#include <linux/slab.h> +#include <linux/hwmon.h> +#include <linux/hwmon-sysfs.h> Alphabetic order, and only include files which are actually needed.
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
drivers/hwmon/sun4i-lradc-hwmon.c line 25
Quoted 6 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +6
-0+ +#define LRADC_CTRL 0x00 +#define LRADC_INTC 0x04 +#define LRADC_INTS 0x08 +#define LRADC_DATA0 0x0c +#define LRADC_DATA1 0x10Alignment seems off. Did you use spaces ?
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
Quoted 16 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +16
-0+ +/* LRADC_CTRL bits */ +#define FIRST_CONVERT_DLY (x) ((x) << 24)/* 8 bits */ +#define CHAN_SELECT (x) ((x) << 22)/* 2 bits */ +#define CONTINUE_TIME_SEL (x) ((x) << 16)/* 4 bits */ +#define KEY_MODE_SEL (x) ((x) << 12)/* 2 bits */ +#define LEVELA_B_CNT (x) ((x) << 8)/* 4 bits */ +#define HOLD_KEY_EN (x) ((x) << 7) +#define HOLD_EN (x) ((x) << 6) +#define LEVELB_VOL (x) ((x) << 4)/* 2 bits */ +#define SAMPLE_RATE (x) ((x) << 2)/* 2 bits */ +#define ENABLE (x) ((x) << 0) + +/* LRADC_INTC and LRADC_INTS bits */ +#define CHAN1_KEYUP_IRQ BIT(12) +#define CHAN1_ALRDY_HOLD_IRQ BIT(11)Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/hwmon/sun4i-lradc-hwmon.c line 49
Quoted 8 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +8
-0+#define CHAN1_HOLD_IRQ BIT(10) +#define CHAN1_KEYDOWN_IRQ BIT(9) +#define CHAN1_DATA_IRQ BIT(8) +#define CHAN0_KEYUP_IRQ BIT(4) +#define CHAN0_ALRDY_HOLD_IRQ BIT(3) +#define CHAN0_HOLD_IRQ BIT(2) +#define CHAN0_KEYDOWN_IRQ BIT(1) +#define CHAN0_DATA_IRQ BIT(0)Odd alignment. It should be all
#define<space>NAME<tab>value
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +11
-0+ + +struct lradc_variant { + u32 bits; + u32 resolution; + u32 vref; +}; + +struct lradc_variant variant_sun4i_a10_lradc = { + .bits = 0x3f, + .resolution = 63,Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/hwmon/sun4i-lradc-hwmon.c line 68
Quoted 8 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +8
-0+ .vref = 2000000, +}; + +struct lradc_variant variant_sun8i_a83t_r_lradc = { + .bits = 0x3f, + .resolution = 63, + .vref = 2000000, +};What is the point of all this as it is all the same ? And the ADC has really only 6 bit of resolution ?
Also, what decides vref ? Is this a fixed value or is it board dependent or configurable ?
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
drivers/hwmon/sun4i-lradc-hwmon.c line 71
Quoted 3 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +3
-0+ +static const struct of_device_id sun4i_lradc_of_match[]; +Please reorder code to not require forward declarations.
Quoted 33 lines
Quoted 33 lines
Quoted 33 lines
Quoted 33 lines
Quoted 33 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +33
-0+ +struct sun4i_lradc_data { + struct device *dev; + struct device *hwmon_dev; + void __iomem *base; + const struct lradc_variant *variant; + u32 in[2]; + u32 in_mvolts[2]; +}; + + +static ssize_t lradc_in_mvolts_show (struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct sun4i_lradc_data *data = dev_get_drvdata(dev); + int nr = to_sensor_dev_attr_2(attr)->nr; + + if (IS_ERR(data)) + return PTR_ERR(data); + + return sprintf(buf, "%d\n", data->in_mvolts[nr]); +} + +static ssize_t lradc_in_show (struct device *dev, + struct device_attribute *attr, char *buf) +{ + struct sun4i_lradc_data *data = dev_get_drvdata(dev); + int nr = to_sensor_dev_attr_2(attr)->nr; + + if (IS_ERR(data)) + return PTR_ERR(data); + + return sprintf(buf, "%d\n", data->in[nr]);Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/hwmon/sun4i-lradc-hwmon.c line 112
Quoted 8 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +8
-0+} + + +static umode_t lradc_is_visible (struct kobject *kobj, + struct attribute *attr, int index) +{ + return attr->mode; +}Completely pointless function.
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 5 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +5
-0+ + + +static SENSOR_DEVICE_ATTR_2_RO(in0_input, lradc_in, 0, 0); +static SENSOR_DEVICE_ATTR_2_RO(in0_input_mvolts, lradc_in_mvolts, 0,Only standard attributes please. What is the point anyway ? Voltage is reported in mV, period. If you want to report raw values, you'll need to write an iio driver. FWIW, that may be more appropriate anyway since the other ADC on this chip is already handled with an iio driver.
Quoted 40 lines
Quoted 40 lines
Quoted 40 lines
Quoted 40 lines
Quoted 40 lines
1);
drivers/hwmon/sun4i-lradc-hwmon.c new file +3
-0+ +static SENSOR_DEVICE_ATTR_2_RO(in1_input, lradc_in, 1, 0); +static SENSOR_DEVICE_ATTR_2_RO(in1_input_mvolts, lradc_in_mvolts, 1,1);
drivers/hwmon/sun4i-lradc-hwmon.c new file +27
-0+ +static struct attribute *lradc_attrs[] = { + &sensor_dev_attr_in0_input.dev_attr.attr, + &sensor_dev_attr_in0_input_mvolts.dev_attr.attr, + &sensor_dev_attr_in1_input.dev_attr.attr, + &sensor_dev_attr_in1_input_mvolts.dev_attr.attr, + NULL +}; + +static const struct attribute_group lradc_group = { + .attrs = lradc_attrs, + .is_visible = lradc_is_visible, +}; +__ATTRIBUTE_GROUPS (lradc); + + +static irqreturn_t sun4i_lradc_irq (int irq,void *dev_id) +{ + struct sun4i_lradc_data *lradc = dev_id; + u32 ints; + + ints = readl(lradc->base + LRADC_INTS); + + if (ints & CHAN0_DATA_IRQ) { + lradc->in[0] = readl(lradc->base + LRADC_DATA0) & + lradc->variant->bits; + lradc->in_mvolts[0] = lradc->in[0] * lradc->variant-vref /
+lradc->variant->resolution/ 1000;
+ }
+
+ if (ints &CHAN1_DATA_IRQ) {
+ lradc->in[1] =readl(lradc->base + LRADC_DATA1)& +lradc->variant->bits;
+ lradc->in_mvolts[1] = lradc->in[1] * lradc->variant-Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
drivers/hwmon/sun4i-lradc-hwmon.c line 161
Quoted 8 lines
vref /
+lradc->variant->resolution/ 1000;
+ }drivers/hwmon/sun4i-lradc-hwmon.c new file +5
-0+ + writel(ints, lradc->base + LRADC_INTS); + + return IRQ_HANDLED; +}This is highly unusual. Why keep reading those values ? hwmon drivers report data on request and are not continuously polling values.
Quoted 60 lines
Quoted 60 lines
Quoted 60 lines
Quoted 60 lines
drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 7 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +7
-0+ +static int sun4i_lradc_open (struct device *dev) +{ + struct sun4i_lradc_data *lradc = dev_get_drvdata(dev); + + writel(FIRST_CONVERT_DLY(2) | CHAN_SELECT(3) | LEVELA_B_CNT(1) | + HOLD_EN(1) | KEY_MODE_SEL(2) | SAMPLE_RATE(3) |ENABLE(1),
Quoted 37 lines
+
lradc->base+LRADC_CTRL);drivers/hwmon/sun4i-lradc-hwmon.c new file +23
-0+ + writel(CHAN0_DATA_IRQ | CHAN1_DATA_IRQ, lradc->base + LRADC_INTC); + + return 0; +} + +static void sun4i_lradc_close (struct device *dev) +{ + struct sun4i_lradc_data *lradc = dev_get_drvdata(dev); + + writel(FIRST_CONVERT_DLY(2) | LEVELA_B_CNT(1) | HOLD_EN(1) | + SAMPLE_RATE(2), lradc->base + LRADC_CTRL); + writel(0, lradc->base + LRADC_INTC); +} + +static int sun4i_lradc_resume (struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + + return sun4i_lradc_open(dev); +} + +static int sun4i_lradc_suspend(struct platform_device *pdev,
pm_message_t
state) +{
+ struct device *dev =&pdev->dev;drivers/hwmon/sun4i-lradc-hwmon.c new file +10
-0+ + sun4i_lradc_close(dev); + return 0; +} + +static int sun4i_lradc_remove (struct platform_device *pdev) +{ + struct device *dev = &pdev->dev; + + sun4i_lradc_close(dev);drivers/hwmon/sun4i-lradc-hwmon.c
Quoted 10 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +10
-0+ return 0; +} + +static int sun4i_lradc_probe (struct platform_device *pdev) +{ + struct sun4i_lradc_data *lradc; + struct device *dev = &pdev->dev; + int error; + + lradc = devm_kzalloc(dev, sizeof(struct sun4i_lradc_data),
GFP_KERNEL);Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
drivers/hwmon/sun4i-lradc-hwmon.c line 224
Quoted 10 lines
+ if (!lradc)
+ return-ENOMEM;drivers/hwmon/sun4i-lradc-hwmon.c new file +8
-0+ + dev_set_drvdata(dev, lradc); + + lradc->variant = of_device_get_match_data(&pdev->dev); + if (!lradc->variant) { + dev_err(&pdev->dev, "Missing '%s' or '%s' variant\n", + sun4i_lradc_of_match[0].compatible, + sun4i_lradc_of_match[1].compatible);Drop the noise. Just return
-EINVAL.Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
+ return
-EINVAL;
+ }
+
+lradc->dev= dev;
+lradc->hwmon_dev= devm_hwmon_device_register_with_groups(dev,
hwmon_devis unnecessary in lradc.Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
Quoted 2 lines
"lradc",
Use
devm_hwmon_device_register_with_info()Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Quoted 13 lines
Quoted 2 lines
+
lradc,
lradc_groups);Quoted 7 lines
+ if (
IS_ERR(lradc->hwmon_dev)) {
+ error =PTR_ERR(lradc->hwmon_dev);
+ return error;
+ }
+
+lradc->base= devm_ioremap_resource(dev,
+ platform_get_resource(pdev,IORESOURCE_MEM,Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
0));
Quoted 5 lines
+ if (
IS_ERR(lradc->base))
+ returnPTR_ERR(lradc->base);
+
+ error = devm_request_irq(dev,platform_get_irq(pdev, 0), +sun4i_lradc_irq, 0, "sun4i-lradc-hwmon",This is all completely racy and must be done before registering the hwmon device.
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
Quoted 6 lines
lradc);
Quoted 4 lines
+ if (error)
+ return error;
+
+ error =sun4i_lradc_open(dev);What does this function do ? Its name is misleading. There is no "open". It seems to me it is really start/stop. If so, name it accordingly.
The stop function should be handled with
devm_add_action_or_reset(), and there should be no remove function.Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
+ if (error)
+ return error;
+
+ return 0;This is equivalent of just
return error;Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 10 lines
Quoted 7 lines
drivers/hwmon/sun4i-lradc-hwmon.c new file +4
-0+} + +static const struct of_device_id sun4i_lradc_of_match[] = { + { .compatible = "allwinner,sun4i-a10-lradc-keys", .data =
&variant_sun4i_a10_lradc}, + { .compatible = "allwinner,sun8i-a83t-r-lradc", .data =&variant_sun8i_a83t_r_lradc}, +{
Quoted 12 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
/* sentinel */ }
drivers/hwmon/sun4i-lradc-hwmon.c new file +3
-0+}; +MODULE_DEVICE_TABLE (of, sun4i_lradc_of_match); +Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
+static struct
platform_driversun4i_lradc_driver= { + .driver = {
+ .name = "sun4i-lradc-hwmon",
+ .of_match_table =of_match_ptr(sun4i_lradc_of_match), + },
+ .probe =sun4i_lradc_probe,
+ .remove =sun4i_lradc_remove,
+ .resume =sun4i_lradc_resume,Use .pm driver callback for suspend/resume.
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
Quoted 11 lines
+ .suspend =
sun4i_lradc_suspend,drivers/hwmon/sun4i-lradc-hwmon.c new file +10
-0+}; + +module_platform_driver (sun4i_lradc_driver); + + + + +MODULE_DESCRIPTION ("Allwinner A13/A20 LRADC hwmon driver" ); +MODULE_AUTHOR ("Ruslan Zalata <[email protected]>" ); +MODULE_LICENSE ("GPL" );
Guenter Roeck
maintainerQuoted 12 lines · Jernej Škrabec
Hi Ruslan!
Dne sreda, 27. april 2022 ob 21:25:12 CEST je Ruslan Zalata napisal(a):
Quoted 9 lines
Some Allwinner SoCs like A13, A20 or T2 are equipped with two-channel low rate (6 bit) ADC that is often used for extra keys. There's a driver for that already implementing standard input device, but it has these
limitations: 1) it cannot be used for general ADC data equisition, and
2) it uses only one LRADC channel of two available.This driver provides basic hwmon interface to both channels of LRADC on such Allwinner SoCs.
Quoted 8 lines
Quoted 1 line
Signed-off-by Ruslan Zalata <[email protected]>Before even going to check actual driver, please read https://www.kernel.org/
doc/html/latest/process/submitting-patches.html in detail.Just few basic things to fix first:
1. subject doesn't conform to rules
2. send patch to maintainers and mailing lists (usescripts/get_maintainer.pl)
I only got the copy sent directly to me. Anyway, how is this different to the driver in drivers/iio/adc/sun4i-gpadc-iio.c ?
Guenter
PATCH 1/1 ARM: Add hwmon driver for LRADC found on Allwinner A13/A20 SoCs
Hi Guenter.
sun4i-gpadc-iio.c uses built-in four-channel ADC that is dedicated to RTP (resistive touch panel). It also can be used as a general purpose 10-bit ADC, but it's a different piece of hardware inside SoC along with LRADC.
---
Regards,
Ruslan.
Fabmicro, LLC.
Quoted 26 lines · Guenter Roeck
Quoted 12 lines · Jernej Škrabec
Hi Ruslan!
Dne sreda, 27. april 2022 ob 21:25:12 CEST je Ruslan Zalata napisal(a):
Quoted 9 lines
Some Allwinner SoCs like A13, A20 or T2 are equipped with two-channel low rate (6 bit) ADC that is often used for extra keys. There's a driver for that already implementing standard input device, but it has these
limitations: 1) it cannot be used for general ADC data equisition, and
2) it uses only one LRADC channel of two available.This driver provides basic hwmon interface to both channels of LRADC on such Allwinner SoCs.
Quoted 8 lines
Quoted 1 line
Signed-off-by Ruslan Zalata <[email protected]>Before even going to check actual driver, please read https://www.kernel.org/
doc/html/latest/process/submitting-patches.html in detail.Just few basic things to fix first:
1. subject doesn't conform to rules
2. send patch to maintainers and mailing lists (usescripts/get_maintainer.pl)I only got the copy sent directly to me. Anyway, how is this different to the driver in
drivers/iio/adc/sun4i-gpadc-iio.c?Guenter