Просмотр исходного кода

Merge branch 'connectivity-ti-linux-4.19.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel into ti-linux-4.19.y

TI-Feature: connectivity
TI-Tree: git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel.git
TI-Branch: connectivity-ti-linux-4.19.y

* 'connectivity-ti-linux-4.19.y' of git://git.ti.com/connectivity-integration-tree/connectivity-ti-linux-kernel:
  ti_config_fragments: connectivity: enable some usb-serial device drivers
  mmc: host: Fix Kconfig warnings on keystone_defconfig

Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
LCPD Auto Merger 7 лет назад
Родитель
Сommit
1f1084d8cc
2 измененных файлов с 5 добавлено и 1 удалено
  1. 1 1
      drivers/mmc/host/Kconfig
  2. 4 0
      ti_config_fragments/connectivity.cfg

+ 1 - 1
drivers/mmc/host/Kconfig

@@ -936,7 +936,7 @@ config MMC_SDHCI_OMAP
 	tristate "TI SDHCI Controller Support"
 	depends on MMC_SDHCI_PLTFM && OF
 	select THERMAL
-	select TI_SOC_THERMAL
+	imply TI_SOC_THERMAL
 	help
 	  This selects the Secure Digital Host Controller Interface (SDHCI)
 	  support present in TI's DRA7 SOCs. The controller supports

+ 4 - 0
ti_config_fragments/connectivity.cfg

@@ -374,6 +374,10 @@ CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 #USB Serial
 CONFIG_USB_ACM=m
 CONFIG_USB_SERIAL=m
+CONFIG_USB_SERIAL_CP210X=m
+CONFIG_USB_SERIAL_FTDI_SIO=m
+CONFIG_USB_SERIAL_PL2303=m
+CONFIG_USB_SERIAL_OPTION=m
 
 # Extcon drivers
 CONFIG_EXTCON=m