summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Ford <aford173@gmail.com>2020-07-09 07:12:32 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-08-26 10:27:10 +0200
commit61e37ca3378f39dffde30c0271cf1f87e8241ce5 (patch)
tree4b44c0d6dd4ad5f2af290e4258cee1b8b0d5019f
parent18037dda3974247e4d3c34ee29898d2436f12819 (diff)
downloadlinux-stable-61e37ca3378f39dffde30c0271cf1f87e8241ce5.tar.gz
linux-stable-61e37ca3378f39dffde30c0271cf1f87e8241ce5.tar.bz2
linux-stable-61e37ca3378f39dffde30c0271cf1f87e8241ce5.zip
omapfb: dss: Fix max fclk divider for omap36xx
There appears to be a timing issue where using a divider of 32 breaks the DSS for OMAP36xx despite the TRM stating 32 is a valid number. Through experimentation, it appears that 31 works. This same fix was issued for kernels 4.5+. However, between kernels 4.4 and 4.5, the directory structure was changed when the dss directory was moved inside the omapfb directory. That broke the patch on kernels older than 4.5, because it didn't permit the patch to apply cleanly for 4.4 and older. A similar patch was applied to the 3.16 kernel already, but not to 4.4. Commit 4b911101a5cd ("drm/omap: fix max fclk divider for omap36xx") is on the 3.16 stable branch with notes from Ben about the path change. Since this was applied for 3.16 already, this patch is for kernels 3.17 through 4.4 only. Fixes: f7018c213502 ("video: move fbdev to drivers/video/fbdev") Cc: <stable@vger.kernel.org> #3.17 - 4.4 CC: <tomi.valkeinen@ti.com> Signed-off-by: Adam Ford <aford173@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/video/fbdev/omap2/dss/dss.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/video/fbdev/omap2/dss/dss.c b/drivers/video/fbdev/omap2/dss/dss.c
index 9200a8668b49..a57c3a5f4bf8 100644
--- a/drivers/video/fbdev/omap2/dss/dss.c
+++ b/drivers/video/fbdev/omap2/dss/dss.c
@@ -843,7 +843,7 @@ static const struct dss_features omap34xx_dss_feats = {
};
static const struct dss_features omap3630_dss_feats = {
- .fck_div_max = 32,
+ .fck_div_max = 31,
.dss_fck_multiplier = 1,
.parent_clk_name = "dpll4_ck",
.dpi_select_source = &dss_dpi_select_source_omap2_omap3,