soundwire: cadence_master: use firmware defaults for frame shape

Remove hard-coding and use firmware (BIOS/DT) values. If they are
wrong use default 48x2 frame shape.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20190806005522.22642-7-pierre-louis.bossart@linux.intel.com
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/soundwire/cadence_master.c b/drivers/soundwire/cadence_master.c
index 89974bbe64c70cca20c01d965f0e7ea00977f85a..7dab1e40382a2650bebf4a01fdb5e865578625f7 100644 (file)
--- a/drivers/soundwire/cadence_master.c
+++ b/drivers/soundwire/cadence_master.c
@@ -47,6 +47,8 @@
 #define CDNS_MCP_SSPSTAT                       0xC
 #define CDNS_MCP_FRAME_SHAPE                   0x10
 #define CDNS_MCP_FRAME_SHAPE_INIT              0x14
+#define CDNS_MCP_FRAME_SHAPE_COL_MASK          GENMASK(2, 0)
+#define CDNS_MCP_FRAME_SHAPE_ROW_OFFSET                3
 
 #define CDNS_MCP_CONFIG_UPDATE                 0x18
 #define CDNS_MCP_CONFIG_UPDATE_BIT             BIT(0)
@@ -174,7 +176,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
 
@@ -807,6 +808,20 @@ int sdw_cdns_pdi_init(struct sdw_cdns *cdns,
 }
 EXPORT_SYMBOL(sdw_cdns_pdi_init);
 
+static u32 cdns_set_initial_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) & CDNS_MCP_FRAME_SHAPE_COL_MASK;
+
+       val = (r << CDNS_MCP_FRAME_SHAPE_ROW_OFFSET) | c;
+
+       return val;
+}
+
 /**
  * sdw_cdns_init() - Cadence initialization
  * @cdns: Cadence instance
@@ -829,8 +844,13 @@ int sdw_cdns_init(struct sdw_cdns *cdns)
        val |= CDNS_DEFAULT_CLK_DIVIDER;
        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);
+       /*
+        * Frame shape changes after initialization have to be done
+        * with the bank switch mechanism
+        */
+       val = cdns_set_initial_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);