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

Allwinner defconfig changes for 4.12 

Some patches to enable new modules in the defconfig.
 -----BEGIN PGP SIGNATURE-----
 
 iQIcBAABCAAGBQJY5f2NAAoJEBx+YmzsjxAgnwsP/2BFWtQrxSlAKvPCHzbHdP82
 HOEBeK/gbBffV3ceumgxDgFqKtMFVDPNlpba9QkrOCS7mSE7qM/BZvdBzszrJfGF
 5zyNls5rS7Bh3XYkrg2szcETNuWKKLBiGjmkSOp5qrPYS83Nqnn6ynIjOQzJ9/7j
 OKXdCnnCBOEq6NL+h++EwmoyQtjEkAEwKWuwsQwK8I18tuk4BGnxxewP2DpZKgsS
 MD+UMYAoINMbk6Uo0jORDjjKpx/MCUo4AleE878inACY2bhc9vK8f+eILF2VLz6/
 QSRqwvwu79B+2AOMb+R3Z+/d6SnN3YkkW+wkc6K0qA+yLoeGRmbFimezx2dO21tW
 ErSOlELEEiCSJzJWiiocFOtDlC39rP+3pRbMcZ63YlrFBIxQkz8KQgWiwxZgwJ3H
 W3ZhnN8foR3iE4NcOe5TRZ7oeSWH6pUa6DkD2P6nG0aNSa/v7qWQ0lpu0YngUnH3
 ZFoaFcBHT8aiKCauepUU+yfwZZxu84+OKuznXsSd/BngCgVlsXI2qIK1dWEWawNl
 pKeeRhmoZKz2Sc9EmLpBEjE2yKuwEZfwPVB4hsULge8TKSxJ01VJMZduoyL6XI4n
 QAbROCZRokMuVBbEOeTTH2exmZvRuLqpiYdXa7cJ/OYPRi00E9gC577vEJ5kNOMW
 9DRcXS0xPEQh9Kftqi7o
 =a4lF
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2017-04-19 05:34:53 -07:00
parent ee93732978 7cae7ef89e
commit 9479f95f32
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/arm/configs/multi_v7_defconfig
View File

@ -195,7 +195,7 @@ CONFIG_DMA_CMA=y
CONFIG_CMA_SIZE_MBYTES=64
CONFIG_OMAP_OCP2SCP=y
CONFIG_SIMPLE_PM_BUS=y
CONFIG_SUNXI_RSB=m
CONFIG_SUNXI_RSB=y
CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y
CONFIG_MTD_BLOCK=y
@ -482,9 +482,10 @@ CONFIG_MFD_AS3722=y
CONFIG_MFD_ATMEL_FLEXCOM=y
CONFIG_MFD_ATMEL_HLCDC=m
CONFIG_MFD_BCM590XX=y
CONFIG_MFD_AC100=y
CONFIG_MFD_AXP20X=y
CONFIG_MFD_AXP20X_I2C=m
CONFIG_MFD_AXP20X_RSB=m
CONFIG_MFD_AXP20X_I2C=y
CONFIG_MFD_AXP20X_RSB=y
CONFIG_MFD_CROS_EC=m
CONFIG_MFD_CROS_EC_I2C=m
CONFIG_MFD_CROS_EC_SPI=m
@ -513,7 +514,7 @@ CONFIG_REGULATOR_ACT8865=y
CONFIG_REGULATOR_ANATOP=y
CONFIG_REGULATOR_AS3711=y
CONFIG_REGULATOR_AS3722=y
CONFIG_REGULATOR_AXP20X=m
CONFIG_REGULATOR_AXP20X=y
CONFIG_REGULATOR_BCM590XX=y
CONFIG_REGULATOR_DA9210=y
CONFIG_REGULATOR_FAN53555=y
@ -753,6 +754,7 @@ CONFIG_EDAC_MM_EDAC=y
CONFIG_EDAC_HIGHBANK_MC=y
CONFIG_EDAC_HIGHBANK_L2=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_AC100=y
CONFIG_RTC_DRV_AS3722=y
CONFIG_RTC_DRV_DS1307=y
CONFIG_RTC_DRV_HYM8563=m

2
arch/arm/configs/sunxi_defconfig
View File

@ -87,6 +87,7 @@ CONFIG_THERMAL_OF=y
CONFIG_CPU_THERMAL=y
CONFIG_WATCHDOG=y
CONFIG_SUNXI_WATCHDOG=y
CONFIG_MFD_AC100=y
CONFIG_MFD_AXP20X=y
CONFIG_MFD_AXP20X_I2C=y
CONFIG_MFD_AXP20X_RSB=y
@ -129,6 +130,7 @@ CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
CONFIG_RTC_CLASS=y
# CONFIG_RTC_INTF_SYSFS is not set
# CONFIG_RTC_INTF_PROC is not set
CONFIG_RTC_DRV_AC100=y
CONFIG_RTC_DRV_SUN6I=y
CONFIG_RTC_DRV_SUNXI=y
CONFIG_DMADEVICES=y