Revert "power: ab8500_bm: Filter spurious temp irqs on AB8500 cut 3.0"u8500-android-2.3_v0.43

This reverts commit b0f0e9c93cabc87975b0ce0d039707edda5cb6b8.

Change-Id: I2602fccd7280a53bd0387a1f34037e505577a588
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/18880
Tested-by: Johan PALSSON <johan.palsson@stericsson.com>
Reviewed-by: Johan GARDSMARK <johan.gardsmark@stericsson.com>
Reviewed-by: Karl KOMIEROWSKI <karl.komierowski@stericsson.com>
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>

1 files changed, 20 insertions, 62 deletions

diff --git a/drivers/power/ab8500_btemp.c b/drivers/power/ab8500_btemp.c
index c1ba6ed129a..ac6b4a2e19f 100644
--- a/drivers/power/ab8500_btemp.c
+++ b/drivers/power/ab8500_btemp.c
@@ -558,9 +558,8 @@ static irqreturn_t ab8500_btemp_templow_handler(int irq, void *_di)
 	case AB8500_CUT1P0:
 	case AB8500_CUT1P1:
 	case AB8500_CUT2P0:
-	case AB8500_CUT3P0:
 		dev_dbg(di->dev, "Ignore false btemp low irq"
-			" for ABB cut 1.0, 1.1, 2.0 and 3.0\n");
+			" for ABB cut 1.0, 1.1 and 2.0\n");
 
 		break;
 	default:
@@ -588,26 +587,14 @@ static irqreturn_t ab8500_btemp_templow_handler(int irq, void *_di)
 static irqreturn_t ab8500_btemp_temphigh_handler(int irq, void *_di)
 {
 	struct ab8500_btemp *di = _di;
-	switch (di->chip_id) {
-	case AB8500_CUT1P0:
-	case AB8500_CUT1P1:
-	case AB8500_CUT2P0:
-	case AB8500_CUT3P0:
-		dev_dbg(di->dev, "Ignore false btemp high irq"
-			" for ABB cut 1.0, 1.1, 2.0 and 3.0\n");
 
-		break;
-	default:
-		dev_crit(di->dev, "Battery temperature higher than MAX\n");
+	dev_crit(di->dev, "Battery temperature is higher than MAX temp\n");
 
-		di->events.btemp_high = true;
-		di->events.btemp_medhigh = false;
-		di->events.btemp_lowmed = false;
-		di->events.btemp_low = false;
-		power_supply_changed(&di->btemp_psy);
-
-		break;
-	}
+	di->events.btemp_high = true;
+	di->events.btemp_medhigh = false;
+	di->events.btemp_lowmed = false;
+	di->events.btemp_low = false;
+	power_supply_changed(&di->btemp_psy);
 
 	return IRQ_HANDLED;
 }
@@ -622,27 +609,14 @@ static irqreturn_t ab8500_btemp_temphigh_handler(int irq, void *_di)
 static irqreturn_t ab8500_btemp_lowmed_handler(int irq, void *_di)
 {
 	struct ab8500_btemp *di = _di;
-	switch (di->chip_id) {
-	case AB8500_CUT1P0:
-	case AB8500_CUT1P1:
-	case AB8500_CUT2P0:
-	case AB8500_CUT3P0:
-		dev_dbg(di->dev, "Ignore false btemp low/med irq"
-			" for ABB cut 1.0, 1.1, 2.0 and 3.0\n");
 
-		break;
-	default:
-		dev_dbg(di->dev,
-			"Battery temperature is between low and medium\n");
+	dev_dbg(di->dev, "Battery temperature is between low and medium\n");
 
-		di->events.btemp_lowmed = true;
-		di->events.btemp_medhigh = false;
-		di->events.btemp_high = false;
-		di->events.btemp_low = false;
-		power_supply_changed(&di->btemp_psy);
-
-		break;
-	}
+	di->events.btemp_lowmed = true;
+	di->events.btemp_medhigh = false;
+	di->events.btemp_high = false;
+	di->events.btemp_low = false;
+	power_supply_changed(&di->btemp_psy);
 
 	return IRQ_HANDLED;
 }
@@ -657,28 +631,14 @@ static irqreturn_t ab8500_btemp_lowmed_handler(int irq, void *_di)
 static irqreturn_t ab8500_btemp_medhigh_handler(int irq, void *_di)
 {
 	struct ab8500_btemp *di = _di;
-	switch (di->chip_id) {
-	case AB8500_CUT1P0:
-	case AB8500_CUT1P1:
-	case AB8500_CUT2P0:
-	case AB8500_CUT3P0:
-		dev_dbg(di->dev, "Ignore false btemp med/high irq"
-			" for ABB cut 1.0, 1.1, 2.0 and 3.0\n");
-
-		break;
-	default:
-
-		dev_dbg(di->dev,
-			"Battery temperature is between medium and high\n");
 
-		di->events.btemp_medhigh = true;
-		di->events.btemp_lowmed = false;
-		di->events.btemp_high = false;
-		di->events.btemp_low = false;
-		power_supply_changed(&di->btemp_psy);
+	dev_dbg(di->dev, "Battery temperature is between medium and high\n");
 
-		break;
-	}
+	di->events.btemp_medhigh = true;
+	di->events.btemp_lowmed = false;
+	di->events.btemp_high = false;
+	di->events.btemp_low = false;
+	power_supply_changed(&di->btemp_psy);
 
 	return IRQ_HANDLED;
 }
@@ -714,15 +674,13 @@ static int ab8500_btemp_get_temp(struct ab8500_btemp *di)
 	int temp = 0;
 
 	/*
-	 * The BTEMP events are not reliabe on AB8500 cut3.0
+	 * The BTEMP events are not reliabe on AB8500 cut2.0
 	 * and prior versions
 	 */
 	switch (di->chip_id) {
 	case AB8500_CUT1P0:
 	case AB8500_CUT1P1:
 	case AB8500_CUT2P0:
-	case AB8500_CUT3P0:
-
 		temp = di->bat_temp * 10;
 
 		break;