diff options
author | Johan Hovold <johan@kernel.org> | 2014-12-11 00:54:14 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-11 02:41:16 +0100 |
commit | 094d3ee3ce8c30756446518cc1895b6bbbca12ef (patch) | |
tree | 2aa971d03eeb983b3d04c87619c78b516f81a73e /drivers/rtc | |
parent | drivers/rtc/rtc-isl12057.c: report error code upon failure in dev_err() calls (diff) | |
download | linux-094d3ee3ce8c30756446518cc1895b6bbbca12ef.tar.xz linux-094d3ee3ce8c30756446518cc1895b6bbbca12ef.zip |
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: 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>
Diffstat (limited to 'drivers/rtc')
-rw-r--r-- | drivers/rtc/rtc-omap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/rtc/rtc-omap.c b/drivers/rtc/rtc-omap.c index fba13e53c278..4f1c6ca97211 100644 --- a/drivers/rtc/rtc-omap.c +++ b/drivers/rtc/rtc-omap.c @@ -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; |