diff mbox series

dt-bindings: trivial-devices: sort entries alphanumerically

Message ID 20240201075805.7492-1-krzysztof.kozlowski@linaro.org
State Accepted
Headers show
Series dt-bindings: trivial-devices: sort entries alphanumerically | expand

Checks

Context Check Description
robh/checkpatch warning total: 0 errors, 1 warnings, 167 lines checked
robh/patch-applied success
robh/dtbs-check warning build log
robh/dt-meta-schema success

Commit Message

Krzysztof Kozlowski Feb. 1, 2024, 7:58 a.m. UTC
Sort entries alphanumerically.  This was a semi manual job with help of:

  cat Documentation/devicetree/bindings/trivial-devices.yaml | grep '    - ' > old
  cat old | sort -n > new
  diff -ubB old new

Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

---

Cc: Charles Hsu <ythsu0511@gmail.com>
Cc: linux-hwmon@vger.kernel.org
Cc: Guenter Roeck <linux@roeck-us.net>
---
 .../devicetree/bindings/trivial-devices.yaml  | 73 ++++++++++---------
 1 file changed, 37 insertions(+), 36 deletions(-)

Comments

Guenter Roeck Feb. 1, 2024, 1:25 p.m. UTC | #1
On 1/31/24 23:58, Krzysztof Kozlowski wrote:
> Sort entries alphanumerically.  This was a semi manual job with help of:
> 
>    cat Documentation/devicetree/bindings/trivial-devices.yaml | grep '    - ' > old
>    cat old | sort -n > new
>    diff -ubB old new
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> 

Acked-by: Guenter Roeck <linux@roeck-us.net>

