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

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

Merge "defconfig: sdm429w: Remove function tracer support"

parents 2e2aaef5 0fc3231c

arch/arm/configs/vendor/sdm429-bg_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -674,7 +674,6 @@ CONFIG_FAULT_INJECTION_STACKTRACE_FILTER=y 
CONFIG_IPC_LOGGING=y

CONFIG_QCOM_RTB=y

CONFIG_QCOM_RTB_SEPARATE_CPUS=y

CONFIG_FUNCTION_TRACER=y

CONFIG_PREEMPTIRQ_EVENTS=y

CONFIG_IRQSOFF_TRACER=y

CONFIG_PREEMPT_TRACER=y

arch/arm64/boot/dts/qcom/Makefile

+8 −2
Original line number Diff line number Diff line
@@ -490,18 +490,24 @@ endif 
ifeq ($(CONFIG_BUILD_ARM64_DT_OVERLAY),y)

        dtbo-$(CONFIG_ARCH_SDM429W) += sdm429-wtp-overlay.dtbo\

		sdm429-wdp-overlay.dtbo\

		sdm429-bg-dvt2-wtp-overlay.dtbo\

		sda429-wdp-overlay.dtbo\

		sda429-wtp-overlay.dtbo

		sda429-wtp-overlay.dtbo\

		sda429-bg-dvt2-wtp-overlay.dtbo



sdm429-wtp-overlay.dtbo-base := sdm429.dtb

sdm429-wdp-overlay.dtbo-base := sdm429.dtb

sdm429-bg-dvt2-wtp-overlay.dtbo-base := sdm429.dtb

sda429-wtp-overlay.dtbo-base := sda429.dtb

sda429-wdp-overlay.dtbo-base := sda429.dtb

sda429-bg-dvt2-wtp-overlay.dtbo-base := sda429.dtb

else

dtb-$(CONFIG_ARCH_SDM429W) += sdm429-wtp.dtb\

	sdm429-wdp.dtb\

	sdm429-bg-dvt2-wtp.dtb\

	sda429-wtp.dtb\

	sda429-wdp.dtb

	sda429-wdp.dtb\

	sda429-bg-dvt2-wtp.dtb

endif

arch/arm64/boot/dts/qcom/msm-arm-smmu-impl-defs-sdm429.dtsi

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2018,2020, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



&kgsl_smmu {

	attach-impl-defs = <0x6000 0x270>,

		<0x6060 0x1055>,

		<0x6800 0x6>,

		<0x6900 0x3ff>,

		<0x6924 0x204>,

		<0x6928 0x10800>,

		<0x6930 0x400>,

		<0x6960 0xffffffff>,

		<0x6b64 0xa0000>,

		<0x6b68 0xaaab92a>;

};

arch/arm64/boot/dts/qcom/msm-arm-smmu-sdm429.dtsi

0 → 100644
+103 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2015-2018, 2020, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */





&soc {

	kgsl_smmu: arm,smmu-kgsl@1c40000 {

		status = "disabled";

		compatible = "qcom,smmu-v2";

		qcom,tz-device-id = "GPU";

		reg = <0x1c40000 0x10000>;

		#iommu-cells = <1>;

		#global-interrupts = <0>;

		interrupts =  <GIC_SPI 225 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 232 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 233 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 234 IRQ_TYPE_LEVEL_HIGH>;

		qcom,dynamic;

		qcom,use-3-lvl-tables;

		qcom,enable-smmu-halt;

		qcom,skip-init;

		vdd-supply = <&oxili_cx_gdsc>;

		qcom,regulator-names = "vdd";

		clocks = <&gcc GCC_OXILI_AHB_CLK>,

			     <&gcc GCC_BIMC_GFX_CLK>;

		clock-names = "gpu_ahb_clk", "gcc_bimc_gfx_clk";

	};



	/* A test device to test the SMMU operation */

	kgsl_iommu_test_device0 {

		status = "disabled";

		compatible = "iommu-debug-test";

		/* The SID should be valid one to get the proper

		 *SMR,S2CR indices.

		 */

		iommus = <&kgsl_smmu 0x0>;

	};



	apps_iommu: qcom,iommu@1e00000 {

		status = "disabled";

		compatible = "qcom,qsmmu-v500";

		reg = <0x1e00000 0x40000>,

			<0x1ee2000 0x20>;

		reg-names = "base", "tcu-base";

		#iommu-cells = <2>;

		qcom,tz-device-id = "APPS";

		qcom,skip-init;

		qcom,regulator-names = "vdd";

		qcom,enable-static-cb;

		qcom,use-3-lvl-tables;

		qcom,disable-atos;

		#global-interrupts = <0>;

		#size-cells = <1>;

		#address-cells = <1>;

		ranges;

		interrupts = <GIC_SPI 253 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 254 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 255 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 60 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 61 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 94 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 102 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 103 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 104 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 106 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 109 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 113 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 114 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 115 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 116 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 117 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 118 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 119 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 120 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 121 IRQ_TYPE_LEVEL_HIGH>,

				<GIC_SPI 122 IRQ_TYPE_LEVEL_HIGH>;

		clocks = <&gcc GCC_SMMU_CFG_CLK>,

			     <&gcc GCC_APSS_TCU_CLK>;

		clock-names = "iface_clk", "core_clk";

	};

};



#include "msm-arm-smmu-impl-defs-sdm429.dtsi"

arch/arm64/boot/dts/qcom/sda429-bg-dvt2-wtp-overlay.dts

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

 * Copyright (c) 2020, 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

 * only version 2 as published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 */



/dts-v1/;

/plugin/;



#include "sda429-bg-dvt2-wtp.dtsi"



/ {

	model = "Qualcomm Technologies, Inc. SDA429 QRD BG WTP Overlay";

	compatible = "qcom,sdm429w-qrd", "qcom,sdm429w", "qcom,qrd";

	qcom,msm-id = <437 0x0>;

	qcom,board-id = <0x00010b 8>;

	qcom,pmic-id = <0x0002001b 0x0 0x0 0x0>;

};