commit 0a4d3453acee328ad084a8957a0aba95a73d1562
author Michael Brooks <michaelbrooks@google.com> Thu Jul 12 12:23:49 2018 -0700
committer Alex Van Damme <atv@google.com> Tue Jun 25 17:03:55 2019 -0700
tree 434cbaaffadfce692dd4d8b57f0103a1d5c2e6d1
parent 596559899caed24a30351bf5d2fe79420af6dfea

Error fixes for IMX8MQ_PHANBELL_POWERSAVE

Change-Id: Id75a0803c85b48db11e996c835e55fd120237dae

drivers/net/ethernet/freescale/fec_main.c

diff --git a/drivers/net/ethernet/freescale/fec_main.c b/drivers/net/ethernet/freescale/fec_main.c
index 2ac9e898..60a80ba 100644
--- a/drivers/net/ethernet/freescale/fec_main.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
@@ -4019,7 +4019,7 @@
 
 	clk_disable_unprepare(fep->clk_ahb);
 	clk_disable_unprepare(fep->clk_ipg);
-#if !defined(IMX8MQ_PHANBELL_ENET_POWERSAVE)
+#if !defined(CONFIG_IMX8MQ_PHANBELL_POWERSAVE)
 	release_bus_freq(BUS_FREQ_HIGH);
 #endif
 
@@ -4032,7 +4032,7 @@
 	struct fec_enet_private *fep = netdev_priv(ndev);
 	int ret;
 
-#if !defined(IMX8MQ_PHANBELL_ENET_POWERSAVE)
+#if !defined(CONFIG_IMX8MQ_PHANBELL_POWERSAVE)
 	request_bus_freq(BUS_FREQ_HIGH);
 #endif
 	ret = clk_prepare_enable(fep->clk_ahb);

drivers/soc/imx/soc-imx8.c

diff --git a/drivers/soc/imx/soc-imx8.c b/drivers/soc/imx/soc-imx8.c
index bcef073..63a3ddb 100644
--- a/drivers/soc/imx/soc-imx8.c
+++ b/drivers/soc/imx/soc-imx8.c
@@ -360,6 +360,7 @@
 #define OCOTP_CFG3_INDUSTRIAL		2
 #define OCOTP_CFG3_AUTO			3
 
+#if !defined(CONFIG_IMX8MQ_PHANBELL_POWERSAVE)
 static void __init imx8mq_opp_check_speed_grading(struct device *cpu_dev)
 {
 	struct device_node *np;
@@ -472,6 +473,7 @@
 put_node:
 	of_node_put(np);
 }
+#endif
 
 static void __init imx8mq_opp_init(void)
 {
@@ -493,10 +495,12 @@
 		goto put_node;
 	}
 
+#if !defined(CONFIG_IMX8MQ_PHANBELL_POWERSAVE)
 	if (of_machine_is_compatible("fsl,imx8mq"))
 		imx8mq_opp_check_speed_grading(cpu_dev);
 	else if (of_machine_is_compatible("fsl,imx8mm"))
 		imx8mm_opp_check_speed_grading(cpu_dev);
+#endif
 
 put_node:
 	of_node_put(np);