> ---
> 
> Cc: Charles Hsu <ythsu0511@gmail.com>
> Cc: linux-hwmon@vger.kernel.org
> Cc: Guenter Roeck <linux@roeck-us.net>
> ---
>   .../devicetree/bindings/trivial-devices.yaml  | 73 ++++++++++---------
>   1 file changed, 37 insertions(+), 36 deletions(-)
> 
> diff --git a/Documentation/devicetree/bindings/trivial-devices.yaml b/Documentation/devicetree/bindings/trivial-devices.yaml
> index 5b52950e6bfc..41982a41398a 100644
> --- a/Documentation/devicetree/bindings/trivial-devices.yaml
> +++ b/Documentation/devicetree/bindings/trivial-devices.yaml
> @@ -28,6 +28,7 @@ properties:
>   
>     compatible:
>       items:
> +      # Entries are sorted alphanumerically by the compatible
>         - enum:
>               # Acbel fsg032 power supply
>             - acbel,fsg032
> @@ -49,12 +50,12 @@ properties:
>             - ams,iaq-core
>               # i2c serial eeprom (24cxx)
>             - at,24c08
> +            # i2c h/w elliptic curve crypto module
> +          - atmel,atecc508a
>               # ATSHA204 - i2c h/w symmetric crypto module
>             - atmel,atsha204
>               # ATSHA204A - i2c h/w symmetric crypto module
>             - atmel,atsha204a
> -            # i2c h/w elliptic curve crypto module
> -          - atmel,atecc508a
>               # BPA-RS600: Power Supply
>             - blutek,bpa-rs600
>               # Bosch Sensortec pressure, temperature, humididty and VOC sensor
> @@ -115,20 +116,6 @@ properties:
>             - fsl,mpl3115
>               # MPR121: Proximity Capacitive Touch Sensor Controller
>             - fsl,mpr121
> -            # Monolithic Power Systems Inc. multi-phase controller mp2856
> -          - mps,mp2856
> -            # Monolithic Power Systems Inc. multi-phase controller mp2857
> -          - mps,mp2857
> -            # Monolithic Power Systems Inc. multi-phase controller mp2888
> -          - mps,mp2888
> -            # Monolithic Power Systems Inc. multi-phase controller mp2971
> -          - mps,mp2971
> -            # Monolithic Power Systems Inc. multi-phase controller mp2973
> -          - mps,mp2973
> -            # Monolithic Power Systems Inc. multi-phase controller mp2975
> -          - mps,mp2975
> -            # Monolithic Power Systems Inc. multi-phase hot-swap controller mp5990
> -          - mps,mp5990
>               # Honeywell Humidicon HIH-6130 humidity/temperature sensor
>             - honeywell,hi6130
>               # IBM Common Form Factor Power Supply Versions (all versions)
> @@ -197,6 +184,8 @@ properties:
>             - maxim,max1237
>               # Temperature Sensor, I2C interface
>             - maxim,max1619
> +            # 3-Channel Remote Temperature Sensor
> +          - maxim,max31730
>               # 10-bit 10 kOhm linear programmable voltage divider
>             - maxim,max5481
>               # 10-bit 50 kOhm linear programmable voltage divider
> @@ -209,8 +198,6 @@ properties:
>             - maxim,max6621
>               # 9-Bit/12-Bit Temperature Sensors with I²C-Compatible Serial Interface
>             - maxim,max6625
> -            # 3-Channel Remote Temperature Sensor
> -          - maxim,max31730
>               # mCube 3-axis 8-bit digital accelerometer
>             - mcube,mc3230
>               # Measurement Specialities I2C temperature and humidity sensor
> @@ -241,8 +228,6 @@ properties:
>             - memsic,mxc6655
>               # Menlo on-board CPLD trivial SPI device
>             - menlo,m53cpld
> -            # Micron SPI NOR Authenta
> -          - micron,spi-authenta
>               # Microchip differential I2C ADC, 1 Channel, 18 bit
>             - microchip,mcp3421
>               # Microchip differential I2C ADC, 2 Channel, 18 bit
> @@ -259,40 +244,56 @@ properties:
>             - microchip,mcp3427
>               # Microchip differential I2C ADC, 4 Channel, 16 bit
>             - microchip,mcp3428
> -            # Microchip 7-bit Single I2C Digital POT (5k)
> -          - microchip,mcp4017-502
>               # Microchip 7-bit Single I2C Digital POT (10k)
>             - microchip,mcp4017-103
> -            # Microchip 7-bit Single I2C Digital POT (50k)
> -          - microchip,mcp4017-503
>               # Microchip 7-bit Single I2C Digital POT (100k)
>             - microchip,mcp4017-104
>               # Microchip 7-bit Single I2C Digital POT (5k)
> -          - microchip,mcp4018-502
> +          - microchip,mcp4017-502
> +            # Microchip 7-bit Single I2C Digital POT (50k)
> +          - microchip,mcp4017-503
>               # Microchip 7-bit Single I2C Digital POT (10k)
>             - microchip,mcp4018-103
> -            # Microchip 7-bit Single I2C Digital POT (50k)
> -          - microchip,mcp4018-503
>               # Microchip 7-bit Single I2C Digital POT (100k)
>             - microchip,mcp4018-104
>               # Microchip 7-bit Single I2C Digital POT (5k)
> -          - microchip,mcp4019-502
> +          - microchip,mcp4018-502
> +            # Microchip 7-bit Single I2C Digital POT (50k)
> +          - microchip,mcp4018-503
>               # Microchip 7-bit Single I2C Digital POT (10k)
>             - microchip,mcp4019-103
> -            # Microchip 7-bit Single I2C Digital POT (50k)
> -          - microchip,mcp4019-503
>               # Microchip 7-bit Single I2C Digital POT (100k)
>             - microchip,mcp4019-104
> +            # Microchip 7-bit Single I2C Digital POT (5k)
> +          - microchip,mcp4019-502
> +            # Microchip 7-bit Single I2C Digital POT (50k)
> +          - microchip,mcp4019-503
>               # PWM Fan Speed Controller With Fan Fault Detection
>             - microchip,tc654
>               # PWM Fan Speed Controller With Fan Fault Detection
>             - microchip,tc655
> +            # Micron SPI NOR Authenta
> +          - micron,spi-authenta
>               # MiraMEMS DA226 2-axis 14-bit digital accelerometer
>             - miramems,da226
>               # MiraMEMS DA280 3-axis 14-bit digital accelerometer
>             - miramems,da280
>               # MiraMEMS DA311 3-axis 12-bit digital accelerometer
>             - miramems,da311
> +            # Monolithic Power Systems Inc. multi-phase controller mp2856
> +          - mps,mp2856
> +            # Monolithic Power Systems Inc. multi-phase controller mp2857
> +          - mps,mp2857
> +            # Monolithic Power Systems Inc. multi-phase controller mp2888
> +          - mps,mp2888
> +            # Monolithic Power Systems Inc. multi-phase controller mp2971
> +          - mps,mp2971
> +            # Monolithic Power Systems Inc. multi-phase controller mp2973
> +          - mps,mp2973
> +            # Monolithic Power Systems Inc. multi-phase controller mp2975
> +          - mps,mp2975
> +            # Monolithic Power Systems Inc. multi-phase hot-swap controller mp5990
> +          - mps,mp5990
>               # Temperature sensor with integrated fan control
>             - national,lm63
>               # Serial Interface ACPI-Compatible Microprocessor System Hardware Monitor
> @@ -323,12 +324,12 @@ properties:
>             - samsung,exynos-sataphy-i2c
>               # Semtech sx1301 baseband processor
>             - semtech,sx1301
> -            # Sensirion low power multi-pixel gas sensor with I2C interface
> -          - sensirion,sgpc3
>               # Sensirion multi-pixel gas sensor with I2C interface
>             - sensirion,sgp30
>               # Sensirion gas sensor with I2C interface
>             - sensirion,sgp40
> +            # Sensirion low power multi-pixel gas sensor with I2C interface
> +          - sensirion,sgpc3
>               # Sensirion temperature & humidity sensor with I2C interface
>             - sensirion,sht4x
>               # Sensortek 3 axis accelerometer
> @@ -374,8 +375,6 @@ properties:
>             - ti,lm74
>               # Temperature sensor with integrated fan control
>             - ti,lm96000
> -            # I2C Touch-Screen Controller
> -          - ti,tsc2003
>               # Low Power Digital Temperature Sensor with SMBUS/Two Wire Serial Interface
>             - ti,tmp103
>               # Thermometer with SPI interface
> @@ -397,10 +396,12 @@ properties:
>             - ti,tps544b25
>             - ti,tps544c20
>             - ti,tps544c25
> -            # Winbond/Nuvoton H/W Monitor
> -          - winbond,w83793
> +            # I2C Touch-Screen Controller
> +          - ti,tsc2003
>               # Vicor Corporation Digital Supervisor
>             - vicor,pli1209bc
> +            # Winbond/Nuvoton H/W Monitor
> +          - winbond,w83793
>   
>   required:
>     - compatible
Conor Dooley Feb. 1, 2024, 6:32 p.m. UTC | #2
On Thu, Feb 01, 2024 at 05:25:13AM -0800, Guenter Roeck wrote:
> On 1/31/24 23:58, Krzysztof Kozlowski wrote:
> > Sort entries alphanumerically.  This was a semi manual job with help of:
> > 
> >    cat Documentation/devicetree/bindings/trivial-devices.yaml | grep '    - ' > old
> >    cat old | sort -n > new
> >    diff -ubB old new
> > 
> > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> > 
> 
> Acked-by: Guenter Roeck <linux@roeck-us.net>

