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

This project is archived. Its data is read-only.

Commit 81c05b77 authored Jul 17, 2013 by Joonwoo Park Committed by Stephen Boyd Sep 04, 2013

ASoC: wcd9xxx: register available conditions to resource manager



When mbhc driver isn't used, resource conditions from mbhc driver isn't
also available even though resources might be still available.
Make resource manager to get registration of available conditions to find
out if specific conditions are available.

CRs-fixed: 514718
Change-Id: I06309f7d1e9b2696c6dd421d6bef481c5d8f0cf8
Signed-off-by: Joonwoo Park <joonwoop@codeaurora.org>

parent e1b9b726

sound/soc/codecs/wcd9xxx-mbhc.c

+6 −0

Original line number	Diff line number	Diff line
		@@ -4058,6 +4058,9 @@ int wcd9xxx_mbhc_init(struct wcd9xxx_mbhc mbhc, struct wcd9xxx_resmgr resmgr,
		}
		wcd9xxx_disable_irq(codec->control_data, WCD9XXX_IRQ_HPH_PA_OCPR_FAULT);

		wcd9xxx_regmgr_cond_register(resmgr, 1 << WCD9XXX_COND_HPH_MIC \|
		1 << WCD9XXX_COND_HPH);

		pr_debug("%s: leave ret %d\n", __func__, ret);
		return ret;

		@@ -4083,6 +4086,9 @@ void wcd9xxx_mbhc_deinit(struct wcd9xxx_mbhc *mbhc)
		{
		void *cdata = mbhc->codec->control_data;

		wcd9xxx_regmgr_cond_deregister(mbhc->resmgr, 1 << WCD9XXX_COND_HPH_MIC \|
		1 << WCD9XXX_COND_HPH);

		wcd9xxx_free_irq(cdata, WCD9XXX_IRQ_MBHC_RELEASE, mbhc);
		wcd9xxx_free_irq(cdata, WCD9XXX_IRQ_MBHC_POTENTIAL, mbhc);
		wcd9xxx_free_irq(cdata, WCD9XXX_IRQ_MBHC_REMOVAL, mbhc);

sound/soc/codecs/wcd9xxx-resmgr.c

+43 −3

Original line number	Diff line number	Diff line
		@@ -652,7 +652,7 @@ done:
		return rc;
		}

		void wcd9xxx_resmgr_cond_trigger_cond(struct wcd9xxx_resmgr *resmgr,
		static void wcd9xxx_resmgr_cond_trigger_cond(struct wcd9xxx_resmgr *resmgr,
		enum wcd9xxx_resmgr_cond cond)
		{
		struct list_head *l;
		@@ -660,7 +660,9 @@ void wcd9xxx_resmgr_cond_trigger_cond(struct wcd9xxx_resmgr *resmgr,
		bool set;

		pr_debug("%s: enter\n", __func__);
		set = !!test_bit(cond, &resmgr->cond_flags);
		/* update bit if cond isn't available or cond is set */
		set = !test_bit(cond, &resmgr->cond_avail_flags) \|\|
		!!test_bit(cond, &resmgr->cond_flags);
		list_for_each(l, &resmgr->update_bit_cond_h) {
		e = list_entry(l, struct wcd9xxx_resmgr_cond_entry, list);
		if (e->cond == cond)
		@@ -672,6 +674,44 @@ void wcd9xxx_resmgr_cond_trigger_cond(struct wcd9xxx_resmgr *resmgr,
		pr_debug("%s: leave\n", __func__);
		}

		/*
		* wcd9xxx_regmgr_cond_register : notify resmgr conditions in the condbits are
		* avaliable and notified.
		* condbits : contains bitmask of enum wcd9xxx_resmgr_cond
		*/
		void wcd9xxx_regmgr_cond_register(struct wcd9xxx_resmgr *resmgr,
		unsigned long condbits)
		{
		unsigned int cond;

		for_each_set_bit(cond, &condbits, BITS_PER_BYTE * sizeof(condbits)) {
		mutex_lock(&resmgr->update_bit_cond_lock);
		WARN(test_bit(cond, &resmgr->cond_avail_flags),
		"Condition 0x%0x is already registered\n", cond);
		set_bit(cond, &resmgr->cond_avail_flags);
		wcd9xxx_resmgr_cond_trigger_cond(resmgr, cond);
		mutex_unlock(&resmgr->update_bit_cond_lock);
		pr_debug("%s: Condition 0x%x is registered\n", __func__, cond);
		}
		}

		void wcd9xxx_regmgr_cond_deregister(struct wcd9xxx_resmgr *resmgr,
		unsigned long condbits)
		{
		unsigned int cond;

		for_each_set_bit(cond, &condbits, BITS_PER_BYTE * sizeof(condbits)) {
		mutex_lock(&resmgr->update_bit_cond_lock);
		WARN(!test_bit(cond, &resmgr->cond_avail_flags),
		"Condition 0x%0x isn't registered\n", cond);
		clear_bit(cond, &resmgr->cond_avail_flags);
		wcd9xxx_resmgr_cond_trigger_cond(resmgr, cond);
		mutex_unlock(&resmgr->update_bit_cond_lock);
		pr_debug("%s: Condition 0x%x is deregistered\n", __func__,
		cond);
		}
		}

		void wcd9xxx_resmgr_cond_update_cond(struct wcd9xxx_resmgr *resmgr,
		enum wcd9xxx_resmgr_cond cond, bool set)
		{

sound/soc/codecs/wcd9xxx-resmgr.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -134,6 +134,7 @@ struct wcd9xxx_resmgr {
		struct wcd9xxx_mbhc *mbhc;

		unsigned long cond_flags;
		unsigned long cond_avail_flags;
		struct list_head update_bit_cond_h;
		struct mutex update_bit_cond_lock;

		@@ -227,6 +228,10 @@ enum wcd9xxx_resmgr_cond {
		WCD9XXX_COND_HPH = 0x01, /* Headphone */
		WCD9XXX_COND_HPH_MIC = 0x02, /* Microphone on the headset */
		};
		void wcd9xxx_regmgr_cond_register(struct wcd9xxx_resmgr *resmgr,
		unsigned long condbits);
		void wcd9xxx_regmgr_cond_deregister(struct wcd9xxx_resmgr *resmgr,
		unsigned long condbits);
		int wcd9xxx_resmgr_rm_cond_update_bits(struct wcd9xxx_resmgr *resmgr,
		enum wcd9xxx_resmgr_cond cond,
		unsigned short reg, int shift,