diff mbox series

[2/6] hikey960_defconfig: Cleanup hikey960_defconfig via savedefconfig

Message ID 1501012595-14434-2-git-send-email-john.stultz@linaro.org
State New
Headers show
Series [1/6] HACK: dwc3: Cleanup wakelock bits from hack patch | expand

Commit Message

John Stultz July 25, 2017, 7:56 p.m. UTC 
Save output from savedefconfig which removes and reorders
some of the defconfig settings.

Signed-off-by: John Stultz <john.stultz@linaro.org>

---
 arch/arm64/configs/hikey960_defconfig | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

-- 
2.7.4
diff mbox series

Patch

diff --git a/arch/arm64/configs/hikey960_defconfig b/arch/arm64/configs/hikey960_defconfig
index 3c1c53e..074f0ab 100644
--- a/arch/arm64/configs/hikey960_defconfig
+++ b/arch/arm64/configs/hikey960_defconfig
@@ -60,15 +60,13 @@  CONFIG_PM_AUTOSLEEP=y
 CONFIG_PM_WAKELOCKS=y
 CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
-CONFIG_CPU_IDLE_MULTIPLE_DRIVERS=y
 CONFIG_ARM_CPUIDLE=y
 CONFIG_ARM_HISI_CPUIDLE=y
 CONFIG_CPU_FREQ=y
 CONFIG_CPU_FREQ_STAT=y
+CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
 CONFIG_CPU_FREQ_GOV_USERSPACE=y
 CONFIG_CPU_FREQ_GOV_ONDEMAND=y
-CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y
-CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y
 CONFIG_CPUFREQ_DT=y
 CONFIG_NET=y
 CONFIG_PACKET=y
@@ -182,10 +180,10 @@  CONFIG_NET_EMATCH=y
 CONFIG_NET_EMATCH_U32=y
 CONFIG_NET_CLS_ACT=y
 CONFIG_BT=y
+CONFIG_BT_LEDS=y
 CONFIG_BT_RFCOMM=y
 CONFIG_BT_RFCOMM_TTY=y
 CONFIG_BT_HIDP=y
-CONFIG_BT_LEDS=y
 CONFIG_BT_HCIUART=y
 CONFIG_BT_HCIUART_H4=y
 CONFIG_BT_WILINK=y
@@ -286,8 +284,8 @@  CONFIG_THERMAL_GOV_STEP_WISE=y
 CONFIG_THERMAL_GOV_USER_SPACE=y
 CONFIG_CPU_THERMAL=y
 CONFIG_DEVFREQ_THERMAL=y
-CONFIG_HI3660_THERMAL=y
 CONFIG_HISI_THERMAL=y
+CONFIG_HI3660_THERMAL=y
 CONFIG_MFD_HI6421_PMIC=y
 CONFIG_MFD_HI655X_PMIC=y
 CONFIG_REGULATOR=y
@@ -365,7 +363,6 @@  CONFIG_HID_WACOM=y
 CONFIG_HID_WIIMOTE=y
 CONFIG_HID_ZEROPLUS=y
 CONFIG_HID_ZYDACRON=y
-CONFIG_HUB_USB5734=y
 CONFIG_USB=y
 CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
 CONFIG_USB_XHCI_HCD=y
@@ -438,6 +435,7 @@  CONFIG_MALI_MIDGARD=y
 CONFIG_MALI_DMA_FENCE=y
 CONFIG_MALI_EXPERT=y
 CONFIG_MALI_PLATFORM_FAKE=y
+# CONFIG_MALI_PLATFORM_HISILICON is not set
 # CONFIG_MALI_IDLE_AUTO_CLK_DIV is not set
 CONFIG_MALI_GPU_DRM=y
 CONFIG_PHY_HI6220_USB=y
@@ -448,11 +446,11 @@  CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder"
 CONFIG_EFI_VARS=y
 CONFIG_EFI_VARS_PSTORE_DEFAULT_DISABLE=y
 CONFIG_ACPI=y
-CONFIG_F2FS_FS=y
 CONFIG_EXT4_FS=y
 CONFIG_EXT4_FS_SECURITY=y
 CONFIG_EXT4_ENCRYPTION=y
 CONFIG_BTRFS_FS=y
+CONFIG_F2FS_FS=y
 CONFIG_FANOTIFY=y
 CONFIG_FANOTIFY_ACCESS_PERMISSIONS=y
 CONFIG_QUOTA=y