Commit 42196048 authored by Olof Johansson's avatar Olof Johansson

Merge tag 'samsung-defconfig-4.21' of...

Merge tag 'samsung-defconfig-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into next/defconfig

Samsung defconfig changes for v4.21

Enable drivers in exynos and multi_v7 defconfigs for MAX8952, MAX8998
(Samsung UniversalC210 board) and TC358764 (Arndale board).

* tag 'samsung-defconfig-4.21' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux:
  ARM: multi_v7_defconfig: Add TOSHIBA TC358764 bridge driver
  ARM: multi_v7_defconfig: Add MAX8952 regulator driver
  ARM: exynos_defconfig: Add TOSHIBA TC358764 bridge driver
  ARM: exynos_defconfig: Add MAX8952 regulator driver
  ARM: exynos_defconfig: Add MAX8998 RTC and charger drivers
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 7d139617 24c8e4b8
...@@ -145,6 +145,7 @@ CONFIG_BATTERY_MAX17042=y ...@@ -145,6 +145,7 @@ CONFIG_BATTERY_MAX17042=y
CONFIG_CHARGER_MAX14577=y CONFIG_CHARGER_MAX14577=y
CONFIG_CHARGER_MAX77693=y CONFIG_CHARGER_MAX77693=y
CONFIG_CHARGER_MAX8997=y CONFIG_CHARGER_MAX8997=y
CONFIG_CHARGER_MAX8998=y
CONFIG_CHARGER_TPS65090=y CONFIG_CHARGER_TPS65090=y
CONFIG_SENSORS_LM90=y CONFIG_SENSORS_LM90=y
CONFIG_SENSORS_NTC_THERMISTOR=y CONFIG_SENSORS_NTC_THERMISTOR=y
...@@ -168,6 +169,7 @@ CONFIG_REGULATOR=y ...@@ -168,6 +169,7 @@ CONFIG_REGULATOR=y
CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_FIXED_VOLTAGE=y
CONFIG_REGULATOR_GPIO=y CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_MAX14577=y CONFIG_REGULATOR_MAX14577=y
CONFIG_REGULATOR_MAX8952=y
CONFIG_REGULATOR_MAX8997=y CONFIG_REGULATOR_MAX8997=y
CONFIG_REGULATOR_MAX8998=y CONFIG_REGULATOR_MAX8998=y
CONFIG_REGULATOR_MAX77686=y CONFIG_REGULATOR_MAX77686=y
...@@ -213,6 +215,7 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=y ...@@ -213,6 +215,7 @@ CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=y
CONFIG_DRM_NXP_PTN3460=y CONFIG_DRM_NXP_PTN3460=y
CONFIG_DRM_PARADE_PS8622=y CONFIG_DRM_PARADE_PS8622=y
CONFIG_DRM_SII9234=y CONFIG_DRM_SII9234=y
CONFIG_DRM_TOSHIBA_TC358764=y
CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_CLASS_DEVICE=y
CONFIG_LCD_PLATFORM=y CONFIG_LCD_PLATFORM=y
CONFIG_BACKLIGHT_PWM=y CONFIG_BACKLIGHT_PWM=y
...@@ -273,6 +276,7 @@ CONFIG_LEDS_MAX77693=y ...@@ -273,6 +276,7 @@ CONFIG_LEDS_MAX77693=y
CONFIG_LEDS_MAX8997=y CONFIG_LEDS_MAX8997=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_MAX8998=y
CONFIG_RTC_DRV_MAX8997=y CONFIG_RTC_DRV_MAX8997=y
CONFIG_RTC_DRV_MAX77686=y CONFIG_RTC_DRV_MAX77686=y
CONFIG_RTC_DRV_S5M=y CONFIG_RTC_DRV_S5M=y
......
...@@ -538,6 +538,7 @@ CONFIG_REGULATOR_GPIO=y ...@@ -538,6 +538,7 @@ CONFIG_REGULATOR_GPIO=y
CONFIG_REGULATOR_LP872X=y CONFIG_REGULATOR_LP872X=y
CONFIG_REGULATOR_MAX14577=m CONFIG_REGULATOR_MAX14577=m
CONFIG_REGULATOR_MAX8907=y CONFIG_REGULATOR_MAX8907=y
CONFIG_REGULATOR_MAX8952=m
CONFIG_REGULATOR_MAX8973=y CONFIG_REGULATOR_MAX8973=y
CONFIG_REGULATOR_MAX8997=m CONFIG_REGULATOR_MAX8997=m
CONFIG_REGULATOR_MAX8998=m CONFIG_REGULATOR_MAX8998=m
...@@ -631,6 +632,7 @@ CONFIG_DRM_DUMB_VGA_DAC=m ...@@ -631,6 +632,7 @@ CONFIG_DRM_DUMB_VGA_DAC=m
CONFIG_DRM_NXP_PTN3460=m CONFIG_DRM_NXP_PTN3460=m
CONFIG_DRM_PARADE_PS8622=m CONFIG_DRM_PARADE_PS8622=m
CONFIG_DRM_SII9234=m CONFIG_DRM_SII9234=m
CONFIG_DRM_TOSHIBA_TC358764=m
CONFIG_DRM_I2C_ADV7511=m CONFIG_DRM_I2C_ADV7511=m
CONFIG_DRM_I2C_ADV7511_AUDIO=y CONFIG_DRM_I2C_ADV7511_AUDIO=y
CONFIG_DRM_STI=m CONFIG_DRM_STI=m
......
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