soundwire: cadence: add header for BPT helpers and make others static

Signed-off-by: Pierre-Louis Bossart <[email protected]>

drivers/soundwire/cadence_master.c

@@ -1910,7 +1910,7 @@ EXPORT_SYMBOL(sdw_cdns_alloc_pdi);
 #define SDW_CDNS_BRA_FOOTER_RESP 1 /* defined by MIPI */
 #define SDW_CDNS_BRA_FOOTER_RESP_PAD 1 /* Cadence only */
 
-unsigned int sdw_bra_actual_data_size(unsigned int allocated_bytes_per_frame)
+static unsigned int sdw_bra_actual_data_size(unsigned int allocated_bytes_per_frame)
 {
  unsigned int total;
 
@@ -1926,7 +1926,7 @@ unsigned int sdw_bra_actual_data_size(unsigned int allocated_bytes_per_frame)
  return total;
 }
 
-unsigned int sdw_write_pdi0_buffer_size(unsigned int actual_data_size)
+static unsigned int sdw_write_pdi0_buffer_size(unsigned int actual_data_size)
 {
  unsigned int total;
 
@@ -1957,7 +1957,7 @@ unsigned int sdw_write_pdi1_buffer_size(unsigned int actual_data_size)
  return total * 2;
 }
 
-unsigned int sdw_read_pdi0_buffer_size(unsigned int actual_data_size)
+static unsigned int sdw_read_pdi0_buffer_size(unsigned int actual_data_size)
 {
  unsigned int total;
 
@@ -1968,7 +1968,7 @@ unsigned int sdw_read_pdi0_buffer_size(unsigned int actual_data_size)
  return total * 2;
 }
 
-unsigned int sdw_read_pdi1_buffer_size(unsigned int actual_data_size)
+static unsigned int sdw_read_pdi1_buffer_size(unsigned int actual_data_size)
 {
  unsigned int total;
 
@@ -2032,7 +2032,7 @@ void sdw_bpt_find_buffer_sizes(int command, /* 0: write, 1: read */
  *pdi1_buffer_size = pdi1_rx_size * num_frames;
 }
 
-int sdw_copy_write_data(u8 *data, int data_size, u8 *dma_buffer, int dma_buffer_size)
+static int sdw_copy_write_data(u8 *data, int data_size, u8 *dma_buffer, int dma_buffer_size)
 {
  int i;
  int j;
@@ -2068,11 +2068,11 @@ int sdw_copy_write_data(u8 *data, int data_size, u8 *dma_buffer, int dma_buffer_
 #define SDW_CRC8_SEED 0xFF
 #define SDW_CRC8_POLY 0x4D
 
-int sdw_prepare_write_pd0_buffer(u8 *header, unsigned int header_size,
-  u8 *data, unsigned int data_size,
-  u8 *dma_buffer, unsigned int dma_buffer_size,
-  unsigned int *dma_data_written,
-  unsigned int frame_counter)
+static int sdw_prepare_write_pd0_buffer(u8 *header, unsigned int header_size,
+  u8 *data, unsigned int data_size,
+  u8 *dma_buffer, unsigned int dma_buffer_size,
+  unsigned int *dma_data_written,
+  unsigned int frame_counter)
 {
  u8 crc8_lookup_table[CRC8_TABLE_SIZE];
  u8 crc;
@@ -2128,10 +2128,10 @@ int sdw_prepare_write_pd0_buffer(u8 *header, unsigned int header_size,
  return 0;
 }
 
-int sdw_prepare_read_pd0_buffer(u8 *header, unsigned int header_size,
- u8 *dma_buffer, unsigned int dma_buffer_size,
- unsigned int *dma_data_written,
- unsigned int frame_counter)
+static int sdw_prepare_read_pd0_buffer(u8 *header, unsigned int header_size,
+  u8 *dma_buffer, unsigned int dma_buffer_size,
+  unsigned int *dma_data_written,
+  unsigned int frame_counter)
 {
  u8 crc8_lookup_table[CRC8_TABLE_SIZE];
  u8 crc;

drivers/soundwire/cadence_master.h

@@ -202,4 +202,27 @@ void sdw_cdns_check_self_clearing_bits(struct sdw_cdns *cdns, const char *string
 void sdw_cdns_config_update(struct sdw_cdns *cdns);
 int sdw_cdns_config_update_set_wait(struct sdw_cdns *cdns);
 
+/* SoundWire BPT/BRA helpers to format data */
+void sdw_bpt_find_buffer_sizes(int command, /* 0: write, 1: read */
+ int row, int col,
+ unsigned int data_bytes,
+ unsigned int requested_bytes_per_frame,
+ unsigned int *data_per_frame,
+ unsigned int *pdi0_buffer_size,
+ unsigned int *pdi1_buffer_size);
+
+int sdw_prepare_write_dma_buffer(u8 dev_num, u32 start_register,
+ u8 *data, int data_size,
+ int data_per_frame,
+ u8 *dma_buffer, int dma_buffer_size,
+ int *dma_buffer_total_bytes);
+
+int sdw_prepare_read_dma_buffer(u8 dev_num, u32 start_register,
+ int data_size,
+ int data_per_frame,
+ u8 *dma_buffer, int dma_buffer_size,
+ int *dma_buffer_total_bytes);
+
+int sdw_test_bra_data_block(void);
+
 #endif /* __SDW_CADENCE_H */