diff options
-rw-r--r-- | Documentation/devicetree/bindings/rtc/rtc-omap.txt | 4 | ||||
-rw-r--r-- | arch/arm/boot/dts/am335x-boneblack.dts | 2 | ||||
-rw-r--r-- | drivers/rtc/rtc-omap.c | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/rtc/rtc-omap.txt b/Documentation/devicetree/bindings/rtc/rtc-omap.txt index 750efd40c72e..4ba4dbd34289 100644 --- a/Documentation/devicetree/bindings/rtc/rtc-omap.txt +++ b/Documentation/devicetree/bindings/rtc/rtc-omap.txt | |||
@@ -13,7 +13,7 @@ Required properties: | |||
13 | - interrupt-parent: phandle for the interrupt controller | 13 | - interrupt-parent: phandle for the interrupt controller |
14 | 14 | ||
15 | Optional properties: | 15 | Optional properties: |
16 | - ti,system-power-controller: whether the rtc is controlling the system power | 16 | - system-power-controller: whether the rtc is controlling the system power |
17 | through pmic_power_en | 17 | through pmic_power_en |
18 | 18 | ||
19 | Example: | 19 | Example: |
@@ -24,5 +24,5 @@ rtc@1c23000 { | |||
24 | interrupts = <19 | 24 | interrupts = <19 |
25 | 19>; | 25 | 19>; |
26 | interrupt-parent = <&intc>; | 26 | interrupt-parent = <&intc>; |
27 | ti,system-power-controller; | 27 | system-power-controller; |
28 | }; | 28 | }; |
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 @@ | |||
82 | }; | 82 | }; |
83 | 83 | ||
84 | &rtc { | 84 | &rtc { |
85 | ti,system-power-controller; | 85 | system-power-controller; |
86 | }; | 86 | }; |
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) | |||
502 | rtc->type = of_id->data; | 502 | rtc->type = of_id->data; |
503 | rtc->is_pmic_controller = rtc->type->has_pmic_mode && | 503 | rtc->is_pmic_controller = rtc->type->has_pmic_mode && |
504 | of_property_read_bool(pdev->dev.of_node, | 504 | of_property_read_bool(pdev->dev.of_node, |
505 | "ti,system-power-controller"); | 505 | "system-power-controller"); |
506 | } else { | 506 | } else { |
507 | id_entry = platform_get_device_id(pdev); | 507 | id_entry = platform_get_device_id(pdev); |
508 | rtc->type = (void *)id_entry->driver_data; | 508 | rtc->type = (void *)id_entry->driver_data; |