From 8fc68cb0aad76a494121a1debf4cc63a3d67feb2 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Sat, 22 Jan 2011 14:51:28 -0800 Subject: [PATCH] siihdmi: max pixclock is platform specific data --- arch/arm/mach-mx5/mx51_efikamx_i2c.c | 3 +++ drivers/video/mxc/mxcfb_siihdmi.c | 4 +--- include/linux/i2c/sii_hdmi.h | 5 +++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-mx5/mx51_efikamx_i2c.c b/arch/arm/mach-mx5/mx51_efikamx_i2c.c index dcc9b8ac1c0..0590ee84018 100644 --- a/arch/arm/mach-mx5/mx51_efikamx_i2c.c +++ b/arch/arm/mach-mx5/mx51_efikamx_i2c.c @@ -23,6 +23,7 @@ #include #include +#include #include #include "devices.h" @@ -82,6 +83,8 @@ static struct siihdmi_platform_data mx51_efikamx_sii9022_data = { .framebuffer = "DISP3 BG", .hotplug_irq = IOMUX_TO_IRQ(MX51_PIN_DISPB2_SER_DIO), + + .pixclock = KHZ2PICOS(133000L), }; static struct i2c_board_info mx51_efikamx_i2c_board_info[] __initdata = { diff --git a/drivers/video/mxc/mxcfb_siihdmi.c b/drivers/video/mxc/mxcfb_siihdmi.c index a04a0beed3b..03559e6a42f 100644 --- a/drivers/video/mxc/mxcfb_siihdmi.c +++ b/drivers/video/mxc/mxcfb_siihdmi.c @@ -621,7 +621,7 @@ static void siihdmi_sanitize_modelist(struct siihdmi_tx * const tx, DEBUG("Removing mode %ux%u@%u (interlaced)\n", mode->xres, mode->yres, mode->refresh); remove = true; - } else if (mode->pixclock < tx->max_pixclock) { + } else if (mode->pixclock < tx->platform->pixclock) { DEBUG("Removing mode %ux%u@%u (exceeds pixclk limit)\n", mode->xres, mode->yres, mode->refresh); remove = true; @@ -711,8 +711,6 @@ static int siihdmi_init_fb(struct siihdmi_tx *tx, struct fb_info *info) tx->connection_type = CONNECTION_TYPE_DVI; tx->pixel_mapping = PIXEL_MAPPING_EXACT; tx->enable_audio = false; - /* this should be in platform data */ - tx->max_pixclock = KHZ2PICOS(133000L); /* use EDID to detect sink characteristics */ if ((ret = siihdmi_read_edid(tx, (u8 *) &block0, sizeof(block0))) < 0) diff --git a/include/linux/i2c/sii_hdmi.h b/include/linux/i2c/sii_hdmi.h index c506e8f45c0..19bbd627732 100644 --- a/include/linux/i2c/sii_hdmi.h +++ b/include/linux/i2c/sii_hdmi.h @@ -324,6 +324,9 @@ struct siihdmi_platform_data { /* hotplug IRQ */ int hotplug_irq; + + /* maximum pixel clock rate */ + int pixclock; }; struct siihdmi_tx { @@ -353,8 +356,6 @@ struct siihdmi_tx { /* preferred video mode (based on EDID) */ struct fb_videomode preferred; - - int max_pixclock; /* platform data vs. EDID max tmds rate */ }; #endif