linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Linus Walleij <linus.walleij@linaro.org>
To: Jonathan Cameron <jic23@kernel.org>,
	linux-iio@vger.kernel.org, Akinobu Mita <akinobu.mita@gmail.com>,
	"H. Nikolaus Schaller" <hns@goldelico.com>,
	Matt Ranostay <mranostay@gmail.com>
Cc: Christoph Mair <christoph.mair@gmail.com>,
	Vlad Dogaru <vlad.dogaru@intel.com>,
	Hartmut Knaack <knaack.h@gmx.de>,
	Marek Belisko <marek@goldelico.com>,
	Eric Andersson <eric.andersson@unixphere.com>,
	Neil Brown <neilb@suse.de>,
	Linus Walleij <linus.walleij@linaro.org>
Subject: [PATCH 02/10 v3] iio: pressure: bmp280: support device tree initialization
Date: Mon, 27 Jun 2016 18:30:12 +0200	[thread overview]
Message-ID: <1467045020-2665-3-git-send-email-linus.walleij@linaro.org> (raw)
In-Reply-To: <1467045020-2665-1-git-send-email-linus.walleij@linaro.org>

This adds device tree support to the BMP085, BMP180 and BMP280
pressure sensors. Tested on the Qualcomm APQ8060 Dragonboard:

iio:device1$ cat in_temp_input
26700
iio:device1$ cat in_pressure_input
99.185000000

Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
---
ChangeLog v2->v3:
- Terminate OF ID table properly with an { }
ChangeLog v1->v2:
- Fix some BMP085 misspelled as BMP058 errors.
- Add the new BME280 sensor as well
---
 drivers/iio/pressure/bmp280.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/drivers/iio/pressure/bmp280.c b/drivers/iio/pressure/bmp280.c
index 1876b50cc84a..fa76f5851245 100644
--- a/drivers/iio/pressure/bmp280.c
+++ b/drivers/iio/pressure/bmp280.c
@@ -18,6 +18,7 @@
 #include <linux/module.h>
 #include <linux/i2c.h>
 #include <linux/acpi.h>
+#include <linux/of.h>
 #include <linux/regmap.h>
 #include <linux/delay.h>
 #include <linux/iio/iio.h>
@@ -1094,6 +1095,19 @@ static const struct acpi_device_id bmp280_acpi_match[] = {
 };
 MODULE_DEVICE_TABLE(acpi, bmp280_acpi_match);
 
+#ifdef CONFIG_OF
+static const struct of_device_id bmp280_of_match[] = {
+	{ .compatible = "bosch,bme280", .data = (void *)BME280_CHIP_ID },
+	{ .compatible = "bosch,bmp280", .data = (void *)BMP280_CHIP_ID },
+	{ .compatible = "bosch,bmp180", .data = (void *)BMP180_CHIP_ID },
+	{ .compatible = "bosch,bmp085", .data = (void *)BMP180_CHIP_ID },
+	{ },
+};
+MODULE_DEVICE_TABLE(of, bmp280_of_match);
+#else
+#define bmp280_of_match NULL
+#endif
+
 static const struct i2c_device_id bmp280_id[] = {
 	{"bmp280", BMP280_CHIP_ID },
 	{"bmp180", BMP180_CHIP_ID },
@@ -1107,6 +1121,7 @@ static struct i2c_driver bmp280_driver = {
 	.driver = {
 		.name	= "bmp280",
 		.acpi_match_table = ACPI_PTR(bmp280_acpi_match),
+		.of_match_table = of_match_ptr(bmp280_of_match),
 	},
 	.probe		= bmp280_probe,
 	.id_table	= bmp280_id,
-- 
2.4.11


  parent reply	other threads:[~2016-06-27 16:30 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-06-27 16:30 [PATCH 00/10] Improve the BMP280 driver v3 Linus Walleij
2016-06-27 16:30 ` [PATCH 01/10 v3] iio: pressure: bmp280: augment DT bindings Linus Walleij
2016-06-27 16:30 ` Linus Walleij [this message]
2016-06-27 16:30 ` [PATCH 03/10 v3] iio: pressure: bmp280: add reset GPIO line handling Linus Walleij
2016-06-27 16:52   ` Peter Meerwald-Stadler
2016-06-27 17:05     ` Linus Walleij
2016-06-29 17:45       ` Jonathan Cameron
2016-06-29 19:00         ` Linus Walleij
2016-06-27 16:30 ` [PATCH 04/10 v3] iio: pressure: bmp280: support supply regulators Linus Walleij
2016-06-27 16:56   ` Peter Meerwald-Stadler
2016-06-27 16:30 ` [PATCH 05/10 v3] iio: pressure: bmp280: split driver in logical parts Linus Walleij
2016-06-28 13:43   ` Akinobu Mita
2016-06-27 16:30 ` [PATCH 06/10 v3] iio: pressure: bmp280: split off an I2C Kconfig entry Linus Walleij
2016-06-27 16:30 ` [PATCH 07/10 v3] iio: pressure: bmp280: add SPI interface driver Linus Walleij
2016-06-27 17:06   ` Peter Meerwald-Stadler
2016-06-29 14:35     ` Linus Walleij
2016-06-27 16:30 ` [PATCH 08/10 v3] iio: pressure: bmp280: add support for BMP085 EOC interrupt Linus Walleij
2016-06-27 16:30 ` [PATCH 09/10 v3] iio: pressure: bmp280: read calibration data once Linus Walleij
2016-06-27 17:01   ` Peter Meerwald-Stadler
2016-06-27 16:30 ` [PATCH 10/10 v3] iio: pressure: bmp280: add power management Linus Walleij
2016-06-27 17:09   ` Peter Meerwald-Stadler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1467045020-2665-3-git-send-email-linus.walleij@linaro.org \
    --to=linus.walleij@linaro.org \
    --cc=akinobu.mita@gmail.com \
    --cc=christoph.mair@gmail.com \
    --cc=eric.andersson@unixphere.com \
    --cc=hns@goldelico.com \
    --cc=jic23@kernel.org \
    --cc=knaack.h@gmx.de \
    --cc=linux-iio@vger.kernel.org \
    --cc=marek@goldelico.com \
    --cc=mranostay@gmail.com \
    --cc=neilb@suse.de \
    --cc=vlad.dogaru@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).