soc: aspeed: Remove LCLK from LPC sub-devices

The LCLK is configured to be critical. LCLK should not be gated even though there are no LPC sub device drivers mounted. Signed-off-by: Chia-Wei Wang <[email protected]> Change-Id: I0a4423a55924c028d92f8220ed59fef7e1cd186f (cherry picked from commit 857b2a8)
9elements · Nov 24, 2023 · 23960d7 · 23960d7
1 parent e9a9397
commit 23960d7
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 20 deletions.
diff --git a/arch/arm/boot/dts/aspeed/aspeed-ast2600-evb.dts b/arch/arm/boot/dts/aspeed/aspeed-ast2600-evb.dts
@@ -357,3 +357,8 @@
 	oob,dma-rx-desc-num = <0x8>;
 	flash,dma-mode;
 };
+
+&lpc_snoop {
+	status = "okay";
+	snoop-ports = <0x80>;
+};
diff --git a/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed/aspeed-g6.dtsi
@@ -667,7 +667,6 @@
 					compatible = "aspeed,ast2600-lpc-snoop";
 					reg = <0x80 0x80>;
 					interrupts = <GIC_SPI 144 IRQ_TYPE_LEVEL_HIGH>;
-					clocks = <&syscon ASPEED_CLK_GATE_LCLK>;
 					status = "disabled";
 				};
 

diff --git a/drivers/soc/aspeed/aspeed-lpc-snoop.c b/drivers/soc/aspeed/aspeed-lpc-snoop.c
@@ -11,7 +11,6 @@
  */
 
 #include <linux/bitops.h>
-#include <linux/clk.h>
 #include <linux/interrupt.h>
 #include <linux/fs.h>
 #include <linux/kfifo.h>
@@ -66,7 +65,6 @@ struct aspeed_lpc_snoop_channel {
 struct aspeed_lpc_snoop {
 	struct regmap		*regmap;
 	int			irq;
-	struct clk		*clk;
 	struct aspeed_lpc_snoop_channel chan[NUM_SNOOP_CHANNELS];
 };
 
@@ -292,19 +290,6 @@ static int aspeed_lpc_snoop_probe(struct platform_device *pdev)
 		return -ENODEV;
 	}
 
-	lpc_snoop->clk = devm_clk_get(dev, NULL);
-	if (IS_ERR(lpc_snoop->clk)) {
-		rc = PTR_ERR(lpc_snoop->clk);
-		if (rc != -EPROBE_DEFER)
-			dev_err(dev, "couldn't get clock\n");
-		return rc;
-	}
-	rc = clk_prepare_enable(lpc_snoop->clk);
-	if (rc) {
-		dev_err(dev, "couldn't enable clock\n");
-		return rc;
-	}
-
 	rc = aspeed_lpc_snoop_config_irq(lpc_snoop, pdev);
 	if (rc)
 		goto err;
@@ -326,8 +311,6 @@ static int aspeed_lpc_snoop_probe(struct platform_device *pdev)
 	return 0;
 
 err:
-	clk_disable_unprepare(lpc_snoop->clk);
-
 	return rc;
 }
 
@@ -339,8 +322,6 @@ static int aspeed_lpc_snoop_remove(struct platform_device *pdev)
 	aspeed_lpc_disable_snoop(lpc_snoop, 0);
 	aspeed_lpc_disable_snoop(lpc_snoop, 1);
 
-	clk_disable_unprepare(lpc_snoop->clk);
-
 	return 0;
 }