linux-kernel - [PATCH] w1: ds2482: add device tree probe support

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Date:	Mon, 25 Mar 2013 17:21:34 +0100
From:	Hector Palacios <hector.palacios@...i.com>
To:	<linux-kernel@...r.kernel.org>
CC:	<zbr@...emap.net>, <hector.palacios@...i.com>
Subject: [PATCH] w1: ds2482: add device tree probe support

It adds device tree probe support for ds2482 driver.

Signed-off-by: Hector Palacios <hector.palacios@...i.com>
---
 .../devicetree/bindings/i2c/trivial-devices.txt    |    1 +
 drivers/w1/masters/ds2482.c                        |    9 ++++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/i2c/trivial-devices.txt b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
index 446859f..c16882b 100644
--- a/Documentation/devicetree/bindings/i2c/trivial-devices.txt
+++ b/Documentation/devicetree/bindings/i2c/trivial-devices.txt
@@ -36,6 +36,7 @@ fsl,mma8450		MMA8450Q: Xtrinsic Low-power, 3-axis Xtrinsic Accelerometer
 fsl,mpr121		MPR121: Proximity Capacitive Touch Sensor Controller
 fsl,sgtl5000		SGTL5000: Ultra Low-Power Audio Codec
 maxim,ds1050		5 Bit Programmable, Pulse-Width Modulator
+maxim,ds2482		i2c to w1-master bridge(s)
 maxim,max1237		Low-Power, 4-/12-Channel, 2-Wire Serial, 12-Bit ADCs
 maxim,max6625		9-Bit/12-Bit Temperature Sensors with I²C-Compatible Serial Interface
 mc,rv3029c2		Real Time Clock Module with I2C-Bus
diff --git a/drivers/w1/masters/ds2482.c b/drivers/w1/masters/ds2482.c
index 6429b9e..a93e431 100644
--- a/drivers/w1/masters/ds2482.c
+++ b/drivers/w1/masters/ds2482.c
@@ -19,6 +19,7 @@
 #include <linux/i2c.h>
 #include <linux/delay.h>
 #include <asm/delay.h>
+#include <linux/of_device.h>
 
 #include "../w1.h"
 #include "../w1_int.h"
@@ -85,7 +86,6 @@ static int ds2482_probe(struct i2c_client *client,
 			const struct i2c_device_id *id);
 static int ds2482_remove(struct i2c_client *client);
 
-
 /**
  * Driver data (common to all clients)
  */
@@ -94,10 +94,17 @@ static const struct i2c_device_id ds2482_id[] = {
 	{ }
 };
 
+static const struct of_device_id ds2482_dt_ids[] = {
+	{ .compatible = "maxim,ds2482" },
+	{}
+};
+MODULE_DEVICE_TABLE(i2c, ds2482_dt_ids);
+
 static struct i2c_driver ds2482_driver = {
 	.driver = {
 		.owner	= THIS_MODULE,
 		.name	= "ds2482",
+		.of_match_table = ds2482_dt_ids,
 	},
 	.probe		= ds2482_probe,
 	.remove		= ds2482_remove,
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/