summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2014-12-10 15:54:14 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-10 17:41:16 -0800
commit094d3ee3ce8c30756446518cc1895b6bbbca12ef (patch)
tree2aa971d03eeb983b3d04c87619c78b516f81a73e /arch/arm
parentcf67d0b6410182eefd4db665279fce76c9a19cf9 (diff)
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 'arch/arm')
-rw-r--r--arch/arm/boot/dts/am335x-boneblack.dts2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/am335x-boneblack.dts b/arch/arm/boot/dts/am335x-boneblack.dts
index 520b63605eb6..5c42d259fa68 100644
--- a/arch/arm/boot/dts/am335x-boneblack.dts
+++ b/arch/arm/boot/dts/am335x-boneblack.dts
@@ -82,5 +82,5 @@
};
&rtc {
- ti,system-power-controller;
+ system-power-controller;
};