Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-05-02 01:26:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

clk: rockchip: rk3399: Fix check patch warnings and checks

Browse source 
- CHECK: spaces preferred around that '*'
- CHECK: spaces preferred around that '/'
- CHECK: space preferred before that '|'
- WARNING: macros should not use a trailing semicolon
- CHECK: Unnecessary parentheses around 'fbdiv <= min_fbdiv'
- CHECK: Unnecessary parentheses around 'parent->id == SCLK_MAC'
- CHECK: Unnecessary parentheses around 'parent->dev == clk->dev'
- WARNING: line over 80 characters
- CHECK: Prefer kernel type 'u8' over 'uint8_t'
- Add proper macro definitions arrangements

Note: there are still line over 80 characters and other warnings but
fixing those making code look unreadable, so I kept it as it is.

Signed-off-by: Jagan Teki <jagan@amarulasolutions.com>
Reviewed-by: Kever Yang <Kever.yang@rock-chips.com>
This commit is contained in:
Jagan Teki 2019-07-15 23:51:10 +05:30 • committed by Kever Yang
parent 7757d1102f
commit dd7dfa217e
1 changed files with 31 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

68
drivers/clk/rockchip/clk_rk3399.c
View file

@ -38,8 +38,8 @@ struct pll_div {
}; };
#define RATE_TO_DIV(input_rate, output_rate) \ #define RATE_TO_DIV(input_rate, output_rate) \
((input_rate) / (output_rate) - 1); ((input_rate) / (output_rate) - 1)
#define DIV_TO_RATE(input_rate, div) ((input_rate) / ((div) + 1)) #define DIV_TO_RATE(input_rate, div) ((input_rate) / ((div) + 1))
#define PLL_DIVISORS(hz, _refdiv, _postdiv1, _postdiv2) {\ #define PLL_DIVISORS(hz, _refdiv, _postdiv1, _postdiv2) {\
.refdiv = _refdiv,\ .refdiv = _refdiv,\
@ -53,15 +53,15 @@ static const struct pll_div cpll_init_cfg = PLL_DIVISORS(CPLL_HZ, 1, 2, 2);
static const struct pll_div ppll_init_cfg = PLL_DIVISORS(PPLL_HZ, 2, 2, 1); static const struct pll_div ppll_init_cfg = PLL_DIVISORS(PPLL_HZ, 2, 2, 1);
#endif #endif
static const struct pll_div apll_l_1600_cfg = PLL_DIVISORS(1600*MHz, 3, 1, 1); static const struct pll_div apll_l_1600_cfg = PLL_DIVISORS(1600 * MHz, 3, 1, 1);
static const struct pll_div apll_l_600_cfg = PLL_DIVISORS(600*MHz, 1, 2, 1); static const struct pll_div apll_l_600_cfg = PLL_DIVISORS(600 * MHz, 1, 2, 1);
static const struct pll_div *apll_l_cfgs[] = { static const struct pll_div *apll_l_cfgs[] = {
[APLL_L_1600_MHZ] = &apll_l_1600_cfg, [APLL_L_1600_MHZ] = &apll_l_1600_cfg,
[APLL_L_600_MHZ] = &apll_l_600_cfg, [APLL_L_600_MHZ] = &apll_l_600_cfg,
}; };
static const struct pll_div apll_b_600_cfg = PLL_DIVISORS(600*MHz, 1, 2, 1); static const struct pll_div apll_b_600_cfg = PLL_DIVISORS(600 * MHz, 1, 2, 1);
static const struct pll_div *apll_b_cfgs[] = { static const struct pll_div *apll_b_cfgs[] = {
[APLL_B_600_MHZ] = &apll_b_600_cfg, [APLL_B_600_MHZ] = &apll_b_600_cfg,
}; };
@ -393,7 +393,7 @@ static int pll_para_config(u32 freq_hz, struct pll_div *div)
fref_khz = ref_khz / refdiv; fref_khz = ref_khz / refdiv;
fbdiv = vco_khz / fref_khz; fbdiv = vco_khz / fref_khz;
if ((fbdiv >= max_fbdiv) || (fbdiv <= min_fbdiv)) if (fbdiv >= max_fbdiv || fbdiv <= min_fbdiv)
continue; continue;
diff_khz = vco_khz - fbdiv * fref_khz; diff_khz = vco_khz - fbdiv * fref_khz;
if (fbdiv + 1 < max_fbdiv && diff_khz > fref_khz / 2) { if (fbdiv + 1 < max_fbdiv && diff_khz > fref_khz / 2) {
@ -409,7 +409,7 @@ static int pll_para_config(u32 freq_hz, struct pll_div *div)
div->fbdiv = fbdiv; div->fbdiv = fbdiv;
} }
if (best_diff_khz > 4 * (MHz/KHz)) { if (best_diff_khz > 4 * (MHz / KHz)) {
printf("%s: Failed to match output frequency %u, " printf("%s: Failed to match output frequency %u, "
"difference is %u Hz,exceed 4MHZ\n", __func__, freq_hz, "difference is %u Hz,exceed 4MHZ\n", __func__, freq_hz,
best_diff_khz * KHz); best_diff_khz * KHz);
@ -489,28 +489,21 @@ void rk3399_configure_cpu_b(struct rk3399_cru *cru,
} }
#define I2C_CLK_REG_MASK(bus) \ #define I2C_CLK_REG_MASK(bus) \
(I2C_DIV_CON_MASK << \ (I2C_DIV_CON_MASK << CLK_I2C ##bus## _DIV_CON_SHIFT | \
CLK_I2C ##bus## _DIV_CON_SHIFT | \ CLK_I2C_PLL_SEL_MASK << CLK_I2C ##bus## _PLL_SEL_SHIFT)
CLK_I2C_PLL_SEL_MASK << \
CLK_I2C ##bus## _PLL_SEL_SHIFT)
#define I2C_CLK_REG_VALUE(bus, clk_div) \ #define I2C_CLK_REG_VALUE(bus, clk_div) \
((clk_div - 1) << \ ((clk_div - 1) << CLK_I2C ##bus## _DIV_CON_SHIFT | \
CLK_I2C ##bus## _DIV_CON_SHIFT | \ CLK_I2C_PLL_SEL_GPLL << CLK_I2C ##bus## _PLL_SEL_SHIFT)
CLK_I2C_PLL_SEL_GPLL << \
CLK_I2C ##bus## _PLL_SEL_SHIFT)
#define I2C_CLK_DIV_VALUE(con, bus) \ #define I2C_CLK_DIV_VALUE(con, bus) \
(con >> CLK_I2C ##bus## _DIV_CON_SHIFT) & \ ((con >> CLK_I2C ##bus## _DIV_CON_SHIFT) & I2C_DIV_CON_MASK)
I2C_DIV_CON_MASK;
#define I2C_PMUCLK_REG_MASK(bus) \ #define I2C_PMUCLK_REG_MASK(bus) \
(I2C_DIV_CON_MASK << \ (I2C_DIV_CON_MASK << CLK_I2C ##bus## _DIV_CON_SHIFT)
CLK_I2C ##bus## _DIV_CON_SHIFT)
#define I2C_PMUCLK_REG_VALUE(bus, clk_div) \ #define I2C_PMUCLK_REG_VALUE(bus, clk_div) \
((clk_div - 1) << \ ((clk_div - 1) << CLK_I2C ##bus## _DIV_CON_SHIFT)
CLK_I2C ##bus## _DIV_CON_SHIFT)
static ulong rk3399_i2c_get_clk(struct rk3399_cru *cru, ulong clk_id) static ulong rk3399_i2c_get_clk(struct rk3399_cru *cru, ulong clk_id)
{ {
@ -597,9 +590,9 @@ static ulong rk3399_i2c_set_clk(struct rk3399_cru *cru, ulong clk_id, uint hz)
*/ */
struct spi_clkreg { struct spi_clkreg {
uint8_t reg; /* CLKSEL_CON[reg] register in CRU */ u8 reg; /* CLKSEL_CON[reg] register in CRU */
uint8_t div_shift; u8 div_shift;
uint8_t sel_shift; u8 sel_shift;
}; };
/* /*
@ -678,7 +671,7 @@ static ulong rk3399_spi_set_clk(struct rk3399_cru *cru, ulong clk_id, uint hz)
static ulong rk3399_vop_set_clk(struct rk3399_cru *cru, ulong clk_id, u32 hz) static ulong rk3399_vop_set_clk(struct rk3399_cru *cru, ulong clk_id, u32 hz)
{ {
struct pll_div vpll_config = {0}; struct pll_div vpll_config = {0};
int aclk_vop = 198*MHz; int aclk_vop = 198 * MHz;
void *aclkreg_addr, *dclkreg_addr; void *aclkreg_addr, *dclkreg_addr;
u32 div; u32 div;
@ -710,7 +703,7 @@ static ulong rk3399_vop_set_clk(struct rk3399_cru *cru, ulong clk_id, u32 hz)
rkclk_set_pll(&cru->vpll_con[0], &vpll_config); rkclk_set_pll(&cru->vpll_con[0], &vpll_config);
rk_clrsetreg(dclkreg_addr, rk_clrsetreg(dclkreg_addr,
DCLK_VOP_DCLK_SEL_MASK | DCLK_VOP_PLL_SEL_MASK| DCLK_VOP_DCLK_SEL_MASK | DCLK_VOP_PLL_SEL_MASK |
DCLK_VOP_DIV_CON_MASK, DCLK_VOP_DIV_CON_MASK,
DCLK_VOP_DCLK_SEL_DIVOUT << DCLK_VOP_DCLK_SEL_SHIFT | DCLK_VOP_DCLK_SEL_DIVOUT << DCLK_VOP_DCLK_SEL_SHIFT |
DCLK_VOP_PLL_SEL_VPLL << DCLK_VOP_PLL_SEL_SHIFT | DCLK_VOP_PLL_SEL_VPLL << DCLK_VOP_PLL_SEL_SHIFT |
@ -750,7 +743,7 @@ static ulong rk3399_mmc_set_clk(struct rk3399_cru *cru,
ulong clk_id, ulong set_rate) ulong clk_id, ulong set_rate)
{ {
int src_clk_div; int src_clk_div;
int aclk_emmc = 198*MHz; int aclk_emmc = 198 * MHz;
switch (clk_id) { switch (clk_id) {
case HCLK_SDMMC: case HCLK_SDMMC:
@ -776,7 +769,7 @@ static ulong rk3399_mmc_set_clk(struct rk3399_cru *cru,
break; break;
case SCLK_EMMC: case SCLK_EMMC:
/* Select aclk_emmc source from GPLL */ /* Select aclk_emmc source from GPLL */
src_clk_div = DIV_ROUND_UP(GPLL_HZ , aclk_emmc); src_clk_div = DIV_ROUND_UP(GPLL_HZ, aclk_emmc);
assert(src_clk_div - 1 < 32); assert(src_clk_div - 1 < 32);
rk_clrsetreg(&cru->clksel_con[21], rk_clrsetreg(&cru->clksel_con[21],
@ -834,23 +827,23 @@ static ulong rk3399_ddr_set_clk(struct rk3399_cru *cru,
/* clk_ddrc == DPLL = 24MHz / refdiv * fbdiv / postdiv1 / postdiv2 */ /* clk_ddrc == DPLL = 24MHz / refdiv * fbdiv / postdiv1 / postdiv2 */
switch (set_rate) { switch (set_rate) {
case 200*MHz: case 200 * MHz:
dpll_cfg = (struct pll_div) dpll_cfg = (struct pll_div)
{.refdiv = 1, .fbdiv = 50, .postdiv1 = 6, .postdiv2 = 1}; {.refdiv = 1, .fbdiv = 50, .postdiv1 = 6, .postdiv2 = 1};
break; break;
case 300*MHz: case 300 * MHz:
dpll_cfg = (struct pll_div) dpll_cfg = (struct pll_div)
{.refdiv = 2, .fbdiv = 100, .postdiv1 = 4, .postdiv2 = 1}; {.refdiv = 2, .fbdiv = 100, .postdiv1 = 4, .postdiv2 = 1};
break; break;
case 666*MHz: case 666 * MHz:
dpll_cfg = (struct pll_div) dpll_cfg = (struct pll_div)
{.refdiv = 2, .fbdiv = 111, .postdiv1 = 2, .postdiv2 = 1}; {.refdiv = 2, .fbdiv = 111, .postdiv1 = 2, .postdiv2 = 1};
break; break;
case 800*MHz: case 800 * MHz:
dpll_cfg = (struct pll_div) dpll_cfg = (struct pll_div)
{.refdiv = 1, .fbdiv = 100, .postdiv1 = 3, .postdiv2 = 1}; {.refdiv = 1, .fbdiv = 100, .postdiv1 = 3, .postdiv2 = 1};
break; break;
case 933*MHz: case 933 * MHz:
dpll_cfg = (struct pll_div) dpll_cfg = (struct pll_div)
{.refdiv = 1, .fbdiv = 116, .postdiv1 = 3, .postdiv2 = 1}; {.refdiv = 1, .fbdiv = 116, .postdiv1 = 3, .postdiv2 = 1};
break; break;
@ -916,7 +909,6 @@ static ulong rk3399_clk_get_rate(struct clk *clk)
case SCLK_UART2: case SCLK_UART2:
case SCLK_UART3: case SCLK_UART3:
return 24000000; return 24000000;
break;
case PCLK_HDMI_CTRL: case PCLK_HDMI_CTRL:
break; break;
case DCLK_VOP0: case DCLK_VOP0:
@ -1014,7 +1006,8 @@ static ulong rk3399_clk_set_rate(struct clk *clk, ulong rate)
return ret; return ret;
} }
static int __maybe_unused rk3399_gmac_set_parent(struct clk *clk, struct clk *parent) static int __maybe_unused rk3399_gmac_set_parent(struct clk *clk,
struct clk *parent)
{ {
struct rk3399_clk_priv *priv = dev_get_priv(clk->dev); struct rk3399_clk_priv *priv = dev_get_priv(clk->dev);
const char *clock_output_name; const char *clock_output_name;
@ -1024,7 +1017,7 @@ static int __maybe_unused rk3399_gmac_set_parent(struct clk *clk, struct clk *pa
* If the requested parent is in the same clock-controller and * If the requested parent is in the same clock-controller and
* the id is SCLK_MAC ("clk_gmac"), switch to the internal clock. * the id is SCLK_MAC ("clk_gmac"), switch to the internal clock.
*/ */
if ((parent->dev == clk->dev) && (parent->id == SCLK_MAC)) { if (parent->dev == clk->dev && parent->id == SCLK_MAC) {
debug("%s: switching RGMII to SCLK_MAC\n", __func__); debug("%s: switching RGMII to SCLK_MAC\n", __func__);
rk_clrreg(&priv->cru->clksel_con[19], BIT(4)); rk_clrreg(&priv->cru->clksel_con[19], BIT(4));
return 0; return 0;
@ -1049,7 +1042,8 @@ static int __maybe_unused rk3399_gmac_set_parent(struct clk *clk, struct clk *pa
return -EINVAL; return -EINVAL;
} }
static int __maybe_unused rk3399_clk_set_parent(struct clk *clk, struct clk *parent) static int __maybe_unused rk3399_clk_set_parent(struct clk *clk,
struct clk *parent)
{ {
switch (clk->id) { switch (clk->id) {
case SCLK_RMII_SRC: case SCLK_RMII_SRC: