pfe: control hfe_clock

Author: scpcom

drivers/pfe_ctrl/pfe_platform.c

@@ -141,11 +141,6 @@ static int pfe_platform_probe(struct platform_device *pdev)
 
 	pfe->dev = &pdev->dev;
 
-	/* FIXME this needs to be done at the BSP level with proper locking */
-	pfe_writel(pfe_readl(PFE_AXI_RESET) | PFE_SYS_AXI_RESET_BIT, PFE_AXI_RESET);
-	mdelay(1);
-	pfe_writel(pfe_readl(PFE_AXI_RESET) & ~PFE_SYS_AXI_RESET_BIT, PFE_AXI_RESET);
-
 	/* Get the system clock */
 	clk_axi = clk_get(NULL,"axi");
 	if (IS_ERR(clk_axi)) {
@@ -154,6 +149,21 @@ static int pfe_platform_probe(struct platform_device *pdev)
 		goto err_clk;
 	}
 
+	/* HFE core clock */
+	pfe->hfe_clock = clk_get(NULL, "hfe_core");
+	if (IS_ERR(pfe->hfe_clock)) {
+		printk(KERN_INFO "clk_get call failed\n");
+		rc = -ENXIO;
+		goto err_hfe_clock;
+	}
+
+	clk_disable(pfe->hfe_clock);
+	/* FIXME this needs to be done at the BSP level with proper locking */
+	pfe_writel(pfe_readl(PFE_AXI_RESET) | PFE_SYS_AXI_RESET_BIT, PFE_AXI_RESET);
+	mdelay(1);
+	pfe_writel(pfe_readl(PFE_AXI_RESET) & ~PFE_SYS_AXI_RESET_BIT, PFE_AXI_RESET);
+	clk_enable(pfe->hfe_clock);
+
 	pfe->ctrl.clk_axi = clk_axi;
 	pfe->ctrl.sys_clk = clk_get_rate(clk_axi) / 1000;  // save sys_clk value as KHz
 
@@ -164,6 +174,8 @@ static int pfe_platform_probe(struct platform_device *pdev)
 	return 0;
 
 err_probe:
+	clk_put(pfe->hfe_clock);
+err_hfe_clock:
 	clk_put(clk_axi);
 err_clk:
 #ifndef CONFIG_OF
@@ -207,6 +219,8 @@ static int pfe_platform_remove(struct platform_device *pdev)
 
 	/* FIXME this needs to be done at the BSP level with proper locking */
 	pfe_writel(pfe_readl(PFE_AXI_RESET) | PFE_SYS_AXI_RESET_BIT, PFE_AXI_RESET);
+	clk_disable(pfe->hfe_clock);
+	clk_put(pfe->hfe_clock);
 
 	clk_put(pfe->ctrl.clk_axi);
 	iounmap(pfe->ipsec_baseaddr);