Re: [PATCH] hwmon: Remove ads1015 driver
On Mon, Jul 22, 2019 at 04:39:44PM -0600, Rob Herring wrote: > On Mon, Jul 01, 2019 at 11:12:38AM -0700, Guenter Roeck wrote: > > A driver for ADS1015 with more functionality is available in the iio > > subsystem. > > > > Remove the hwmon driver as duplicate. If the chip is used for hardware > > monitoring, the iio->hwmon bridge should be used. > > > > Cc: Dirk Eibach > > Signed-off-by: Guenter Roeck > > --- > > Current plan is to queue this removal for v5.4 (not v5.3) in the hwmon > > tree. > > > > .../devicetree/bindings/hwmon/ads1015.txt | 73 - > > .../devicetree/bindings/iio/adc/ads1015.txt| 73 + > > I assume no change or I should review it again? > It is identical. > Acked-by: Rob Herring > Thanks, Guenter > > Documentation/hwmon/ads1015.rst| 90 -- > > Documentation/hwmon/index.rst | 1 - > > MAINTAINERS| 8 - > > drivers/hwmon/Kconfig | 10 - > > drivers/hwmon/Makefile | 1 - > > drivers/hwmon/ads1015.c| 324 > > - > > drivers/iio/adc/Kconfig| 2 +- > > 9 files changed, 74 insertions(+), 508 deletions(-) > > delete mode 100644 Documentation/devicetree/bindings/hwmon/ads1015.txt > > create mode 100644 Documentation/devicetree/bindings/iio/adc/ads1015.txt > > delete mode 100644 Documentation/hwmon/ads1015.rst > > delete mode 100644 drivers/hwmon/ads1015.c
Re: [PATCH] hwmon: Remove ads1015 driver
On Mon, Jul 01, 2019 at 11:12:38AM -0700, Guenter Roeck wrote: > A driver for ADS1015 with more functionality is available in the iio > subsystem. > > Remove the hwmon driver as duplicate. If the chip is used for hardware > monitoring, the iio->hwmon bridge should be used. > > Cc: Dirk Eibach > Signed-off-by: Guenter Roeck > --- > Current plan is to queue this removal for v5.4 (not v5.3) in the hwmon > tree. > > .../devicetree/bindings/hwmon/ads1015.txt | 73 - > .../devicetree/bindings/iio/adc/ads1015.txt| 73 + I assume no change or I should review it again? Acked-by: Rob Herring > Documentation/hwmon/ads1015.rst| 90 -- > Documentation/hwmon/index.rst | 1 - > MAINTAINERS| 8 - > drivers/hwmon/Kconfig | 10 - > drivers/hwmon/Makefile | 1 - > drivers/hwmon/ads1015.c| 324 > - > drivers/iio/adc/Kconfig| 2 +- > 9 files changed, 74 insertions(+), 508 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/hwmon/ads1015.txt > create mode 100644 Documentation/devicetree/bindings/iio/adc/ads1015.txt > delete mode 100644 Documentation/hwmon/ads1015.rst > delete mode 100644 drivers/hwmon/ads1015.c
Re: [PATCH] hwmon: Remove ads1015 driver
On Mon, 1 Jul 2019 11:12:38 -0700
Guenter Roeck wrote:
> A driver for ADS1015 with more functionality is available in the iio
> subsystem.
>
> Remove the hwmon driver as duplicate. If the chip is used for hardware
> monitoring, the iio->hwmon bridge should be used.
>
> Cc: Dirk Eibach
> Signed-off-by: Guenter Roeck
On the basis I agree with the concept of dropping this driver:
Acked-by: Jonathan Cameron
Thanks for tidying this up.
Jonathan
> ---
> Current plan is to queue this removal for v5.4 (not v5.3) in the hwmon
> tree.
>
> .../devicetree/bindings/hwmon/ads1015.txt | 73 -
> .../devicetree/bindings/iio/adc/ads1015.txt| 73 +
> Documentation/hwmon/ads1015.rst| 90 --
> Documentation/hwmon/index.rst | 1 -
> MAINTAINERS| 8 -
> drivers/hwmon/Kconfig | 10 -
> drivers/hwmon/Makefile | 1 -
> drivers/hwmon/ads1015.c| 324
> -
> drivers/iio/adc/Kconfig| 2 +-
> 9 files changed, 74 insertions(+), 508 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/hwmon/ads1015.txt
> create mode 100644 Documentation/devicetree/bindings/iio/adc/ads1015.txt
> delete mode 100644 Documentation/hwmon/ads1015.rst
> delete mode 100644 drivers/hwmon/ads1015.c
>
> diff --git a/Documentation/devicetree/bindings/hwmon/ads1015.txt
> b/Documentation/devicetree/bindings/hwmon/ads1015.txt
> deleted file mode 100644
> index 918a507d1159..
> --- a/Documentation/devicetree/bindings/hwmon/ads1015.txt
> +++ /dev/null
> @@ -1,73 +0,0 @@
> -ADS1015 (I2C)
> -
> -This device is a 12-bit A-D converter with 4 inputs.
> -
> -The inputs can be used single ended or in certain differential combinations.
> -
> -For configuration all possible combinations are mapped to 8 channels:
> - 0: Voltage over AIN0 and AIN1.
> - 1: Voltage over AIN0 and AIN3.
> - 2: Voltage over AIN1 and AIN3.
> - 3: Voltage over AIN2 and AIN3.
> - 4: Voltage over AIN0 and GND.
> - 5: Voltage over AIN1 and GND.
> - 6: Voltage over AIN2 and GND.
> - 7: Voltage over AIN3 and GND.
> -
> -Each channel can be configured individually:
> - - pga is the programmable gain amplifier (values are full scale)
> -0: +/- 6.144 V
> -1: +/- 4.096 V
> -2: +/- 2.048 V (default)
> -3: +/- 1.024 V
> -4: +/- 0.512 V
> -5: +/- 0.256 V
> - - data_rate in samples per second
> -0: 128
> -1: 250
> -2: 490
> -3: 920
> -4: 1600 (default)
> -5: 2400
> -6: 3300
> -
> -1) The /ads1015 node
> -
> - Required properties:
> -
> - - compatible : must be "ti,ads1015"
> - - reg : I2C bus address of the device
> - - #address-cells : must be <1>
> - - #size-cells : must be <0>
> -
> - The node contains child nodes for each channel that the platform uses.
> -
> - Example ADS1015 node:
> -
> -ads1015@49 {
> - compatible = "ti,ads1015";
> - reg = <0x49>;
> - #address-cells = <1>;
> - #size-cells = <0>;
> -
> - [ child node definitions... ]
> -}
> -
> -2) channel nodes
> -
> - Required properties:
> -
> - - reg : the channel number
> -
> - Optional properties:
> -
> - - ti,gain : the programmable gain amplifier setting
> - - ti,datarate : the converter data rate
> -
> - Example ADS1015 channel node:
> -
> -channel@4 {
> - reg = <4>;
> - ti,gain = <3>;
> - ti,datarate = <5>;
> -};
> diff --git a/Documentation/devicetree/bindings/iio/adc/ads1015.txt
> b/Documentation/devicetree/bindings/iio/adc/ads1015.txt
> new file mode 100644
> index ..918a507d1159
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/iio/adc/ads1015.txt
> @@ -0,0 +1,73 @@
> +ADS1015 (I2C)
> +
> +This device is a 12-bit A-D converter with 4 inputs.
> +
> +The inputs can be used single ended or in certain differential combinations.
> +
> +For configuration all possible combinations are mapped to 8 channels:
> + 0: Voltage over AIN0 and AIN1.
> + 1: Voltage over AIN0 and AIN3.
> + 2: Voltage over AIN1 and AIN3.
> + 3: Voltage over AIN2 and AIN3.
> + 4: Voltage over AIN0 and GND.
> + 5: Voltage over AIN1 and GND.
> + 6: Voltage over AIN2 and GND.
> + 7: Voltage over AIN3 and GND.
> +
> +Each channel can be configured individually:
> + - pga is the programmable gain amplifier (values are full scale)
> +0: +/- 6.144 V
> +1: +/- 4.096 V
> +2: +/- 2.048 V (default)
> +3: +/- 1.024 V
> +4: +/- 0.512 V
> +5: +/- 0.256 V
> + - data_rate in samples per second
> +0: 128
> +1: 250
> +2: 490
> +3: 920
> +4: 1600 (default)
> +5: 2400
> +6: 3300
> +
> +1) The /ads1015 node
> +
> + Required properties:
> +
> + - compatible : must be "ti,ads1015"
> + - reg : I2C bus address of the device
> + - #address-cells : must be <1>
> + -
[PATCH] hwmon: Remove ads1015 driver
A driver for ADS1015 with more functionality is available in the iio
subsystem.
Remove the hwmon driver as duplicate. If the chip is used for hardware
monitoring, the iio->hwmon bridge should be used.
Cc: Dirk Eibach
Signed-off-by: Guenter Roeck
---
Current plan is to queue this removal for v5.4 (not v5.3) in the hwmon
tree.
.../devicetree/bindings/hwmon/ads1015.txt | 73 -
.../devicetree/bindings/iio/adc/ads1015.txt| 73 +
Documentation/hwmon/ads1015.rst| 90 --
Documentation/hwmon/index.rst | 1 -
MAINTAINERS| 8 -
drivers/hwmon/Kconfig | 10 -
drivers/hwmon/Makefile | 1 -
drivers/hwmon/ads1015.c| 324 -
drivers/iio/adc/Kconfig| 2 +-
9 files changed, 74 insertions(+), 508 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/hwmon/ads1015.txt
create mode 100644 Documentation/devicetree/bindings/iio/adc/ads1015.txt
delete mode 100644 Documentation/hwmon/ads1015.rst
delete mode 100644 drivers/hwmon/ads1015.c
diff --git a/Documentation/devicetree/bindings/hwmon/ads1015.txt
b/Documentation/devicetree/bindings/hwmon/ads1015.txt
deleted file mode 100644
index 918a507d1159..
--- a/Documentation/devicetree/bindings/hwmon/ads1015.txt
+++ /dev/null
@@ -1,73 +0,0 @@
-ADS1015 (I2C)
-
-This device is a 12-bit A-D converter with 4 inputs.
-
-The inputs can be used single ended or in certain differential combinations.
-
-For configuration all possible combinations are mapped to 8 channels:
- 0: Voltage over AIN0 and AIN1.
- 1: Voltage over AIN0 and AIN3.
- 2: Voltage over AIN1 and AIN3.
- 3: Voltage over AIN2 and AIN3.
- 4: Voltage over AIN0 and GND.
- 5: Voltage over AIN1 and GND.
- 6: Voltage over AIN2 and GND.
- 7: Voltage over AIN3 and GND.
-
-Each channel can be configured individually:
- - pga is the programmable gain amplifier (values are full scale)
-0: +/- 6.144 V
-1: +/- 4.096 V
-2: +/- 2.048 V (default)
-3: +/- 1.024 V
-4: +/- 0.512 V
-5: +/- 0.256 V
- - data_rate in samples per second
-0: 128
-1: 250
-2: 490
-3: 920
-4: 1600 (default)
-5: 2400
-6: 3300
-
-1) The /ads1015 node
-
- Required properties:
-
- - compatible : must be "ti,ads1015"
- - reg : I2C bus address of the device
- - #address-cells : must be <1>
- - #size-cells : must be <0>
-
- The node contains child nodes for each channel that the platform uses.
-
- Example ADS1015 node:
-
-ads1015@49 {
- compatible = "ti,ads1015";
- reg = <0x49>;
- #address-cells = <1>;
- #size-cells = <0>;
-
- [ child node definitions... ]
-}
-
-2) channel nodes
-
- Required properties:
-
- - reg : the channel number
-
- Optional properties:
-
- - ti,gain : the programmable gain amplifier setting
- - ti,datarate : the converter data rate
-
- Example ADS1015 channel node:
-
-channel@4 {
- reg = <4>;
- ti,gain = <3>;
- ti,datarate = <5>;
-};
diff --git a/Documentation/devicetree/bindings/iio/adc/ads1015.txt
b/Documentation/devicetree/bindings/iio/adc/ads1015.txt
new file mode 100644
index ..918a507d1159
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/adc/ads1015.txt
@@ -0,0 +1,73 @@
+ADS1015 (I2C)
+
+This device is a 12-bit A-D converter with 4 inputs.
+
+The inputs can be used single ended or in certain differential combinations.
+
+For configuration all possible combinations are mapped to 8 channels:
+ 0: Voltage over AIN0 and AIN1.
+ 1: Voltage over AIN0 and AIN3.
+ 2: Voltage over AIN1 and AIN3.
+ 3: Voltage over AIN2 and AIN3.
+ 4: Voltage over AIN0 and GND.
+ 5: Voltage over AIN1 and GND.
+ 6: Voltage over AIN2 and GND.
+ 7: Voltage over AIN3 and GND.
+
+Each channel can be configured individually:
+ - pga is the programmable gain amplifier (values are full scale)
+0: +/- 6.144 V
+1: +/- 4.096 V
+2: +/- 2.048 V (default)
+3: +/- 1.024 V
+4: +/- 0.512 V
+5: +/- 0.256 V
+ - data_rate in samples per second
+0: 128
+1: 250
+2: 490
+3: 920
+4: 1600 (default)
+5: 2400
+6: 3300
+
+1) The /ads1015 node
+
+ Required properties:
+
+ - compatible : must be "ti,ads1015"
+ - reg : I2C bus address of the device
+ - #address-cells : must be <1>
+ - #size-cells : must be <0>
+
+ The node contains child nodes for each channel that the platform uses.
+
+ Example ADS1015 node:
+
+ads1015@49 {
+ compatible = "ti,ads1015";
+ reg = <0x49>;
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ [ child node definitions... ]
+}
+
+2) channel nodes
+
+ Required properties:
+
+ - reg : the channel number
+
+ Optional properties:
+
+ - ti,gain : the programmable gain amplifier
