Samsung i9300 Update 11

Change-Id: I7f6dbdd97e3ed66634bf123d43224a79524c04e9

9 files changed, 282 insertions, 13 deletions

diff --git a/arch/arm/configs/m0_00_defconfig b/arch/arm/configs/m0_00_defconfig
index fb9dea6..26d9bc6 100644
--- a/arch/arm/configs/m0_00_defconfig
+++ b/arch/arm/configs/m0_00_defconfig
@@ -1388,8 +1388,6 @@ CONFIG_WIFI_CONTROL_FUNC=y
 # CONFIG_BCM4330 is not set
 CONFIG_BCM4334=y
 # CONFIG_BCM43241 is not set
-CONFIG_BCMDHD_FW_PATH="/system/etc/firmware/fw_bcmdhd.bin"
-CONFIG_BCMDHD_NVRAM_PATH="/system/etc/wifi/bcmdhd.cal"
 CONFIG_BROADCOM_WIFI_RESERVED_MEM=y
 CONFIG_WLAN_REGION_CODE=100
 # CONFIG_HOSTAP is not set
diff --git a/arch/arm/mach-exynos/board-grande.c b/arch/arm/mach-exynos/board-grande.c
index 79c0fa8..ede2570 100755
--- a/arch/arm/mach-exynos/board-grande.c
+++ b/arch/arm/mach-exynos/board-grande.c
@@ -1553,7 +1553,7 @@ static void __init exynos4_reserve_mem(void)
 #endif
 
 	static const char map[] __initconst =
-		"s3cfb.0=fimd;exynos4-fb.0=fimd;"
+		"s3cfb.0=fimd;exynos4-fb.0=fimd;samsung-pd.1=fimd;"
 		"s3c-fimc.0=fimc0;s3c-fimc.1=fimc1;s3c-fimc.2=fimc2;s3c-fimc.3=fimc3;"
 		"exynos4210-fimc.0=fimc0;exynos4210-fimc.1=fimc1;exynos4210-fimc.2=fimc2;exynos4210-fimc.3=fimc3;"
 #ifdef CONFIG_ION_EXYNOS
