[PATCH 1/2] dt-bindings: hwmon: merge max1619 into trivial devices

[PATCH 1/2] dt-bindings: hwmon: merge max1619 into trivial devices

[Krzysztof Kozlowski]

Ther Maxim max1619 bindings are trivial, so simply merge it into
trivial-devices.yaml.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
 Documentation/devicetree/bindings/hwmon/max1619.txt  | 12 ------------
 .../devicetree/bindings/trivial-devices.yaml         |  2 ++
 2 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/hwmon/max1619.txt

diff --git a/Documentation/devicetree/bindings/hwmon/max1619.txt b/Documentation/devicetree/bindings/hwmon/max1619.txt
deleted file mode 100644
index c70dbbe1e56f..000000000000
--- a/Documentation/devicetree/bindings/hwmon/max1619.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Bindings for MAX1619 Temperature Sensor
-
-Required properties:
-- compatible : "maxim,max1619"
-- reg        : I2C address, one of 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, or
-               0x4d, 0x4e
-
-Example:
-	temp@4c {
-		compatible = "maxim,max1619";
-		reg = <0x4c>;
-	};
diff --git a/Documentation/devicetree/bindings/trivial-devices.yaml b/Documentation/devicetree/bindings/trivial-devices.yaml
index fb03febc6616..1e4b3464d734 100644
--- a/Documentation/devicetree/bindings/trivial-devices.yaml
+++ b/Documentation/devicetree/bindings/trivial-devices.yaml
@@ -147,6 +147,8 @@ properties:
           - maxim,ds1803-100
             # Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs
           - maxim,max1237
+            # Temperature Sensor, I2C interface
+          - maxim,max1619
             # 10-bit 10 kOhm linear programable voltage divider
           - maxim,max5481
             # 10-bit 50 kOhm linear programable voltage divider
-- 
2.30.2

[PATCH 2/2] dt-bindings: hwmon: merge max31785 into trivial devices

[Krzysztof Kozlowski]

Ther Maxim max31785 bindings are trivial, so simply merge it into
trivial-devices.yaml.

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
 .../devicetree/bindings/hwmon/max31785.txt    | 22 -------------------
 .../devicetree/bindings/trivial-devices.yaml  |  4 ++++
 MAINTAINERS                                   |  1 -
 3 files changed, 4 insertions(+), 23 deletions(-)
 delete mode 100644 Documentation/devicetree/bindings/hwmon/max31785.txt

diff --git a/Documentation/devicetree/bindings/hwmon/max31785.txt b/Documentation/devicetree/bindings/hwmon/max31785.txt
deleted file mode 100644
index 106e08c56aaa..000000000000
--- a/Documentation/devicetree/bindings/hwmon/max31785.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Bindings for the Maxim MAX31785 Intelligent Fan Controller
-==========================================================
-
-Reference:
-
-https://datasheets.maximintegrated.com/en/ds/MAX31785.pdf
-
-The Maxim MAX31785 is a PMBus device providing closed-loop, multi-channel fan
-management with temperature and remote voltage sensing. Various fan control
-features are provided, including PWM frequency control, temperature hysteresis,
-dual tachometer measurements, and fan health monitoring.
-
-Required properties:
-- compatible     : One of "maxim,max31785" or "maxim,max31785a"
-- reg            : I2C address, one of 0x52, 0x53, 0x54, 0x55.
-
-Example:
-
-        fans@52 {
-                compatible = "maxim,max31785";
-                reg = <0x52>;
-        };
diff --git a/Documentation/devicetree/bindings/trivial-devices.yaml b/Documentation/devicetree/bindings/trivial-devices.yaml
index 1e4b3464d734..646ab3a82387 100644
--- a/Documentation/devicetree/bindings/trivial-devices.yaml
+++ b/Documentation/devicetree/bindings/trivial-devices.yaml
@@ -163,6 +163,10 @@ properties:
           - maxim,max6625
             # 3-Channel Remote Temperature Sensor
           - maxim,max31730
+            # Intelligent Fan Controller with temperature and remote voltage sensing
+            # Datasheet: https://datasheets.maximintegrated.com/en/ds/MAX31785.pdf
+          - maxim,max31785
+          - maxim,max31785a
             # mCube 3-axis 8-bit digital accelerometer
           - mcube,mc3230
             # Measurement Specialities I2C temperature and humidity sensor
diff --git a/MAINTAINERS b/MAINTAINERS
index fda9f438cc27..c8935b455dd2 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -14869,7 +14869,6 @@ W:	http://www.roeck-us.net/linux/drivers/
 T:	git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
 F:	Documentation/devicetree/bindings/hwmon/ibm,cffps1.txt
 F:	Documentation/devicetree/bindings/hwmon/ltc2978.txt
-F:	Documentation/devicetree/bindings/hwmon/max31785.txt
 F:	Documentation/hwmon/adm1275.rst
 F:	Documentation/hwmon/ibm-cffps.rst
 F:	Documentation/hwmon/ir35221.rst
-- 
2.30.2

Re: [PATCH 2/2] dt-bindings: hwmon: merge max31785 into trivial devices