z sorts before a, please fix in the whole file.

Acked-by: Conor Dooley <conor.dooley@microchip.com>

Thanks,
Conor.

> 
> > ---
> > 
> > Cc: Charles Hsu <ythsu0511@gmail.com>
> > Cc: linux-hwmon@vger.kernel.org
> > Cc: Guenter Roeck <linux@roeck-us.net>
> > ---
> >   .../devicetree/bindings/trivial-devices.yaml  | 73 ++++++++++---------
> >   1 file changed, 37 insertions(+), 36 deletions(-)
> > 
> > diff --git a/Documentation/devicetree/bindings/trivial-devices.yaml b/Documentation/devicetree/bindings/trivial-devices.yaml
> > index 5b52950e6bfc..41982a41398a 100644
> > --- a/Documentation/devicetree/bindings/trivial-devices.yaml
> > +++ b/Documentation/devicetree/bindings/trivial-devices.yaml
> > @@ -28,6 +28,7 @@ properties:
> >     compatible:
> >       items:
> > +      # Entries are sorted alphanumerically by the compatible
> >         - enum:
> >               # Acbel fsg032 power supply
> >             - acbel,fsg032
> > @@ -49,12 +50,12 @@ properties:
> >             - ams,iaq-core
> >               # i2c serial eeprom (24cxx)
> >             - at,24c08
> > +            # i2c h/w elliptic curve crypto module
> > +          - atmel,atecc508a
> >               # ATSHA204 - i2c h/w symmetric crypto module
> >             - atmel,atsha204
> >               # ATSHA204A - i2c h/w symmetric crypto module
> >             - atmel,atsha204a
> > -            # i2c h/w elliptic curve crypto module
> > -          - atmel,atecc508a
> >               # BPA-RS600: Power Supply
> >             - blutek,bpa-rs600
> >               # Bosch Sensortec pressure, temperature, humididty and VOC sensor
> > @@ -115,20 +116,6 @@ properties:
> >             - fsl,mpl3115
> >               # MPR121: Proximity Capacitive Touch Sensor Controller
> >             - fsl,mpr121
> > -            # Monolithic Power Systems Inc. multi-phase controller mp2856
> > -          - mps,mp2856
> > -            # Monolithic Power Systems Inc. multi-phase controller mp2857
> > -          - mps,mp2857
> > -            # Monolithic Power Systems Inc. multi-phase controller mp2888
> > -          - mps,mp2888
> > -            # Monolithic Power Systems Inc. multi-phase controller mp2971
> > -          - mps,mp2971
> > -            # Monolithic Power Systems Inc. multi-phase controller mp2973
> > -          - mps,mp2973
> > -            # Monolithic Power Systems Inc. multi-phase controller mp2975
> > -          - mps,mp2975
> > -            # Monolithic Power Systems Inc. multi-phase hot-swap controller mp5990
> > -          - mps,mp5990
> >               # Honeywell Humidicon HIH-6130 humidity/temperature sensor
> >             - honeywell,hi6130
> >               # IBM Common Form Factor Power Supply Versions (all versions)
> > @@ -197,6 +184,8 @@ properties:
> >             - maxim,max1237
> >               # Temperature Sensor, I2C interface
> >             - maxim,max1619
> > +            # 3-Channel Remote Temperature Sensor
> > +          - maxim,max31730
> >               # 10-bit 10 kOhm linear programmable voltage divider
> >             - maxim,max5481
> >               # 10-bit 50 kOhm linear programmable voltage divider
> > @@ -209,8 +198,6 @@ properties:
> >             - maxim,max6621
> >               # 9-Bit/12-Bit Temperature Sensors with I²C-Compatible Serial Interface
> >             - maxim,max6625
> > -            # 3-Channel Remote Temperature Sensor
> > -          - maxim,max31730
> >               # mCube 3-axis 8-bit digital accelerometer
> >             - mcube,mc3230
> >               # Measurement Specialities I2C temperature and humidity sensor
> > @@ -241,8 +228,6 @@ properties:
> >             - memsic,mxc6655
> >               # Menlo on-board CPLD trivial SPI device
> >             - menlo,m53cpld
> > -            # Micron SPI NOR Authenta
> > -          - micron,spi-authenta
> >               # Microchip differential I2C ADC, 1 Channel, 18 bit
> >             - microchip,mcp3421
> >               # Microchip differential I2C ADC, 2 Channel, 18 bit
> > @@ -259,40 +244,56 @@ properties:
> >             - microchip,mcp3427
> >               # Microchip differential I2C ADC, 4 Channel, 16 bit
> >             - microchip,mcp3428
> > -            # Microchip 7-bit Single I2C Digital POT (5k)
> > -          - microchip,mcp4017-502
> >               # Microchip 7-bit Single I2C Digital POT (10k)
> >             - microchip,mcp4017-103
> > -            # Microchip 7-bit Single I2C Digital POT (50k)
> > -          - microchip,mcp4017-503
> >               # Microchip 7-bit Single I2C Digital POT (100k)
> >             - microchip,mcp4017-104
> >               # Microchip 7-bit Single I2C Digital POT (5k)
> > -          - microchip,mcp4018-502
> > +          - microchip,mcp4017-502
> > +            # Microchip 7-bit Single I2C Digital POT (50k)
> > +          - microchip,mcp4017-503
> >               # Microchip 7-bit Single I2C Digital POT (10k)
> >             - microchip,mcp4018-103
> > -            # Microchip 7-bit Single I2C Digital POT (50k)
> > -          - microchip,mcp4018-503
> >               # Microchip 7-bit Single I2C Digital POT (100k)
> >             - microchip,mcp4018-104
> >               # Microchip 7-bit Single I2C Digital POT (5k)
> > -          - microchip,mcp4019-502
> > +          - microchip,mcp4018-502
> > +            # Microchip 7-bit Single I2C Digital POT (50k)
> > +          - microchip,mcp4018-503
> >               # Microchip 7-bit Single I2C Digital POT (10k)
> >             - microchip,mcp4019-103
> > -            # Microchip 7-bit Single I2C Digital POT (50k)
> > -          - microchip,mcp4019-503
> >               # Microchip 7-bit Single I2C Digital POT (100k)
> >             - microchip,mcp4019-104
> > +            # Microchip 7-bit Single I2C Digital POT (5k)
> > +          - microchip,mcp4019-502
> > +            # Microchip 7-bit Single I2C Digital POT (50k)
> > +          - microchip,mcp4019-503
> >               # PWM Fan Speed Controller With Fan Fault Detection
> >             - microchip,tc654
> >               # PWM Fan Speed Controller With Fan Fault Detection
> >             - microchip,tc655
> > +            # Micron SPI NOR Authenta
> > +          - micron,spi-authenta
> >               # MiraMEMS DA226 2-axis 14-bit digital accelerometer
> >             - miramems,da226
> >               # MiraMEMS DA280 3-axis 14-bit digital accelerometer
> >             - miramems,da280
> >               # MiraMEMS DA311 3-axis 12-bit digital accelerometer
> >             - miramems,da311
> > +            # Monolithic Power Systems Inc. multi-phase controller mp2856
> > +          - mps,mp2856
> > +            # Monolithic Power Systems Inc. multi-phase controller mp2857
> > +          - mps,mp2857
> > +            # Monolithic Power Systems Inc. multi-phase controller mp2888
> > +          - mps,mp2888
> > +            # Monolithic Power Systems Inc. multi-phase controller mp2971
> > +          - mps,mp2971
> > +            # Monolithic Power Systems Inc. multi-phase controller mp2973
> > +          - mps,mp2973
> > +            # Monolithic Power Systems Inc. multi-phase controller mp2975
> > +          - mps,mp2975
> > +            # Monolithic Power Systems Inc. multi-phase hot-swap controller mp5990
> > +          - mps,mp5990
> >               # Temperature sensor with integrated fan control
> >             - national,lm63
> >               # Serial Interface ACPI-Compatible Microprocessor System Hardware Monitor
> > @@ -323,12 +324,12 @@ properties:
> >             - samsung,exynos-sataphy-i2c
> >               # Semtech sx1301 baseband processor
> >             - semtech,sx1301
> > -            # Sensirion low power multi-pixel gas sensor with I2C interface
> > -          - sensirion,sgpc3
> >               # Sensirion multi-pixel gas sensor with I2C interface
> >             - sensirion,sgp30
> >               # Sensirion gas sensor with I2C interface
> >             - sensirion,sgp40
> > +            # Sensirion low power multi-pixel gas sensor with I2C interface
> > +          - sensirion,sgpc3
> >               # Sensirion temperature & humidity sensor with I2C interface
> >             - sensirion,sht4x
> >               # Sensortek 3 axis accelerometer
> > @@ -374,8 +375,6 @@ properties:
> >             - ti,lm74
> >               # Temperature sensor with integrated fan control
> >             - ti,lm96000
> > -            # I2C Touch-Screen Controller
> > -          - ti,tsc2003
> >               # Low Power Digital Temperature Sensor with SMBUS/Two Wire Serial Interface
> >             - ti,tmp103
> >               # Thermometer with SPI interface
> > @@ -397,10 +396,12 @@ properties:
> >             - ti,tps544b25
> >             - ti,tps544c20
> >             - ti,tps544c25
> > -            # Winbond/Nuvoton H/W Monitor
> > -          - winbond,w83793
> > +            # I2C Touch-Screen Controller
> > +          - ti,tsc2003
> >               # Vicor Corporation Digital Supervisor
> >             - vicor,pli1209bc
> > +            # Winbond/Nuvoton H/W Monitor
> > +          - winbond,w83793
> >   required:
> >     - compatible
>
Rob Herring (Arm) Feb. 2, 2024, 8:21 p.m. UTC | #3
On Thu, Feb 01, 2024 at 06:32:09PM +0000, Conor Dooley wrote:
> On Thu, Feb 01, 2024 at 05:25:13AM -0800, Guenter Roeck wrote:
> > On 1/31/24 23:58, Krzysztof Kozlowski wrote:
> > > Sort entries alphanumerically.  This was a semi manual job with help of:
> > > 
> > >    cat Documentation/devicetree/bindings/trivial-devices.yaml | grep '    - ' > old
> > >    cat old | sort -n > new
> > >    diff -ubB old new
> > > 
> > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> > > 
> > 
> > Acked-by: Guenter Roeck <linux@roeck-us.net>
> 
> z sorts before a, please fix in the whole file.

