On Thu, Jul 25, 2019 at 06:40:16PM -0500, Pierre-Louis Bossart wrote: > Remove hard-coding and use BIOS values. If they are wrong use default > 48x2 frame shape. > > Signed-off-by: Pierre-Louis Bossart <pierre-louis.boss...@linux.intel.com> > --- > drivers/soundwire/cadence_master.c | 19 +++++++++++++++++-- > 1 file changed, 17 insertions(+), 2 deletions(-) > > diff --git a/drivers/soundwire/cadence_master.c > b/drivers/soundwire/cadence_master.c > index 442f78c00f09..d84344e29f71 100644 > --- a/drivers/soundwire/cadence_master.c > +++ b/drivers/soundwire/cadence_master.c > @@ -175,7 +175,6 @@ > /* Driver defaults */ > > #define CDNS_DEFAULT_CLK_DIVIDER 0 > -#define CDNS_DEFAULT_FRAME_SHAPE 0x30 > #define CDNS_DEFAULT_SSP_INTERVAL 0x18 > #define CDNS_TX_TIMEOUT 2000 > > @@ -954,6 +953,20 @@ int sdw_cdns_pdi_init(struct sdw_cdns *cdns, > } > EXPORT_SYMBOL(sdw_cdns_pdi_init); > > +static u32 cdns_set_default_frame_shape(int n_rows, int n_cols) > +{ > + u32 val; > + int c; > + int r; > + > + r = sdw_find_row_index(n_rows); > + c = sdw_find_col_index(n_cols); > +
Now i get why you need above functions to be exported, please ignore my previous comment. > + val = (r << 3) | c; > + > + return val; > +} > + > /** > * sdw_cdns_init() - Cadence initialization > * @cdns: Cadence instance > @@ -977,7 +990,9 @@ int sdw_cdns_init(struct sdw_cdns *cdns) > cdns_writel(cdns, CDNS_MCP_CLK_CTRL0, val); > > /* Set the default frame shape */ > - cdns_writel(cdns, CDNS_MCP_FRAME_SHAPE_INIT, CDNS_DEFAULT_FRAME_SHAPE); > + val = cdns_set_default_frame_shape(prop->default_row, > + prop->default_col); > + cdns_writel(cdns, CDNS_MCP_FRAME_SHAPE_INIT, val); > > /* Set SSP interval to default value */ > cdns_writel(cdns, CDNS_MCP_SSP_CTRL0, CDNS_DEFAULT_SSP_INTERVAL); > -- > 2.20.1 > --