|
@@ -1870,7 +1870,8 @@ static unsigned int sci_scbrr_calc(struct sci_port *s, unsigned int bps,
|
|
static void sci_baud_calc_hscif(unsigned int bps, unsigned long freq, int *brr,
|
|
static void sci_baud_calc_hscif(unsigned int bps, unsigned long freq, int *brr,
|
|
unsigned int *srr, unsigned int *cks)
|
|
unsigned int *srr, unsigned int *cks)
|
|
{
|
|
{
|
|
- int sr, c, br, err, recv_margin;
|
|
|
|
|
|
+ unsigned int sr, br, c;
|
|
|
|
+ int err, recv_margin;
|
|
int min_err = 1000; /* 100% */
|
|
int min_err = 1000; /* 100% */
|
|
int recv_max_margin = 0;
|
|
int recv_max_margin = 0;
|
|
|
|
|
|
@@ -1880,9 +1881,9 @@ static void sci_baud_calc_hscif(unsigned int bps, unsigned long freq, int *brr,
|
|
for (c = 0; c <= 3; c++) {
|
|
for (c = 0; c <= 3; c++) {
|
|
/* integerized formulas from HSCIF documentation */
|
|
/* integerized formulas from HSCIF documentation */
|
|
br = DIV_ROUND_CLOSEST(freq, (sr *
|
|
br = DIV_ROUND_CLOSEST(freq, (sr *
|
|
- (1 << (2 * c + 1)) * bps)) - 1;
|
|
|
|
- br = clamp(br, 0, 255);
|
|
|
|
- err = DIV_ROUND_CLOSEST(freq, ((br + 1) * bps * sr *
|
|
|
|
|
|
+ (1 << (2 * c + 1)) * bps));
|
|
|
|
+ br = clamp(br, 1U, 256U);
|
|
|
|
+ err = DIV_ROUND_CLOSEST(freq, (br * bps * sr *
|
|
(1 << (2 * c + 1)) / 1000)) -
|
|
(1 << (2 * c + 1)) / 1000)) -
|
|
1000;
|
|
1000;
|
|
/* Calc recv margin
|
|
/* Calc recv margin
|
|
@@ -1908,7 +1909,7 @@ static void sci_baud_calc_hscif(unsigned int bps, unsigned long freq, int *brr,
|
|
else
|
|
else
|
|
continue;
|
|
continue;
|
|
|
|
|
|
- *brr = br;
|
|
|
|
|
|
+ *brr = br - 1;
|
|
*srr = sr - 1;
|
|
*srr = sr - 1;
|
|
*cks = c;
|
|
*cks = c;
|
|
}
|
|
}
|