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

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

Merge "asoc: bolero: Update mask of wsa macro" into audio-drivers.lnx.5.0

parents 65af65b1 b4d55c71

asoc/codecs/bolero/wsa-macro.c

+4 −4
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/* Copyright (c) 2018-2019, The Linux Foundation. All rights reserved.

/* Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.

 */



#include <linux/module.h>
@@ -41,7 +41,7 @@ 
#define NUM_INTERPOLATORS 2



#define WSA_MACRO_MUX_INP_SHFT 0x3

#define WSA_MACRO_MUX_INP_MASK1 0x38

#define WSA_MACRO_MUX_INP_MASK1 0x07

#define WSA_MACRO_MUX_INP_MASK2 0x38

#define WSA_MACRO_MUX_CFG_OFFSET 0x8

#define WSA_MACRO_MUX_CFG1_OFFSET 0x4
@@ -620,10 +620,10 @@ static int wsa_macro_set_prim_interpolator_rate(struct snd_soc_dai *dai, 
			inp0_sel = int_mux_cfg0_val & WSA_MACRO_MUX_INP_MASK1;

			inp1_sel = (int_mux_cfg0_val >>

					WSA_MACRO_MUX_INP_SHFT) &

					WSA_MACRO_MUX_INP_MASK2;

					WSA_MACRO_MUX_INP_MASK1;

			inp2_sel = (int_mux_cfg1_val >>

					WSA_MACRO_MUX_INP_SHFT) &

					WSA_MACRO_MUX_INP_MASK2;

					WSA_MACRO_MUX_INP_MASK1;

			if ((inp0_sel == int_1_mix1_inp + INTn_1_INP_SEL_RX0) ||

			    (inp1_sel == int_1_mix1_inp + INTn_1_INP_SEL_RX0) ||

			    (inp2_sel == int_1_mix1_inp + INTn_1_INP_SEL_RX0)) {