From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Wed, 30 Nov 2011 16:51:04 +0000 (+0000)
Subject: mfd: Correct revision display for WM1811 revision D
X-Git-Tag: firefly_0821_release~3680^2~2691^2~261^2~5
X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=443e67ed8d40c0e08619f087da4332dbbff47954;p=firefly-linux-kernel-4.4.55.git

mfd: Correct revision display for WM1811 revision D

As WM1811 revision C was transparent to software the revision IDs for
subsequent revisions are one less than they would normally be. Correct
for this in log messages.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: Samuel Ortiz <sameo@linux.intel.com>
---

diff --git a/drivers/mfd/wm8994-core.c b/drivers/mfd/wm8994-core.c
index f9c4016baea6..12bd0eed0b2e 100644
--- a/drivers/mfd/wm8994-core.c
+++ b/drivers/mfd/wm8994-core.c
@@ -460,6 +460,11 @@ static int wm8994_device_init(struct wm8994 *wm8994, int irq)
 			break;
 		}
 		break;
+	case WM1811:
+		/* Revision C did not change the relevant layer */
+		if (ret > 1)
+			ret++;
+		break;
 	default:
 		break;
 	}