Merge remote-tracking branch 'iio/togreg'

diff --cc Documentation/ABI/testing/sysfs-bus-iio
Simple merge

diff --cc Documentation/devicetree/bindings/trivial-devices.yaml
Simple merge

diff --cc MAINTAINERS
Simple merge

diff --cc drivers/iio/accel/bmc150-accel-core.c
Simple merge

diff --cc drivers/iio/adc/ad7768-1.c
Simple merge

diff --cc drivers/iio/gyro/fxas21002c_core.c
Simple merge

diff --cc drivers/staging/iio/cdc/ad7746.c
index eab534dc4bcc0dbfad60de19bcc43000d3791aa3,c42fffa8b60e9a0d064a5023763e04e2864a1c5d..109f19585e115d2ec05c9459e9d147873e57aca9
--- 1/drivers/staging/iio/cdc/ad7746.c
--- 2/drivers/staging/iio/cdc/ad7746.c
+++ b/drivers/staging/iio/cdc/ad7746.c
@@@ -700,28 -699,42 +699,41 @@@ static int ad7746_probe(struct i2c_clie
                indio_dev->num_channels = ARRAY_SIZE(ad7746_channels);
        else
                indio_dev->num_channels =  ARRAY_SIZE(ad7746_channels) - 2;
 -      indio_dev->num_channels = ARRAY_SIZE(ad7746_channels);
        indio_dev->modes = INDIO_DIRECT_MODE;
  
-       if (pdata) {
-               if (pdata->exca_en) {
-                       if (pdata->exca_inv_en)
-                               regval |= AD7746_EXCSETUP_NEXCA;
-                       else
-                               regval |= AD7746_EXCSETUP_EXCA;
-               }
+       if (device_property_read_bool(dev, "adi,exca-output-en")) {
+               if (device_property_read_bool(dev, "adi,exca-output-invert"))
+                       regval |= AD7746_EXCSETUP_NEXCA;
+               else
+                       regval |= AD7746_EXCSETUP_EXCA;
+       }
  
-               if (pdata->excb_en) {
-                       if (pdata->excb_inv_en)
-                               regval |= AD7746_EXCSETUP_NEXCB;
-                       else
-                               regval |= AD7746_EXCSETUP_EXCB;
-               }
+       if (device_property_read_bool(dev, "adi,excb-output-en")) {
+               if (device_property_read_bool(dev, "adi,excb-output-invert"))
+                       regval |= AD7746_EXCSETUP_NEXCB;
+               else
+                       regval |= AD7746_EXCSETUP_EXCB;
+       }
  
-               regval |= AD7746_EXCSETUP_EXCLVL(pdata->exclvl);
-       } else {
-               dev_warn(&client->dev, "No platform data? using default\n");
-               regval = AD7746_EXCSETUP_EXCA | AD7746_EXCSETUP_EXCB |
-                       AD7746_EXCSETUP_EXCLVL(3);
+       ret = device_property_read_u32(dev, "adi,excitation-vdd-permille",
+                                      &vdd_permille);
+       if (!ret) {
+               switch (vdd_permille) {
+               case 125:
+                       regval |= AD7746_EXCSETUP_EXCLVL(0);
+                       break;
+               case 250:
+                       regval |= AD7746_EXCSETUP_EXCLVL(1);
+                       break;
+               case 375:
+                       regval |= AD7746_EXCSETUP_EXCLVL(2);
+                       break;
+               case 500:
+                       regval |= AD7746_EXCSETUP_EXCLVL(3);
+                       break;
+               default:
+                       break;
+               }
        }
  
        ret = i2c_smbus_write_byte_data(chip->client,