tmakin/ack-tegra
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

soundwire: cadence_master: set frame shape and divider based on actual clk freq

Browse Source 
[ Upstream commit e738d77f78b3ac085dfb51be414e93464abba7ec ]

Frame shape and curr_dr_freq could be updated by sdw_compute_bus_params().
Peripherals will set curr_dr_freq as their frequency. Managers
should do the same. Then update frame shape according to the actual
bus frequency.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.dev>
Link: https://lore.kernel.org/r/20250205074232.87537-2-yung-chuan.liao@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Bard Liao
2025-02-05 15:42:31 +08:00
committed by Greg Kroah-Hartman
parent c043867b65
commit 97dba4472e
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/soundwire/cadence_master.c
+19 -3
View File
@@ -1341,7 +1341,7 @@ static u32 cdns_set_initial_frame_shape(int n_rows, int n_cols)
return val; return val;
} }
static void cdns_init_clock_ctrl(struct sdw_cdns *cdns) static int cdns_init_clock_ctrl(struct sdw_cdns *cdns)
{ {
struct sdw_bus *bus = &cdns->bus; struct sdw_bus *bus = &cdns->bus;
struct sdw_master_prop *prop = &bus->prop; struct sdw_master_prop *prop = &bus->prop;
@@ -1355,14 +1355,25 @@ static void cdns_init_clock_ctrl(struct sdw_cdns *cdns)
prop->default_row, prop->default_row,
prop->default_col); prop->default_col);
if (!prop->default_frame_rate || !prop->default_row) {
dev_err(cdns->dev, "Default frame_rate %d or row %d is invalid\n",
prop->default_frame_rate, prop->default_row);
return -EINVAL;
}
/* Set clock divider */ /* Set clock divider */
divider = (prop->mclk_freq / prop->max_clk_freq) - 1; divider = (prop->mclk_freq * SDW_DOUBLE_RATE_FACTOR /
bus->params.curr_dr_freq) - 1;
cdns_updatel(cdns, CDNS_MCP_CLK_CTRL0, cdns_updatel(cdns, CDNS_MCP_CLK_CTRL0,
CDNS_MCP_CLK_MCLKD_MASK, divider); CDNS_MCP_CLK_MCLKD_MASK, divider);
cdns_updatel(cdns, CDNS_MCP_CLK_CTRL1, cdns_updatel(cdns, CDNS_MCP_CLK_CTRL1,
CDNS_MCP_CLK_MCLKD_MASK, divider); CDNS_MCP_CLK_MCLKD_MASK, divider);
/* Set frame shape base on the actual bus frequency. */
prop->default_col = bus->params.curr_dr_freq /
prop->default_frame_rate / prop->default_row;
/* /*
* Frame shape changes after initialization have to be done * Frame shape changes after initialization have to be done
* with the bank switch mechanism * with the bank switch mechanism
@@ -1375,6 +1386,8 @@ static void cdns_init_clock_ctrl(struct sdw_cdns *cdns)
ssp_interval = prop->default_frame_rate / SDW_CADENCE_GSYNC_HZ; ssp_interval = prop->default_frame_rate / SDW_CADENCE_GSYNC_HZ;
cdns_writel(cdns, CDNS_MCP_SSP_CTRL0, ssp_interval); cdns_writel(cdns, CDNS_MCP_SSP_CTRL0, ssp_interval);
cdns_writel(cdns, CDNS_MCP_SSP_CTRL1, ssp_interval); cdns_writel(cdns, CDNS_MCP_SSP_CTRL1, ssp_interval);
return 0;
} }
/** /**
@@ -1383,9 +1396,12 @@ static void cdns_init_clock_ctrl(struct sdw_cdns *cdns)
*/ */
int sdw_cdns_init(struct sdw_cdns *cdns) int sdw_cdns_init(struct sdw_cdns *cdns)
{ {
int ret;
u32 val; u32 val;
cdns_init_clock_ctrl(cdns); ret = cdns_init_clock_ctrl(cdns);
if (ret)
return ret;
sdw_cdns_check_self_clearing_bits(cdns, __func__, false, 0); sdw_cdns_check_self_clearing_bits(cdns, __func__, false, 0);