[Guenter Roeck]

On 8/19/21 11:25 AM, Krzysztof Kozlowski wrote:
> Ther Maxim max31785 bindings are trivial, so simply merge it into
> trivial-devices.yaml.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
> ---
>   .../devicetree/bindings/hwmon/max31785.txt    | 22 -------------------

Not sure if that is a good idea. It would make more sense to standardize the
properties needed by the driver/chip instead (see existing dts files in the kernel).

Guenter

Re: [PATCH 1/2] dt-bindings: hwmon: merge max1619 into trivial devices

[Guenter Roeck]

On 8/19/21 11:25 AM, Krzysztof Kozlowski wrote:
> Ther Maxim max1619 bindings are trivial, so simply merge it into
> trivial-devices.yaml.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>

Do we have a general guideline on how to handle such trivial bindings ?
I normally leave it up to the driver author to decide one way or another.

Guenter

> ---
>   Documentation/devicetree/bindings/hwmon/max1619.txt  | 12 ------------
>   .../devicetree/bindings/trivial-devices.yaml         |  2 ++
>   2 files changed, 2 insertions(+), 12 deletions(-)
>   delete mode 100644 Documentation/devicetree/bindings/hwmon/max1619.txt
> 
> diff --git a/Documentation/devicetree/bindings/hwmon/max1619.txt b/Documentation/devicetree/bindings/hwmon/max1619.txt
> deleted file mode 100644
> index c70dbbe1e56f..000000000000
> --- a/Documentation/devicetree/bindings/hwmon/max1619.txt
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -Bindings for MAX1619 Temperature Sensor
> -
> -Required properties:
> -- compatible : "maxim,max1619"
> -- reg        : I2C address, one of 0x18, 0x19, 0x1a, 0x29, 0x2a, 0x2b, 0x4c, or
> -               0x4d, 0x4e
> -
> -Example:
> -	temp@4c {
> -		compatible = "maxim,max1619";
> -		reg = <0x4c>;
> -	};
> diff --git a/Documentation/devicetree/bindings/trivial-devices.yaml b/Documentation/devicetree/bindings/trivial-devices.yaml
> index fb03febc6616..1e4b3464d734 100644
> --- a/Documentation/devicetree/bindings/trivial-devices.yaml
> +++ b/Documentation/devicetree/bindings/trivial-devices.yaml
> @@ -147,6 +147,8 @@ properties:
>             - maxim,ds1803-100
>               # Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs
>             - maxim,max1237
> +            # Temperature Sensor, I2C interface
> +          - maxim,max1619
>               # 10-bit 10 kOhm linear programable voltage divider
>             - maxim,max5481
>               # 10-bit 50 kOhm linear programable voltage divider
> 

Re: [PATCH 2/2] dt-bindings: hwmon: merge max31785 into trivial devices

[Rob Herring]

On Fri, Aug 20, 2021 at 9:23 AM Guenter Roeck <linux@roeck-us.net> wrote:
>
> On 8/19/21 11:25 AM, Krzysztof Kozlowski wrote:
> > Ther Maxim max31785 bindings are trivial, so simply merge it into
> > trivial-devices.yaml.
> >
> > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
> > ---
> >   .../devicetree/bindings/hwmon/max31785.txt    | 22 -------------------
>
> Not sure if that is a good idea. It would make more sense to standardize the
> properties needed by the driver/chip instead (see existing dts files in the kernel).

This device is certainly not trivial, the binding is just incomplete.

Device specific fan controller bindings are something I'm just going
to reject until someone comes up with something common.

Rob

Re: [PATCH 1/2] dt-bindings: hwmon: merge max1619 into trivial devices

[Rob Herring]

On Fri, Aug 20, 2021 at 9:26 AM Guenter Roeck <linux@roeck-us.net> wrote:
>
> On 8/19/21 11:25 AM, Krzysztof Kozlowski wrote:
> > Ther Maxim max1619 bindings are trivial, so simply merge it into
> > trivial-devices.yaml.
> >
> > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
>
> Do we have a general guideline on how to handle such trivial bindings ?

Not really. I debate (with myself) just getting rid of it as I suspect
lots of bindings are just incomplete. Like should supplies be
required? But it's convenient to have and not duplicate a bunch of
boilerplate.

> I normally leave it up to the driver author to decide one way or another.

Me too.

This one looks simple enough to be in trivial-devices, so I'll take
having a schema over not.

Rob

Re: [PATCH 1/2] dt-bindings: hwmon: merge max1619 into trivial devices

[Rob Herring]

On Thu, 19 Aug 2021 20:25:43 +0200, Krzysztof Kozlowski wrote:
> Ther Maxim max1619 bindings are trivial, so simply merge it into
> trivial-devices.yaml.
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
> ---
>  Documentation/devicetree/bindings/hwmon/max1619.txt  | 12 ------------
>  .../devicetree/bindings/trivial-devices.yaml         |  2 ++
>  2 files changed, 2 insertions(+), 12 deletions(-)
>  delete mode 100644 Documentation/devicetree/bindings/hwmon/max1619.txt
> 

Applied, thanks!