i.MX23/MCI: Make the clock calculation easier to read and correct
PATCH 1/1 i.MX23/MCI: Make the clock calculation easier to read and correct
From: Juergen Beisert <[email protected]>
Subject: Make the clock calculation easier to read and correct
Due to a wrong rounding while calculating the clock divider the requested clock of 25 MHz resulted into a 48 MHz clock. With this patch a clock frequency below or equal the requested one will be set.
By using 'div' and 'rate' as vars, its also easier to check against the data sheet.
Signed-off-by Juergen Beisert <[email protected]>
--- drivers/mci/stm378x.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
drivers/mci/stm378x.c +7 -7
@@ -474,7 +474,7 @@ static int stm_mci_adtc(struct device_d*/ static unsigned setup_clock_speed (struct device_d *hw_dev,unsigned nc) { -unsigned ssp, div1, div2, reg; +unsigned ssp, div, rate, reg;if (nc ==0U ) {/* TODO stop the clock */
@@ -483,21 +483,21 @@ static unsigned setup_clock_speed(struct ssp =imx_get_sspclk (0 ) *1000 ; -for (div1 =2 ; div1 <255 ; div1 +=2 ) { - div2 = ssp / nc / div1; -if (div2 <=0x100 ) +for (div =2 ; div <255 ; div +=2 ) { + rate = (((ssp + (nc >>1 ) ) / nc) + (div >>1 )) / div; +if (rate <=0x100 )break ; } -if (div1 >=255 ) { +if (div >=255 ) {pr_warning ("Cannot set clock to %d Hz\n" , nc);return 0 ; } reg =readl (hw_dev->map_base +HW_SSP_TIMING ) &SSP_TIMING_TIMEOUT_MASK ; - reg |=SSP_TIMING_CLOCK_DIVIDE (div1) |SSP_TIMING_CLOCK_RATE (div2 -1 ); + reg |=SSP_TIMING_CLOCK_DIVIDE (div) |SSP_TIMING_CLOCK_RATE (rate -1 );writel (reg, hw_dev->map_base +HW_SSP_TIMING ); -return ssp / div1 / div2; +return ssp / div / rate; }/**
Signature · 9 lines
Pengutronix e.K. | Juergen Beisert | Linux Solutions for Science and Industry | Phone: +49-8766-939 228 | Vertretung Sued/Muenchen, Germany | Fax: +49-5121-206917-5555 | Amtsgericht Hildesheim, HRA 2686 | http://www.pengutronix.de/ | _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox