| Message ID | 1408421693-9929-6-git-send-email-Li.Xiubo@freescale.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, Aug 19, 2014 at 12:14:53PM +0800, Xiubo Li wrote: > Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com> > --- > Documentation/devicetree/bindings/sound/fsl-sai.txt | 8 ++++---- > sound/soc/fsl/fsl_sai.c | 6 +++--- > sound/soc/fsl/fsl_sai.h | 2 +- > 3 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/Documentation/devicetree/bindings/sound/fsl-sai.txt b/Documentation/devicetree/bindings/sound/fsl-sai.txt > index aed1f21..e25ef38 100644 > --- a/Documentation/devicetree/bindings/sound/fsl-sai.txt > +++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt > @@ -20,9 +20,9 @@ Required properties: > See ../pinctrl/pinctrl-bindings.txt for details of the property values. > - big-endian: Boolean property, required if all the SAI device registers > are big-endian rather than little-endian. > -- big-endian-data: If this property is absent, the little endian mode will > - be in use as default, or the big endian mode will be in use for all the > - fifo data. > +- msb-first: Configures whether the LSB or the MSB is transmitted first for > + the fifo data. If this property is absent, the LSB is transmitted first as > + default, or the MSB is transmitted first. > - fsl,sai-synchronous-rx: This is a boolean property. If present, indicating > that SAI will work in the synchronous mode (sync Tx with Rx) which means > both the transimitter and receiver will send and receive data by following > @@ -53,5 +53,5 @@ sai2: sai@40031000 { > dmas = <&edma0 0 VF610_EDMA_MUXID0_SAI2_TX>, > <&edma0 0 VF610_EDMA_MUXID0_SAI2_RX>; > big-endian; > - big-endian-data; > + msb-first; > }; > diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c > index a6eb784..4e48431 100644 > --- a/sound/soc/fsl/fsl_sai.c > +++ b/sound/soc/fsl/fsl_sai.c > @@ -175,7 +175,7 @@ static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai *cpu_dai, > bool tx = fsl_dir == FSL_FMT_TRANSMITTER; > u32 val_cr2 = 0, val_cr4 = 0; > > - if (!sai->big_endian_data) > + if (!sai->is_msb_first) > val_cr4 |= FSL_SAI_CR4_MF; IIRC, MF stands for 'MSB First' but the condition is !is_msb_first.. And also we can't not simply inverse the condition here since those platforms without the original 'big_endian_data' property will be broken unless they add the new 'is_msb_first' into the DT bindings, which is, however, a violation due to breaking the old bindings. So I guess is_lsb_first might be better here? And actually, Xiubo, what's your purpose to add this patch? I can't see any commit comments to explain the reason. So could you please say something about it? Thanks Nicolin
> -----Original Message----- > From: Nicolin Chen [mailto:nicoleotsuka@gmail.com] > Sent: Monday, August 25, 2014 9:51 AM > To: Xiubo Li-B47053 > Cc: broonie@kernel.org; alsa-devel@alsa-project.org; mark.rutland@arm.com; > timur@tabi.org; devicetree@vger.kernel.org > Subject: Re: [PATCHv2 5/5] ASoC: fsl-sai: rename big_endian_data to > is_msb_first. > > On Tue, Aug 19, 2014 at 12:14:53PM +0800, Xiubo Li wrote: > > Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com> > > --- > > Documentation/devicetree/bindings/sound/fsl-sai.txt | 8 ++++---- > > sound/soc/fsl/fsl_sai.c | 6 +++--- > > sound/soc/fsl/fsl_sai.h | 2 +- > > 3 files changed, 8 insertions(+), 8 deletions(-) > > > > diff --git a/Documentation/devicetree/bindings/sound/fsl-sai.txt > b/Documentation/devicetree/bindings/sound/fsl-sai.txt > > index aed1f21..e25ef38 100644 > > --- a/Documentation/devicetree/bindings/sound/fsl-sai.txt > > +++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt > > @@ -20,9 +20,9 @@ Required properties: > > See ../pinctrl/pinctrl-bindings.txt for details of the property values. > > - big-endian: Boolean property, required if all the SAI device registers > > are big-endian rather than little-endian. > > -- big-endian-data: If this property is absent, the little endian mode will > > - be in use as default, or the big endian mode will be in use for all the > > - fifo data. > > +- msb-first: Configures whether the LSB or the MSB is transmitted first for > > + the fifo data. If this property is absent, the LSB is transmitted first > as > > + default, or the MSB is transmitted first. > > - fsl,sai-synchronous-rx: This is a boolean property. If present, > indicating > > that SAI will work in the synchronous mode (sync Tx with Rx) which means > > both the transimitter and receiver will send and receive data by > following > > @@ -53,5 +53,5 @@ sai2: sai@40031000 { > > dmas = <&edma0 0 VF610_EDMA_MUXID0_SAI2_TX>, > > <&edma0 0 VF610_EDMA_MUXID0_SAI2_RX>; > > big-endian; > > - big-endian-data; > > + msb-first; > > }; > > diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c > > index a6eb784..4e48431 100644 > > --- a/sound/soc/fsl/fsl_sai.c > > +++ b/sound/soc/fsl/fsl_sai.c > > @@ -175,7 +175,7 @@ static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai > *cpu_dai, > > bool tx = fsl_dir == FSL_FMT_TRANSMITTER; > > u32 val_cr2 = 0, val_cr4 = 0; > > > > - if (!sai->big_endian_data) > > + if (!sai->is_msb_first) > > val_cr4 |= FSL_SAI_CR4_MF; > > IIRC, MF stands for 'MSB First' but the condition is !is_msb_first.. > Yes, I will fix this. > And also we can't not simply inverse the condition here since those > platforms without the original 'big_endian_data' property will be > broken unless they add the new 'is_msb_first' into the DT bindings, > which is, however, a violation due to breaking the old bindings. > > So I guess is_lsb_first might be better here? > > And actually, Xiubo, what's your purpose to add this patch? I can't > see any commit comments to explain the reason. So could you please > say something about it? > > Thanks > Nicolin Months ago, the hardware team needed to do some IP test based LS1 needing this to be added to the driver. And for now there is hasn't any other reason for this yet. Thanks, BRs Xiubo
On Mon, Aug 25, 2014 at 02:04:46AM +0000, Li.Xiubo@freescale.com wrote: > > -----Original Message----- > > From: Nicolin Chen [mailto:nicoleotsuka@gmail.com] > > Sent: Monday, August 25, 2014 9:51 AM > > To: Xiubo Li-B47053 > > Cc: broonie@kernel.org; alsa-devel@alsa-project.org; mark.rutland@arm.com; > > timur@tabi.org; devicetree@vger.kernel.org > > Subject: Re: [PATCHv2 5/5] ASoC: fsl-sai: rename big_endian_data to > > is_msb_first. > > > > On Tue, Aug 19, 2014 at 12:14:53PM +0800, Xiubo Li wrote: > > > Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com> > > > --- > > > Documentation/devicetree/bindings/sound/fsl-sai.txt | 8 ++++---- > > > sound/soc/fsl/fsl_sai.c | 6 +++--- > > > sound/soc/fsl/fsl_sai.h | 2 +- > > > 3 files changed, 8 insertions(+), 8 deletions(-) > > > > > > diff --git a/Documentation/devicetree/bindings/sound/fsl-sai.txt > > b/Documentation/devicetree/bindings/sound/fsl-sai.txt > > > index aed1f21..e25ef38 100644 > > > --- a/Documentation/devicetree/bindings/sound/fsl-sai.txt > > > +++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt > > > @@ -20,9 +20,9 @@ Required properties: > > > See ../pinctrl/pinctrl-bindings.txt for details of the property values. > > > - big-endian: Boolean property, required if all the SAI device registers > > > are big-endian rather than little-endian. > > > -- big-endian-data: If this property is absent, the little endian mode will > > > - be in use as default, or the big endian mode will be in use for all the > > > - fifo data. > > > +- msb-first: Configures whether the LSB or the MSB is transmitted first for > > > + the fifo data. If this property is absent, the LSB is transmitted first > > as > > > + default, or the MSB is transmitted first. > > > - fsl,sai-synchronous-rx: This is a boolean property. If present, > > indicating > > > that SAI will work in the synchronous mode (sync Tx with Rx) which means > > > both the transimitter and receiver will send and receive data by > > following > > > @@ -53,5 +53,5 @@ sai2: sai@40031000 { > > > dmas = <&edma0 0 VF610_EDMA_MUXID0_SAI2_TX>, > > > <&edma0 0 VF610_EDMA_MUXID0_SAI2_RX>; > > > big-endian; > > > - big-endian-data; > > > + msb-first; > > > }; > > > diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c > > > index a6eb784..4e48431 100644 > > > --- a/sound/soc/fsl/fsl_sai.c > > > +++ b/sound/soc/fsl/fsl_sai.c > > > @@ -175,7 +175,7 @@ static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai > > *cpu_dai, > > > bool tx = fsl_dir == FSL_FMT_TRANSMITTER; > > > u32 val_cr2 = 0, val_cr4 = 0; > > > > > > - if (!sai->big_endian_data) > > > + if (!sai->is_msb_first) > > > val_cr4 |= FSL_SAI_CR4_MF; > > > > IIRC, MF stands for 'MSB First' but the condition is !is_msb_first.. > > > > Yes, I will fix this. > > > And also we can't not simply inverse the condition here since those > > platforms without the original 'big_endian_data' property will be > > broken unless they add the new 'is_msb_first' into the DT bindings, > > which is, however, a violation due to breaking the old bindings. > > > > So I guess is_lsb_first might be better here? > > > > And actually, Xiubo, what's your purpose to add this patch? I can't > > see any commit comments to explain the reason. So could you please > > say something about it? > > Months ago, the hardware team needed to do some IP test based LS1 needing > this to be added to the driver. And for now there is hasn't any other reason > for this yet. Hmm...the patch only renames big_endian_data to is_msb_first. So whatever the problem of LS1 is, this change doesn't matter to LS1 at all unless LS1 has a specific property in its DT binding: If using is_msb_first works for LS1, using big_endian_data without applying this patch does work as well, doesn't it? I think this patch is more likely making the binding explicit so that any platform like LS1 will not miss the essential property. Then the commit comments could have mentioned it if so. I'm looking forward to your new version. And I give you an extra info about SAI on i.MX. It should be configured as Little Endian and MSB first. So with the current DT binding it doesn't have big_endian* properties. Any replacement for big_endian_data shall be compatible to this case as well as I mentioned in the previous reply. Thank you, Nicolin
> > > > diff --git a/Documentation/devicetree/bindings/sound/fsl-sai.txt > > > b/Documentation/devicetree/bindings/sound/fsl-sai.txt > > > > index aed1f21..e25ef38 100644 > > > > --- a/Documentation/devicetree/bindings/sound/fsl-sai.txt > > > > +++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt > > > > @@ -20,9 +20,9 @@ Required properties: > > > > See ../pinctrl/pinctrl-bindings.txt for details of the property > values. > > > > - big-endian: Boolean property, required if all the SAI device > registers > > > > are big-endian rather than little-endian. > > > > -- big-endian-data: If this property is absent, the little endian mode > will > > > > - be in use as default, or the big endian mode will be in use for all > the > > > > - fifo data. > > > > +- msb-first: Configures whether the LSB or the MSB is transmitted first > for > > > > + the fifo data. If this property is absent, the LSB is transmitted > first > > > as > > > > + default, or the MSB is transmitted first. > > > > - fsl,sai-synchronous-rx: This is a boolean property. If present, > > > indicating > > > > that SAI will work in the synchronous mode (sync Tx with Rx) which > means > > > > both the transimitter and receiver will send and receive data by > > > following > > > > @@ -53,5 +53,5 @@ sai2: sai@40031000 { > > > > dmas = <&edma0 0 VF610_EDMA_MUXID0_SAI2_TX>, > > > > <&edma0 0 VF610_EDMA_MUXID0_SAI2_RX>; > > > > big-endian; > > > > - big-endian-data; > > > > + msb-first; > > > > }; > > > > diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c > > > > index a6eb784..4e48431 100644 > > > > --- a/sound/soc/fsl/fsl_sai.c > > > > +++ b/sound/soc/fsl/fsl_sai.c > > > > @@ -175,7 +175,7 @@ static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai > > > *cpu_dai, > > > > bool tx = fsl_dir == FSL_FMT_TRANSMITTER; > > > > u32 val_cr2 = 0, val_cr4 = 0; > > > > > > > > - if (!sai->big_endian_data) > > > > + if (!sai->is_msb_first) > > > > val_cr4 |= FSL_SAI_CR4_MF; > > > > > > IIRC, MF stands for 'MSB First' but the condition is !is_msb_first.. > > > > > > > Yes, I will fix this. > > > > > And also we can't not simply inverse the condition here since those > > > platforms without the original 'big_endian_data' property will be > > > broken unless they add the new 'is_msb_first' into the DT bindings, > > > which is, however, a violation due to breaking the old bindings. > > > > > > So I guess is_lsb_first might be better here? > > > > > > And actually, Xiubo, what's your purpose to add this patch? I can't > > > see any commit comments to explain the reason. So could you please > > > say something about it? > > > > Months ago, the hardware team needed to do some IP test based LS1 needing > > this to be added to the driver. And for now there is hasn't any other reason > > for this yet. > > Hmm...the patch only renames big_endian_data to is_msb_first. > > So whatever the problem of LS1 is, this change doesn't matter to LS1 > at all unless LS1 has a specific property in its DT binding: If using > is_msb_first works for LS1, using big_endian_data without applying > this patch does work as well, doesn't it? > Yes. > I think this patch is more likely making the binding explicit so that > any platform like LS1 will not miss the essential property. Then the > commit comments could have mentioned it if so. > > I'm looking forward to your new version. And I give you an extra info > about SAI on i.MX. It should be configured as Little Endian and MSB > first. So with the current DT binding it doesn't have big_endian* > properties. Any replacement for big_endian_data shall be compatible > to this case as well as I mentioned in the previous reply. > Fine. Please wait. BYW, how about other four patches of this patch series ? Do you have any Comment here ? BRs Xiubo
On Mon, Aug 25, 2014 at 03:11:22AM +0000, Li.Xiubo@freescale.com wrote: > > I'm looking forward to your new version. And I give you an extra info > > about SAI on i.MX. It should be configured as Little Endian and MSB > > first. So with the current DT binding it doesn't have big_endian* > > properties. Any replacement for big_endian_data shall be compatible > > to this case as well as I mentioned in the previous reply. > > > > Fine. > > Please wait. > > BYW, how about other four patches of this patch series ? Do you have any > Comment here ? Not any more. I think you can drop this one from this series so that the other four can be applied soon :) Best regards, Nicolin
Xiubo Li wrote: > - sai->big_endian_data = of_property_read_bool(np, "big-endian-data"); > + sai->is_msb_first = of_property_read_bool(np, "msb-first"); This will break backwards compatibility with older device trees.
> -----Original Message----- > From: Timur Tabi [mailto:timur@tabi.org] > Sent: Monday, August 25, 2014 11:19 AM > To: Xiubo Li-B47053; broonie@kernel.org; alsa-devel@alsa-project.org; > mark.rutland@arm.com; nicoleotsuka@gmail.com > Cc: devicetree@vger.kernel.org > Subject: Re: [PATCHv2 5/5] ASoC: fsl-sai: rename big_endian_data to > is_msb_first. > > Xiubo Li wrote: > > - sai->big_endian_data = of_property_read_bool(np, "big-endian-data"); > > + sai->is_msb_first = of_property_read_bool(np, "msb-first"); > > This will break backwards compatibility with older device trees. > Well, this hasn't been used for any other SoCs expect the LS1+, which are still doing the Upstream. Thanks, BRs Xiubo
On Sun, Aug 24, 2014 at 10:18:37PM -0500, Timur Tabi wrote: > Xiubo Li wrote: > >- sai->big_endian_data = of_property_read_bool(np, "big-endian-data"); > >+ sai->is_msb_first = of_property_read_bool(np, "msb-first"); > > This will break backwards compatibility with older device trees. Yes. Xiubo, you can try to fetch "big-endian-data" first. Then fetch the new binding if the "big-endian-data" is absent. Just make it compatible with both older device trees and the new one.
> On Sun, Aug 24, 2014 at 10:18:37PM -0500, Timur Tabi wrote: > > Xiubo Li wrote: > > >- sai->big_endian_data = of_property_read_bool(np, "big-endian-data"); > > >+ sai->is_msb_first = of_property_read_bool(np, "msb-first"); > > > > This will break backwards compatibility with older device trees. > > Yes. > > Xiubo, you can try to fetch "big-endian-data" first. Then fetch > the new binding if the "big-endian-data" is absent. Just make > it compatible with both older device trees and the new one. > @ Nicolin, Timur, Okay, if there has any other SoCs using this, I will modify them together. Thanks, BRs Xiubo
> On Mon, Aug 25, 2014 at 03:11:22AM +0000, Li.Xiubo@freescale.com wrote: > > > I'm looking forward to your new version. And I give you an extra info > > > about SAI on i.MX. It should be configured as Little Endian and MSB > > > first. So with the current DT binding it doesn't have big_endian* > > > properties. Any replacement for big_endian_data shall be compatible > > > to this case as well as I mentioned in the previous reply. > > > > > > > Fine. > > > > Please wait. > > > > BYW, how about other four patches of this patch series ? Do you have any > > Comment here ? > > Not any more. I think you can drop this one from this series > so that the other four can be applied soon :) > Sure, I will send them out separately. Please help me review them. Thanks, BRs Xiubo
diff --git a/Documentation/devicetree/bindings/sound/fsl-sai.txt b/Documentation/devicetree/bindings/sound/fsl-sai.txt index aed1f21..e25ef38 100644 --- a/Documentation/devicetree/bindings/sound/fsl-sai.txt +++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt @@ -20,9 +20,9 @@ Required properties: See ../pinctrl/pinctrl-bindings.txt for details of the property values. - big-endian: Boolean property, required if all the SAI device registers are big-endian rather than little-endian. -- big-endian-data: If this property is absent, the little endian mode will - be in use as default, or the big endian mode will be in use for all the - fifo data. +- msb-first: Configures whether the LSB or the MSB is transmitted first for + the fifo data. If this property is absent, the LSB is transmitted first as + default, or the MSB is transmitted first. - fsl,sai-synchronous-rx: This is a boolean property. If present, indicating that SAI will work in the synchronous mode (sync Tx with Rx) which means both the transimitter and receiver will send and receive data by following @@ -53,5 +53,5 @@ sai2: sai@40031000 { dmas = <&edma0 0 VF610_EDMA_MUXID0_SAI2_TX>, <&edma0 0 VF610_EDMA_MUXID0_SAI2_RX>; big-endian; - big-endian-data; + msb-first; }; diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c index a6eb784..4e48431 100644 --- a/sound/soc/fsl/fsl_sai.c +++ b/sound/soc/fsl/fsl_sai.c @@ -175,7 +175,7 @@ static int fsl_sai_set_dai_fmt_tr(struct snd_soc_dai *cpu_dai, bool tx = fsl_dir == FSL_FMT_TRANSMITTER; u32 val_cr2 = 0, val_cr4 = 0; - if (!sai->big_endian_data) + if (!sai->is_msb_first) val_cr4 |= FSL_SAI_CR4_MF; /* DAI mode */ @@ -304,7 +304,7 @@ static int fsl_sai_hw_params(struct snd_pcm_substream *substream, val_cr5 |= FSL_SAI_CR5_WNW(word_width); val_cr5 |= FSL_SAI_CR5_W0W(word_width); - if (sai->big_endian_data) + if (sai->is_msb_first) val_cr5 |= FSL_SAI_CR5_FBT(0); else val_cr5 |= FSL_SAI_CR5_FBT(word_width - 1); @@ -573,7 +573,7 @@ static int fsl_sai_probe(struct platform_device *pdev) if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx6sx-sai")) sai->sai_on_imx = true; - sai->big_endian_data = of_property_read_bool(np, "big-endian-data"); + sai->is_msb_first = of_property_read_bool(np, "msb-first"); res = platform_get_resource(pdev, IORESOURCE_MEM, 0); base = devm_ioremap_resource(&pdev->dev, res); diff --git a/sound/soc/fsl/fsl_sai.h b/sound/soc/fsl/fsl_sai.h index 2cded44..7c76e8d 100644 --- a/sound/soc/fsl/fsl_sai.h +++ b/sound/soc/fsl/fsl_sai.h @@ -132,7 +132,7 @@ struct fsl_sai { struct clk *bus_clk; struct clk *mclk_clk[FSL_SAI_MCLK_MAX]; - bool big_endian_data; + bool is_msb_first; bool is_dsp_mode; bool sai_on_imx; bool synchronous[2];
Signed-off-by: Xiubo Li <Li.Xiubo@freescale.com> --- Documentation/devicetree/bindings/sound/fsl-sai.txt | 8 ++++---- sound/soc/fsl/fsl_sai.c | 6 +++--- sound/soc/fsl/fsl_sai.h | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-)