hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Ajay Kumar Gupta <ajay.gupta@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Ajay Kumar Gupta 2010-05-10 14:29:19 -07:00 committed by Tony Lindgren
parent 4cfcaef11f
commit de997718b6
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/mach-omap2/board-am3517evm.c
View File

@ -216,6 +216,8 @@ static int __init am3517_evm_i2c_init(void)
static int lcd_enabled; static int lcd_enabled;
static int dvi_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) static void __init am3517_evm_display_init(void)
{ {
int r; int r;
@ -259,6 +261,9 @@ err_2:
err_1: err_1:
gpio_free(LCD_PANEL_BKLIGHT_PWR); 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) 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 = { static const struct ehci_hcd_omap_platform_data ehci_pdata __initconst = {
.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY, .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, .port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
#endif
.port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN, .port_mode[2] = EHCI_HCD_OMAP_MODE_UNKNOWN,
.phy_reset = true, .phy_reset = true,