diff --git a/arch/arm/mach-exynos/charger-slp.c b/arch/arm/mach-exynos/charger-slp.c
new file mode 100644
index 0000000..c8bdefe
--- /dev/null
+++ b/arch/arm/mach-exynos/charger-slp.c
@@ -0,0 +1,271 @@
+/*
+ * linux/arch/arm/mach-exynos/charger-slp.c
+ * COPYRIGHT(C) 2011
+ * MyungJoo Ham <myungjoo.ham@samsung.com>
+ *
+ * Charger Support with Charger-Manager Framework
+ *
+ */
+
+#include <linux/io.h>
+#include <linux/err.h>
+#include <linux/platform_device.h>
+#include <linux/regulator/consumer.h>
+#include <linux/power/charger-manager.h>
+#include <linux/hwmon.h>
+#include <linux/platform_data/ntc_thermistor.h>
+
+#include <plat/adc.h>
+#include <plat/pm.h>
+
+#include <mach/regs-pmu.h>
+#include <mach/irqs.h>
+
+#include "board-mobile.h"
+
+#define S5P_WAKEUP_STAT_WKSRC_MASK	0x000ffe3f
+#define ADC_SAMPLING_CNT 7
+#define SDI_2100MA_BATT	4350000
+
+/* Temperatures in milli-centigrade */
+#define SECBATTSPEC_TEMP_HIGH		(65 * 1000)
+#define SECBATTSPEC_TEMP_HIGH_REC	(43 * 1000)
+#define SECBATTSPEC_TEMP_LOW		(-5 * 1000)
+#define SECBATTSPEC_TEMP_LOW_REC	(0 * 1000)
+
+#ifdef CONFIG_SENSORS_NTC_THERMISTOR
+struct platform_device midas_ncp15wb473_thermistor;
+static int ntc_adc_num = -EINVAL; /* Uninitialized */
+static struct s3c_adc_client *ntc_adc;
+
+int __init adc_ntc_init(int port)
+{
+	int err = 0;
+
+	if (port < 0 || port > 9)
+		return -EINVAL;
+	ntc_adc_num = port;
+
+	ntc_adc = s3c_adc_register(&midas_ncp15wb473_thermistor,
+			NULL, NULL, 0);
+	if (IS_ERR(ntc_adc)) {
+		err = PTR_ERR(ntc_adc);
+		ntc_adc = NULL;
+		return err;
+	}
+
+	return 0;
+}
+
+static int read_thermistor_uV(void)
+{
+	int val, i;
+	int adc_min = 0;
+	int adc_max = 0;
+	int adc_total = 0;
+
+	s64 converted;
+
+	WARN(ntc_adc == NULL || ntc_adc_num < 0,
+	     "NTC-ADC is not initialized for %s.\n", __func__);
+
+	for (i = 0; i < ADC_SAMPLING_CNT; i++) {
+		val = s3c_adc_read(ntc_adc, ntc_adc_num);
+		if (val <  0) {
+			pr_err("%s : read failed.(%d).\n", __func__, val);
+			return -EAGAIN;
+		}
+
+		if (i != 0) {
+			if (val > adc_max)
+				adc_max = val;
+			else if (val < adc_min)
+				adc_min = val;
+		} else {
+			adc_max = val;
+			adc_min = val;
+		}
+
+		adc_total += val;
+	}
+
+	val = (adc_total - (adc_max + adc_min)) / (ADC_SAMPLING_CNT - 2);
+
+	/* Multiplied by maximum input voltage */
+	converted = 1800000LL * (s64) val;
+	/* Divided by resolution */
+	converted >>= 12;
+
+	return converted;
+}
+
+static struct ntc_thermistor_platform_data ncp15wb473_pdata = {
+	.read_uV	= read_thermistor_uV,
+	.pullup_uV	= 1800000, /* VCC_1.8V_AP */
+	.pullup_ohm	= 100000, /* 100K */
+	.pulldown_ohm	= 100000, /* 100K */
+	.connect	= NTC_CONNECTED_GROUND,
+};
+
+static int __read_thermistor_mC(int *mC)
+{
+	int ret;
+	static struct device *hwmon;
+	static struct hwmon_property *entry;
+
+	if (ntc_adc_num == -EINVAL)
+		return -ENODEV;
+
+	if (hwmon == NULL)
+		hwmon = hwmon_find_device(&midas_ncp15wb473_thermistor.dev);
+
+	if (IS_ERR_OR_NULL(hwmon)) {
+		hwmon = NULL;
+		return -ENODEV;
+	}
+
+	if (entry == NULL)
+		entry = hwmon_get_property(hwmon, "temp1_input");
+	if (IS_ERR_OR_NULL(entry)) {
+		entry = NULL;
+		return -ENODEV;
+	}
+
+	ret = hwmon_get_value(hwmon, entry, mC);
+	if (ret < 0) {
+		entry = NULL;
+		return ret;
+	}
+
+	return 0;
+}
+#else
+static int __read_thermistor_mC(int *mC)
+{
+	*mC = 25000;
+	return 0;
+}
+#endif
+
+enum temp_stat { TEMP_OK = 0, TEMP_HOT = 1, TEMP_COLD = -1 };
+
+static int midas_thermistor_ck(int *mC)
+{
+	static enum temp_stat state = TEMP_OK;
+
+	 __read_thermistor_mC(mC);
+
+	switch (state) {
+	case TEMP_OK:
+		if (*mC >= SECBATTSPEC_TEMP_HIGH)
+			state = TEMP_HOT;
+		else if (*mC <= SECBATTSPEC_TEMP_LOW)
+			state = TEMP_COLD;
+		break;
+	case TEMP_HOT:
+		if (*mC <= SECBATTSPEC_TEMP_LOW)
+			state = TEMP_COLD;
+		else if (*mC < SECBATTSPEC_TEMP_HIGH_REC)
+			state = TEMP_OK;
+		break;
+	case TEMP_COLD:
+		if (*mC >= SECBATTSPEC_TEMP_HIGH)
+			state = TEMP_HOT;
+		else if (*mC > SECBATTSPEC_TEMP_LOW_REC)
+			state = TEMP_OK;
+	default:
+		pr_err("%s has invalid state %d\n", __func__, state);
+	}
+
+	return state;
+}
+
+static bool s3c_wksrc_rtc_alarm(void)
+{
+	u32 reg = s3c_suspend_wakeup_stat & S5P_WAKEUP_STAT_WKSRC_MASK;
+
+	if ((reg & S5P_WAKEUP_STAT_RTCALARM) &&
+	    !(reg & ~S5P_WAKEUP_STAT_RTCALARM))
+		return true; /* yes, it is */
+
+	return false;
+}
+
+static char *midas_charger_stats[] = {
+#if defined(CONFIG_BATTERY_MAX77693_CHARGER)
+	"max77693-charger",
+#endif
+	NULL };
+
+struct charger_cable charger_cable_vinchg1[] = {
+	{
+		.extcon_name	= "max77693-muic",
+		.name		= "USB",
+		.min_uA		= 475000,
+		.max_uA		= 475000 + 25000,
+	}, {
+		.extcon_name	= "max77693-muic",
+		.name		= "TA",
+		.min_uA		= 650000,
+		.max_uA		= 650000 + 25000,
+	}, {
+		.extcon_name	= "max77693-muic",
+		.name		= "MHL",
+	},
+};
+
+static struct charger_regulator midas_regulators[] = {
+	{
+		.regulator_name	= "vinchg1",
+		.cables		= charger_cable_vinchg1,
+		.num_cables	= ARRAY_SIZE(charger_cable_vinchg1),
+	},
+};
+
+static struct charger_desc midas_charger_desc = {
+	.psy_name		= "battery",
+	.polling_interval_ms	= 30000,
+	.polling_mode		= CM_POLL_EXTERNAL_POWER_ONLY,
+	.fullbatt_vchkdrop_ms	= 30000,
+	.fullbatt_vchkdrop_uV	= 50000,
+	.fullbatt_uV		= 4200000,
+	.battery_present	= CM_CHARGER_STAT,
+	.psy_charger_stat	= midas_charger_stats,
+	.psy_fuel_gauge		= "max17047-fuelgauge",
+	.is_temperature_error	= midas_thermistor_ck,
+	.measure_ambient_temp	= true,
+	.measure_battery_temp	= false,
+	.soc_margin		= 0,
+
+	.charger_regulators	= midas_regulators,
+	.num_charger_regulators	= ARRAY_SIZE(midas_regulators),
+};
+
+struct charger_global_desc midas_charger_g_desc = {
+	.rtc = "rtc0",
+	.is_rtc_only_wakeup_reason = s3c_wksrc_rtc_alarm,
+	.assume_timer_stops_in_suspend	= false,
+};
+
+struct platform_device midas_charger_manager = {
+	.name			= "charger-manager",
+	.dev			= {
+		.platform_data = &midas_charger_desc,
+	},
+};
+
+#ifdef CONFIG_SENSORS_NTC_THERMISTOR
+struct platform_device midas_ncp15wb473_thermistor = {
+	.name			= "ncp15wb473",
+	.dev			= {
+		.platform_data = &ncp15wb473_pdata,
+	},
+};
+#endif
+
+void cm_change_fullbatt_uV(void)
+{
+	midas_charger_desc.fullbatt_uV =  SDI_2100MA_BATT;
+}
+EXPORT_SYMBOL(cm_change_fullbatt_uV);
+
diff --git a/arch/arm/mach-exynos/cpuidle-exynos4.c b/arch/arm/mach-exynos/cpuidle-exynos4.c
index 3bfc3fb..3c77fed 100644
--- a/arch/arm/mach-exynos/cpuidle-exynos4.c
+++ b/arch/arm/mach-exynos/cpuidle-exynos4.c
@@ -741,7 +741,7 @@ early_wakeup:
 			       ARRAY_SIZE(exynos4_lpa_save));
 
 #ifdef CONFIG_EXYNOS4_CPUFREQ