I don't follow this comment.

> 
> Acked-by: Conor Dooley <conor.dooley@microchip.com>
> 
> Thanks,
> Conor.
Conor Dooley Feb. 2, 2024, 8:37 p.m. UTC | #4
On Fri, Feb 02, 2024 at 02:21:58PM -0600, Rob Herring wrote:
> On Thu, Feb 01, 2024 at 06:32:09PM +0000, Conor Dooley wrote:
> > On Thu, Feb 01, 2024 at 05:25:13AM -0800, Guenter Roeck wrote:
> > > On 1/31/24 23:58, Krzysztof Kozlowski wrote:
> > > > Sort entries alphanumerically.  This was a semi manual job with help of:
> > > > 
> > > >    cat Documentation/devicetree/bindings/trivial-devices.yaml | grep '    - ' > old
> > > >    cat old | sort -n > new
> > > >    diff -ubB old new
> > > > 
> > > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> > > > 
> > > 
> > > Acked-by: Guenter Roeck <linux@roeck-us.net>
> > 
> > z sorts before a, please fix in the whole file.
> 
> I don't follow this comment.

I was just taking the piss out of myself, dw bout it.

> > Acked-by: Conor Dooley <conor.dooley@microchip.com>
> > 
> > Thanks,
> > Conor.
Krzysztof Kozlowski Feb. 5, 2024, 9:29 a.m. UTC | #5
On 02/02/2024 21:21, Rob Herring wrote:
> On Thu, Feb 01, 2024 at 06:32:09PM +0000, Conor Dooley wrote:
>> On Thu, Feb 01, 2024 at 05:25:13AM -0800, Guenter Roeck wrote:
>>> On 1/31/24 23:58, Krzysztof Kozlowski wrote:
>>>> Sort entries alphanumerically.  This was a semi manual job with help of:
>>>>
>>>>    cat Documentation/devicetree/bindings/trivial-devices.yaml | grep '    - ' > old
>>>>    cat old | sort -n > new
>>>>    diff -ubB old new
>>>>
>>>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>>>>
>>>
>>> Acked-by: Guenter Roeck <linux@roeck-us.net>
>>
>> z sorts before a, please fix in the whole file.
> 
> I don't follow this comment.

I think this was just poetry :)

Best regards,
Krzysztof
Rob Herring (Arm) Feb. 5, 2024, 5:20 p.m. UTC | #6
On Thu, 01 Feb 2024 08:58:05 +0100, Krzysztof Kozlowski wrote:
> Sort entries alphanumerically.  This was a semi manual job with help of:
> 
>   cat Documentation/devicetree/bindings/trivial-devices.yaml | grep '    - ' > old
>   cat old | sort -n > new
>   diff -ubB old new
> 
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> 
> ---
> 
> Cc: Charles Hsu <ythsu0511@gmail.com>
> Cc: linux-hwmon@vger.kernel.org
> Cc: Guenter Roeck <linux@roeck-us.net>
> ---
>  .../devicetree/bindings/trivial-devices.yaml  | 73 ++++++++++---------
>  1 file changed, 37 insertions(+), 36 deletions(-)
> 

Applied, thanks!

I'll try and pick up all the trivial-devices.yaml changes this cycle to 
minimize any conflicts.

Rob
Guenter Roeck Feb. 5, 2024, 6:33 p.m. UTC | #7
Hi Rob,

On 2/5/24 09:20, Rob Herring wrote:
> 
> On Thu, 01 Feb 2024 08:58:05 +0100, Krzysztof Kozlowski wrote:
>> Sort entries alphanumerically.  This was a semi manual job with help of:
>>
>>    cat Documentation/devicetree/bindings/trivial-devices.yaml | grep '    - ' > old
>>    cat old | sort -n > new
>>    diff -ubB old new
>>
>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
>>
>> ---
>>
>> Cc: Charles Hsu <ythsu0511@gmail.com>
>> Cc: linux-hwmon@vger.kernel.org
>> Cc: Guenter Roeck <linux@roeck-us.net>
>> ---
>>   .../devicetree/bindings/trivial-devices.yaml  | 73 ++++++++++---------
>>   1 file changed, 37 insertions(+), 36 deletions(-)
>>
> 
> Applied, thanks!
> 
> I'll try and pick up all the trivial-devices.yaml changes this cycle to
> minimize any conflicts.
> 

