From: Fabio Estevam <fabio.estevam@xxxxxxx>
On mx6ul the General Purpose Register 1 (GPR1) contains the following
bits for enabling the output of the SAI MCLKs:
SAI1_MCLK_DIR, SAI2_MCLK_DIR, SAI3_MCLK_DIR
Introduce "gpr" and "fsl,sai-enable-mclk" optional properties to allow
the enablement of the SAI_MCLK outputs.
Tested on a imx6ul-evk board.
Signed-off-by: Fabio Estevam <fabio.estevam@xxxxxxx>
---
.../devicetree/bindings/sound/fsl-sai.txt | 8 +++++
include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 3 ++
sound/soc/fsl/fsl_sai.c | 37 ++++++++++++++++++++++
3 files changed, 48 insertions(+)
diff --git a/Documentation/devicetree/bindings/sound/fsl-sai.txt b/Documentation/devicetree/bindings/sound/fsl-sai.txt
index 044e5d7..86755bb 100644
--- a/Documentation/devicetree/bindings/sound/fsl-sai.txt
+++ b/Documentation/devicetree/bindings/sound/fsl-sai.txt
@@ -48,6 +48,14 @@ Required properties:
receive data by following their own bit clocks and
frame sync clocks separately.
+Optional properties (for mx6ul):
+
+ - gpr : The phandle to the General Purpose Register (GPR)
+ node.
+
+ - fsl,sai-enable-mclk : 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..401f97e 100644
--- a/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
+++ b/include/linux/mfd/syscon/imx6q-iomuxc-gpr.h
@@ -447,5 +447,8 @@
#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)
#endif /* __LINUX_IMX6Q_IOMUXC_GPR_H */
diff --git a/sound/soc/fsl/fsl_sai.c b/sound/soc/fsl/fsl_sai.c
index 0754df7..311325e 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"
@@ -785,11 +787,14 @@ static const struct regmap_config fsl_sai_regmap_config = {
static int fsl_sai_probe(struct platform_device *pdev)
{
struct device_node *np = pdev->dev.of_node;
+ struct device_node *gpr_np = of_parse_phandle(np, "gpr", 0);
struct fsl_sai *sai;
+ struct regmap *gpr;
struct resource *res;
void __iomem *base;
char tmp[8];
int irq, ret, i;
+ u32 index;
sai = devm_kzalloc(&pdev->dev, sizeof(*sai), GFP_KERNEL);
if (!sai)
@@ -877,6 +882,38 @@ static int fsl_sai_probe(struct platform_device *pdev)
fsl_sai_dai.symmetric_samplebits = 0;
}
+ if (of_find_property(np, "fsl,sai-enable-mclk", NULL)) {
+ ret = of_property_read_u32(np, "sai-index", &index);
+ if (ret) {
+ dev_err(&pdev->dev, "could not read sai-index\n");
+ return ret;
+ }
+
+ gpr = syscon_node_to_regmap(gpr_np);
+ if (IS_ERR(gpr)) {
+ dev_err(&pdev->dev, "could not find gpr node\n");
+ return PTR_ERR(gpr);
+ }
+
+ switch (index) {
+ case 1:
+ regmap_update_bits(gpr, IOMUXC_GPR1,
+ IMX6UL_GPR1_SAI1_MCLK_DIR,
+ IMX6UL_GPR1_SAI1_MCLK_DIR);
+ break;
+ case 2:
+ regmap_update_bits(gpr, IOMUXC_GPR1,
+ IMX6UL_GPR1_SAI2_MCLK_DIR,
+ IMX6UL_GPR1_SAI2_MCLK_DIR);
+ break;
+ case 3:
+ regmap_update_bits(gpr, IOMUXC_GPR1,
+ IMX6UL_GPR1_SAI3_MCLK_DIR,
+ IMX6UL_GPR1_SAI3_MCLK_DIR);
+ break;
+ }
+ }
+
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
_______________________________________________
Alsa-devel mailing list
Alsa-devel@xxxxxxxxxxxxxxxx
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
