luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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: Johan 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: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Johan Hovold 2014-12-10 15:54:14 -08:00 committed by Linus Torvalds
parent cf67d0b641
commit 094d3ee3ce
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Documentation/devicetree/bindings/rtc/rtc-omap.txt
View File

@ -13,7 +13,7 @@ Required properties:
- interrupt-parent: phandle for the interrupt controller
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
Example:
@ -24,5 +24,5 @@ rtc@1c23000 {
interrupts = <19
19>;
interrupt-parent = <&intc>;
ti,system-power-controller;
system-power-controller;
};

2
arch/arm/boot/dts/am335x-boneblack.dts
View File

@ -82,5 +82,5 @@ hdmi {
};
&rtc {
ti,system-power-controller;
system-power-controller;
};

2
drivers/rtc/rtc-omap.c
View File

@ -502,7 +502,7 @@ static int __init omap_rtc_probe(struct platform_device *pdev)
rtc->type = of_id->data;
rtc->is_pmic_controller = rtc->type->has_pmic_mode &&
of_property_read_bool(pdev->dev.of_node,
"ti,system-power-controller");
"system-power-controller");
} else {
id_entry = platform_get_device_id(pdev);
rtc->type = (void *)id_entry->driver_data;