AM35x: fix UI card EHCI port and LCD dependency
Subsystems (3)
PATCH 1/1 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.
---
Patch adding config (CONFIG_PANEL_SHARP_LQ043T1DG01) in AM3517 defconfig is already accepted and available in linux-omap/dss2 branch.
arch/arm/mach-omap2/board-am3517evm.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-)
arch/arm/mach-omap2/board-am3517evm.c +10 -0
@@ -119,6 +119,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;
@@ -162,6 +164,9 @@ err_2: 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) {
@@ -275,7 +280,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,
Signature · 1 line
1.6.2.4
Tony Lindgren
maintainerPATCH 1/1 AM35x: fix UI card EHCI port and LCD dependency
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.
Branch in linux-omap: for-next
Initial commit ID (Likely to change): 869c0f68ff64620334e044c56aa3dedd42eb6ccc
PatchWorks
http://patchwork.kernel.org/patch/96688/
Git (Likely to change, and takes a while to get mirrored)
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=869c0f68ff64620334e044c56aa3dedd42eb6ccc