From d7a57527c7ce282f3ef7d5f1e16422324942f733 Mon Sep 17 00:00:00 2001 From: Mukesh Ojha Date: Fri, 24 Sep 2021 15:22:05 +0530 Subject: [PATCH] ARM: dts: msm: Remove redundant change from Diwali 1. Remove service_locator.enable=1 as it is not used. 2. Remove wdt node as hyp will overlay it on top. Change-Id: I20583b57ea77304ad0df6a8eff95372ba17999a5 --- qcom/diwali.dtsi | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/qcom/diwali.dtsi b/qcom/diwali.dtsi index 551b0279..0e51b838 100644 --- a/qcom/diwali.dtsi +++ b/qcom/diwali.dtsi @@ -24,7 +24,7 @@ chosen: chosen { stdout-path = "/soc/qcom,qup_uart@994000:115200n8"; - bootargs = "console=ttyMSM0,115200n8 loglevel=8 log_buf_len=256K kernel.panic_on_rcu_stall=1 loop.max_part=7 pcie_ports=compat service_locator.enable=1 msm_rtb.filter=0x237 allow_mismatched_32bit_el0 kasan=off rcupdate.rcu_expedited=1 rcu_nocbs=0-7 ftrace_dump_on_oops pstore.compress=none"; + bootargs = "console=ttyMSM0,115200n8 loglevel=8 log_buf_len=256K kernel.panic_on_rcu_stall=1 loop.max_part=7 pcie_ports=compat msm_rtb.filter=0x237 allow_mismatched_32bit_el0 kasan=off rcupdate.rcu_expedited=1 rcu_nocbs=0-7 ftrace_dump_on_oops pstore.compress=none"; }; memory { device_type = "memory"; reg = <0 0 0 0>; }; @@ -442,13 +442,6 @@ qcom,gpios-reserved = <32 33 34 35>; }; - wdog: qcom,wdt@17410000 { - compatible = "qcom,msm-watchdog"; - reg = <0x17410000 0x1000>; - reg-names = "wdt-base"; - interrupts = ; - }; - arch_timer: timer { compatible = "arm,armv8-timer"; interrupts = ,