Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de997718 authored by Ajay Kumar Gupta's avatar Ajay Kumar Gupta Committed by Tony Lindgren
Browse files

AM35x: fix UI card EHCI port and LCD dependency 



EHCI port on UI card and LCD share two pins (GPIO 181 and 182) thus
they have to be mutually exclusive.

Signed-off-by: default avatarAjay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 4cfcaef1

arch/arm/mach-omap2/board-am3517evm.c

+10 −0
Original line number Diff line number Diff line
@@ -216,6 +216,8 @@ static int __init am3517_evm_i2c_init(void) 
static int lcd_enabled;

static int dvi_enabled;



#if defined(CONFIG_PANEL_SHARP_LQ043T1DG01) || \

		defined(CONFIG_PANEL_SHARP_LQ043T1DG01_MODULE)

static void __init am3517_evm_display_init(void)

{

	int r;
@@ -259,6 +261,9 @@ static void __init am3517_evm_display_init(void) 
err_1:

	gpio_free(LCD_PANEL_BKLIGHT_PWR);

}

#else

static void __init am3517_evm_display_init(void) {}

#endif



static int am3517_evm_panel_enable_lcd(struct omap_dss_device *dssdev)

{
@@ -372,7 +377,12 @@ static void __init am3517_evm_init_irq(void) 


static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {

	.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,

#if defined(CONFIG_PANEL_SHARP_LQ043T1DG01) || \

		defined(CONFIG_PANEL_SHARP_LQ043T1DG01_MODULE)

	.port_mode[1] = EHCI_HCD_OMAP_MODE_UNKNOWN,

#else

	.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,

#endif

	.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,



	.phy_reset  = true,