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

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

Merge "coresight: add the fuse check logic for TPDM"

parents 05352690 5b5269dd
Loading
Loading
Loading
Loading
+3 −5
Original line number Diff line number Diff line
@@ -3409,6 +3409,9 @@ static int tpdm_probe(struct platform_device *pdev)
	struct resource *res;
	struct coresight_desc *desc;

	if (coresight_fuse_access_disabled())
		return -EPERM;

	pdata = of_get_coresight_platform_data(dev, pdev->dev.of_node);
	if (IS_ERR(pdata))
		return PTR_ERR(pdata);
@@ -3445,11 +3448,6 @@ static int tpdm_probe(struct platform_device *pdev)
	if (ret)
		return ret;

	if (!coresight_authstatus_enabled(drvdata->base)) {
		clk_disable_unprepare(drvdata->clk);
		return -EPERM;
	}

	pidr = tpdm_readl(drvdata, CORESIGHT_PERIPHIDR0);
	for (i = 0; i < TPDM_DATASETS; i++) {
		if (pidr & BIT(i)) {