Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1593af62 authored by Fabio Estevam's avatar Fabio Estevam Committed by Mark Brown
Browse files

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: default avatarFabio Estevam <fabio.estevam@nxp.com>
Acked-by: default avatarNicolin Chen <nicoleotsuka@gmail.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent f55532a0

Documentation/devicetree/bindings/sound/fsl-sai.txt

+2 −2
Original line number Diff line number Diff line
@@ -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.

sound/soc/fsl/fsl_sai.c

+3 −1
Original line number Diff line number Diff line
@@ -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);