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

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

Merge "sdxpoorwills_defconfig: Enable tzlog driver"

parents bd1f1351 93ede76f

arch/arm/boot/dts/qcom/sdxpoorwills.dtsi

+5 −0
Original line number Diff line number Diff line
@@ -1166,6 +1166,11 @@ 
		clock-names = "iface_clk";

	};



	qcom_tzlog: tz-log@1468B720 {

		compatible = "qcom,tz-log";

		reg = <0x1468B720 0x2000>;

	};



	qcom_seecom: qseecom@90000000{

		compatible = "qcom,qseecom";

		reg = <0x90000000 0x600000>;

arch/arm/configs/sdxpoorwills-perf_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -402,6 +402,7 @@ CONFIG_PWM=y 
CONFIG_PWM_QPNP=y

CONFIG_QCOM_SHOW_RESUME_IRQ=y

CONFIG_ANDROID=y

CONFIG_MSM_TZ_LOG=y

CONFIG_EXT3_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_VFAT_FS=y

arch/arm/configs/sdxpoorwills_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -407,6 +407,7 @@ CONFIG_PWM=y 
CONFIG_PWM_QPNP=y

CONFIG_QCOM_SHOW_RESUME_IRQ=y

CONFIG_ANDROID=y

CONFIG_MSM_TZ_LOG=y

CONFIG_EXT3_FS=y

CONFIG_EXT4_FS_SECURITY=y

CONFIG_VFAT_FS=y