From 6f5dbd68682ae77942bb4985485e0b2bf5dff28a Mon Sep 17 00:00:00 2001 From: Rask Ingemann Lambertsen Date: Wed, 8 Feb 2017 23:07:15 +0100 Subject: [PATCH 1/4] ARM: sunxi_defconfig: Enable AC100 RTC driver Enable the AC100 RTC driver so boards with it can keep track of time. Signed-off-by: Rask Ingemann Lambertsen Acked-by: Chen-Yu Tsai Signed-off-by: Maxime Ripard --- arch/arm/configs/sunxi_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/sunxi_defconfig b/arch/arm/configs/sunxi_defconfig index da92c25eb7ccd..5cd5dd70bc836 100644 --- a/arch/arm/configs/sunxi_defconfig +++ b/arch/arm/configs/sunxi_defconfig @@ -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 From 5741e07b465d32458945d363ce87c0e2b7fd028d Mon Sep 17 00:00:00 2001 From: Rask Ingemann Lambertsen Date: Wed, 8 Feb 2017 23:08:00 +0100 Subject: [PATCH 2/4] ARM: multi_v7_defconfig: Switch sunxi RSB driver from module to built-in The sunxi RSB bus is used for peripherals like voltage regulators and real-time clocks which should be available early in the boot process. As a module, the driver will not be available until the root fs has been mounted, so build the driver into the kernel. Signed-off-by: Rask Ingemann Lambertsen Signed-off-by: Maxime Ripard --- arch/arm/configs/multi_v7_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index a94126fb02c2a..0dbbc4d4c96bf 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -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 From f48a203cc44f26921f05911c047db49d2864c797 Mon Sep 17 00:00:00 2001 From: Rask Ingemann Lambertsen Date: Wed, 8 Feb 2017 23:08:45 +0100 Subject: [PATCH 3/4] ARM: multi_v7_defconfig: Enable AC100 RTC driver Enable the AC100 RTC driver so boards with it can keep track of time. Signed-off-by: Rask Ingemann Lambertsen Signed-off-by: Maxime Ripard --- arch/arm/configs/multi_v7_defconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index 0dbbc4d4c96bf..cfa3ae2e55e90 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -482,6 +482,7 @@ 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 @@ -752,6 +753,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 From 7cae7ef89e360cd3dc139eaac2f480c25bc7bfa1 Mon Sep 17 00:00:00 2001 From: Rask Ingemann Lambertsen Date: Wed, 8 Feb 2017 23:09:31 +0100 Subject: [PATCH 4/4] ARM: multi_v7_defconfig: Switch AXP20x driver from module to built-in The AXP20X regulator support is currently built as a module, which means it's not available until the root fs has been mounted, but the boot loader might not have enabled the required regulators, so build their drivers into the kernel. Signed-off-by: Rask Ingemann Lambertsen Signed-off-by: Maxime Ripard --- arch/arm/configs/multi_v7_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig index cfa3ae2e55e90..36c1b39cfb541 100644 --- a/arch/arm/configs/multi_v7_defconfig +++ b/arch/arm/configs/multi_v7_defconfig @@ -484,8 +484,8 @@ 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 @@ -514,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