diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-29 21:29:12 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2015-05-29 21:29:12 +1000 |
| commit | e4eacbea9a418a88bc4a2b44db5ed6b2250afde0 (patch) | |
| tree | 50760896ecca78281df27906769fa19b670dc805 /Documentation/devicetree/bindings/w1/omap-hdq.txt | |
| parent | c12d56184d6f6526261d6b1811ddc63aa8db8b1d (diff) | |
| parent | 8c169d94c31fced71d907e26b19b4f5f0bd9d7bf (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/x86/kernel/machine_kexec_64.c
drivers/staging/android/lowmemorykiller.c
Diffstat (limited to 'Documentation/devicetree/bindings/w1/omap-hdq.txt')
| -rw-r--r-- | Documentation/devicetree/bindings/w1/omap-hdq.txt | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/w1/omap-hdq.txt b/Documentation/devicetree/bindings/w1/omap-hdq.txt index fef794741bd1..913c5f91a0f9 100644 --- a/Documentation/devicetree/bindings/w1/omap-hdq.txt +++ b/Documentation/devicetree/bindings/w1/omap-hdq.txt @@ -1,11 +1,15 @@ * OMAP HDQ One wire bus master controller Required properties: -- compatible : should be "ti,omap3-1w" +- compatible : should be "ti,omap3-1w" or "ti,am4372-hdq" - reg : Address and length of the register set for the device - interrupts : interrupt line. - ti,hwmods : "hdq1w" +Optional properties: +- ti,mode: should be "hdq": HDQ mode "1w": one-wire mode. + If not specified HDQ mode is implied. + Example: - From omap3.dtsi @@ -14,4 +18,5 @@ Example: reg = <0x480b2000 0x1000>; interrupts = <58>; ti,hwmods = "hdq1w"; + ti,mode = "hdq"; }; |