From 8ad48f65fd15e9f944d5652be452791eec226a77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
Date: Fri, 26 Apr 2019 18:45:07 +0200
Subject: [PATCH] dcss: HACK: Hardcode B0 silicon revision and drop busfreq
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
According to 4.18 we have B0. Need to check what to do about busfreq
Signed-off-by: Guido Günther <guido.gunther@puri.sm>
---
drivers/gpu/imx/dcss/dcss-blkctl.c | 3 +--
drivers/gpu/imx/dcss/dcss-common.c | 3 ++-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/imx/dcss/dcss-blkctl.c b/drivers/gpu/imx/dcss/dcss-blkctl.c
index 2d9248ac926de..1dadbf77d23bb 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 1fa9efc61d46d..dfcd6a6f23f89 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;
}
--
GitLab