Commit 094d3ee3 authored by Johan Hovold's avatar Johan Hovold Committed by Linus Torvalds

rtc: omap: drop vendor-prefix from power-controller dt property

Drop the vendor-prefix from the "ti,system-power-controller" device-tree
property name.

It has been agreed to make "system-power-controller" a standard property
and to drop the vendor-prefix that is currently used by several drivers.

Note that drivers that have used "<vendor>,system-power-controller" in a
released kernel will need to support both versions.
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Cc: Tony Lindgren <tony@atomide.com>
Cc: Benot Cousson <bcousson@baylibre.com>
Cc: Alessandro Zummo <a.zummo@towertech.it>
Cc: Felipe Balbi <balbi@ti.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent cf67d0b6
...@@ -13,7 +13,7 @@ Required properties: ...@@ -13,7 +13,7 @@ Required properties:
- interrupt-parent: phandle for the interrupt controller - interrupt-parent: phandle for the interrupt controller
Optional properties: Optional properties:
- ti,system-power-controller: whether the rtc is controlling the system power - system-power-controller: whether the rtc is controlling the system power
through pmic_power_en through pmic_power_en
Example: Example:
...@@ -24,5 +24,5 @@ rtc@1c23000 { ...@@ -24,5 +24,5 @@ rtc@1c23000 {
interrupts = <19 interrupts = <19
19>; 19>;
interrupt-parent = <&intc>; interrupt-parent = <&intc>;
ti,system-power-controller; system-power-controller;
}; };
...@@ -82,5 +82,5 @@ hdmi { ...@@ -82,5 +82,5 @@ hdmi {
}; };
&rtc { &rtc {
ti,system-power-controller; system-power-controller;
}; };
...@@ -502,7 +502,7 @@ static int __init omap_rtc_probe(struct platform_device *pdev) ...@@ -502,7 +502,7 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
rtc->type = of_id->data; rtc->type = of_id->data;
rtc->is_pmic_controller = rtc->type->has_pmic_mode && rtc->is_pmic_controller = rtc->type->has_pmic_mode &&
of_property_read_bool(pdev->dev.of_node, of_property_read_bool(pdev->dev.of_node,
"ti,system-power-controller"); "system-power-controller");
} else { } else {
id_entry = platform_get_device_id(pdev); id_entry = platform_get_device_id(pdev);
rtc->type = (void *)id_entry->driver_data; rtc->type = (void *)id_entry->driver_data;
......
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