I currently carry the following patches in hwmon-next:

  dt-bindings: trivial-devices: add Astera Labs PT5161L
  dt-bindings: Add MPQ8785 voltage regulator device

I'll drop them after I get a notification from Stephen that they are
queued in both trees. Please let me know if I should drop them now.

Thanks,
Guenter
diff mbox series

Patch

diff --git a/Documentation/devicetree/bindings/trivial-devices.yaml b/Documentation/devicetree/bindings/trivial-devices.yaml
index 5b52950e6bfc..41982a41398a 100644
--- a/Documentation/devicetree/bindings/trivial-devices.yaml
+++ b/Documentation/devicetree/bindings/trivial-devices.yaml
@@ -28,6 +28,7 @@  properties:
 
   compatible:
     items:
+      # Entries are sorted alphanumerically by the compatible
       - enum:
             # Acbel fsg032 power supply
           - acbel,fsg032
@@ -49,12 +50,12 @@  properties:
           - ams,iaq-core
             # i2c serial eeprom (24cxx)
           - at,24c08
+            # i2c h/w elliptic curve crypto module
+          - atmel,atecc508a
             # ATSHA204 - i2c h/w symmetric crypto module
           - atmel,atsha204
             # ATSHA204A - i2c h/w symmetric crypto module
           - atmel,atsha204a
