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

Commit 541d78fe authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes Ic919b0f7,I4c2b67e3 into msm-next 

* changes:
  ARM: dts: msm: Add wdog device for SDM855
  ARM: dts: msm: Add memory dump devices for SDM855
parents ef853ef1 5ca944aa

arch/arm64/boot/dts/qcom/sdm855.dtsi

+72 −0
Original line number Diff line number Diff line
@@ -430,6 +430,12 @@ 
			size = <0x0 0x5c00000>;

		};



		dump_mem: mem_dump_region {

			compatible = "shared-dma-pool";

			reusable;

			size = <0 0x2400000>;

		};



		/* global autoconfigured region for contiguous allocations */

		linux,cma {

			compatible = "shared-dma-pool";
@@ -637,6 +643,11 @@ 
		#address-cells = <1>;

		#size-cells = <1>;



		mem_dump_table@10 {

			compatible = "qcom,msm-imem-mem_dump_table";

			reg = <0x10 8>;

		};



		restart_reason@65c {

			compatible = "qcom,msm-imem-restart_reason";

			reg = <0x65c 4>;
@@ -945,6 +956,17 @@ 
		qcom,spss-scsr-bits = <24 25>;

	};



	wdog: qcom,wdt@17c10000{

		compatible = "qcom,msm-watchdog";

		reg = <0x17c10000 0x1000>;

		reg-names = "wdt-base";

		interrupts = <0 0 0>, <0 1 0>;

		qcom,bark-time = <11000>;

		qcom,pet-time = <9360>;

		qcom,ipi-ping;

		qcom,wakeup-enable;

	};



	qcom,turing@8300000 {

		compatible = "qcom,pil-tz-generic";

		reg = <0x8300000 0x100000>;
@@ -1430,6 +1452,56 @@ 
		compatible = "qcom,cmd-db";

		reg = <0xc3f000c 8>;

	};



	mem_dump {

		compatible = "qcom,mem-dump";

		memory-region = <&dump_mem>;



		rpmh_dump {

			qcom,dump-size = <0x2000000>;

			qcom,dump-id = <0xec>;

		};



		rpm_sw_dump {

			qcom,dump-size = <0x28000>;

			qcom,dump-id = <0xea>;

		};



		pmic_dump {

			qcom,dump-size = <0x10000>;

			qcom,dump-id = <0xe4>;

		};



		tmc_etf_dump {

			qcom,dump-size = <0x10000>;

			qcom,dump-id = <0xf0>;

		};



		tmc_etf_swao_dump {

			qcom,dump-size = <0x8400>;

			qcom,dump-id = <0xf1>;

		};



		tmc_etr_reg_dump {

			qcom,dump-size = <0x1000>;

			qcom,dump-id = <0x100>;

		};



		tmc_etf_reg_dump {

			qcom,dump-size = <0x1000>;

			qcom,dump-id = <0x101>;

		};



		tmc_etf_swao_reg_dump {

			qcom,dump-size = <0x1000>;

			qcom,dump-id = <0x102>;

		};



		misc_data_dump {

			qcom,dump-size = <0x1000>;

			qcom,dump-id = <0xe8>;

		};

	};

};



&emac_gdsc {