From e7b87f2fcc0c35011fa8a7cd001a59d74729bc2f Mon Sep 17 00:00:00 2001 From: Phani Kumar Uppalapati Date: Mon, 27 Jun 2022 23:31:56 -0700 Subject: [PATCH] Revert "soc: Fix PDR WSA auto-enumeration issue" This reverts commit d17a0ca85e23ef1ae69ef336d296b1d5c67a02a6. Change-Id: I23792f4926184f4e37afed59b08a870d7279979d --- soc/swr-mstr-ctrl.c | 5 ++--- soc/swr-mstr-ctrl.h | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/soc/swr-mstr-ctrl.c b/soc/swr-mstr-ctrl.c index 118bd3a581..d88dab5132 100644 --- a/soc/swr-mstr-ctrl.c +++ b/soc/swr-mstr-ctrl.c @@ -1400,7 +1400,7 @@ static void swrm_get_device_frame_shape(struct swr_mstr_ctrl *swrm, if (swrm->master_id == MASTER_ID_TX) { uc = swrm_get_uc(swrm->bus_clk); - port_id_offset = swrm->dev_mapping[port_req->dev_num] * + port_id_offset = (port_req->dev_num - 1) * SWR_MAX_DEV_PORT_NUM + port_req->slave_port_id; if (port_id_offset >= SWR_MAX_MSTR_PORT_NUM) @@ -1429,7 +1429,7 @@ static void swrm_get_device_frame_shape(struct swr_mstr_ctrl *swrm, } if (swrm->master_id == MASTER_ID_WSA) { uc = swrm_get_uc(swrm->bus_clk); - port_id_offset = swrm->dev_mapping[port_req->dev_num] * + port_id_offset = (port_req->dev_num - 1) * SWR_MAX_DEV_PORT_NUM + port_req->slave_port_id; if (port_id_offset >= SWR_MAX_MSTR_PORT_NUM || @@ -2464,7 +2464,6 @@ static int swrm_get_logical_dev_num(struct swr_master *mstr, u64 dev_id, if ((id & SWR_DEV_ID_MASK) == dev_id) { *dev_num = i; ret = 0; - swrm->dev_mapping[*dev_num] = dev_id; dev_info(swrm->dev, "%s: devnum %d assigned for dev %llx\n", __func__, i, diff --git a/soc/swr-mstr-ctrl.h b/soc/swr-mstr-ctrl.h index 3e2db6f837..f51c0c6ede 100644 --- a/soc/swr-mstr-ctrl.h +++ b/soc/swr-mstr-ctrl.h @@ -197,7 +197,6 @@ struct swr_mstr_ctrl { u32 is_always_on; bool clk_stop_wakeup; struct swr_port_params pp[SWR_UC_MAX][SWR_MAX_MSTR_PORT_NUM];/*max_devNum * max_ports 11 * 14 */ - u64 dev_mapping[SWR_MAX_DEV_NUM + 1]; /* Dev Num is 1-indexed */ #ifdef CONFIG_DEBUG_FS struct dentry *debugfs_swrm_dent; struct dentry *debugfs_peek;