ARM: mach-shmobile: ap4evb: FSI clock use proper process for HDMI (d4bc99b9) · Commits · e / devices / android_kernel_xiaomi_nabu

arch/arm/mach-shmobile/board-ap4evb.c

+45 −13

Original line number	Original line	Diff line number	Diff line
	@@ -567,42 +567,74 @@ static struct platform_device *qhd_devices[] __initdata = {

	/* FSI */		/* FSI */
	#define IRQ_FSI evt2irq(0x1840)		#define IRQ_FSI evt2irq(0x1840)
			static int __fsi_set_rate(struct clk *clk, long rate, int enable)
			{
			int ret = 0;

			if (rate <= 0)
			return ret;

			if (enable) {
			ret = clk_set_rate(clk, clk_round_rate(clk, rate));
			if (0 == ret)
			ret = clk_enable(clk);
			} else {
			clk_disable(clk);
			}

	static int fsi_set_rate(int is_porta, int rate)		return ret;
			}

			static int fsi_set_rate(struct device *dev, int is_porta, int rate, int enable)
	{		{
	struct clk *fsib_clk;		struct clk *fsib_clk;
	struct clk *fdiv_clk = &sh7372_fsidivb_clk;		struct clk *fdiv_clk = &sh7372_fsidivb_clk;
			long fsib_rate = 0;
			long fdiv_rate = 0;
			int ackmd_bpfmd;
	int ret;		int ret;

	/* set_rate is not needed if port A */		/* set_rate is not needed if port A */
	if (is_porta)		if (is_porta)
	return 0;		return 0;

	fsib_clk = clk_get(NULL, "fsib_clk");
	if (IS_ERR(fsib_clk))
	return -EINVAL;

	switch (rate) {		switch (rate) {
	case 44100:		case 44100:
	clk_set_rate(fsib_clk, clk_round_rate(fsib_clk, 11283000));		fsib_rate = rate * 256;
	ret = SH_FSI_ACKMD_256 \| SH_FSI_BPFMD_64;		ackmd_bpfmd = SH_FSI_ACKMD_256 \| SH_FSI_BPFMD_64;
	break;		break;
	case 48000:		case 48000:
	clk_set_rate(fsib_clk, clk_round_rate(fsib_clk, 85428000));		fsib_rate = 85428000; /* around 48kHz x 256 x 7 */
	clk_set_rate(fdiv_clk, clk_round_rate(fdiv_clk, 12204000));		fdiv_rate = rate * 256;
	ret = SH_FSI_ACKMD_256 \| SH_FSI_BPFMD_64;		ackmd_bpfmd = SH_FSI_ACKMD_256 \| SH_FSI_BPFMD_64;
	break;		break;
	default:		default:
	pr_err("unsupported rate in FSI2 port B\n");		pr_err("unsupported rate in FSI2 port B\n");
	ret = -EINVAL;		return -EINVAL;
	break;
	}		}

			/* FSI B setting */
			fsib_clk = clk_get(dev, "ickb");
			if (IS_ERR(fsib_clk))
			return -EIO;

			ret = __fsi_set_rate(fsib_clk, fsib_rate, enable);
	clk_put(fsib_clk);		clk_put(fsib_clk);
			if (ret < 0)
			return ret;

			/* FSI DIV setting */
			ret = __fsi_set_rate(fdiv_clk, fdiv_rate, enable);
			if (ret < 0) {
			/* disable FSI B */
			if (enable)
			__fsi_set_rate(fsib_clk, fsib_rate, 0);
	return ret;		return ret;
	}		}

			return ackmd_bpfmd;
			}

	static struct sh_fsi_platform_info fsi_info = {		static struct sh_fsi_platform_info fsi_info = {
	.porta_flags = SH_FSI_BRS_INV \|		.porta_flags = SH_FSI_BRS_INV \|
	SH_FSI_OUT_SLAVE_MODE \|		SH_FSI_OUT_SLAVE_MODE \|

arch/arm/mach-shmobile/clock-sh7372.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -471,7 +471,7 @@ static int fsidiv_set_rate(struct clk *clk,
	return -ENOENT;		return -ENOENT;

	__raw_writel(idx << 16, clk->mapping->base);		__raw_writel(idx << 16, clk->mapping->base);
	return fsidiv_enable(clk);		return 0;
	}		}

	static struct clk_ops fsidiv_clk_ops = {		static struct clk_ops fsidiv_clk_ops = {

include/sound/sh_fsi.h

+4 −2

Original line number	Original line	Diff line number	Diff line
	@@ -86,6 +86,8 @@
	* CKG1 (FSI)		* CKG1 (FSI)
	*		*
	* err : return value < 0		* err : return value < 0
			* no change : return value == 0
			* change xMD : return value > 0
	*		*
	* 0x-00000AB		* 0x-00000AB
	*		*
	@@ -111,7 +113,7 @@
	struct sh_fsi_platform_info {		struct sh_fsi_platform_info {
	unsigned long porta_flags;		unsigned long porta_flags;
	unsigned long portb_flags;		unsigned long portb_flags;
	int (set_rate)(int is_porta, int rate); / for master mode */		int (set_rate)(struct device dev, int is_porta, int rate, int enable);
	};		};

	#endif /* __SOUND_FSI_H */		#endif /* __SOUND_FSI_H */

sound/soc/sh/fsi.c

+17 −2

Original line number	Original line	Diff line number	Diff line
	@@ -132,6 +132,8 @@ struct fsi_priv {
	struct fsi_stream playback;		struct fsi_stream playback;
	struct fsi_stream capture;		struct fsi_stream capture;

			long rate;

	u32 mst_ctrl;		u32 mst_ctrl;
	};		};

	@@ -854,10 +856,17 @@ static void fsi_dai_shutdown(struct snd_pcm_substream *substream,
	{		{
	struct fsi_priv *fsi = fsi_get_priv(substream);		struct fsi_priv *fsi = fsi_get_priv(substream);
	int is_play = fsi_is_play(substream);		int is_play = fsi_is_play(substream);
			struct fsi_master *master = fsi_get_master(fsi);
			int (set_rate)(struct device dev, int is_porta, int rate, int enable);

	fsi_irq_disable(fsi, is_play);		fsi_irq_disable(fsi, is_play);
	fsi_clk_ctrl(fsi, 0);		fsi_clk_ctrl(fsi, 0);

			set_rate = master->info->set_rate;
			if (set_rate && fsi->rate)
			set_rate(dai->dev, fsi_is_port_a(fsi), fsi->rate, 0);
			fsi->rate = 0;

	pm_runtime_put_sync(dai->dev);		pm_runtime_put_sync(dai->dev);
	}		}

	@@ -891,9 +900,10 @@ static int fsi_dai_hw_params(struct snd_pcm_substream *substream,
	{		{
	struct fsi_priv *fsi = fsi_get_priv(substream);		struct fsi_priv *fsi = fsi_get_priv(substream);
	struct fsi_master *master = fsi_get_master(fsi);		struct fsi_master *master = fsi_get_master(fsi);
	int (*set_rate)(int is_porta, int rate) = master->info->set_rate;		int (set_rate)(struct device dev, int is_porta, int rate, int enable);
	int fsi_ver = master->core->ver;		int fsi_ver = master->core->ver;
	int is_play = fsi_is_play(substream);		int is_play = fsi_is_play(substream);
			long rate = params_rate(params);
	int ret;		int ret;

	/* if slave mode, set_rate is not needed */		/* if slave mode, set_rate is not needed */
	@@ -901,10 +911,15 @@ static int fsi_dai_hw_params(struct snd_pcm_substream *substream,
	return 0;		return 0;

	/* it is error if no set_rate */		/* it is error if no set_rate */
			set_rate = master->info->set_rate;
	if (!set_rate)		if (!set_rate)
	return -EIO;		return -EIO;

	ret = set_rate(fsi_is_port_a(fsi), params_rate(params));		ret = set_rate(dai->dev, fsi_is_port_a(fsi), rate, 1);
			if (ret < 0) /* error */
			return ret;

			fsi->rate = rate;
	if (ret > 0) {		if (ret > 0) {
	u32 data = 0;		u32 data = 0;