[alsa-devel] [RFC PATCH 03/14] ASoC: qcom: move ipq806x specific bits out of lpass driver.

[Kenneth Westfield]

On Tue, May 05, 2015 at 12:17:23AM -0700, Srinivas Kandagatla wrote:
> On 05/05/15 06:19, Kenneth Westfield wrote:
> >>>> >+enum lpaif_i2s_ports {
> >>>> >+	LPAIF_I2S_PORT_MIN		= 0,
> >>>> >+
> >>>> >+	LPAIF_I2S_PORT_CODEC_SPK	= 0,
> >>>> >+	LPAIF_I2S_PORT_CODEC_MIC	= 1,
> >>>> >+	LPAIF_I2S_PORT_SEC_SPK		= 2,
> >>>> >+	LPAIF_I2S_PORT_SEC_MIC		= 3,
> >>>> >+	LPAIF_I2S_PORT_MI2S		= 4,
> >>>> >+
> >>>> >+	LPAIF_I2S_PORT_MAX		= 4,
> >>>> >+	LPAIF_I2S_PORT_NUM		= 5,
> >>>> >+};
> >>>
> >>>These port mappings here...
> >>>
> >>>> >+enum lpaif_irq_ports {
> >>>> >+	LPAIF_IRQ_PORT_MIN		= 0,
> >>>> >+
> >>>> >+	LPAIF_IRQ_PORT_HOST		= 0,
> >>>> >+	LPAIF_IRQ_PORT_ADSP		= 1,
> >>>> >+
> >>>> >+	LPAIF_IRQ_PORT_MAX		= 2,
> >>>> >+	LPAIF_IRQ_PORT_NUM		= 3,
> >>>> >+};
> >>>
> >>>...here...
> >>>
> >>>> >+enum lpaif_dma_channels {
> >>>> >+	LPAIF_RDMA_CHAN_MIN		= 0,
> >>>> >+
> >>>> >+	LPAIF_RDMA_CHAN_MI2S		= 0,
> >>>> >+	LPAIF_RDMA_CHAN_PCM0		= 1,
> >>>> >+	LPAIF_RDMA_CHAN_PCM1		= 2,
> >>>> >+
> >>>> >+	LPAIF_RDMA_CHAN_MAX		= 4,
> >>>> >+	LPAIF_RDMA_CHAN_NUM		= 5,
> >>>> >+};
> >>>
> >>>...and here can be SOC-specific.  Should move them to the SOC-specific
> >>>files.
> >Expanding on this, the I2S port mappings for the APQ8016 should replace
> >the ones defined above with the constants you refer to in
> >dt-bindings/sound/apq8016.h:
> >    MI2S_PRIMARY
> >    MI2S_SECONDARY
> >    etc.
> >
> >Maybe defining a corresponding ipq806x.h in the same directory, and
> >moving the above definitions there?
> 
> As you pointed out i2s ports definitions can be moved to
> dt-bindings/soc/ipq806x.h but the channels can be directly defined
> in lpass-ipq806x.c as there would be no DT consumers for these
> defines
> anyway.

Moving the I2S ports to dt-bindings and the other definitions to their
SOC-specific source files works for me.

-- 
Kenneth Westfield
Qualcomm Innovation Center, Inc.
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, 
a Linux Foundation Collaborative Project