Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49d49b15 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mfd: wcd9xxx: send down notification to devices before cleaning-up IRQs"

parents 29bcd578 76771ab5

drivers/mfd/wcd9xxx-core.c

+2 −2
Original line number Diff line number Diff line 
/* Copyright (c) 2011-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -1519,9 +1519,9 @@ static int wcd9xxx_slim_device_down(struct slim_device *sldev) 
		return 0;



	wcd9xxx->dev_up = false;

	wcd9xxx_irq_exit(&wcd9xxx->core_res);

	if (wcd9xxx->dev_down)

		wcd9xxx->dev_down(wcd9xxx);

	wcd9xxx_irq_exit(&wcd9xxx->core_res);

	wcd9xxx_reset_low(wcd9xxx->dev);

	return 0;

}

sound/soc/codecs/wcd_cpe_core.c

+2 −10
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -891,13 +891,6 @@ static int wcd_cpe_enable(struct wcd_cpe_core *core, 
			 * instead SSR handler will control CPE.

			 */

			wcd_cpe_enable_cpe_clks(core, false);

			/*

			 * During BUS_DOWN event, possibly the

			 * irq driver is under cleanup, do not request

			 * cleanup of irqs here, rather cleanup irqs

			 * once BUS_UP event is received.

			 */

			if (core->ssr_type != WCD_CPE_BUS_DOWN_EVENT)

			wcd_cpe_cleanup_irqs(core);

			goto done;

		}
@@ -1149,7 +1142,6 @@ int wcd_cpe_ssr_event(void *core_handle, 
		break;



	case WCD_CPE_BUS_UP_EVENT:

		wcd_cpe_cleanup_irqs(core);

		wcd_cpe_set_and_complete(core, WCD_CPE_BUS_READY);

		/*

		 * In case of bus up event ssr_type will be changed