Created
December 5, 2014 15:28
-
-
Save Oberon00/fa54afc73ee5b0c07365 to your computer and use it in GitHub Desktop.
Disabled PM_SLEEP_SMP, CONFIG_EXYNOS_PM_HOTPLUG , CONFIG_CPU_FREQ_GOV_PEGASUSQ
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| diff --git a/arch/arm/configs/cyanogenmod_i9100_defconfig b/arch/arm/configs/cyanogenmod_i9100_defconfig | |
| index d4d365b..3baab75 100644 | |
| --- a/arch/arm/configs/cyanogenmod_i9100_defconfig | |
| +++ b/arch/arm/configs/cyanogenmod_i9100_defconfig | |
| @@ -391,12 +391,7 @@ CONFIG_EXYNOS4_SETUP_THERMAL=y | |
| CONFIG_EXYNOS4_CPUFREQ=y | |
| CONFIG_EXYNOS4210_1200MHZ_SUPPORT=y | |
| # CONFIG_EXYNOS4210_1400MHZ_SUPPORT is not set | |
| - | |
| -# | |
| -# Support dynamic CPU Hotplug | |
| -# | |
| -CONFIG_EXYNOS_PM_HOTPLUG=y | |
| -CONFIG_STAND_ALONE_POLICY=y | |
| +# CONFIG_STAND_ALONE_POLICY is not set | |
| # CONFIG_LEGACY_HOTPLUG_POLICY is not set | |
| # CONFIG_WITH_DVFS_POLICY is not set | |
| # CONFIG_DVFS_NR_RUNNING_POLICY is not set | |
| @@ -451,12 +446,15 @@ CONFIG_TARGET_LOCALE_EUR=y | |
| # CONFIG_GC1_00_BD is not set | |
| # CONFIG_T0_00_BD is not set | |
| # CONFIG_T0_04_BD is not set | |
| +# CONFIG_KONA_00_BD is not set | |
| +# CONFIG_KONA_01_BD is not set | |
| # CONFIG_IRON_BD is not set | |
| # CONFIG_GRANDE_BD is not set | |
| # CONFIG_WRITEBACK_ENABLED is not set | |
| # CONFIG_EXYNOS_SOUND_PLATFORM_DATA is not set | |
| # CONFIG_JACK_FET is not set | |
| # CONFIG_JACK_GROUND_DET is not set | |
| +# CONFIG_USE_ADC_DET is not set | |
| CONFIG_SAMSUNG_ANALOG_UART_SWITCH=1 | |
| # CONFIG_EXYNOS5_DEV_BTS is not set | |
| @@ -507,6 +505,7 @@ CONFIG_SEC_LOG=y | |
| CONFIG_SEC_LOG_NONCACHED=y | |
| CONFIG_SEC_LOG_LAST_KMSG=y | |
| CONFIG_EHCI_IRQ_DISTRIBUTION=y | |
| +CONFIG_EHCI_MODEM_PORTNUM=2 | |
| # | |
| # Samsung Modem Feature | |
| @@ -530,6 +529,11 @@ CONFIG_SEC_MODEM_U1=y | |
| # CONFIG_SEC_MODEM_P8LTE is not set | |
| # CONFIG_SEC_MODEM_T0_TD_DUAL is not set | |
| # CONFIG_SEC_MODEM_U1_SPR is not set | |
| + | |
| +# | |
| +# Connectivity Feature | |
| +# | |
| +# CONFIG_GPS_BRCM_475X is not set | |
| # CONFIG_BT_CSR8811 is not set | |
| CONFIG_BT_BCM4330=y | |
| # CONFIG_BT_BCM4334 is not set | |
| @@ -548,6 +552,7 @@ CONFIG_BT_MGMT=y | |
| CONFIG_USB_CDFS_SUPPORT=y | |
| CONFIG_SAMSUNG_PRODUCT_SHIP=y | |
| # CONFIG_CORESIGHT_ETM is not set | |
| +# CONFIG_MACH_KONA_SENSOR is not set | |
| # | |
| # Processor Type | |
| @@ -630,7 +635,7 @@ CONFIG_VMSPLIT_3G=y | |
| # CONFIG_VMSPLIT_1G is not set | |
| CONFIG_PAGE_OFFSET=0xC0000000 | |
| CONFIG_NR_CPUS=2 | |
| -CONFIG_HOTPLUG_CPU=y | |
| +# CONFIG_HOTPLUG_CPU is not set | |
| CONFIG_LOCAL_TIMERS=y | |
| # CONFIG_PREEMPT_NONE is not set | |
| # CONFIG_PREEMPT_VOLUNTARY is not set | |
| @@ -716,7 +721,7 @@ CONFIG_CPU_FREQ_GOV_ONDEMAND_FLEXRATE_MAX_DURATION=100 | |
| # CONFIG_CPU_FREQ_GOV_INTERACTIVE is not set | |
| CONFIG_CPU_FREQ_GOV_CONSERVATIVE=y | |
| # CONFIG_CPU_FREQ_GOV_ADAPTIVE is not set | |
| -CONFIG_CPU_FREQ_GOV_PEGASUSQ=y | |
| +# CONFIG_CPU_FREQ_GOV_PEGASUSQ is not set | |
| # CONFIG_CPU_FREQ_GOV_SLP is not set | |
| # CONFIG_CPU_FREQ_DVFS_MONITOR is not set | |
| CONFIG_CPU_IDLE=y | |
| @@ -762,7 +767,7 @@ CONFIG_EARLYSUSPEND=y | |
| # CONFIG_CONSOLE_EARLYSUSPEND is not set | |
| CONFIG_FB_EARLYSUSPEND=y | |
| CONFIG_PM_SLEEP=y | |
| -CONFIG_PM_SLEEP_SMP=y | |
| +# CONFIG_PM_SLEEP_SMP is not set | |
| CONFIG_PM_RUNTIME=y | |
| CONFIG_PM=y | |
| # CONFIG_PM_DEBUG is not set | |
| @@ -1171,6 +1176,14 @@ CONFIG_RFKILL_PM=y | |
| # | |
| # Device Drivers | |
| # | |
| +CONFIG_MALI400=y | |
| +CONFIG_MALI_VER_R3P2=y | |
| +# CONFIG_MALI400_DEBUG is not set | |
| +# CONFIG_MALI400_PROFILING is not set | |
| +CONFIG_MALI_DVFS=y | |
| +CONFIG_MALI400_UMP=y | |
| +# CONFIG_MALI_SHARED_INTERRUPTS is not set | |
| +# CONFIG_UMP_DEBUG is not set | |
| # | |
| # Generic Driver Options | |
| @@ -1463,6 +1476,7 @@ CONFIG_KEYBOARD_GPIO=y | |
| # CONFIG_KEYBOARD_STOWAWAY is not set | |
| # CONFIG_KEYBOARD_SUNKBD is not set | |
| # CONFIG_KEYBOARD_XTKBD is not set | |
| +# CONFIG_SENSORS_HALL is not set | |
| CONFIG_KEYBOARD_CYPRESS_TOUCH=y | |
| # CONFIG_INPUT_MOUSE is not set | |
| # CONFIG_INPUT_JOYSTICK is not set | |
| @@ -1519,8 +1533,12 @@ CONFIG_TOUCHSCREEN_ATMEL_MXT224_U1=y | |
| # CONFIG_TOUCHSCREEN_MXT1386 is not set | |
| # CONFIG_TOUCHSCREEN_MXT768E is not set | |
| # CONFIG_TOUCHSCREEN_SYNAPTICS_S7301 is not set | |
| +# CONFIG_TOUCHSCREEN_SYNAPTICS_S7301_KEYS is not set | |
| +# CONFIG_TOUCHSCREEN_SYNAPTICS_S7301_WORKAROUND is not set | |
| +# CONFIG_TOUCHSCREEN_SYNAPTICS_S7301_KEYLED is not set | |
| # CONFIG_TOUCHSCREEN_CYTTSP4 is not set | |
| # CONFIG_SEC_TOUCHSCREEN_DVFS_LOCK is not set | |
| +# CONFIG_SEC_TOUCHSCREEN_SURFACE_TOUCH is not set | |
| # CONFIG_KEYPAD_MELFAS_TOUCH is not set | |
| # CONFIG_TOUCHSCREEN_ATMEL_MXT540S is not set | |
| # CONFIG_INPUT_WACOM is not set | |
| @@ -1758,6 +1776,7 @@ CONFIG_POWER_SUPPLY=y | |
| # CONFIG_BATTERY_MAX17043_FUELGAUGE is not set | |
| # CONFIG_BATTERY_MAX17042_FUELGAUGE is not set | |
| # CONFIG_BATTERY_MAX17047_FUELGAUGE is not set | |
| +# CONFIG_BATTERY_MAX17047_C_FUELGAUGE is not set | |
| # CONFIG_BATTERY_SMB136_CHARGER is not set | |
| # CONFIG_BATTERY_SAMSUNG_P1X is not set | |
| # CONFIG_CHARGER_MAX8903 is not set | |
| @@ -1981,6 +2000,7 @@ CONFIG_VIDEO_S5K5BAFX=y | |
| # CONFIG_VIDEO_S5K4EA is not set | |
| # CONFIG_VIDEO_S5C73M3 is not set | |
| # CONFIG_VIDEO_SLP_S5C73M3 is not set | |
| +# CONFIG_VIDEO_SR130PC20 is not set | |
| CONFIG_VIDEO_IMPROVE_STREAMOFF=y | |
| CONFIG_CSI_C=y | |
| # CONFIG_CSI_D is not set | |
| @@ -2047,7 +2067,6 @@ CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y | |
| # CONFIG_USB_ZR364XX is not set | |
| # CONFIG_USB_STKWEBCAM is not set | |
| # CONFIG_USB_S2255 is not set | |
| -CONFIG_MALI_400MP_UMP=y | |
| CONFIG_VIDEO_SAMSUNG=y | |
| CONFIG_VIDEO_SAMSUNG_V4L2=y | |
| CONFIG_VIDEO_FIMC=y | |
| @@ -2076,6 +2095,8 @@ CONFIG_VIDEO_MFC5X=y | |
| CONFIG_VIDEO_MFC_MAX_INSTANCE=4 | |
| CONFIG_VIDEO_MFC_MEM_PORT_COUNT=2 | |
| # CONFIG_VIDEO_MFC5X_DEBUG is not set | |
| +# CONFIG_VIDEO_MALI400MP is not set | |
| +# CONFIG_VIDEO_UMP is not set | |
| CONFIG_VIDEO_FIMG2D=y | |
| # CONFIG_VIDEO_FIMG2D_DEBUG is not set | |
| CONFIG_VIDEO_FIMG2D3X=y | |
| @@ -2112,19 +2133,12 @@ CONFIG_SAMSUNG_WORKAROUND_HPD_GLANCE=y | |
| # | |
| # Graphics support | |
| # | |
| -# CONFIG_MALI_VER_BEFORE_R3P2 is not set | |
| # CONFIG_DRM is not set | |
| CONFIG_ION=y | |
| CONFIG_ION_EXYNOS=y | |
| CONFIG_ION_EXYNOS_CONTIGHEAP_SIZE=71680 | |
| # CONFIG_ION_EXYNOS_CONTIGHEAP_DEBUG is not set | |
| -CONFIG_MALI400=y | |
| -CONFIG_MALI_VER_R3P2=y | |
| -# CONFIG_MALI400_DEBUG is not set | |
| -# CONFIG_MALI400_PROFILING is not set | |
| -CONFIG_MALI_DVFS=y | |
| -CONFIG_MALI400_UMP=y | |
| -# CONFIG_MALI_SHARED_INTERRUPTS is not set | |
| +# CONFIG_VGASTATE is not set | |
| # CONFIG_VIDEO_OUTPUT_CONTROL is not set | |
| CONFIG_FB=y | |
| # CONFIG_FIRMWARE_EDID is not set | |
| @@ -2199,6 +2213,7 @@ CONFIG_BACKLIGHT_CLASS_DEVICE=y | |
| # CONFIG_BACKLIGHT_PWM is not set | |
| # CONFIG_BACKLIGHT_ADP8860 is not set | |
| # CONFIG_BACKLIGHT_ADP8870 is not set | |
| +# CONFIG_BACKLIGHT_LP855X is not set | |
| # | |
| # Display device support | |
| @@ -2703,10 +2718,15 @@ CONFIG_SENSORS_CM3663=y | |
| # CONFIG_SENSORS_CM36651 is not set | |
| # CONFIG_SENSORS_BH1721 is not set | |
| # CONFIG_SENSORS_AL3201 is not set | |
| +# CONFIG_SENSORS_K2DH is not set | |
| CONFIG_SENSORS_K3DH=y | |
| +# CONFIG_SENSOR_K3DH_INPUTDEV is not set | |
| CONFIG_SENSORS_K3G=y | |
| # CONFIG_SENSORS_LSM330DLC is not set | |
| # CONFIG_SENSORS_LPS331 is not set | |
| +# CONFIG_SENSORS_YAS532 is not set | |
| +# CONFIG_SENSORS_YAS_ORI is not set | |
| +CONFIG_INPUT_YAS_MAGNETOMETER_POSITION=0 | |
| # CONFIG_SENSORS_SYSFS is not set | |
| # CONFIG_SENSORS_SSP is not set | |
| # CONFIG_SENSORS_SSP_LSM330 is not set | |
| @@ -2984,7 +3004,6 @@ CONFIG_RCU_CPU_STALL_VERBOSE=y | |
| # CONFIG_DEBUG_FORCE_WEAK_PER_CPU is not set | |
| # CONFIG_DEBUG_PER_CPU_MAPS is not set | |
| # CONFIG_LKDTM is not set | |
| -# CONFIG_CPU_NOTIFIER_ERROR_INJECT is not set | |
| # CONFIG_FAULT_INJECTION is not set | |
| # CONFIG_LATENCYTOP is not set | |
| CONFIG_SYSCTL_SYSCALL_CHECK=y | |
| diff --git a/kernel/power/Kconfig b/kernel/power/Kconfig | |
| index 9fda331..6d41c12 100644 | |
| --- a/kernel/power/Kconfig | |
| +++ b/kernel/power/Kconfig | |
| @@ -196,7 +196,7 @@ config PM_SLEEP | |
| depends on SUSPEND || HIBERNATE_CALLBACKS | |
| config PM_SLEEP_SMP | |
| - def_bool y | |
| + def_bool n | |
| depends on SMP | |
| depends on ARCH_SUSPEND_POSSIBLE || ARCH_HIBERNATION_POSSIBLE | |
| depends on PM_SLEEP |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment