diff options
author | Fabio Estevam <fabio.estevam@nxp.com> | 2016-05-04 18:33:58 -0400 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2016-05-05 11:44:18 -0400 |
commit | 1593af62b694b3638edf577e3b763fa1a4ca3d76 (patch) | |
tree | 2e39c5b23456583ba0937a62d8add7140d8bbfa2 | |
parent | f55532a0c0b8bb6148f4e07853b876ef73bc69ca (diff) |
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>
-rw-r--r-- | Documentation/devicetree/bindings/sound/fsl-sai.txt | 4 | ||||
-rw-r--r-- | 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. | |||
7 | 7 | ||
8 | Required properties: | 8 | Required properties: |
9 | 9 | ||
10 | - compatible : Compatible list, contains "fsl,vf610-sai" or | 10 | - compatible : Compatible list, contains "fsl,vf610-sai", |
11 | "fsl,imx6sx-sai". | 11 | "fsl,imx6sx-sai" or "fsl,imx6ul-sai" |
12 | 12 | ||
13 | - reg : Offset and length of the register set for the device. | 13 | - reg : Offset and length of the register set for the device. |
14 | 14 | ||
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) | |||
797 | 797 | ||
798 | sai->pdev = pdev; | 798 | sai->pdev = pdev; |
799 | 799 | ||
800 | if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx6sx-sai")) | 800 | if (of_device_is_compatible(pdev->dev.of_node, "fsl,imx6sx-sai") || |
801 | of_device_is_compatible(pdev->dev.of_node, "fsl,imx6ul-sai")) | ||
801 | sai->sai_on_imx = true; | 802 | sai->sai_on_imx = true; |
802 | 803 | ||
803 | sai->is_lsb_first = of_property_read_bool(np, "lsb-first"); | 804 | sai->is_lsb_first = of_property_read_bool(np, "lsb-first"); |
@@ -898,6 +899,7 @@ static int fsl_sai_probe(struct platform_device *pdev) | |||
898 | static const struct of_device_id fsl_sai_ids[] = { | 899 | static const struct of_device_id fsl_sai_ids[] = { |
899 | { .compatible = "fsl,vf610-sai", }, | 900 | { .compatible = "fsl,vf610-sai", }, |
900 | { .compatible = "fsl,imx6sx-sai", }, | 901 | { .compatible = "fsl,imx6sx-sai", }, |
902 | { .compatible = "fsl,imx6ul-sai", }, | ||
901 | { /* sentinel */ } | 903 | { /* sentinel */ } |
902 | }; | 904 | }; |
903 | MODULE_DEVICE_TABLE(of, fsl_sai_ids); | 905 | MODULE_DEVICE_TABLE(of, fsl_sai_ids); |