diff options
author | Tim Kryger <tkryger@google.com> | 2021-12-10 09:44:24 -0800 |
---|---|---|
committer | Tim Kryger <tkryger@google.com> | 2021-12-10 10:08:18 -0800 |
commit | 890b63eab641fb992cff30a56eee6ad186210fb9 (patch) | |
tree | ef69bd40c742afbe89e69352edee94c5a530fafe | |
parent | 7cc6bd7d15686b51b59fa30122e0b8d56c7b571c (diff) | |
download | devicetree-890b63eab641fb992cff30a56eee6ad186210fb9.tar.gz |
Keep S3C RTC block disabled on EVT and later
Prior to EVT / Dev3, the 32k used by haptics, mcu, and other external
ICs was sourced from the RTCCLKOUT pin associated with the RTC block
in the main part of the SoC and in order to enable the output of the
clock, the s3c-rtc driver needed to be loaded to configure registers.
However, now the 32k is being sourced from the PERI32K pin of the PMIC
such that no driver is needed and furthermore, it now appears that the
s3c-rtc driver is unexpectedly seeing interrupts and taking wakelocks
which is causing attempted entries into suspend to abort.
Since this driver is not necessary and is creating problems, keep it
from activating by marking the hardware declaration disabled within
the device tree.
Bug: 209870351
Test: No s3c2410-rtc in /proc/interrupts and 32k present at R212 on Dev3
Change-Id: I8b2ffbbde67076d150795c3cb14e324ff465515e
-rw-r--r-- | r11_audio_haptics.dtsi | 2 | ||||
-rw-r--r-- | r11_dev2_boe_overlay.dts | 4 | ||||
-rw-r--r-- | r11_dev2_btwifi_boe_overlay.dts | 4 | ||||
-rw-r--r-- | r11_dev2_btwifi_overlay.dts | 4 | ||||
-rw-r--r-- | r11_dev2_no_nfc_boe_overlay.dts | 4 | ||||
-rw-r--r-- | r11_dev2_no_nfc_overlay.dts | 4 | ||||
-rw-r--r-- | r11_dev2_overlay.dts | 4 | ||||
-rw-r--r-- | r11_dev2_swap_audio_no_nfc_auo_overlay.dts | 4 | ||||
-rw-r--r-- | r11_dev2_swap_audio_no_nfc_boe_overlay.dts | 4 | ||||
-rw-r--r-- | r11_proto11_no_nfc_overlay.dts | 4 | ||||
-rw-r--r-- | r11_proto1_btwifi_overlay.dts | 4 | ||||
-rw-r--r-- | r11_proto1_overlay.dts | 4 |
12 files changed, 45 insertions, 1 deletions
diff --git a/r11_audio_haptics.dtsi b/r11_audio_haptics.dtsi index 1e73132..1b5db97 100644 --- a/r11_audio_haptics.dtsi +++ b/r11_audio_haptics.dtsi @@ -53,7 +53,7 @@ // Used to generate 32kHz reference clock for haptics and BT/Wifi devices &exynos_rtc { - status = "ok"; + status = "disabled"; pinctrl-names = "default"; pinctrl-0 = <&haptics_refclk>; }; diff --git a/r11_dev2_boe_overlay.dts b/r11_dev2_boe_overlay.dts index b916c14..e315355 100644 --- a/r11_dev2_boe_overlay.dts +++ b/r11_dev2_boe_overlay.dts @@ -46,6 +46,10 @@ status = "ok"; }; +&exynos_rtc { + status = "ok"; +}; + &dev2_cs40l25 { status = "ok"; }; diff --git a/r11_dev2_btwifi_boe_overlay.dts b/r11_dev2_btwifi_boe_overlay.dts index 3ed07e2..b3d5e74 100644 --- a/r11_dev2_btwifi_boe_overlay.dts +++ b/r11_dev2_btwifi_boe_overlay.dts @@ -46,6 +46,10 @@ status = "ok"; }; +&exynos_rtc { + status = "ok"; +}; + &dev2_cs40l25 { status = "ok"; }; diff --git a/r11_dev2_btwifi_overlay.dts b/r11_dev2_btwifi_overlay.dts index fb86a2a..4e7c486 100644 --- a/r11_dev2_btwifi_overlay.dts +++ b/r11_dev2_btwifi_overlay.dts @@ -46,6 +46,10 @@ status = "ok"; }; +&exynos_rtc { + status = "ok"; +}; + &dev2_cs40l25 { status = "ok"; }; diff --git a/r11_dev2_no_nfc_boe_overlay.dts b/r11_dev2_no_nfc_boe_overlay.dts index 4935380..bf88cb2 100644 --- a/r11_dev2_no_nfc_boe_overlay.dts +++ b/r11_dev2_no_nfc_boe_overlay.dts @@ -46,6 +46,10 @@ status = "ok"; }; +&exynos_rtc { + status = "ok"; +}; + &dev2_cs40l25 { status = "ok"; }; diff --git a/r11_dev2_no_nfc_overlay.dts b/r11_dev2_no_nfc_overlay.dts index 4e3d98f..58a0228 100644 --- a/r11_dev2_no_nfc_overlay.dts +++ b/r11_dev2_no_nfc_overlay.dts @@ -46,6 +46,10 @@ status = "ok"; }; +&exynos_rtc { + status = "ok"; +}; + &dev2_cs40l25 { status = "ok"; }; diff --git a/r11_dev2_overlay.dts b/r11_dev2_overlay.dts index f142985..a21c220 100644 --- a/r11_dev2_overlay.dts +++ b/r11_dev2_overlay.dts @@ -46,6 +46,10 @@ status = "ok"; }; +&exynos_rtc { + status = "ok"; +}; + &dev2_cs40l25 { status = "ok"; }; diff --git a/r11_dev2_swap_audio_no_nfc_auo_overlay.dts b/r11_dev2_swap_audio_no_nfc_auo_overlay.dts index f5a3fee..c7d8720 100644 --- a/r11_dev2_swap_audio_no_nfc_auo_overlay.dts +++ b/r11_dev2_swap_audio_no_nfc_auo_overlay.dts @@ -46,6 +46,10 @@ status = "ok"; }; +&exynos_rtc { + status = "ok"; +}; + &dev2_cs40l25 { status = "ok"; }; diff --git a/r11_dev2_swap_audio_no_nfc_boe_overlay.dts b/r11_dev2_swap_audio_no_nfc_boe_overlay.dts index 30e8ab9..e949739 100644 --- a/r11_dev2_swap_audio_no_nfc_boe_overlay.dts +++ b/r11_dev2_swap_audio_no_nfc_boe_overlay.dts @@ -46,6 +46,10 @@ status = "ok"; }; +&exynos_rtc { + status = "ok"; +}; + &dev2_cs40l25 { status = "ok"; }; diff --git a/r11_proto11_no_nfc_overlay.dts b/r11_proto11_no_nfc_overlay.dts index 75bc618..1a03ea0 100644 --- a/r11_proto11_no_nfc_overlay.dts +++ b/r11_proto11_no_nfc_overlay.dts @@ -46,6 +46,10 @@ status = "ok"; }; +&exynos_rtc { + status = "ok"; +}; + &proto1_cs40l25 { status = "ok"; }; diff --git a/r11_proto1_btwifi_overlay.dts b/r11_proto1_btwifi_overlay.dts index 966f245..bafb48a 100644 --- a/r11_proto1_btwifi_overlay.dts +++ b/r11_proto1_btwifi_overlay.dts @@ -48,6 +48,10 @@ status = "ok"; }; +&exynos_rtc { + status = "ok"; +}; + &proto1_cs40l25 { status = "ok"; }; diff --git a/r11_proto1_overlay.dts b/r11_proto1_overlay.dts index 4cbbabe..31518fc 100644 --- a/r11_proto1_overlay.dts +++ b/r11_proto1_overlay.dts @@ -46,6 +46,10 @@ status = "ok"; }; +&exynos_rtc { + status = "ok"; +}; + &proto1_cs40l25 { status = "ok"; }; |