@@ -112,12 +112,6 @@ struct sh_msiof_spi_priv {
112
112
/* SITSCR and SIRSCR */
113
113
#define SISCR_BRPS GENMASK(12, 8) /* Prescaler Setting (1-32) */
114
114
#define SISCR_BRDV GENMASK(2, 0) /* Baud Rate Generator's Division Ratio */
115
- #define SISCR_BRDV_DIV_2 0U
116
- #define SISCR_BRDV_DIV_4 1U
117
- #define SISCR_BRDV_DIV_8 2U
118
- #define SISCR_BRDV_DIV_16 3U
119
- #define SISCR_BRDV_DIV_32 4U
120
- #define SISCR_BRDV_DIV_1 7U
121
115
122
116
/* SICTR */
123
117
#define SICTR_TSCKIZ GENMASK(31, 30) /* Transmit Clock I/O Polarity Select */
@@ -256,11 +250,6 @@ static void sh_msiof_spi_reset_regs(struct sh_msiof_spi_priv *p)
256
250
100 );
257
251
}
258
252
259
- static const u32 sh_msiof_spi_div_array [] = {
260
- SISCR_BRDV_DIV_1 , SISCR_BRDV_DIV_2 , SISCR_BRDV_DIV_4 ,
261
- SISCR_BRDV_DIV_8 , SISCR_BRDV_DIV_16 , SISCR_BRDV_DIV_32 ,
262
- };
263
-
264
253
static void sh_msiof_spi_set_clk_regs (struct sh_msiof_spi_priv * p ,
265
254
struct spi_transfer * t )
266
255
{
@@ -299,7 +288,8 @@ static void sh_msiof_spi_set_clk_regs(struct sh_msiof_spi_priv *p,
299
288
300
289
t -> effective_speed_hz = parent_rate / (brps << div_pow );
301
290
302
- scr = FIELD_PREP (SISCR_BRDV , sh_msiof_spi_div_array [div_pow ]) |
291
+ /* div_pow == 0 maps to SISCR_BRDV_DIV_1 == all ones */
292
+ scr = FIELD_PREP (SISCR_BRDV , div_pow - 1 ) |
303
293
FIELD_PREP (SISCR_BRPS , brps - 1 );
304
294
sh_msiof_write (p , SITSCR , scr );
305
295
if (!(p -> ctlr -> flags & SPI_CONTROLLER_MUST_TX ))
0 commit comments