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

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

Merge "ARM: dts: msm: Correct soc id for monaco"

parents 6294a767 67f36f02

qcom/monaco-rumi.dts

+1 −1
Original line number Diff line number Diff line 
/dts-v1/;

/memreserve/ 0x90000000 0x00000100;

/memreserve/ 0x90f00000 0x00000100;



#include "monaco.dtsi"

#include "monaco-rumi.dtsi"

qcom/monaco-rumi.dtsi

+2 −2
Original line number Diff line number Diff line 
&soc {

	timer {

		clock-frequency = <500000>;

		clock-frequency = <5000000>;

	};



	timer@f120000 {

		clock-frequency = <500000>;

		clock-frequency = <5000000>;

	};



	wdog: qcom,wdt@f017000 {

qcom/monaco.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
/ {

	model = "Qualcomm Technologies, Inc. Monaco";

	compatible = "qcom,monaco";

	qcom,msm-id = <459 0x10000>;

	qcom,msm-id = <486 0x10000>;

	interrupt-parent = <&intc>;



	#address-cells = <2>;