Commit d8764646 authored by Markus Schneider-Pargmann's avatar Markus Schneider-Pargmann Committed by Mark Brown
Browse files

ASoC: fsl-ssi: Move ac97 specific setup to seperate function 



This is a pure cleanup patch to increase code readability.

Signed-off-by: default avatarMarkus Pargmann <mpa@pengutronix.de>
Signed-off-by: default avatarMark Brown <broonie@linaro.org>
parent 6ce4eac1

sound/soc/fsl/fsl_ssi.c

+32 −25
Original line number Diff line number Diff line
@@ -321,6 +321,36 @@ static irqreturn_t fsl_ssi_isr(int irq, void *dev_id) 
	return ret;

}



static void fsl_ssi_setup_ac97(struct fsl_ssi_private *ssi_private)

{

	struct ccsr_ssi __iomem *ssi = ssi_private->ssi;



	/*

	 * Setup the clock control register

	 */

	write_ssi(CCSR_SSI_SxCCR_WL(17) | CCSR_SSI_SxCCR_DC(13),

			&ssi->stccr);

	write_ssi(CCSR_SSI_SxCCR_WL(17) | CCSR_SSI_SxCCR_DC(13),

			&ssi->srccr);



	/*

	 * Enable AC97 mode and startup the SSI

	 */

	write_ssi(CCSR_SSI_SACNT_AC97EN | CCSR_SSI_SACNT_FV,

			&ssi->sacnt);

	write_ssi(0xff, &ssi->saccdis);

	write_ssi(0x300, &ssi->saccen);



	/*

	 * Enable SSI, Transmit and Receive. AC97 has to communicate with the

	 * codec before a stream is started.

	 */

	write_ssi_mask(&ssi->scr, 0, CCSR_SSI_SCR_SSIEN |

			CCSR_SSI_SCR_TE | CCSR_SSI_SCR_RE);



	write_ssi(CCSR_SSI_SOR_WAIT(3), &ssi->sor);

}



static int fsl_ssi_setup(struct fsl_ssi_private *ssi_private)

{

	struct ccsr_ssi __iomem *ssi = ssi_private->ssi;
@@ -387,31 +417,8 @@ static int fsl_ssi_setup(struct fsl_ssi_private *ssi_private) 
	 * because it is also running without an active substream. Normally SSI

	 * is only enabled when there is a substream.

	 */

	if (ssi_private->imx_ac97) {

		/*

		 * Setup the clock control register

		 */

		write_ssi(CCSR_SSI_SxCCR_WL(17) | CCSR_SSI_SxCCR_DC(13),

				&ssi->stccr);

		write_ssi(CCSR_SSI_SxCCR_WL(17) | CCSR_SSI_SxCCR_DC(13),

				&ssi->srccr);



		/*

		 * Enable AC97 mode and startup the SSI

		 */

		write_ssi(CCSR_SSI_SACNT_AC97EN | CCSR_SSI_SACNT_FV,

				&ssi->sacnt);

		write_ssi(0xff, &ssi->saccdis);

		write_ssi(0x300, &ssi->saccen);



		/*

		 * Enable SSI, Transmit and Receive

		 */

		write_ssi_mask(&ssi->scr, 0, CCSR_SSI_SCR_SSIEN |

				CCSR_SSI_SCR_TE | CCSR_SSI_SCR_RE);



		write_ssi(CCSR_SSI_SOR_WAIT(3), &ssi->sor);

	}

	if (ssi_private->imx_ac97)

		fsl_ssi_setup_ac97(ssi_private);



	return 0;

}