On Wed, 2020-03-25 at 16:05 -0600, Rob Herring wrote: > [External] > > The 'adi,adxl345' definition is a duplicate as there's a full binding in: > Documentation/devicetree/bindings/iio/accel/adi,adxl345.yaml > > The trivial-devices binding doesn't capture that 'adi,adxl346' has a > fallback compatible 'adi,adxl345', so let's add it to adi,adxl345.yaml. > Acked-by: Alexandru Ardelean <alexandru.ardelean@xxxxxxxxxx> > Cc: Michael Hennerich <michael.hennerich@xxxxxxxxxx> > Cc: Jonathan Cameron <jic23@xxxxxxxxxx> > Cc: Hartmut Knaack <knaack.h@xxxxxx> > Cc: Lars-Peter Clausen <lars@xxxxxxxxxx> > Cc: Peter Meerwald-Stadler <pmeerw@xxxxxxxxxx> > Cc: linux-iio@xxxxxxxxxxxxxxx > Signed-off-by: Rob Herring <robh@xxxxxxxxxx> > --- > .../devicetree/bindings/iio/accel/adi,adxl345.yaml | 10 +++++++--- > Documentation/devicetree/bindings/trivial-devices.yaml | 4 ---- > 2 files changed, 7 insertions(+), 7 deletions(-) > > diff --git a/Documentation/devicetree/bindings/iio/accel/adi,adxl345.yaml > b/Documentation/devicetree/bindings/iio/accel/adi,adxl345.yaml > index c602b6fe1c0c..d124eba1ce54 100644 > --- a/Documentation/devicetree/bindings/iio/accel/adi,adxl345.yaml > +++ b/Documentation/devicetree/bindings/iio/accel/adi,adxl345.yaml > @@ -17,9 +17,13 @@ description: | > > properties: > compatible: > - enum: > - - adi,adxl345 > - - adi,adxl375 > + oneOf: > + - items: > + - const: adi,adxl346 > + - const: adi,adxl345 > + - enum: > + - adi,adxl345 > + - adi,adxl375 > > reg: > maxItems: 1 > diff --git a/Documentation/devicetree/bindings/trivial-devices.yaml > b/Documentation/devicetree/bindings/trivial-devices.yaml > index 978de7d37c66..51d1f6e43c02 100644 > --- a/Documentation/devicetree/bindings/trivial-devices.yaml > +++ b/Documentation/devicetree/bindings/trivial-devices.yaml > @@ -42,10 +42,6 @@ properties: > - adi,adt7476 > # +/-1C TDM Extended Temp Range I.C > - adi,adt7490 > - # Three-Axis Digital Accelerometer > - - adi,adxl345 > - # Three-Axis Digital Accelerometer (backward-compatibility value > "adi,adxl345" must be listed too) > - - adi,adxl346 > # AMS iAQ-Core VOC Sensor > - ams,iaq-core > # i2c serial eeprom (24cxx)
