* [PATCH v3 2/2] ASoC: fsl_sai: Allow setting the SAI MCLK direction
2016-05-04 22:33 [PATCH v3 1/2] ASoC: fsl_sai: Introduce a compatible string for MX6UL Fabio Estevam
@ 2016-05-04 22:33 ` Fabio Estevam
2016-05-04 23:11 ` Nicolin Chen
2016-05-05 15:56 ` Applied "ASoC: fsl_sai: Allow setting the SAI MCLK direction" to the asoc tree Mark Brown
2016-05-04 23:10 ` [PATCH v3 1/2] ASoC: fsl_sai: Introduce a compatible string for MX6UL Nicolin Chen
2016-05-05 15:56 ` Applied "ASoC: fsl_sai: Introduce a compatible string for MX6UL" to the asoc tree Mark Brown
2 siblings, 2 replies; 6+ messages in thread
From: Fabio Estevam @ 2016-05-04 22:33 UTC (permalink / raw)
To: broonie; +Cc: nicoleotsuka, Fabio Estevam, alsa-devel, shawnguo, brain
From: Fabio Estevam <fabio.estevam@nxp.com>
On mx6ul the General Purpose Register 1 (GPR1) contains the following
bits for configuring the direction of the SAI MCLKs:
SAI1_MCLK_DIR, SAI2_MCLK_DIR, SAI3_MCLK_DIR
Introduce the "fsl,sai-mclk-direction-output" optional property to allow
configuring the SAI_MCLK outputs.
Tested on a imx6ul-evk board.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
---
Changes since v2:
- Use of_alias_get_id() (Nicolin)
Documentation/devicetree/bindings/sound/fsl-sai.txt | 5 +++++
include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 6 ++++++
sound/soc/fsl/fsl_sai.c | 20 ++++++++++++++++++++
3 files changed, 31 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/fsl-sai.txt b/Documentation/devicetree/bindings/sound/fsl-sai.txt
index 777b941..740b467 100644
--- a/Documentation/devicetree/bindings/sound/fsl-sai.txt
+++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt
@@ -48,6 +48,11 @@ Required properties:
receive data by following their own bit clocks and
frame sync clocks separately.
+Optional properties (for mx6ul):
+
+ - fsl,sai-mclk-direction-output: This is a boolean property. If present,
+ indicates that SAI will output the SAI MCLK clock.
+
Note:
- If both fsl,sai-asynchronous and fsl,sai-synchronous-rx are absent, the
default synchronous mode (sync Rx with Tx) will be used, which means both
diff --git a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
index 238c8db..6835382 100644
--- a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
+++ b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
@@ -447,5 +447,11 @@
#define IMX6UL_GPR1_ENET2_CLK_OUTPUT (0x1 << 18)
#define IMX6UL_GPR1_ENET_CLK_DIR (0x3 << 17)
#define IMX6UL_GPR1_ENET_CLK_OUTPUT (0x3 << 17)
+#define IMX6UL_GPR1_SAI1_MCLK_DIR (0x1 << 19)
+#define IMX6UL_GPR1_SAI2_MCLK_DIR (0x1 << 20)
+#define IMX6UL_GPR1_SAI3_MCLK_DIR (0x1 << 21)
+#define IMX6UL_GPR1_SAI_MCLK_MASK (0x7 << 19)
+#define MCLK_DIR(x) (x == 1 ? IMX6UL_GPR1_SAI1_MCLK_DIR : x == 2 ? \
+ IMX6UL_GPR1_SAI2_MCLK_DIR : IMX6UL_GPR1_SAI3_MCLK_DIR)
#endif /* __LINUX_IMX6Q_IOMUXC_GPR_H */
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index d8b673f..2147994 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -21,6 +21,8 @@
#include <sound/core.h>
#include <sound/dmaengine_pcm.h>
#include <sound/pcm_params.h>
+#include <linux/mfd/syscon.h>
+#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
#include "fsl_sai.h"
#include "imx-pcm.h"
@@ -786,10 +788,12 @@ static int fsl_sai_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
struct fsl_sai *sai;
+ struct regmap *gpr;
struct resource *res;
void __iomem *base;
char tmp[8];
int irq, ret, i;
+ int index;
sai = devm_kzalloc(&pdev->dev, sizeof(*sai), GFP_KERNEL);
if (!sai)
@@ -878,6 +882,22 @@ static int fsl_sai_probe(struct platform_device *pdev)
fsl_sai_dai.symmetric_samplebits = 0;
}
+ if (of_find_property(np, "fsl,sai-mclk-direction-output", NULL) &&
+ of_device_is_compatible(pdev->dev.of_node, "fsl,imx6ul-sai")) {
+ gpr = syscon_regmap_lookup_by_compatible("fsl,imx6ul-iomuxc-gpr");
+ if (IS_ERR(gpr)) {
+ dev_err(&pdev->dev, "cannot find iomuxc registers\n");
+ return PTR_ERR(gpr);
+ }
+
+ index = of_alias_get_id(np, "sai");
+ if (index < 0)
+ return index;
+
+ regmap_update_bits(gpr, IOMUXC_GPR1, MCLK_DIR(index),
+ MCLK_DIR(index));
+ }
+
sai->dma_params_rx.addr = res->start + FSL_SAI_RDR;
sai->dma_params_tx.addr = res->start + FSL_SAI_TDR;
sai->dma_params_rx.maxburst = FSL_SAI_MAXBURST_RX;
--
1.9.1
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v3 2/2] ASoC: fsl_sai: Allow setting the SAI MCLK direction
2016-05-04 22:33 ` [PATCH v3 2/2] ASoC: fsl_sai: Allow setting the SAI MCLK direction Fabio Estevam
@ 2016-05-04 23:11 ` Nicolin Chen
2016-05-05 15:56 ` Applied "ASoC: fsl_sai: Allow setting the SAI MCLK direction" to the asoc tree Mark Brown
1 sibling, 0 replies; 6+ messages in thread
From: Nicolin Chen @ 2016-05-04 23:11 UTC (permalink / raw)
To: Fabio Estevam; +Cc: Fabio Estevam, alsa-devel, broonie, shawnguo, brain
On Wed, May 04, 2016 at 07:33:59PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@nxp.com>
>
> On mx6ul the General Purpose Register 1 (GPR1) contains the following
> bits for configuring the direction of the SAI MCLKs:
> SAI1_MCLK_DIR, SAI2_MCLK_DIR, SAI3_MCLK_DIR
>
> Introduce the "fsl,sai-mclk-direction-output" optional property to allow
> configuring the SAI_MCLK outputs.
>
> Tested on a imx6ul-evk board.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
Thank you
Nicolin
> ---
> Changes since v2:
> - Use of_alias_get_id() (Nicolin)
>
> Documentation/devicetree/bindings/sound/fsl-sai.txt | 5 +++++
> include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 6 ++++++
> sound/soc/fsl/fsl_sai.c | 20 ++++++++++++++++++++
> 3 files changed, 31 insertions(+)
>
> diff --git a/Documentation/devicetree/bindings/sound/fsl-sai.txt b/Documentation/devicetree/bindings/sound/fsl-sai.txt
> index 777b941..740b467 100644
> --- a/Documentation/devicetree/bindings/sound/fsl-sai.txt
> +++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt
> @@ -48,6 +48,11 @@ Required properties:
> receive data by following their own bit clocks and
> frame sync clocks separately.
>
> +Optional properties (for mx6ul):
> +
> + - fsl,sai-mclk-direction-output: This is a boolean property. If present,
> + indicates that SAI will output the SAI MCLK clock.
> +
> Note:
> - If both fsl,sai-asynchronous and fsl,sai-synchronous-rx are absent, the
> default synchronous mode (sync Rx with Tx) will be used, which means both
> diff --git a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
> index 238c8db..6835382 100644
> --- a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
> +++ b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
> @@ -447,5 +447,11 @@
> #define IMX6UL_GPR1_ENET2_CLK_OUTPUT (0x1 << 18)
> #define IMX6UL_GPR1_ENET_CLK_DIR (0x3 << 17)
> #define IMX6UL_GPR1_ENET_CLK_OUTPUT (0x3 << 17)
> +#define IMX6UL_GPR1_SAI1_MCLK_DIR (0x1 << 19)
> +#define IMX6UL_GPR1_SAI2_MCLK_DIR (0x1 << 20)
> +#define IMX6UL_GPR1_SAI3_MCLK_DIR (0x1 << 21)
> +#define IMX6UL_GPR1_SAI_MCLK_MASK (0x7 << 19)
> +#define MCLK_DIR(x) (x == 1 ? IMX6UL_GPR1_SAI1_MCLK_DIR : x == 2 ? \
> + IMX6UL_GPR1_SAI2_MCLK_DIR : IMX6UL_GPR1_SAI3_MCLK_DIR)
>
> #endif /* __LINUX_IMX6Q_IOMUXC_GPR_H */
> diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
> index d8b673f..2147994 100644
> --- a/sound/soc/fsl/fsl_sai.c
> +++ b/sound/soc/fsl/fsl_sai.c
> @@ -21,6 +21,8 @@
> #include <sound/core.h>
> #include <sound/dmaengine_pcm.h>
> #include <sound/pcm_params.h>
> +#include <linux/mfd/syscon.h>
> +#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
>
> #include "fsl_sai.h"
> #include "imx-pcm.h"
> @@ -786,10 +788,12 @@ static int fsl_sai_probe(struct platform_device *pdev)
> {
> struct device_node *np = pdev->dev.of_node;
> struct fsl_sai *sai;
> + struct regmap *gpr;
> struct resource *res;
> void __iomem *base;
> char tmp[8];
> int irq, ret, i;
> + int index;
>
> sai = devm_kzalloc(&pdev->dev, sizeof(*sai), GFP_KERNEL);
> if (!sai)
> @@ -878,6 +882,22 @@ static int fsl_sai_probe(struct platform_device *pdev)
> fsl_sai_dai.symmetric_samplebits = 0;
> }
>
> + if (of_find_property(np, "fsl,sai-mclk-direction-output", NULL) &&
> + of_device_is_compatible(pdev->dev.of_node, "fsl,imx6ul-sai")) {
> + gpr = syscon_regmap_lookup_by_compatible("fsl,imx6ul-iomuxc-gpr");
> + if (IS_ERR(gpr)) {
> + dev_err(&pdev->dev, "cannot find iomuxc registers\n");
> + return PTR_ERR(gpr);
> + }
> +
> + index = of_alias_get_id(np, "sai");
> + if (index < 0)
> + return index;
> +
> + regmap_update_bits(gpr, IOMUXC_GPR1, MCLK_DIR(index),
> + MCLK_DIR(index));
> + }
> +
> sai->dma_params_rx.addr = res->start + FSL_SAI_RDR;
> sai->dma_params_tx.addr = res->start + FSL_SAI_TDR;
> sai->dma_params_rx.maxburst = FSL_SAI_MAXBURST_RX;
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Applied "ASoC: fsl_sai: Allow setting the SAI MCLK direction" to the asoc tree
2016-05-04 22:33 ` [PATCH v3 2/2] ASoC: fsl_sai: Allow setting the SAI MCLK direction Fabio Estevam
2016-05-04 23:11 ` Nicolin Chen
@ 2016-05-05 15:56 ` Mark Brown
1 sibling, 0 replies; 6+ messages in thread
From: Mark Brown @ 2016-05-05 15:56 UTC (permalink / raw)
To: Fabio Estevam; +Cc: nicoleotsuka, alsa-devel, broonie, shawnguo, brain
The patch
ASoC: fsl_sai: Allow setting the SAI MCLK direction
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 4d2458507d0b465c62ae80f3e81b8c008ec96b05 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@nxp.com>
Date: Wed, 4 May 2016 19:33:59 -0300
Subject: [PATCH] ASoC: fsl_sai: Allow setting the SAI MCLK direction
On mx6ul the General Purpose Register 1 (GPR1) contains the following
bits for configuring the direction of the SAI MCLKs:
SAI1_MCLK_DIR, SAI2_MCLK_DIR, SAI3_MCLK_DIR
Introduce the "fsl,sai-mclk-direction-output" optional property to allow
configuring the SAI_MCLK outputs.
Tested on a imx6ul-evk board.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
Documentation/devicetree/bindings/sound/fsl-sai.txt | 5 +++++
include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 6 ++++++
sound/soc/fsl/fsl_sai.c | 20 ++++++++++++++++++++
3 files changed, 31 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/fsl-sai.txt b/Documentation/devicetree/bindings/sound/fsl-sai.txt
index 777b941d6cbe..740b467adf7d 100644
--- a/Documentation/devicetree/bindings/sound/fsl-sai.txt
+++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt
@@ -48,6 +48,11 @@ Required properties:
receive data by following their own bit clocks and
frame sync clocks separately.
+Optional properties (for mx6ul):
+
+ - fsl,sai-mclk-direction-output: This is a boolean property. If present,
+ indicates that SAI will output the SAI MCLK clock.
+
Note:
- If both fsl,sai-asynchronous and fsl,sai-synchronous-rx are absent, the
default synchronous mode (sync Rx with Tx) will be used, which means both
diff --git a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
index 238c8db953eb..68353822afce 100644
--- a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
+++ b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
@@ -447,5 +447,11 @@
#define IMX6UL_GPR1_ENET2_CLK_OUTPUT (0x1 << 18)
#define IMX6UL_GPR1_ENET_CLK_DIR (0x3 << 17)
#define IMX6UL_GPR1_ENET_CLK_OUTPUT (0x3 << 17)
+#define IMX6UL_GPR1_SAI1_MCLK_DIR (0x1 << 19)
+#define IMX6UL_GPR1_SAI2_MCLK_DIR (0x1 << 20)
+#define IMX6UL_GPR1_SAI3_MCLK_DIR (0x1 << 21)
+#define IMX6UL_GPR1_SAI_MCLK_MASK (0x7 << 19)
+#define MCLK_DIR(x) (x == 1 ? IMX6UL_GPR1_SAI1_MCLK_DIR : x == 2 ? \
+ IMX6UL_GPR1_SAI2_MCLK_DIR : IMX6UL_GPR1_SAI3_MCLK_DIR)
#endif /* __LINUX_IMX6Q_IOMUXC_GPR_H */
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index d8b673f7c577..2147994ab46f 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -21,6 +21,8 @@
#include <sound/core.h>
#include <sound/dmaengine_pcm.h>
#include <sound/pcm_params.h>
+#include <linux/mfd/syscon.h>
+#include <linux/mfd/syscon/imx6q-iomuxc-gpr.h>
#include "fsl_sai.h"
#include "imx-pcm.h"
@@ -786,10 +788,12 @@ static int fsl_sai_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
struct fsl_sai *sai;
+ struct regmap *gpr;
struct resource *res;
void __iomem *base;
char tmp[8];
int irq, ret, i;
+ int index;
sai = devm_kzalloc(&pdev->dev, sizeof(*sai), GFP_KERNEL);
if (!sai)
@@ -878,6 +882,22 @@ static int fsl_sai_probe(struct platform_device *pdev)
fsl_sai_dai.symmetric_samplebits = 0;
}
+ if (of_find_property(np, "fsl,sai-mclk-direction-output", NULL) &&
+ of_device_is_compatible(pdev->dev.of_node, "fsl,imx6ul-sai")) {
+ gpr = syscon_regmap_lookup_by_compatible("fsl,imx6ul-iomuxc-gpr");
+ if (IS_ERR(gpr)) {
+ dev_err(&pdev->dev, "cannot find iomuxc registers\n");
+ return PTR_ERR(gpr);
+ }
+
+ index = of_alias_get_id(np, "sai");
+ if (index < 0)
+ return index;
+
+ regmap_update_bits(gpr, IOMUXC_GPR1, MCLK_DIR(index),
+ MCLK_DIR(index));
+ }
+
sai->dma_params_rx.addr = res->start + FSL_SAI_RDR;
sai->dma_params_tx.addr = res->start + FSL_SAI_TDR;
sai->dma_params_rx.maxburst = FSL_SAI_MAXBURST_RX;
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3 1/2] ASoC: fsl_sai: Introduce a compatible string for MX6UL
2016-05-04 22:33 [PATCH v3 1/2] ASoC: fsl_sai: Introduce a compatible string for MX6UL Fabio Estevam
2016-05-04 22:33 ` [PATCH v3 2/2] ASoC: fsl_sai: Allow setting the SAI MCLK direction Fabio Estevam
@ 2016-05-04 23:10 ` Nicolin Chen
2016-05-05 15:56 ` Applied "ASoC: fsl_sai: Introduce a compatible string for MX6UL" to the asoc tree Mark Brown
2 siblings, 0 replies; 6+ messages in thread
From: Nicolin Chen @ 2016-05-04 23:10 UTC (permalink / raw)
To: Fabio Estevam; +Cc: Fabio Estevam, alsa-devel, broonie, shawnguo, brain
On Wed, May 04, 2016 at 07:33:58PM -0300, Fabio Estevam wrote:
> From: Fabio Estevam <fabio.estevam@nxp.com>
>
> MX6UL may need to configure the General Purpose Register 1 (GPR1), so
> it is better to add a new compatible string to differentiate.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
Thank you
Nicolin
> ---
> Changes since v2:
> - Add binding doc entry for mx6ul (Nicolin)
>
> Documentation/devicetree/bindings/sound/fsl-sai.txt | 4 ++--
> sound/soc/fsl/fsl_sai.c | 4 +++-
> 2 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/sound/fsl-sai.txt b/Documentation/devicetree/bindings/sound/fsl-sai.txt
> index 044e5d7..777b941 100644
> --- a/Documentation/devicetree/bindings/sound/fsl-sai.txt
> +++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt
> @@ -7,8 +7,8 @@ codec/DSP interfaces.
>
> Required properties:
>
> - - compatible : Compatible list, contains "fsl,vf610-sai" or
> - "fsl,imx6sx-sai".
> + - compatible : Compatible list, contains "fsl,vf610-sai",
> + "fsl,imx6sx-sai" or "fsl,imx6ul-sai"
>
> - reg : Offset and length of the register set for the device.
>
> diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
> index 0754df7..d8b673f 100644
> --- a/sound/soc/fsl/fsl_sai.c
> +++ b/sound/soc/fsl/fsl_sai.c
> @@ -797,7 +797,8 @@ static int fsl_sai_probe(struct platform_device *pdev)
>
> sai->pdev = pdev;
>
> - if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx6sx-sai"))
> + if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx6sx-sai") ||
> + of_device_is_compatible(pdev->dev.of_node, "fsl,imx6ul-sai"))
> sai->sai_on_imx = true;
>
> sai->is_lsb_first = of_property_read_bool(np, "lsb-first");
> @@ -898,6 +899,7 @@ static int fsl_sai_probe(struct platform_device *pdev)
> static const struct of_device_id fsl_sai_ids[] = {
> { .compatible = "fsl,vf610-sai", },
> { .compatible = "fsl,imx6sx-sai", },
> + { .compatible = "fsl,imx6ul-sai", },
> { /* sentinel */ }
> };
> MODULE_DEVICE_TABLE(of, fsl_sai_ids);
> --
> 1.9.1
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Applied "ASoC: fsl_sai: Introduce a compatible string for MX6UL" to the asoc tree
2016-05-04 22:33 [PATCH v3 1/2] ASoC: fsl_sai: Introduce a compatible string for MX6UL Fabio Estevam
2016-05-04 22:33 ` [PATCH v3 2/2] ASoC: fsl_sai: Allow setting the SAI MCLK direction Fabio Estevam
2016-05-04 23:10 ` [PATCH v3 1/2] ASoC: fsl_sai: Introduce a compatible string for MX6UL Nicolin Chen
@ 2016-05-05 15:56 ` Mark Brown
2 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2016-05-05 15:56 UTC (permalink / raw)
To: Fabio Estevam; +Cc: nicoleotsuka, alsa-devel, broonie, shawnguo, brain
The patch
ASoC: fsl_sai: Introduce a compatible string for MX6UL
has been applied to the asoc tree at
git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
>From 1593af62b694b3638edf577e3b763fa1a4ca3d76 Mon Sep 17 00:00:00 2001
From: Fabio Estevam <fabio.estevam@nxp.com>
Date: Wed, 4 May 2016 19:33:58 -0300
Subject: [PATCH] ASoC: fsl_sai: Introduce a compatible string for MX6UL
MX6UL may need to configure the General Purpose Register 1 (GPR1), so
it is better to add a new compatible string to differentiate.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Acked-by: Nicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
---
Documentation/devicetree/bindings/sound/fsl-sai.txt | 4 ++--
sound/soc/fsl/fsl_sai.c | 4 +++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Documentation/devicetree/bindings/sound/fsl-sai.txt b/Documentation/devicetree/bindings/sound/fsl-sai.txt
index 044e5d76e2dd..777b941d6cbe 100644
--- a/Documentation/devicetree/bindings/sound/fsl-sai.txt
+++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt
@@ -7,8 +7,8 @@ codec/DSP interfaces.
Required properties:
- - compatible : Compatible list, contains "fsl,vf610-sai" or
- "fsl,imx6sx-sai".
+ - compatible : Compatible list, contains "fsl,vf610-sai",
+ "fsl,imx6sx-sai" or "fsl,imx6ul-sai"
- reg : Offset and length of the register set for the device.
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index 0754df771e3b..d8b673f7c577 100644
--- a/sound/soc/fsl/fsl_sai.c
+++ b/sound/soc/fsl/fsl_sai.c
@@ -797,7 +797,8 @@ static int fsl_sai_probe(struct platform_device *pdev)
sai->pdev = pdev;
- if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx6sx-sai"))
+ if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx6sx-sai") ||
+ of_device_is_compatible(pdev->dev.of_node, "fsl,imx6ul-sai"))
sai->sai_on_imx = true;
sai->is_lsb_first = of_property_read_bool(np, "lsb-first");
@@ -898,6 +899,7 @@ static int fsl_sai_probe(struct platform_device *pdev)
static const struct of_device_id fsl_sai_ids[] = {
{ .compatible = "fsl,vf610-sai", },
{ .compatible = "fsl,imx6sx-sai", },
+ { .compatible = "fsl,imx6ul-sai", },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, fsl_sai_ids);
--
2.8.1
^ permalink raw reply related [flat|nested] 6+ messages in thread