2014-11-07 23:30:44

by NeilBrown

[permalink] [raw]

Subject: [PATCH] w1: omap-hdq: support device probing with device-tree.

---

This driver has no 'compatible' string and so is not found when
using device-tree.

Add one with value to match
hdqw1w: 1w@480b2000 {
device in omap3.dtsi.

Signed-off-by: NeilBrown <[email protected]>

diff --git a/Documentation/devicetree/bindings/w1/omap-hdq.txt b/Documentation/devicetree/bindings/w1/omap-hdq.txt
new file mode 100644
index 000000000000..fef794741bd1
--- /dev/null
+++ b/Documentation/devicetree/bindings/w1/omap-hdq.txt
@@ -0,0 +1,17 @@
+* OMAP HDQ One wire bus master controller
+
+Required properties:
+- compatible : should be "ti,omap3-1w"
+- reg : Address and length of the register set for the device
+- interrupts : interrupt line.
+- ti,hwmods : "hdq1w"
+
+Example:
+
+- From omap3.dtsi
+ hdqw1w: 1w@480b2000 {
+ compatible = "ti,omap3-1w";
+ reg = <0x480b2000 0x1000>;
+ interrupts = <58>;
+ ti,hwmods = "hdq1w";
+ };
diff --git a/drivers/w1/masters/omap_hdq.c b/drivers/w1/masters/omap_hdq.c
index 9900e8ec7393..03321d6a2684 100644
--- a/drivers/w1/masters/omap_hdq.c
+++ b/drivers/w1/masters/omap_hdq.c
@@ -72,11 +72,18 @@ struct hdq_data {
static int omap_hdq_probe(struct platform_device *pdev);
static int omap_hdq_remove(struct platform_device *pdev);

+static struct of_device_id omap_hdq_dt_ids[] = {
+ { .compatible = "ti,omap3-1w" },
+ {}
+};
+MODULE_DEVICE_TABLE(of, omap_hdq_dt_ids);
+
static struct platform_driver omap_hdq_driver = {
.probe = omap_hdq_probe,
.remove = omap_hdq_remove,
.driver = {
.name = "omap_hdq",
+ .of_match_table = omap_hdq_dt_ids,
},
};

---

Attachments:

(No filename) (811.00 B)
OpenPGP digital signature

2014-11-10 00:16:35

by Evgeniy Polyakov

[permalink] [raw]

Subject: Re: [PATCH] w1: omap-hdq: support device probing with device-tree.

---

Hi

08.11.2014, 02:30, "NeilBrown" <[email protected]>:
> This driver has no 'compatible' string and so is not found when
> using device-tree.
>
> Add one with value to match
> ????????????????hdqw1w: 1w@480b2000 {
> device in omap3.dtsi.
>
> Signed-off-by: NeilBrown <[email protected]>

Looks good to me
Acked-by: Evgeniy Polyakov <[email protected]>

2014-11-11 00:00:03

by Tony Lindgren

[permalink] [raw]

Subject: Re: [PATCH] w1: omap-hdq: support device probing with device-tree.

---

* Евгений Поляков <[email protected]> [141109 16:11]:
> Hi
>
> 08.11.2014, 02:30, "NeilBrown" <[email protected]>:
> > This driver has no 'compatible' string and so is not found when
> > using device-tree.
> >
> > Add one with value to match
> >                 hdqw1w: 1w@480b2000 {
> > device in omap3.dtsi.
> >
> > Signed-off-by: NeilBrown <[email protected]>
>
> Looks good to me
> Acked-by: Evgeniy Polyakov <[email protected]>

Applying into omap-for-v3.19/drivers branch thanks.

Tony