Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mfd: Update WM8350 drivers for changed interrupt numbers

The headphone detect and charger are using the IRQ numbers so need
to take account of irq_base with the genirq conversion. I obviously
picked the wrong system for initial testing.

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

authored by

Mark Brown and committed by
Samuel Ortiz
59f25070 ecf926bc

+3 -3
+1 -1
drivers/power/wm8350_power.c
··· 190 190 struct wm8350_power *power = &wm8350->power; 191 191 struct wm8350_charger_policy *policy = power->policy; 192 192 193 - switch (irq) { 193 + switch (irq - wm8350->irq_base) { 194 194 case WM8350_IRQ_CHG_BAT_FAIL: 195 195 dev_err(wm8350->dev, "battery failed\n"); 196 196 break;
+2 -2
sound/soc/codecs/wm8350.c
··· 1349 1349 int mask; 1350 1350 struct wm8350_jack_data *jack = NULL; 1351 1351 1352 - switch (irq) { 1352 + switch (irq - wm8350->irq_base) { 1353 1353 case WM8350_IRQ_CODEC_JCK_DET_L: 1354 1354 jack = &priv->hpl; 1355 1355 mask = WM8350_JACK_L_LVL; ··· 1424 1424 wm8350_set_bits(wm8350, WM8350_JACK_DETECT, ena); 1425 1425 1426 1426 /* Sync status */ 1427 - wm8350_hp_jack_handler(irq, priv); 1427 + wm8350_hp_jack_handler(irq + wm8350->irq_base, priv); 1428 1428 1429 1429 return 0; 1430 1430 }