diff --git a/drivers/gpu/imx/dcss/dcss-blkctl.c b/drivers/gpu/imx/dcss/dcss-blkctl.c index 2d9248ac926deadbaed9dcfae7823ec9851fde83..1dadbf77d23bb8273b67c80f20f9d50a39c434d6 100644 --- a/drivers/gpu/imx/dcss/dcss-blkctl.c +++ b/drivers/gpu/imx/dcss/dcss-blkctl.c @@ -18,7 +18,6 @@ #include <linux/of.h> #include <linux/delay.h> #include <linux/seq_file.h> -#include <soc/imx8/soc.h> #include "dcss-prv.h" #include <video/imx-dcss.h> @@ -117,7 +116,7 @@ int dcss_blkctl_init(struct dcss_soc *dcss, unsigned long blkctl_base) if (!disp_dev || !strncmp(disp_dev, "hdmi_disp", 9)) blkctl->hdmi_output = true; - if (imx8_get_soc_revision() == B0_SILICON_ID) + //if (imx8_get_soc_revision() == B0_SILICON_ID) blkctl->clk_setting = HDMI_MIPI_CLK_SEL; dcss_blkctl_cfg(dcss); diff --git a/drivers/gpu/imx/dcss/dcss-common.c b/drivers/gpu/imx/dcss/dcss-common.c index 1fa9efc61d46dafe64a297bcd07a6b5a3804d929..dfcd6a6f23f895d352c88aad75936a0f167380b3 100644 --- a/drivers/gpu/imx/dcss/dcss-common.c +++ b/drivers/gpu/imx/dcss/dcss-common.c @@ -18,7 +18,6 @@ #include <linux/of_graph.h> #include <linux/clk.h> #include <linux/pm_runtime.h> -#include <linux/busfreq-imx.h> #include <linux/pm_qos.h> #include <video/imx-dcss.h> @@ -404,11 +403,13 @@ static void dcss_debugfs_init(struct dcss_soc *dcss) static void dcss_bus_freq(struct dcss_soc *dcss, bool en) { +#ifdef HAVE_NXP_BUSFREQ if (en && !dcss->bus_freq_req) request_bus_freq(BUS_FREQ_HIGH); if (!en && dcss->bus_freq_req) release_bus_freq(BUS_FREQ_HIGH); +#endif dcss->bus_freq_req = en; }