Re: [PATCH v3 4/5] ASoC: qcom: Add support for audio over DP

Quoting Srinivasa Rao Mandadapu (2020-08-30 23:39:23)

diff --git a/sound/soc/qcom/lpass-sc7180.c b/sound/soc/qcom/lpass-sc7180.c index 167bf2c..cea7ae7 100644 --- a/sound/soc/qcom/lpass-sc7180.c +++ b/sound/soc/qcom/lpass-sc7180.c @@ -190,15 +232,92 @@ static struct lpass_variant sc7180_data = { "mi2s-bit-clk0", "mi2s-bit-clk1", },

•   .id                             = I2S_INTERFACE,
    .init                   = sc7180_lpass_init,
    .exit                   = sc7180_lpass_exit,
    .alloc_dma_channel      = sc7180_lpass_alloc_dma_channel,
    .free_dma_channel       = sc7180_lpass_free_dma_channel,
  

};

+static struct lpass_variant sc7180_hdmi_data = {

Can this be const?

•   .hdmi_tx_ctl_addr       = 0x1000,
  

•   .hdmi_legacy_addr       = 0x1008,
  

•   .hdmi_vbit_addr         = 0x610c0,
  

•   .hdmi_ch_lsb_addr       = 0x61048,
  

•   .hdmi_ch_msb_addr       = 0x6104c,
  

•   .ch_stride              = 0x8,
  

•   .hdmi_parity_addr       = 0x61034,
  

•   .hdmi_dmactl_addr       = 0x61038,
  

•   .hdmi_dma_stride        = 0x4,
  

•   .hdmi_DP_addr           = 0x610c8,
  

•   .hdmi_sstream_addr      = 0x6101c,
  

•   .irq_reg_base           = 0x63000,
  

•   .irq_ports              = 1,
  

•   .rdma_reg_base          = 0x64000,
  

•   .rdma_reg_stride        = 0x1000,
  

•   .rdma_channels          = 4,
  

•   .rdma_dyncclk           = REG_FIELD_ID(0x64000, 14, 14, 4, 0x1000),
  

•   .rdma_bursten           = REG_FIELD_ID(0x64000, 13, 13, 4, 0x1000),
  

•   .rdma_burst8            = REG_FIELD_ID(0x64000, 15, 15, 4, 0x1000),
  

•   .rdma_burst16           = REG_FIELD_ID(0x64000, 16, 16, 4, 0x1000),
  

•   .rdma_dynburst          = REG_FIELD_ID(0x64000, 18, 18, 4, 0x1000),
  

•   .rdma_wpscnt            = REG_FIELD_ID(0x64000, 10, 12, 4, 0x1000),
  

•   .rdma_fifowm            = REG_FIELD_ID(0x64000, 1, 5, 4, 0x1000),
  

•   .rdma_enable            = REG_FIELD_ID(0x64000, 0, 0, 4, 0x1000),
  

•   .sstream_en             = REG_FIELD(0x6101c, 0, 0),
  

•   .dma_sel                        = REG_FIELD(0x6101c, 1, 2),
  

•   .auto_bbit_en   = REG_FIELD(0x6101c, 3, 3),
  

•   .layout                 = REG_FIELD(0x6101c, 4, 4),
  

•   .layout_sp              = REG_FIELD(0x6101c, 5, 8),
  

•   .set_sp_on_en   = REG_FIELD(0x6101c, 10, 10),
  

•   .dp_audio               = REG_FIELD(0x6101c, 11, 11),
  

•   .dp_staffing_en = REG_FIELD(0x6101c, 12, 12),
  

•   .dp_sp_b_hw_en  = REG_FIELD(0x6101c, 13, 13),
  

•   .mute                   = REG_FIELD(0x610c8, 0, 0),
  

•   .as_sdp_cc              = REG_FIELD(0x610c8, 1, 3),
  

•   .as_sdp_ct              = REG_FIELD(0x610c8, 4, 7),
  

•   .aif_db4                        = REG_FIELD(0x610c8, 8, 15),
  

•   .frequency              = REG_FIELD(0x610c8, 16, 21),
  

•   .mst_index              = REG_FIELD(0x610c8, 28, 29),
  

•   .dptx_index             = REG_FIELD(0x610c8, 30, 31),
  

•   .soft_reset             = REG_FIELD(0x1000, 31, 31),
  

•   .force_reset    = REG_FIELD(0x1000, 30, 30),
  

•   .use_hw_chs             = REG_FIELD(0x61038, 0, 0),
  

•   .use_hw_usr             = REG_FIELD(0x61038, 1, 1),
  

•   .hw_chs_sel             = REG_FIELD(0x61038, 2, 4),
  

•   .hw_usr_sel             = REG_FIELD(0x61038, 5, 6),
  

•   .replace_vbit   = REG_FIELD(0x610c0, 0, 0),
  

•   .vbit_stream    = REG_FIELD(0x610c0, 1, 1),
  

•   .legacy_en              =  REG_FIELD(0x1008, 0, 0),
  

•   .calc_en                =  REG_FIELD(0x61034, 0, 0),
  

•   .lsb_bits               =  REG_FIELD(0x61048, 0, 31),
  

•   .msb_bits               =  REG_FIELD(0x6104c, 0, 31),
  

•   .clk_name               = (const char*[]) {
  

•                                   "pcnoc-sway-clk",
  

•                                   "audio-core",
  

•                                   "pcnoc-mport-clk",
  

•                           },
  

•   .num_clks               = 3,
  

•   .id                     = HDMI_INTERFACE,
  

•   .dai_driver             = sc7180_lpass_cpu_hdmi_dai_driver,
  

•   .num_dai                = ARRAY_SIZE(sc7180_lpass_cpu_hdmi_dai_driver),
  

•   .init                   = sc7180_lpass_init,
  

•   .exit                   = sc7180_lpass_exit,
  

•   .alloc_dma_channel = sc7180_lpass_alloc_hdmi_dma_channel,
  

•   .free_dma_channel = sc7180_lpass_free_hdmi_dma_channel,
  

+};

Add a newline here?

static const struct of_device_id sc7180_lpass_cpu_device_id[] = { {.compatible = "qcom,sc7180-lpass-cpu", .data = &sc7180_data},

•   {}
  

•   {.compatible = "qcom,sc7180-lpass-hdmi", .data = &sc7180_hdmi_data}
  

This most likely needs to keep the sentinel around so that a match can be made or stop if nothing is found.

};