-            # i2c h/w elliptic curve crypto module
-          - atmel,atecc508a
             # BPA-RS600: Power Supply
           - blutek,bpa-rs600
             # Bosch Sensortec pressure, temperature, humididty and VOC sensor
@@ -115,20 +116,6 @@  properties:
           - fsl,mpl3115
             # MPR121: Proximity Capacitive Touch Sensor Controller
           - fsl,mpr121
-            # Monolithic Power Systems Inc. multi-phase controller mp2856
-          - mps,mp2856
-            # Monolithic Power Systems Inc. multi-phase controller mp2857
-          - mps,mp2857
-            # Monolithic Power Systems Inc. multi-phase controller mp2888
-          - mps,mp2888
-            # Monolithic Power Systems Inc. multi-phase controller mp2971
-          - mps,mp2971
-            # Monolithic Power Systems Inc. multi-phase controller mp2973
-          - mps,mp2973
-            # Monolithic Power Systems Inc. multi-phase controller mp2975
-          - mps,mp2975
-            # Monolithic Power Systems Inc. multi-phase hot-swap controller mp5990
-          - mps,mp5990
             # Honeywell Humidicon HIH-6130 humidity/temperature sensor
           - honeywell,hi6130
             # IBM Common Form Factor Power Supply Versions (all versions)
@@ -197,6 +184,8 @@  properties:
           - maxim,max1237
             # Temperature Sensor, I2C interface
           - maxim,max1619
+            # 3-Channel Remote Temperature Sensor
+          - maxim,max31730
             # 10-bit 10 kOhm linear programmable voltage divider
           - maxim,max5481
             # 10-bit 50 kOhm linear programmable voltage divider
@@ -209,8 +198,6 @@  properties:
           - maxim,max6621
             # 9-Bit/12-Bit Temperature Sensors with I²C-Compatible Serial Interface
           - maxim,max6625
-            # 3-Channel Remote Temperature Sensor
-          - maxim,max31730
             # mCube 3-axis 8-bit digital accelerometer
           - mcube,mc3230
             # Measurement Specialities I2C temperature and humidity sensor
@@ -241,8 +228,6 @@  properties:
           - memsic,mxc6655
             # Menlo on-board CPLD trivial SPI device
           - menlo,m53cpld
-            # Micron SPI NOR Authenta
-          - micron,spi-authenta
             # Microchip differential I2C ADC, 1 Channel, 18 bit
           - microchip,mcp3421
             # Microchip differential I2C ADC, 2 Channel, 18 bit
@@ -259,40 +244,56 @@  properties:
           - microchip,mcp3427
             # Microchip differential I2C ADC, 4 Channel, 16 bit
           - microchip,mcp3428
-            # Microchip 7-bit Single I2C Digital POT (5k)
-          - microchip,mcp4017-502
             # Microchip 7-bit Single I2C Digital POT (10k)
           - microchip,mcp4017-103
