Commit 8179a77d authored by Olof Johansson's avatar Olof Johansson

Merge tag 'omap-for-v4.11/defconfig-signed' of...

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: default avatarOlof Johansson <olof@lixom.net>
parents e66e9371 ac57feb2
...@@ -137,7 +137,6 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 ...@@ -137,7 +137,6 @@ CONFIG_BLK_DEV_RAM_SIZE=16384
CONFIG_SENSORS_TSL2550=m CONFIG_SENSORS_TSL2550=m
CONFIG_SRAM=y CONFIG_SRAM=y
CONFIG_EEPROM_AT24=m CONFIG_EEPROM_AT24=m
CONFIG_SENSORS_LIS3_I2C=m
CONFIG_BLK_DEV_SD=y CONFIG_BLK_DEV_SD=y
CONFIG_SCSI_SCAN_ASYNC=y CONFIG_SCSI_SCAN_ASYNC=y
CONFIG_ATA=y CONFIG_ATA=y
...@@ -168,6 +167,7 @@ CONFIG_TI_CPTS=y ...@@ -168,6 +167,7 @@ CONFIG_TI_CPTS=y
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
CONFIG_AT803X_PHY=y CONFIG_AT803X_PHY=y
CONFIG_MICREL_PHY=y
CONFIG_SMSC_PHY=y CONFIG_SMSC_PHY=y
CONFIG_USB_USBNET=m CONFIG_USB_USBNET=m
CONFIG_USB_NET_SMSC75XX=m CONFIG_USB_NET_SMSC75XX=m
...@@ -213,6 +213,7 @@ CONFIG_SERIO=m ...@@ -213,6 +213,7 @@ CONFIG_SERIO=m
CONFIG_SERIAL_8250=y CONFIG_SERIAL_8250=y
CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_CONSOLE=y
CONFIG_SERIAL_8250_NR_UARTS=32 CONFIG_SERIAL_8250_NR_UARTS=32
CONFIG_SERIAL_8250_RUNTIME_UARTS=6
CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_EXTENDED=y
CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_MANY_PORTS=y
CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_8250_SHARE_IRQ=y
...@@ -413,6 +414,7 @@ CONFIG_LEDS_TRIGGER_GPIO=m ...@@ -413,6 +414,7 @@ CONFIG_LEDS_TRIGGER_GPIO=m
CONFIG_LEDS_TRIGGER_DEFAULT_ON=m CONFIG_LEDS_TRIGGER_DEFAULT_ON=m
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_DS1307=m CONFIG_RTC_DRV_DS1307=m
CONFIG_RTC_DRV_M41T80=m
CONFIG_RTC_DRV_TWL92330=y CONFIG_RTC_DRV_TWL92330=y
CONFIG_RTC_DRV_TWL4030=m CONFIG_RTC_DRV_TWL4030=m
CONFIG_RTC_DRV_PALMAS=m CONFIG_RTC_DRV_PALMAS=m
...@@ -426,6 +428,9 @@ CONFIG_EXTCON_PALMAS=m ...@@ -426,6 +428,9 @@ CONFIG_EXTCON_PALMAS=m
CONFIG_EXTCON_USB_GPIO=m CONFIG_EXTCON_USB_GPIO=m
CONFIG_TI_EMIF=m CONFIG_TI_EMIF=m
CONFIG_IIO=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_TI_AM335X_ADC=m
CONFIG_BMP280=m CONFIG_BMP280=m
CONFIG_PWM=y CONFIG_PWM=y
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment