[SRU][N][PATCH v2 1/6] UBUNTU: SAUCE: Revert "coresight: catu: Support atclk"

[Noah Wager]

BugLink: https://bugs.launchpad.net/bugs/2142337

This reverts commit 0b88e5c14c2f5827cb91c8e62035d3ac19481a23.

The dependent commit
cf08211db65c ("coresight: catu: Move ACPI support from AMBA driver to platform driver")
breaks coresight builds because it depends on patches that were not
ported. We need to revert that commit, so this also needs to be
reverted.

This revert is acceptable because the generic kernel has not
demonstrated any need for this atclk fix.

Signed-off-by: Noah Wager <noah.wager at canonical.com>
---
 drivers/hwtracing/coresight/coresight-catu.c | 22 +++++---------------
 drivers/hwtracing/coresight/coresight-catu.h |  1 -
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/drivers/hwtracing/coresight/coresight-catu.c b/drivers/hwtracing/coresight/coresight-catu.c
index 2dcf0137da62..49ee8526f35a 100644
--- a/drivers/hwtracing/coresight/coresight-catu.c
+++ b/drivers/hwtracing/coresight/coresight-catu.c
@@ -521,10 +521,6 @@ static int __catu_probe(struct device *dev, struct resource *res)
 	struct coresight_platform_data *pdata = NULL;
 	void __iomem *base;
 
-	drvdata->atclk = devm_clk_get_optional_enabled(dev, "atclk");
-	if (IS_ERR(drvdata->atclk))
-		return PTR_ERR(drvdata->atclk);
-
 	catu_desc.name = coresight_alloc_device_name(&catu_devs, dev);
 	if (!catu_desc.name)
 		return -ENOMEM;
@@ -674,26 +670,18 @@ static int catu_runtime_suspend(struct device *dev)
 {
 	struct catu_drvdata *drvdata = dev_get_drvdata(dev);
 
-	clk_disable_unprepare(drvdata->atclk);
-	clk_disable_unprepare(drvdata->pclk);
-
+	if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk))
+		clk_disable_unprepare(drvdata->pclk);
 	return 0;
 }
 
 static int catu_runtime_resume(struct device *dev)
 {
 	struct catu_drvdata *drvdata = dev_get_drvdata(dev);
-	int ret;
-
-	ret = clk_prepare_enable(drvdata->pclk);
-	if (ret)
-		return ret;
 
-	ret = clk_prepare_enable(drvdata->atclk);
-	if (ret)
-		clk_disable_unprepare(drvdata->pclk);
-
-	return ret;
+	if (drvdata && !IS_ERR_OR_NULL(drvdata->pclk))
+		clk_prepare_enable(drvdata->pclk);
+	return 0;
 }
 #endif
 
diff --git a/drivers/hwtracing/coresight/coresight-catu.h b/drivers/hwtracing/coresight/coresight-catu.h
index 6e6b7aac206d..755776cd19c5 100644
--- a/drivers/hwtracing/coresight/coresight-catu.h
+++ b/drivers/hwtracing/coresight/coresight-catu.h
@@ -62,7 +62,6 @@
 
 struct catu_drvdata {
 	struct clk *pclk;
-	struct clk *atclk;
 	void __iomem *base;
 	struct coresight_device *csdev;
 	int irq;
-- 
2.43.0