Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ranj063 merged 2 commits into from
Nov 12, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf71c4a
soundwire: cadence_master: set frame shape and divider based on actua…
bardliao Sep 16, 2024
412607c
Revert "soundwire: intel_auxdevice: start the bus at default frequency"
bardliao Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 21 additions & 3 deletions drivers/soundwire/cadence_master.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1345,13 +1345,14 @@ static u32 cdns_set_initial_frame_shape(int n_rows, int n_cols)
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_master_prop *prop = &bus->prop;
u32 val;
u32 ssp_interval;
int divider;
int freq;

dev_dbg(cdns->dev, "mclk %d max %d row %d col %d\n",
prop->mclk_freq,
Expand All @@ -1360,13 +1361,25 @@ static void cdns_init_clock_ctrl(struct sdw_cdns *cdns)
prop->default_col);

/* 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;
freq = bus->params.curr_dr_freq >> 1;

cdns_updatel(cdns, CDNS_MCP_CLK_CTRL0,
CDNS_MCP_CLK_MCLKD_MASK, divider);
cdns_updatel(cdns, CDNS_MCP_CLK_CTRL1,
CDNS_MCP_CLK_MCLKD_MASK, divider);

/* Set frame shape base on the actual bus frequency. */
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;
}

prop->default_col = freq * SDW_DOUBLE_RATE_FACTOR /
prop->default_frame_rate / prop->default_row;

/*
* Frame shape changes after initialization have to be done
* with the bank switch mechanism
Expand All @@ -1379,6 +1392,8 @@ static void cdns_init_clock_ctrl(struct sdw_cdns *cdns)
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_CTRL1, ssp_interval);

return 0;
}

/**
Expand Down Expand Up @@ -1412,9 +1427,12 @@ EXPORT_SYMBOL(sdw_cdns_soft_reset);
*/
int sdw_cdns_init(struct sdw_cdns *cdns)
{
int ret;
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);

Expand Down
21 changes: 0 additions & 21 deletions drivers/soundwire/intel_auxdevice.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,30 +222,9 @@ static int sdw_master_read_intel_prop(struct sdw_bus *bus)

static int intel_prop_read(struct sdw_bus *bus)
{
struct sdw_master_prop *prop;

/* Initialize with default handler to read all DisCo properties */
sdw_master_read_prop(bus);

/*
* Only one bus frequency is supported so far, filter
* frequencies reported in the DSDT
*/
prop = &bus->prop;
if (prop->clk_freq && prop->num_clk_freq > 1) {
unsigned int default_bus_frequency;

default_bus_frequency =
prop->default_frame_rate *
prop->default_row *
prop->default_col /
SDW_DOUBLE_RATE_FACTOR;

prop->num_clk_freq = 1;
prop->clk_freq[0] = default_bus_frequency;
prop->max_clk_freq = default_bus_frequency;
}

/* read Intel-specific properties */
sdw_master_read_intel_prop(bus);

Expand Down
Loading