Unverified Commit 6358c883 authored by Marek Vasut's avatar Marek Vasut Committed by Stephen Boyd
Browse files

clk: fsl-sai: Add MCLK generation support 



The driver currently supports generating BCLK. There are systems which
require generation of MCLK instead. Register new MCLK clock and handle
clock-cells = <1> to differentiate between BCLK and MCLK. In case of a
legacy system with clock-cells = <0>, the driver behaves as before, i.e.
always returns BCLK.

Note that it is not possible re-use the current SAI audio driver to
generate MCLK and correctly enable and disable the MCLK.

If SAI (audio driver) is used to control the MCLK enablement, then MCLK
clock is not always enabled, and it is not necessarily enabled when the
codec may need the clock to be enabled. There is also no way for the
codec node to specify phandle to clock provider in DT, because the SAI
(audio driver) is not clock provider.

If SAI (clock driver) is used to control the MCLK enablement, then MCLK
clock is enabled when the codec needs the clock enabled, because the
codec is the clock consumer and the SAI (clock driver) is the clock
provider, and the codec driver can request the clock to be enabled when
needed. There is also the usual phandle to clock provider in DT, because
the SAI (clock driver) is clock provider.

Acked-by: default avatarMichael Walle <mwalle@kernel.org>
Signed-off-by: default avatarMarek Vasut <marex@nabladev.com>
Reviewed-by: default avatarBrian Masney <bmasney@redhat.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 32b0c7aa

drivers/clk/clk-fsl-sai.c

+33 −1
Original line number Diff line number Diff line
@@ -16,19 +16,27 @@ 


#define I2S_CSR		0x00

#define I2S_CR2		0x08

#define I2S_MCR		0x100

#define CSR_BCE_BIT	28

#define CSR_TE_BIT	31

#define CR2_BCD		BIT(24)

#define CR2_DIV_SHIFT	0

#define CR2_DIV_WIDTH	8

#define MCR_MOE		BIT(30)



struct fsl_sai_data {

	unsigned int	offset;	/* Register offset */

	bool		have_mclk; /* Have MCLK control */

};



struct fsl_sai_clk {

	const struct fsl_sai_data *data;

	struct clk_divider bclk_div;

	struct clk_divider mclk_div;

	struct clk_gate bclk_gate;

	struct clk_gate mclk_gate;

	struct clk_hw *bclk_hw;

	struct clk_hw *mclk_hw;

	spinlock_t lock;

};
@@ -37,7 +45,17 @@ fsl_sai_of_clk_get(struct of_phandle_args *clkspec, void *data) 
{

	struct fsl_sai_clk *sai_clk = data;



	if (clkspec->args_count == 0)

		return sai_clk->bclk_hw;



	if (clkspec->args_count == 1) {

		if (clkspec->args[0] == 0)

			return sai_clk->bclk_hw;

		if (sai_clk->data->have_mclk && clkspec->args[0] == 1)

			return sai_clk->mclk_hw;

	}



	return ERR_PTR(-EINVAL);

}



static int fsl_sai_clk_register(struct device *dev, void __iomem *base,
@@ -104,6 +122,7 @@ static int fsl_sai_clk_probe(struct platform_device *pdev) 
	if (IS_ERR(clk_bus))

		return PTR_ERR(clk_bus);



	sai_clk->data = data;

	spin_lock_init(&sai_clk->lock);



	ret = fsl_sai_clk_register(dev, base, &sai_clk->lock,
@@ -113,15 +132,28 @@ static int fsl_sai_clk_probe(struct platform_device *pdev) 
	if (ret)

		return ret;



	if (data->have_mclk) {

		ret = fsl_sai_clk_register(dev, base, &sai_clk->lock,

					   &sai_clk->mclk_div,

					   &sai_clk->mclk_gate,

					   &sai_clk->mclk_hw,

					   CSR_TE_BIT, MCR_MOE, I2S_MCR,

					   "MCLK");

		if (ret)

			return ret;

	}



	return devm_of_clk_add_hw_provider(dev, fsl_sai_of_clk_get, sai_clk);

}



static const struct fsl_sai_data fsl_sai_vf610_data = {

	.offset	= 0,

	.have_mclk = false,

};



static const struct fsl_sai_data fsl_sai_imx8mq_data = {

	.offset	= 8,

	.have_mclk = true,

};



static const struct of_device_id of_fsl_sai_clk_ids[] = {