Commit 9479f95f authored by Olof Johansson's avatar Olof Johansson

Merge tag 'sunxi-defconfig-for-4.12' of...

Merge tag 'sunxi-defconfig-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into next/defconfig

Allwinner defconfig changes for 4.12

Some patches to enable new modules in the defconfig.

* tag 'sunxi-defconfig-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  ARM: multi_v7_defconfig: Switch AXP20x driver from module to built-in
  ARM: multi_v7_defconfig: Enable AC100 RTC driver
  ARM: multi_v7_defconfig: Switch sunxi RSB driver from module to built-in
  ARM: sunxi_defconfig: Enable AC100 RTC driver
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents ee937329 7cae7ef8
...@@ -195,7 +195,7 @@ CONFIG_DMA_CMA=y ...@@ -195,7 +195,7 @@ CONFIG_DMA_CMA=y
CONFIG_CMA_SIZE_MBYTES=64 CONFIG_CMA_SIZE_MBYTES=64
CONFIG_OMAP_OCP2SCP=y CONFIG_OMAP_OCP2SCP=y
CONFIG_SIMPLE_PM_BUS=y CONFIG_SIMPLE_PM_BUS=y
CONFIG_SUNXI_RSB=m CONFIG_SUNXI_RSB=y
CONFIG_MTD=y CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_BLOCK=y CONFIG_MTD_BLOCK=y
...@@ -482,9 +482,10 @@ CONFIG_MFD_AS3722=y ...@@ -482,9 +482,10 @@ CONFIG_MFD_AS3722=y
CONFIG_MFD_ATMEL_FLEXCOM=y CONFIG_MFD_ATMEL_FLEXCOM=y
CONFIG_MFD_ATMEL_HLCDC=m CONFIG_MFD_ATMEL_HLCDC=m
CONFIG_MFD_BCM590XX=y CONFIG_MFD_BCM590XX=y
CONFIG_MFD_AC100=y
CONFIG_MFD_AXP20X=y CONFIG_MFD_AXP20X=y
CONFIG_MFD_AXP20X_I2C=m CONFIG_MFD_AXP20X_I2C=y
CONFIG_MFD_AXP20X_RSB=m CONFIG_MFD_AXP20X_RSB=y
CONFIG_MFD_CROS_EC=m CONFIG_MFD_CROS_EC=m
CONFIG_MFD_CROS_EC_I2C=m CONFIG_MFD_CROS_EC_I2C=m
CONFIG_MFD_CROS_EC_SPI=m CONFIG_MFD_CROS_EC_SPI=m
...@@ -513,7 +514,7 @@ CONFIG_REGULATOR_ACT8865=y ...@@ -513,7 +514,7 @@ CONFIG_REGULATOR_ACT8865=y
CONFIG_REGULATOR_ANATOP=y CONFIG_REGULATOR_ANATOP=y
CONFIG_REGULATOR_AS3711=y CONFIG_REGULATOR_AS3711=y
CONFIG_REGULATOR_AS3722=y CONFIG_REGULATOR_AS3722=y
CONFIG_REGULATOR_AXP20X=m CONFIG_REGULATOR_AXP20X=y
CONFIG_REGULATOR_BCM590XX=y CONFIG_REGULATOR_BCM590XX=y
CONFIG_REGULATOR_DA9210=y CONFIG_REGULATOR_DA9210=y
CONFIG_REGULATOR_FAN53555=y CONFIG_REGULATOR_FAN53555=y
...@@ -753,6 +754,7 @@ CONFIG_EDAC_MM_EDAC=y ...@@ -753,6 +754,7 @@ CONFIG_EDAC_MM_EDAC=y
CONFIG_EDAC_HIGHBANK_MC=y CONFIG_EDAC_HIGHBANK_MC=y
CONFIG_EDAC_HIGHBANK_L2=y CONFIG_EDAC_HIGHBANK_L2=y
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_AC100=y
CONFIG_RTC_DRV_AS3722=y CONFIG_RTC_DRV_AS3722=y
CONFIG_RTC_DRV_DS1307=y CONFIG_RTC_DRV_DS1307=y
CONFIG_RTC_DRV_HYM8563=m CONFIG_RTC_DRV_HYM8563=m
......
...@@ -87,6 +87,7 @@ CONFIG_THERMAL_OF=y ...@@ -87,6 +87,7 @@ CONFIG_THERMAL_OF=y
CONFIG_CPU_THERMAL=y CONFIG_CPU_THERMAL=y
CONFIG_WATCHDOG=y CONFIG_WATCHDOG=y
CONFIG_SUNXI_WATCHDOG=y CONFIG_SUNXI_WATCHDOG=y
CONFIG_MFD_AC100=y
CONFIG_MFD_AXP20X=y CONFIG_MFD_AXP20X=y
CONFIG_MFD_AXP20X_I2C=y CONFIG_MFD_AXP20X_I2C=y
CONFIG_MFD_AXP20X_RSB=y CONFIG_MFD_AXP20X_RSB=y
...@@ -129,6 +130,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y ...@@ -129,6 +130,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
CONFIG_RTC_CLASS=y CONFIG_RTC_CLASS=y
# CONFIG_RTC_INTF_SYSFS is not set # CONFIG_RTC_INTF_SYSFS is not set
# CONFIG_RTC_INTF_PROC is not set # CONFIG_RTC_INTF_PROC is not set
CONFIG_RTC_DRV_AC100=y
CONFIG_RTC_DRV_SUN6I=y CONFIG_RTC_DRV_SUN6I=y
CONFIG_RTC_DRV_SUNXI=y CONFIG_RTC_DRV_SUNXI=y
CONFIG_DMADEVICES=y CONFIG_DMADEVICES=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