--- d5c6a622c1b5315eaf030d1246b3940b5ea6f235
+++ aaef68da7aaf53d8b02f24c52e27ee30701ac597
@@ -17,6 +17,35 @@ config CPU_FREQ
 
 if CPU_FREQ
 
+config CPU_FREQ_MIN_SCALING_LIMIT
+	int "Min CPU Scaling Frequency Limit"
+	depends on CPU_FREQ
+	default 384000
+
+config CPU_FREQ_MAX_SCALING_LIMIT
+	int "Max CPU Scaling Frequency Limit"
+	depends on CPU_FREQ
+	default 1900000
+
+config CPU_FREQ_MAX_VDD_SC
+	int "Max CPU VDD SC uV"
+	depends on CPU_FREQ
+	default 1400000
+
+config CPU_FREQ_MIN_VDD_SC
+	int "Min CPU VDD SC uV"
+	depends on CPU_FREQ
+	default 850000
+
+config CPU_FREQ_MSM_DCVS_CPU1_DELAY
+	int "Delay prior to initializing dcvs for cpu1 (ms)"
+	depends on CPU_FREQ
+	default 1000
+	help
+		The MSM-DCVS governor sometimes does not register
+		the second cpu, cpu1, correctly.  This delay gives
+		cpu1 additional time to become ready prior to registering
+		
 config CPU_FREQ_TABLE
 	tristate
 
@@ -123,7 +152,7 @@ config CPU_FREQ_DEFAULT_GOV_INTERACTIVE
 	  'interactive' governor for latency-sensitive workloads.
 
 config CPU_FREQ_DEFAULT_GOV_SMARTASSV2
-	bool "smartass2"
+	bool "smartassv2"
 	select CPU_FREQ_GOV_SMARTASSV2
 	help
 		Use the CPUFreq governor 'smartassV2' as default.