Merge "coresight: tpdm: Don't disable clk and regulator when enabled" (3b70ca42) · Commits · e / devices / android_kernel_oneplus_sm8150

arch/arm64/boot/dts/qcom/sm8150-coresight.dtsi

+1 −4

Original line number	Diff line number	Diff line
		@@ -1771,8 +1771,7 @@
		"npu_core_clk_src",
		"npu_core_cti_clk";

		qcom,tpdm-clks = "apb_pclk",
		"gcc_npu_trig_clk",
		qcom,tpdm-clks = "gcc_npu_trig_clk",
		"gcc_npu_at_clk",
		"npu_core_apb_clk",
		"npu_core_atb_clk",
		@@ -1782,8 +1781,6 @@

		vdd-supply = <&npu_core_gdsc>;
		vdd_cx-supply = <&VDD_CX_LEVEL>;
		qcom,proxy-reg-names ="vdd", "vdd_cx";
		qcom,vdd_cx-uV-uA = <RPMH_REGULATOR_LEVEL_TURBO 100000>;
		qcom,tpdm-regs = "vdd", "vdd_cx";

		port{

+8 −5

Original line number	Diff line number	Diff line
		@@ -690,7 +690,12 @@ static int tpdm_enable(struct coresight_device *csdev,
		struct perf_event *event, u32 mode)
		{
		struct tpdm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);
		int ret;
		int ret = 0;

		if (drvdata->enable) {
		dev_err(drvdata->dev, "TPDM setup already enabled,Skipping enable");
		return ret;
		}

		ret = tpdm_setup_enable(drvdata);
		if (ret) {
		@@ -703,8 +708,6 @@ static int tpdm_enable(struct coresight_device *csdev,
		drvdata->enable = true;
		mutex_unlock(&drvdata->lock);

		tpdm_setup_disable(drvdata);

		dev_info(drvdata->dev, "TPDM tracing enabled\n");
		return 0;
		}
		@@ -773,8 +776,8 @@ static void tpdm_disable(struct coresight_device *csdev,
		{
		struct tpdm_drvdata *drvdata = dev_get_drvdata(csdev->dev.parent);

		if (tpdm_setup_enable(drvdata)) {
		dev_err(drvdata->dev, "TPDM setup failed. Skipping disable");
		if (!drvdata->enable) {
		dev_err(drvdata->dev, "TPDM setup already disabled, Skipping disable");
		return;
		}
		mutex_lock(&drvdata->lock);