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

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

Merge changes I7eb9dcc8,Id7afb172 into msm-4.14 

* changes:
  defconfig: sdm855: Enable TZ-log driver
  ARM: dts: msm: Enable TZ-log driver for sdm855
parents da40bc41 aedd5efd

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

+8 −0
Original line number Diff line number Diff line
@@ -2384,6 +2384,14 @@ 
		};

	};



	qcom_tzlog: tz-log@146bf720 {

		compatible = "qcom,tz-log";

		reg = <0x146bf720 0x3000>;

		qcom,hyplog-enabled;

		hyplog-address-offset = <0x410>;

		hyplog-size-offset = <0x414>;

	};



	dcc: dcc_v2@10a2000 {

		compatible = "qcom,dcc_v2";

		reg = <0x10a2000 0x1000>,

arch/arm64/configs/sdm855-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ CONFIG_ESOC_CLIENT=y 
CONFIG_ESOC_MDM_4x=y

CONFIG_ESOC_MDM_DRV=y

CONFIG_ESOC_MDM_DBG_ENG=y

CONFIG_MSM_TZ_LOG=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT3_FS=y

arch/arm64/configs/sdm855_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -533,6 +533,7 @@ CONFIG_ESOC_DEBUG=y 
CONFIG_ESOC_MDM_4x=y

CONFIG_ESOC_MDM_DRV=y

CONFIG_ESOC_MDM_DBG_ENG=y

CONFIG_MSM_TZ_LOG=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT3_FS=y