Merge "ASoC: wcd: add support for extension cable feature" (c3feebb4) · Commits · e / devices / android_kernel_sony_msm8994

sound/soc/codecs/msm8x16-wcd.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -157,7 +157,8 @@ static const struct wcd_mbhc_intr intr_ids = {
		.mbhc_sw_intr = MSM8X16_WCD_IRQ_MBHC_HS_DET,
		.mbhc_btn_press_intr = MSM8X16_WCD_IRQ_MBHC_PRESS,
		.mbhc_btn_release_intr = MSM8X16_WCD_IRQ_MBHC_RELEASE,
		.mbhc_hs_ins_rem_intr = MSM8X16_WCD_IRQ_MBHC_INSREM_DET,
		.mbhc_hs_ins_intr = MSM8X16_WCD_IRQ_MBHC_INSREM_DET1,
		.mbhc_hs_rem_intr = MSM8X16_WCD_IRQ_MBHC_INSREM_DET,
		.hph_left_ocp = MSM8X16_WCD_IRQ_HPHL_OCP,
		.hph_right_ocp = MSM8X16_WCD_IRQ_HPHR_OCP,
		};

+418 −125

File changed.

Preview size limit exceeded, changes collapsed.

+4 −1

Original line number	Diff line number	Diff line
		@@ -56,7 +56,8 @@ struct wcd_mbhc_intr {
		int mbhc_sw_intr;
		int mbhc_btn_press_intr;
		int mbhc_btn_release_intr;
		int mbhc_hs_ins_rem_intr;
		int mbhc_hs_ins_intr;
		int mbhc_hs_rem_intr;
		int hph_left_ocp;
		int hph_right_ocp;
		};
		@@ -66,6 +67,8 @@ struct wcd_mbhc_cb {
		};

		struct wcd_mbhc {
		/* Delayed work to report long button press */
		struct delayed_work mbhc_btn_dwork;
		int buttons_pressed;
		struct wcd_mbhc_config *mbhc_cfg;
		const struct wcd_mbhc_cb *mbhc_cb;