-	if ((exynos_result_of_asv > 1) && !soc_is_exynos4210()) {
+	if (!soc_is_exynos4210()) {
 		exynos4x12_set_abb_member(ABB_ARM, abb_val);
 		exynos4x12_set_abb_member(ABB_INT, abb_val_int);
 	}
diff --git a/arch/arm/mach-exynos/mach-midas.c b/arch/arm/mach-exynos/mach-midas.c
index c2de56b..46161be 100644
--- a/arch/arm/mach-exynos/mach-midas.c
+++ b/arch/arm/mach-exynos/mach-midas.c
@@ -2675,7 +2675,7 @@ static void __init exynos4_reserve_mem(void)
 #ifdef CONFIG_EXYNOS_C2C
 		"samsung-c2c=c2c_shdmem;"
 #endif
-		"s3cfb.0=fimd;exynos4-fb.0=fimd;"
+		"s3cfb.0=fimd;exynos4-fb.0=fimd;samsung-pd.1=fimd;"
 		"s3c-fimc.0=fimc0;s3c-fimc.1=fimc1;s3c-fimc.2=fimc2;s3c-fimc.3=fimc3;"
 		"exynos4210-fimc.0=fimc0;exynos4210-fimc.1=fimc1;exynos4210-fimc.2=fimc2;exynos4210-fimc.3=fimc3;"
 #ifdef CONFIG_ION_EXYNOS
diff --git a/arch/arm/mach-exynos/mach-p4notepq.c b/arch/arm/mach-exynos/mach-p4notepq.c
index eafb3b9..1502556 100644
--- a/arch/arm/mach-exynos/mach-p4notepq.c
+++ b/arch/arm/mach-exynos/mach-p4notepq.c
@@ -2259,7 +2259,7 @@ static void __init exynos4_reserve_mem(void)
 #ifdef CONFIG_EXYNOS_C2C
 		"samsung-c2c=c2c_shdmem;"
 #endif
-		"s3cfb.0=fimd;exynos4-fb.0=fimd;"
+		"s3cfb.0=fimd;exynos4-fb.0=fimd;samsung-pd.1=fimd;"
 		"s3c-fimc.0=fimc0;s3c-fimc.1=fimc1;s3c-fimc.2=fimc2;s3c-fimc.3=fimc3;"
 		"exynos4210-fimc.0=fimc0;exynos4210-fimc.1=fimc1;exynos4210-fimc.2=fimc2;exynos4210-fimc.3=fimc3;"
 #ifdef CONFIG_ION_EXYNOS
diff --git a/arch/arm/mach-exynos/mach-px.c b/arch/arm/mach-exynos/mach-px.c
index c5c4cc8..eaec80f 100644
--- a/arch/arm/mach-exynos/mach-px.c
+++ b/arch/arm/mach-exynos/mach-px.c
@@ -7246,9 +7246,9 @@ static void __init exynos4_reserve_mem(void)
 
 	static const char map[] __initconst =
 		"android_pmem.0=pmem;android_pmem.1=pmem_gpu1;"
-		"s3cfb.0=fimd;exynos4-fb.0=fimd;"
-		"s3c-fimc.0=fimc0;s3c-fimc.1=fimc1;s3c-fimc.2=fimc2;"
-		"exynos4210-fimc.0=fimc0;exynos4210-fimc.1=fimc1;exynos4210-fimc.2=fimc2;exynos4210-fimc3=fimc3;"
+		"s3cfb.0=fimd;exynos4-fb.0=fimd;samsung-pd.1=fimd;"
+		"s3c-fimc.0=fimc0;s3c-fimc.1=fimc1;s3c-fimc.2=fimc2;s3c-fimc.3=fimc3;"
+		"exynos4210-fimc.0=fimc0;exynos4210-fimc.1=fimc1;exynos4210-fimc.2=fimc2;exynos4210-fimc.3=fimc3;"
 #ifdef CONFIG_VIDEO_MFC5X
 		"s3c-mfc/A=mfc0,mfc-secure;"
 		"s3c-mfc/B=mfc1,mfc-normal;"
diff --git a/arch/arm/mach-exynos/mach-smdk4x12.c b/arch/arm/mach-exynos/mach-smdk4x12.c
index 97daba2..da004f3 100644
--- a/arch/arm/mach-exynos/mach-smdk4x12.c
+++ b/arch/arm/mach-exynos/mach-smdk4x12.c
@@ -3693,7 +3693,7 @@ static void __init exynos4_reserve_mem(void)
 #ifdef CONFIG_EXYNOS_C2C
 		"samsung-c2c=c2c_shdmem;"
 #endif
-		"s3cfb.0/fimd=fimd;exynos4-fb.0/fimd=fimd;"
+		"s3cfb.0/fimd=fimd;exynos4-fb.0/fimd=fimd;samsung-pd.1=fimd;"
 #ifdef CONFIG_EXYNOS_CONTENT_PATH_PROTECTION
 		"s3cfb.0/video=video;exynos4-fb.0/video=video;"
 #endif
diff --git a/arch/arm/mach-exynos/mach-u1.c b/arch/arm/mach-exynos/mach-u1.c
index 59cb0bc..ab756ab 100644
--- a/arch/arm/mach-exynos/mach-u1.c
+++ b/arch/arm/mach-exynos/mach-u1.c
@@ -7767,10 +7767,10 @@ static void __init exynos4_reserve_mem(void)
 
 	static const char map[] __initconst =
 		"android_pmem.0=pmem;android_pmem.1=pmem_gpu1;"
-		"s3cfb.0=fimd;exynos4-fb.0=fimd;"
-		"s3c-fimc.0=fimc0;s3c-fimc.1=fimc1;s3c-fimc.2=fimc2;"
+		"s3cfb.0=fimd;exynos4-fb.0=fimd;samsung-pd.1=fimd;"
+		"s3c-fimc.0=fimc0;s3c-fimc.1=fimc1;s3c-fimc.2=fimc2;s3c-fimc.3=fimc3;"
 		"exynos4210-fimc.0=fimc0;exynos4210-fimc.1=fimc1;"
-		"exynos4210-fimc.2=fimc2;exynos4210-fimc3=fimc3;"
+		"exynos4210-fimc.2=fimc2;exynos4210-fimc.3=fimc3;"
 #ifdef CONFIG_ION_EXYNOS
 		"ion-exynos=ion;"
 #endif