| Message ID | 1462401239-995-1-git-send-email-festevam@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 1593af62b694b3638edf577e3b763fa1a4ca3d76 |
| Headers | show |
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 >
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);