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

Commit d03820b8 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Disable watchdog for Lahaina-RUMI"

parents f44b1b4d a542936e

qcom/lahaina-rumi.dtsi

+8 −0
Original line number Original line Diff line number Diff line 
#include "lahaina-pmic-overlay.dtsi"

#include "lahaina-pmic-overlay.dtsi"

#include <dt-bindings/gpio/gpio.h>

#include <dt-bindings/gpio/gpio.h>





&arch_timer {

	clock-frequency = <96000>;

};



&wdog {

	status = "disabled";

};



&spmi_debug_bus {

&spmi_debug_bus {

	status = "ok";

	status = "ok";

};

};

qcom/lahaina.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -510,7 +510,7 @@ 
			     <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>,

			     <GIC_PPI 12 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;

			     <GIC_PPI 12 (GIC_CPU_MASK_SIMPLE(8) | IRQ_TYPE_LEVEL_LOW)>;

		clock-frequency = <96000>;

		clock-frequency = <19200000>;

	};

	};





	memtimer: timer@17c20000 {

	memtimer: timer@17c20000 {