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

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

Merge "ARM: dts: msm: Increase size of ETR to 32MB for couple of SoCs"

parents 7f6e82d8 3212922a

arch/arm/boot/dts/qcom/msm8937-coresight.dtsi

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -20,7 +20,7 @@ 
		interrupts = <0 166 0>;

		interrupt-names = "byte-cntr-irq";



		qcom,memory-size = <0x100000>;

		qcom,memory-size = <0x2000000>;

		qcom,sg-enable;

		qcom,force-reg-dump;

arch/arm/boot/dts/qcom/msmgold-coresight.dtsi

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015, The Linux Foundation. All rights reserved.

 * Copyright (c) 2015-2016, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -20,7 +20,7 @@ 
		interrupts = <0 166 0>;

		interrupt-names = "byte-cntr-irq";



		qcom,memory-size = <0x100000>;

		qcom,memory-size = <0x2000000>;

		qcom,sg-enable;

		qcom,force-reg-dump;

arch/arm/boot/dts/qcom/msmtitanium-coresight.dtsi

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
		interrupts = <0 166 0>;

		interrupt-names = "byte-cntr-irq";



		qcom,memory-size = <0x100000>;

		qcom,memory-size = <0x2000000>;

		qcom,sg-enable;

		qcom,force-reg-dump;

arch/arm/configs/msm8937_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -223,6 +223,7 @@ CONFIG_IPC_ROUTER=y 
CONFIG_IPC_ROUTER_SECURITY=y

CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y

CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=40

CONFIG_ZRAM=y

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

arch/arm/configs/msmcortex_defconfig

+1 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ CONFIG_IPC_ROUTER=y 
CONFIG_IPC_ROUTER_SECURITY=y

CONFIG_FW_LOADER_USER_HELPER_FALLBACK=y

CONFIG_DMA_CMA=y

CONFIG_CMA_SIZE_MBYTES=40

CONFIG_BLK_DEV_LOOP=y

CONFIG_BLK_DEV_RAM=y

CONFIG_QSEECOM=y