Commit 71a0151c authored by Sudeep Holla's avatar Sudeep Holla Committed by Rob Herring

Documentation: devicetree: fix reference to legacy wakeup properties

This patch marks all the reference to the legacy wakeup bindings
and replaces them with the standard "wakeup-source" property.

All these legacy property are also listed under a separate section in
the generic wakeup-source binding document.

Cc: Rob Herring <robh+dt@kernel.org>
Cc: Pawel Moll <pawel.moll@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Ian Campbell <ijc+devicetree@hellion.org.uk>
Signed-off-by: default avatarSudeep Holla <sudeep.holla@arm.com>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent a68eee4c
...@@ -441,7 +441,7 @@ EXAMPLE: ...@@ -441,7 +441,7 @@ EXAMPLE:
regmap = <&snvs>; regmap = <&snvs>;
interrupts = <0 4 0x4> interrupts = <0 4 0x4>
linux,keycode = <116>; /* KEY_POWER */ linux,keycode = <116>; /* KEY_POWER */
wakeup; wakeup-source;
}; };
===================================================================== =====================================================================
...@@ -530,7 +530,7 @@ FULL EXAMPLE ...@@ -530,7 +530,7 @@ FULL EXAMPLE
regmap = <&sec_mon>; regmap = <&sec_mon>;
interrupts = <0 4 0x4>; interrupts = <0 4 0x4>;
linux,keycode = <116>; /* KEY_POWER */ linux,keycode = <116>; /* KEY_POWER */
wakeup; wakeup-source;
}; };
}; };
......
...@@ -65,6 +65,7 @@ Optional properties: ...@@ -65,6 +65,7 @@ Optional properties:
pendown-gpio GPIO handle describing the pin the !PENIRQ pendown-gpio GPIO handle describing the pin the !PENIRQ
line is connected to. line is connected to.
wakeup-source use any event on touchscreen as wakeup event. wakeup-source use any event on touchscreen as wakeup event.
(Legacy property support: "linux,wakeup")
Example for a TSC2046 chip connected to an McSPI controller of an OMAP SoC:: Example for a TSC2046 chip connected to an McSPI controller of an OMAP SoC::
...@@ -86,6 +87,6 @@ Example for a TSC2046 chip connected to an McSPI controller of an OMAP SoC:: ...@@ -86,6 +87,6 @@ Example for a TSC2046 chip connected to an McSPI controller of an OMAP SoC::
ti,x-plate-ohms = /bits/ 16 <40>; ti,x-plate-ohms = /bits/ 16 <40>;
ti,pressure-max = /bits/ 16 <255>; ti,pressure-max = /bits/ 16 <255>;
linux,wakeup; wakeup-source;
}; };
}; };
...@@ -21,6 +21,7 @@ Optional subnode-properties: ...@@ -21,6 +21,7 @@ Optional subnode-properties:
- debounce-interval: Debouncing interval time in milliseconds. - debounce-interval: Debouncing interval time in milliseconds.
If not specified defaults to 5. If not specified defaults to 5.
- wakeup-source: Boolean, button can wake-up the system. - wakeup-source: Boolean, button can wake-up the system.
(Legacy property supported: "gpio-key,wakeup")
Example nodes: Example nodes:
......
...@@ -24,6 +24,7 @@ Optional subnode-properties: ...@@ -24,6 +24,7 @@ Optional subnode-properties:
- debounce-interval: Debouncing interval time in milliseconds. - debounce-interval: Debouncing interval time in milliseconds.
If not specified defaults to 5. If not specified defaults to 5.
- wakeup-source: Boolean, button can wake-up the system. - wakeup-source: Boolean, button can wake-up the system.
(Legacy property supported: "gpio-key,wakeup")
- linux,can-disable: Boolean, indicates that button is connected - linux,can-disable: Boolean, indicates that button is connected
to dedicated (not shared) interrupt which can be disabled to to dedicated (not shared) interrupt which can be disabled to
suppress events from the button. suppress events from the button.
......
...@@ -20,6 +20,7 @@ Required Properties: ...@@ -20,6 +20,7 @@ Required Properties:
Optional Properties: Optional Properties:
- linux,no-autorepeat: do no enable autorepeat feature. - linux,no-autorepeat: do no enable autorepeat feature.
- wakeup-source: use any event on keypad as wakeup event. - wakeup-source: use any event on keypad as wakeup event.
(Legacy property supported: "linux,wakeup")
- debounce-delay-ms: debounce interval in milliseconds - debounce-delay-ms: debounce interval in milliseconds
- col-scan-delay-us: delay, measured in microseconds, that is needed - col-scan-delay-us: delay, measured in microseconds, that is needed
before we can scan keypad after activating column gpio before we can scan keypad after activating column gpio
......
...@@ -29,7 +29,8 @@ matrix-keyboard bindings: ...@@ -29,7 +29,8 @@ matrix-keyboard bindings:
- nvidia,debounce-delay-ms: delay in milliseconds per row scan for debouncing - nvidia,debounce-delay-ms: delay in milliseconds per row scan for debouncing
- nvidia,repeat-delay-ms: delay in milliseconds before repeat starts - nvidia,repeat-delay-ms: delay in milliseconds before repeat starts
- nvidia,ghost-filter: enable ghost filtering for this device - nvidia,ghost-filter: enable ghost filtering for this device
- nvidia,wakeup-source: configure keyboard as a wakeup source for suspend/resume - wakeup-source: configure keyboard as a wakeup source for suspend/resume
(Legacy property supported: "nvidia,wakeup-source")
Example: Example:
......
...@@ -37,6 +37,7 @@ PROPERTIES ...@@ -37,6 +37,7 @@ PROPERTIES
Usage: optional Usage: optional
Value type: <bool> Value type: <bool>
Definition: use any event on keypad as wakeup event. Definition: use any event on keypad as wakeup event.
(Legacy property supported: "linux,keypad-wakeup")
- keypad,num-rows: - keypad,num-rows:
Usage: required Usage: required
......
...@@ -38,6 +38,7 @@ Required Board Specific Properties: ...@@ -38,6 +38,7 @@ Required Board Specific Properties:
Optional Properties: Optional Properties:
- wakeup-source: use any event on keypad as wakeup event. - wakeup-source: use any event on keypad as wakeup event.
(Legacy property supported: "linux,input-wakeup")
Optional Properties specific to linux: Optional Properties specific to linux:
- linux,keypad-no-autorepeat: do no enable autorepeat feature. - linux,keypad-no-autorepeat: do no enable autorepeat feature.
...@@ -51,7 +52,7 @@ Example: ...@@ -51,7 +52,7 @@ Example:
samsung,keypad-num-rows = <2>; samsung,keypad-num-rows = <2>;
samsung,keypad-num-columns = <8>; samsung,keypad-num-columns = <8>;
linux,input-no-autorepeat; linux,input-no-autorepeat;
linux,input-wakeup; wakeup-source;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&keypad_rows &keypad_columns>; pinctrl-0 = <&keypad_rows &keypad_columns>;
......
...@@ -56,6 +56,7 @@ Optional nodes: ...@@ -56,6 +56,7 @@ Optional nodes:
bindings/input/matrix-keymap.txt bindings/input/matrix-keymap.txt
- linux,no-autorepeat: do no enable autorepeat feature. - linux,no-autorepeat: do no enable autorepeat feature.
- wakeup-source: use any event on keypad as wakeup event. - wakeup-source: use any event on keypad as wakeup event.
(Legacy property supported: "linux,wakeup")
Example: Example:
......
...@@ -67,7 +67,8 @@ polarity is in effect. ...@@ -67,7 +67,8 @@ polarity is in effect.
Optional SDIO properties: Optional SDIO properties:
- keep-power-in-suspend: Preserves card power during a suspend/resume cycle - keep-power-in-suspend: Preserves card power during a suspend/resume cycle
- enable-sdio-wakeup: Enables wake up of host system on SDIO IRQ assertion - wakeup-source: Enables wake up of host system on SDIO IRQ assertion
(Legacy property supported: "enable-sdio-wakeup")
MMC power sequences: MMC power sequences:
...@@ -117,7 +118,7 @@ sdhci@ab000000 { ...@@ -117,7 +118,7 @@ sdhci@ab000000 {
wp-gpios = <&gpio 70 0>; wp-gpios = <&gpio 70 0>;
max-frequency = <50000000>; max-frequency = <50000000>;
keep-power-in-suspend; keep-power-in-suspend;
enable-sdio-wakeup; wakeup-source;
mmc-pwrseq = <&sdhci0_pwrseq> mmc-pwrseq = <&sdhci0_pwrseq>
} }
......
...@@ -5,7 +5,7 @@ consisting of a compatible field, an address and possibly an interrupt ...@@ -5,7 +5,7 @@ consisting of a compatible field, an address and possibly an interrupt
line). line).
Nonetheless, it also supports an option boolean property Nonetheless, it also supports an option boolean property
("isil,irq2-can-wakeup-machine") to handle the specific use-case found ("wakeup-source") to handle the specific use-case found
on at least three in-tree users of the chip (NETGEAR ReadyNAS 102, 104 on at least three in-tree users of the chip (NETGEAR ReadyNAS 102, 104
and 2120 ARM-based NAS); On those devices, the IRQ#2 pin of the chip and 2120 ARM-based NAS); On those devices, the IRQ#2 pin of the chip
(associated with the alarm supported by the driver) is not connected (associated with the alarm supported by the driver) is not connected
...@@ -22,9 +22,9 @@ Required properties supported by the device: ...@@ -22,9 +22,9 @@ Required properties supported by the device:
Optional properties: Optional properties:
- "isil,irq2-can-wakeup-machine": mark the chip as a wakeup source, - "wakeup-source": mark the chip as a wakeup source, independently of
independently of the availability of an IRQ line connected to the the availability of an IRQ line connected to the SoC.
SoC. (Legacy property supported: "isil,irq2-can-wakeup-machine")
- "interrupt-parent", "interrupts": for passing the interrupt line - "interrupt-parent", "interrupts": for passing the interrupt line
of the SoC connected to IRQ#2 of the RTC chip. of the SoC connected to IRQ#2 of the RTC chip.
...@@ -74,5 +74,5 @@ PMIC, allowing the device to be started based on configured alarm: ...@@ -74,5 +74,5 @@ PMIC, allowing the device to be started based on configured alarm:
isl12057: isl12057@68 { isl12057: isl12057@68 {
compatible = "isil,isl12057"; compatible = "isil,isl12057";
reg = <0x68>; reg = <0x68>;
isil,irq2-can-wakeup-machine; wakeup-source;
}; };
...@@ -5,12 +5,13 @@ Required properties: ...@@ -5,12 +5,13 @@ Required properties:
- comapatible: Should be "ibm,opal-rtc" - comapatible: Should be "ibm,opal-rtc"
Optional properties: Optional properties:
- has-tpo: Decides if the wakeup is supported or not. - wakeup-source: Decides if the wakeup is supported or not
(Legacy property supported: "has-tpo")
Example: Example:
rtc { rtc {
compatible = "ibm,opal-rtc"; compatible = "ibm,opal-rtc";
has-tpo; wakeup-source;
phandle = <0x10000029>; phandle = <0x10000029>;
linux,phandle = <0x10000029>; linux,phandle = <0x10000029>;
}; };
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment