On Thu, Oct 19, 2023 at 06:34:37PM +1030, Subhajit Ghosh wrote: > Squashing Avago (Broadcom) APDS9300 and APDS9960 schemas into one > file and removing the other. > Link: https://lore.kernel.org/all/4e785d2e-d310-4592-a75a-13549938dcef@xxxxxxxxxx/ "Yes, they look similar. I will combine them all in a single yaml file in the next revision. Thank you Krzysztof." Yet this is a follow-up patch, not a version 2. The original patches seem to not have been applied, so I am not sure why you didn't send a v2? Cheers, Conor. > --- > .../bindings/iio/light/avago,apds9300.yaml | 35 ++++++++++++--- > .../bindings/iio/light/avago,apds9960.yaml | 44 ------------------- > 2 files changed, 29 insertions(+), 50 deletions(-) > delete mode 100644 Documentation/devicetree/bindings/iio/light/avago,apds9960.yaml > > diff --git a/Documentation/devicetree/bindings/iio/light/avago,apds9300.yaml b/Documentation/devicetree/bindings/iio/light/avago,apds9300.yaml > index 206af44f2c43..7826a1749fcd 100644 > --- a/Documentation/devicetree/bindings/iio/light/avago,apds9300.yaml > +++ b/Documentation/devicetree/bindings/iio/light/avago,apds9300.yaml > @@ -4,17 +4,26 @@ > $id: http://devicetree.org/schemas/iio/light/avago,apds9300.yaml# > $schema: http://devicetree.org/meta-schemas/core.yaml# > > -title: Avago APDS9300 ambient light sensor > +title: Avago Gesture, RGB, ALS and Proximity sensors > > maintainers: > - Jonathan Cameron <jic23@xxxxxxxxxx> > + - Matt Ranostay <matt.ranostay@xxxxxxxxxxxx> > > description: | > - Datasheet at https://www.avagotech.com/docs/AV02-1077EN > + Avago (Broadcom) optical and proximity sensors with I2C interfaces. > + Datasheet at https://docs.broadcom.com/doc/AV02-1077EN > + Datasheet at https://docs.broadcom.com/doc/AV02-4191EN > > properties: > compatible: > - const: avago,apds9300 > + oneOf: > + - items: > + - const: avago,apds9300 > + - const: avago,apds9960 > + - enum: > + - avago,apds9300 > + - avago,apds9960 > > reg: > maxItems: 1 > @@ -22,14 +31,28 @@ properties: > interrupts: > maxItems: 1 > > -additionalProperties: false > - > required: > - compatible > - reg > > +allOf: > + - $ref: ../common.yaml# > + - if: > + properties: > + compatible: > + contains: > + enum: > + - avago,apds9960 > + then: > + required: > + - interrupts > + > +additionalProperties: false > + > examples: > - | > + #include <dt-bindings/interrupt-controller/irq.h> > + > i2c { > #address-cells = <1>; > #size-cells = <0>; > @@ -38,7 +61,7 @@ examples: > compatible = "avago,apds9300"; > reg = <0x39>; > interrupt-parent = <&gpio2>; > - interrupts = <29 8>; > + interrupts = <29 IRQ_TYPE_LEVEL_LOW>; > }; > }; > ... > diff --git a/Documentation/devicetree/bindings/iio/light/avago,apds9960.yaml b/Documentation/devicetree/bindings/iio/light/avago,apds9960.yaml > deleted file mode 100644 > index f06e0fda5629..000000000000 > --- a/Documentation/devicetree/bindings/iio/light/avago,apds9960.yaml > +++ /dev/null > @@ -1,44 +0,0 @@ > -# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) > -%YAML 1.2 > ---- > -$id: http://devicetree.org/schemas/iio/light/avago,apds9960.yaml# > -$schema: http://devicetree.org/meta-schemas/core.yaml# > - > -title: Avago APDS9960 gesture/RGB/ALS/proximity sensor > - > -maintainers: > - - Matt Ranostay <matt.ranostay@xxxxxxxxxxxx> > - > -description: | > - Datasheet at https://www.avagotech.com/docs/AV02-4191EN > - > -properties: > - compatible: > - const: avago,apds9960 > - > - reg: > - maxItems: 1 > - > - interrupts: > - maxItems: 1 > - > -additionalProperties: false > - > -required: > - - compatible > - - reg > - > -examples: > - - | > - i2c { > - #address-cells = <1>; > - #size-cells = <0>; > - > - light-sensor@39 { > - compatible = "avago,apds9960"; > - reg = <0x39>; > - interrupt-parent = <&gpio1>; > - interrupts = <16 1>; > - }; > - }; > -... > -- > 2.34.1 >
Attachment:
signature.asc
Description: PGP signature
