Sfoglia il codice sorgente

Merge branch 'audio_display-ti-linux-4.19.y' of git.ti.com:~jyrisarha/ti-linux-kernel/jyrisarhas-audio-video-linux-feature-tree into ti-linux-4.19.y

TI-Feature: audio-display
TI-Tree: git@git.ti.com:~jyrisarha/ti-linux-kernel/jyrisarhas-audio-video-linux-feature-tree.git
TI-Branch: audio_display-ti-linux-4.19.y

* 'audio_display-ti-linux-4.19.y' of git.ti.com:~jyrisarha/ti-linux-kernel/jyrisarhas-audio-video-linux-feature-tree:
  ti_config_fragments: audio_display.cfg: Update for dra7 LCD/HDMI support

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
LCPD Auto Merger 6 anni fa
parent
commit
957f293cb7
1 ha cambiato i file con 8 aggiunte e 1 eliminazioni
  1. 8 1
      ti_config_fragments/audio_display.cfg

+ 8 - 1
ti_config_fragments/audio_display.cfg

@@ -25,7 +25,9 @@ CONFIG_DRM=y
 CONFIG_DRM_SII902X=y
 CONFIG_DRM_TI_TFP410=y
 CONFIG_DRM_TOSHIBA_TC358767=y
+CONFIG_DRM_TOSHIBA_TC358768=y
 CONFIG_DRM_PANEL_SIMPLE=y
+CONFIG_DRM_PANEL_OSD_OSD101T2587_53TS=y
 
 # SGX driver needs legacy support
 CONFIG_DRM_LEGACY=y
@@ -51,6 +53,7 @@ CONFIG_OMAP2_DSS_DSI=n
 
 CONFIG_DRM_OMAP_CONNECTOR_HDMI=y
 CONFIG_DRM_OMAP_ENCODER_TPD12S015=y
+CONFIG_DRM_OMAP_DRA7EVM_ENCODER_TPD12S015=y
 CONFIG_DRM_OMAP_ENCODER_TFP410=y
 CONFIG_DRM_OMAP_CONNECTOR_DVI=y
 CONFIG_DRM_OMAP_PANEL_DPI=y
@@ -71,6 +74,7 @@ CONFIG_DRM_NXP_PTN3460=n
 CONFIG_DRM_PARADE_PS8622=n
 CONFIG_DRM_STI=n
 CONFIG_DRM_PANEL_SAMSUNG_LD9040=n
+CONFIG_DRM_PANEL_SAMSUNG_S6E63J0X03=n
 CONFIG_DRM_DUMB_VGA_DAC=n
 CONFIG_LCD_CLASS_DEVICE=n
 CONFIG_FB_EFI=n
@@ -129,12 +133,15 @@ CONFIG_SND_SOC_SGTL5000=n
 CONFIG_SND_SOC_STI_SAS=n
 CONFIG_SND_SOC_WM8978=n
 
+CONFIG_SOUND=y
+CONFIG_SND=y
+CONFIG_SND_SOC=y
 CONFIG_SND_SIMPLE_CARD=m
 CONFIG_SND_SIMPLE_SCU_CARD=m
 CONFIG_SND_AUDIO_GRAPH_CARD=m
 CONFIG_SND_AUDIO_GRAPH_SCU_CARD=m
 
-CONFIG_SND_SOC_DAVINCI_MCASP=m
+CONFIG_SND_SOC_DAVINCI_MCASP=y
 
 CONFIG_SND_SOC_TLV320AIC3X=m
 CONFIG_SND_SOC_TLV320AIC31XX=m