-            # Microchip 7-bit Single I2C Digital POT (50k)
-          - microchip,mcp4017-503
             # Microchip 7-bit Single I2C Digital POT (100k)
           - microchip,mcp4017-104
             # Microchip 7-bit Single I2C Digital POT (5k)
-          - microchip,mcp4018-502
+          - microchip,mcp4017-502
+            # Microchip 7-bit Single I2C Digital POT (50k)
+          - microchip,mcp4017-503
             # Microchip 7-bit Single I2C Digital POT (10k)
           - microchip,mcp4018-103
-            # Microchip 7-bit Single I2C Digital POT (50k)
-          - microchip,mcp4018-503
             # Microchip 7-bit Single I2C Digital POT (100k)
           - microchip,mcp4018-104
             # Microchip 7-bit Single I2C Digital POT (5k)
-          - microchip,mcp4019-502
+          - microchip,mcp4018-502
+            # Microchip 7-bit Single I2C Digital POT (50k)
+          - microchip,mcp4018-503
             # Microchip 7-bit Single I2C Digital POT (10k)
           - microchip,mcp4019-103
-            # Microchip 7-bit Single I2C Digital POT (50k)
-          - microchip,mcp4019-503
             # Microchip 7-bit Single I2C Digital POT (100k)
           - microchip,mcp4019-104
+            # Microchip 7-bit Single I2C Digital POT (5k)
+          - microchip,mcp4019-502
+            # Microchip 7-bit Single I2C Digital POT (50k)
+          - microchip,mcp4019-503
             # PWM Fan Speed Controller With Fan Fault Detection
           - microchip,tc654
             # PWM Fan Speed Controller With Fan Fault Detection
           - microchip,tc655
+            # Micron SPI NOR Authenta
+          - micron,spi-authenta
             # MiraMEMS DA226 2-axis 14-bit digital accelerometer
           - miramems,da226
             # MiraMEMS DA280 3-axis 14-bit digital accelerometer
           - miramems,da280
             # MiraMEMS DA311 3-axis 12-bit digital accelerometer
           - miramems,da311
+            # Monolithic Power Systems Inc. multi-phase controller mp2856
+          - mps,mp2856
+            # Monolithic Power Systems Inc. multi-phase controller mp2857
+          - mps,mp2857
+            # Monolithic Power Systems Inc. multi-phase controller mp2888
+          - mps,mp2888
+            # Monolithic Power Systems Inc. multi-phase controller mp2971
+          - mps,mp2971
+            # Monolithic Power Systems Inc. multi-phase controller mp2973
+          - mps,mp2973
+            # Monolithic Power Systems Inc. multi-phase controller mp2975
+          - mps,mp2975
+            # Monolithic Power Systems Inc. multi-phase hot-swap controller mp5990
+          - mps,mp5990
             # Temperature sensor with integrated fan control
           - national,lm63
             # Serial Interface ACPI-Compatible Microprocessor System Hardware Monitor
@@ -323,12 +324,12 @@  properties:
           - samsung,exynos-sataphy-i2c
             # Semtech sx1301 baseband processor
           - semtech,sx1301
-            # Sensirion low power multi-pixel gas sensor with I2C interface
-          - sensirion,sgpc3
             # Sensirion multi-pixel gas sensor with I2C interface
           - sensirion,sgp30
             # Sensirion gas sensor with I2C interface
           - sensirion,sgp40
+            # Sensirion low power multi-pixel gas sensor with I2C interface
+          - sensirion,sgpc3
             # Sensirion temperature & humidity sensor with I2C interface
           - sensirion,sht4x
             # Sensortek 3 axis accelerometer
@@ -374,8 +375,6 @@  properties:
           - ti,lm74
             # Temperature sensor with integrated fan control
           - ti,lm96000
-            # I2C Touch-Screen Controller
-          - ti,tsc2003
             # Low Power Digital Temperature Sensor with SMBUS/Two Wire Serial Interface
           - ti,tmp103
             # Thermometer with SPI interface
@@ -397,10 +396,12 @@  properties:
           - ti,tps544b25
           - ti,tps544c20
           - ti,tps544c25
-            # Winbond/Nuvoton H/W Monitor
-          - winbond,w83793
+            # I2C Touch-Screen Controller
+          - ti,tsc2003
             # Vicor Corporation Digital Supervisor
           - vicor,pli1209bc
+            # Winbond/Nuvoton H/W Monitor
+          - winbond,w83793
 
 required:
   - compatible