Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Documentation/devicetree/bindings/rtc/rtc-omap.txt

+2 −2
Original line number Diff line number Diff line
@@ -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;

};

arch/arm/boot/dts/am335x-boneblack.dts

+1 −1
Original line number Diff line number Diff line
@@ -82,5 +82,5 @@ 
};



&rtc {

	ti,system-power-controller;

	system-power-controller;

};

drivers/rtc/rtc-omap.c

+1 −1
Original line number Diff line number Diff line
@@ -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;