diff --git a/config-armv7-generic b/config-armv7-generic index 17d689156..8c380fef1 100644 --- a/config-armv7-generic +++ b/config-armv7-generic @@ -200,14 +200,18 @@ CONFIG_GPIO_PCA953X=m CONFIG_GPIO_PCF857X=m CONFIG_TOUCHSCREEN_SUN4I=m CONFIG_MFD_AXP20X=y -CONFIG_REGULATOR_AXP20X=m CONFIG_AXP288_FUEL_GAUGE=m +CONFIG_AXP288_ADC=m +CONFIG_EXTCON_AXP288=m +CONFIG_INPUT_AXP20X_PEK=m +CONFIG_REGULATOR_AXP20X=m +CONFIG_AXP288_CHARGER=m +CONFIG_TOUCHSCREEN_CHIPONE_ICN8318=m CONFIG_IR_SUNXI=m CONFIG_MDIO_SUN4I=m CONFIG_DWMAC_SUNXI=m CONFIG_SUN4I_EMAC=m CONFIG_RTC_DRV_SUN6I=m -CONFIG_AXP288_ADC=m CONFIG_MTD_NAND_SUNXI=m CONFIG_SERIO_SUN4I_PS2=m CONFIG_KEYBOARD_SUN4I_LRADC=m @@ -910,7 +914,6 @@ CONFIG_R8188EU=m # CONFIG_PMIC_DA903X is not set # CONFIG_PMIC_ADP5520 is not set # CONFIG_INPUT_REGULATOR_HAPTIC is not set -# CONFIG_INPUT_AXP20X_PEK is not set # CONFIG_POWER_RESET_BRCMSTB is not set # CONFIG_INPUT_TPS65218_PWRBUTTON is not set # CONFIG_CLK_QORIQ is not set @@ -918,7 +921,6 @@ CONFIG_R8188EU=m # CONFIG_QCOM_SPMI_TEMP_ALARM is not set # CONFIG_SND_SOC_APQ8016_SBC is not set # CONFIG_SND_SOC_TAS571X is not set -# CONFIG_EXTCON_AXP288 is not set # Debug options. We need to deal with them at some point like x86 # CONFIG_DEBUG_USER is not set diff --git a/kernel.spec b/kernel.spec index df65aabe5..b17f59d5c 100644 --- a/kernel.spec +++ b/kernel.spec @@ -2041,6 +2041,9 @@ fi # # %changelog +* Mon Sep 14 2015 Peter Robinson +- ARMv7 update for AllWinner devices + * Fri Sep 11 2015 Josh Boyer - 4.3.0-0.rc0.git14.1 - Linux v4.2-11169-g64d1def7d338