samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "asoc: haptics: update port config to match devicetree"

Browse Source
This commit is contained in:
qctecmdr
2020-04-26 23:42:49 -07:00
committed by Gerrit - the friendly Code Review server
parent f1e766c6b0 5aaab79a9f
commit 0fa13e4ada
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
asoc/codecs/swr-haptics.c
View File

@@ -55,9 +55,9 @@ static struct reg_default swr_hap_reg_defaults[] = {
enum { enum {
PORT_ID_DT_IDX, PORT_ID_DT_IDX,
NUM_CH_DT_IDX,
CH_MASK_DT_IDX, CH_MASK_DT_IDX,
CH_RATE_DT_IDX, CH_RATE_DT_IDX,
NUM_CH_DT_IDX,
PORT_TYPE_DT_IDX, PORT_TYPE_DT_IDX,
NUM_SWR_PORT_DT_PARAMS, NUM_SWR_PORT_DT_PARAMS,
}; };
@@ -282,9 +282,9 @@ static int swr_haptics_parse_port_mapping(struct swr_device *sdev)
} }
swr_hap->port.port_id = (u8) port_cfg[PORT_ID_DT_IDX]; swr_hap->port.port_id = (u8) port_cfg[PORT_ID_DT_IDX];
swr_hap->port.num_ch = (u8) port_cfg[NUM_CH_DT_IDX];
swr_hap->port.ch_mask = (u8) port_cfg[CH_MASK_DT_IDX]; swr_hap->port.ch_mask = (u8) port_cfg[CH_MASK_DT_IDX];
swr_hap->port.ch_rate = port_cfg[CH_RATE_DT_IDX]; swr_hap->port.ch_rate = port_cfg[CH_RATE_DT_IDX];
swr_hap->port.num_ch = (u8) port_cfg[NUM_CH_DT_IDX];
swr_hap->port.port_type = (u8) port_cfg[PORT_TYPE_DT_IDX]; swr_hap->port.port_type = (u8) port_cfg[PORT_TYPE_DT_IDX];
dev_dbg(swr_hap->dev, "%s: port_id = %d, ch_mask = %d, ch_rate = %d, num_ch = %d, port_type = %d\n", dev_dbg(swr_hap->dev, "%s: port_id = %d, ch_mask = %d, ch_rate = %d, num_ch = %d, port_type = %d\n",