openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Few omap2plus_defconfig changes for v4.11 merge window: 

- Switch to use LIS3LV02DL IIO driver instead of the
   LIS3LC02D misc driver
 
 - Set CONFIG_SERIAL_8250_RUNTIME_UARTS=6 to avoid runtime
   warnings on omap5 and dra7
 
 - Enable ksz9021 phy and m41t80 rtc as they are used at
   least on phyCORE-AM335x
 -----BEGIN PGP SIGNATURE-----
 
 iQJFBAABCAAvFiEEkgNvrZJU/QSQYIcQG9Q+yVyrpXMFAliHbxYRHHRvbnlAYXRv
 bWlkZS5jb20ACgkQG9Q+yVyrpXPLDBAAmEKb4eMFYBJ2Df48PugoIhslvfS/in8a
 3mNtH8RY9TzoB7+wu2535hVifBGrLtg10TateZLzJtGNZ0eZurms+gvP4pP+Pgsw
 +aUz3pQgYyx9xCdvPR4rGxrgU7fjk+NI8JqgoPgVo6WU/+vWpvFu8TJguSst1VDX
 jxSeQUOvDDK5N3w42WSiLrecg+hCiZqiMbK/+UtuJvgfByeVqA3Azk8/imQxOISU
 A2TNCTlcCgSiCEOueIP9JDJZuUkqeswzThhNUksRfl3WhjOyXso2iOqvN2tbUH5o
 gLC3GSTmBVgu0O5tf8Zjnqkp+2aAKgb6Ilwzcjk0FkRfCty/wnJAGh/izfUJTcPK
 aza99As0WFFKmRiD/9QNKaoDptTINQAA8SpXLNp/KBvok67j84YoP3SXUC7fwnYd
 UnC9DGleBBhj/6I7S9TcBdn06lTDXZ0vvFGXQTTxQG/u6erI+DuzMYRbrBEO5e1H
 L44BSL7/enZ3Bk9DzqkrIuJudXYuHxxMsjL1J4IdA8YBrs6JhByBEjFkyzVR3CWH
 1AhCtZWTAVGSebTSgVUompCQfynond9prae0pUz+p7GQzXQcMnmxh5rWHM9OTV2C
 3PnFb6brhLomkIoAujgH3O60N9EvpXKx+hl6JGSXB0Gorf4zU7INswZkjLtoZhNo
 FyghpmnV/W0=
 =Vv0t
 -----END PGP SIGNATURE-----

Merge tag 'omap-for-v4.11/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/defconfig

Few omap2plus_defconfig changes for v4.11 merge window:

- Switch to use LIS3LV02DL IIO driver instead of the
  LIS3LC02D misc driver
- Set CONFIG_SERIAL_8250_RUNTIME_UARTS=6 to avoid runtime
  warnings on omap5 and dra7
- Enable ksz9021 phy and m41t80 rtc as they are used at
  least on phyCORE-AM335x

* tag 'omap-for-v4.11/defconfig-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: omap2plus_defconfig: Enable support for RTC M41T80
  ARM: omap2plus_defconfig: Enable support for micrell phys
  ARM: omap2plus_defconfig: Fix probe errors on UARTs 5 and 6
  ARM: defconfig: omap2plus: switch LIS3LV02DL driver

Signed-off-by: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2017-01-29 17:18:21 -08:00
parent e66e937121 ac57feb258
commit 8179a77deb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/arm/configs/omap2plus_defconfig
View File

@ -137,7 +137,6 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
CONFIG_SENSORS_TSL2550=m
CONFIG_SRAM=y
CONFIG_EEPROM_AT24=m
CONFIG_SENSORS_LIS3_I2C=m
CONFIG_BLK_DEV_SD=y
CONFIG_SCSI_SCAN_ASYNC=y
CONFIG_ATA=y
@ -168,6 +167,7 @@ CONFIG_TI_CPTS=y
# CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set
CONFIG_AT803X_PHY=y
CONFIG_MICREL_PHY=y
CONFIG_SMSC_PHY=y
CONFIG_USB_USBNET=m
CONFIG_USB_NET_SMSC75XX=m
@ -213,6 +213,7 @@ CONFIG_SERIO=m
CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_NR_UARTS=32
CONFIG_SERIAL_8250_RUNTIME_UARTS=6
CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_SHARE_IRQ=y
@ -413,6 +414,7 @@ CONFIG_LEDS_TRIGGER_GPIO=m
CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_DS1307=m
CONFIG_RTC_DRV_M41T80=m
CONFIG_RTC_DRV_TWL92330=y
CONFIG_RTC_DRV_TWL4030=m
CONFIG_RTC_DRV_PALMAS=m
@ -426,6 +428,9 @@ CONFIG_EXTCON_PALMAS=m
CONFIG_EXTCON_USB_GPIO=m
CONFIG_TI_EMIF=m
CONFIG_IIO=m
CONFIG_IIO_SW_DEVICE=m
CONFIG_IIO_SW_TRIGGER=m
CONFIG_IIO_ST_ACCEL_3AXIS=m
CONFIG_TI_AM335X_ADC=m
CONFIG_BMP280=m
CONFIG_PWM=y