Skip to content

Commit

Permalink
OMAP: board-files: fix i2c_bus for tfp410
Browse files Browse the repository at this point in the history
The i2c handling in tfp410 driver, which handles converting parallel RGB
to DVI, was changed in 958f271
(OMAPDSS: TFP410: pdata rewrite). The patch changed what value the
driver considers as invalid/undefined.  Before the patch, 0 was the
invalid value, but as 0 is a valid bus number, the patch changed this to
-1.

However, the fact was missed that many board files do not define the bus
number at all, thus it's left to 0. This causes the driver to fail to
get the i2c bus, exiting from the driver's probe with an error, meaning
that the DVI output does not work for those boards.

This patch fixes the issue by changing the i2c_bus number field in the
driver's platform data from u16 to int, and setting the bus number to -1
in the board files for the boards that did not define the bus. The
exception is devkit8000, for which the bus is set to 1, which is the
correct bus for that board.

The bug exists in v3.5+ kernels.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reported-by: Thomas Weber <thomas@tomweber.eu>
Cc: Thomas Weber <thomas@tomweber.eu>
Cc: <stable@vger.kernel.org> # v3.5+
Signed-off-by: Tony Lindgren <tony@atomide.com>
  • Loading branch information
Tomi Valkeinen authored and Tony Lindgren committed Dec 14, 2012
1 parent bce9e90 commit ca2e16f
Show file tree
Hide file tree
Showing 7 changed files with 7 additions and 1 deletion.
1 change: 1 addition & 0 deletions arch/arm/mach-omap2/board-3430sdp.c
Original file line number Diff line number Diff line change
Expand Up @@ -157,6 +157,7 @@ static struct omap_dss_device sdp3430_lcd_device = {

static struct tfp410_platform_data dvi_panel = {
.power_down_gpio = -1,
.i2c_bus_num = -1,
};

static struct omap_dss_device sdp3430_dvi_device = {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-omap2/board-am3517evm.c
Original file line number Diff line number Diff line change
Expand Up @@ -208,6 +208,7 @@ static struct omap_dss_device am3517_evm_tv_device = {

static struct tfp410_platform_data dvi_panel = {
.power_down_gpio = -1,
.i2c_bus_num = -1,
};

static struct omap_dss_device am3517_evm_dvi_device = {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-omap2/board-cm-t35.c
Original file line number Diff line number Diff line change
Expand Up @@ -241,6 +241,7 @@ static struct omap_dss_device cm_t35_lcd_device = {

static struct tfp410_platform_data dvi_panel = {
.power_down_gpio = CM_T35_DVI_EN_GPIO,
.i2c_bus_num = -1,
};

static struct omap_dss_device cm_t35_dvi_device = {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-omap2/board-devkit8000.c
Original file line number Diff line number Diff line change
Expand Up @@ -141,6 +141,7 @@ static struct omap_dss_device devkit8000_lcd_device = {

static struct tfp410_platform_data dvi_panel = {
.power_down_gpio = -1,
.i2c_bus_num = 1,
};

static struct omap_dss_device devkit8000_dvi_device = {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-omap2/board-omap3evm.c
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ static struct omap_dss_device omap3_evm_tv_device = {

static struct tfp410_platform_data dvi_panel = {
.power_down_gpio = OMAP3EVM_DVI_PANEL_EN_GPIO,
.i2c_bus_num = -1,
};

static struct omap_dss_device omap3_evm_dvi_device = {
Expand Down
1 change: 1 addition & 0 deletions arch/arm/mach-omap2/board-omap3stalker.c
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ static struct omap_dss_device omap3_stalker_tv_device = {

static struct tfp410_platform_data dvi_panel = {
.power_down_gpio = DSS_ENABLE_GPIO,
.i2c_bus_num = -1,
};

static struct omap_dss_device omap3_stalker_dvi_device = {
Expand Down
2 changes: 1 addition & 1 deletion include/video/omap-panel-tfp410.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ struct omap_dss_device;
* @power_down_gpio: gpio number for PD pin (or -1 if not available)
*/
struct tfp410_platform_data {
u16 i2c_bus_num;
int i2c_bus_num;
int power_down_gpio;
};

Expand Down

0 comments on commit ca2e16f

Please sign in to comment.