patrick/zephyr
1
0
Fork 0
Code Issues Pull requests Actions 8 Packages Projects Releases Wiki Activity

drivers: clock: rcar: r8a7795 driver cleanup

Browse source 
Remove old unused defines from header
Use clang-format to apply coding guideline to r8a7795 driver

Signed-off-by: Aymeric Aillet <aymeric.aillet@iot.bzh>
This commit is contained in:
Aymeric Aillet 2023-11-29 14:38:11 +01:00 committed by Carles Cufí
parent fdafbdb1c9
commit d2e79866ad
2 changed files with 14 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
drivers/clock_control/clock_control_r8a7795_cpg_mssr.c
View file

@ -19,12 +19,12 @@
LOG_MODULE_DECLARE(clock_control_rcar); LOG_MODULE_DECLARE(clock_control_rcar);
#define R8A7795_CLK_SD_STOP_BIT 8 #define R8A7795_CLK_SD_STOP_BIT 8
#define R8A7795_CLK_SD_DIV_MASK 0x3 #define R8A7795_CLK_SD_DIV_MASK 0x3
#define R8A7795_CLK_SD_DIV_SHIFT 0 #define R8A7795_CLK_SD_DIV_SHIFT 0
#define R8A7795_CLK_SDH_STOP_BIT 9 #define R8A7795_CLK_SDH_STOP_BIT 9
#define R8A7795_CLK_SDH_DIV_MASK 0x7 #define R8A7795_CLK_SDH_DIV_MASK 0x7
#define R8A7795_CLK_SDH_DIV_SHIFT 2 #define R8A7795_CLK_SDH_DIV_SHIFT 2
#define R8A7795_CLK_CANFD_STOP_BIT 8 #define R8A7795_CLK_CANFD_STOP_BIT 8
@ -40,8 +40,8 @@ struct r8a7795_cpg_mssr_data {
/* NOTE: the array MUST be sorted by module field */ /* NOTE: the array MUST be sorted by module field */
static struct cpg_clk_info_table core_props[] = { static struct cpg_clk_info_table core_props[] = {
RCAR_CORE_CLK_INFO_ITEM(R8A7795_CLK_S3D4, RCAR_CPG_NONE, RCAR_CORE_CLK_INFO_ITEM(R8A7795_CLK_S3D4, RCAR_CPG_NONE, RCAR_CPG_NONE,
RCAR_CPG_NONE, RCAR_CPG_KHZ(66600)), RCAR_CPG_KHZ(66600)),
RCAR_CORE_CLK_INFO_ITEM(R8A7795_CLK_SD0H, 0x0074, RCAR_CPG_NONE, RCAR_CPG_MHZ(800)), RCAR_CORE_CLK_INFO_ITEM(R8A7795_CLK_SD0H, 0x0074, RCAR_CPG_NONE, RCAR_CPG_MHZ(800)),
RCAR_CORE_CLK_INFO_ITEM(R8A7795_CLK_SD0, 0x0074, R8A7795_CLK_SD0H, RCAR_CPG_MHZ(800)), RCAR_CORE_CLK_INFO_ITEM(R8A7795_CLK_SD0, 0x0074, R8A7795_CLK_SD0H, RCAR_CPG_MHZ(800)),
@ -57,8 +57,8 @@ static struct cpg_clk_info_table core_props[] = {
RCAR_CORE_CLK_INFO_ITEM(R8A7795_CLK_CANFD, 0x0244, RCAR_CPG_NONE, RCAR_CPG_MHZ(800)), RCAR_CORE_CLK_INFO_ITEM(R8A7795_CLK_CANFD, 0x0244, RCAR_CPG_NONE, RCAR_CPG_MHZ(800)),
RCAR_CORE_CLK_INFO_ITEM(R8A7795_CLK_S0D12, RCAR_CPG_NONE, RCAR_CORE_CLK_INFO_ITEM(R8A7795_CLK_S0D12, RCAR_CPG_NONE, RCAR_CPG_NONE,
RCAR_CPG_NONE, RCAR_CPG_KHZ(66600)), RCAR_CPG_KHZ(66600)),
}; };
/* NOTE: the array MUST be sorted by module field */ /* NOTE: the array MUST be sorted by module field */
@ -72,8 +72,7 @@ static struct cpg_clk_info_table mod_props[] = {
}; };
static int r8a7795_cpg_enable_disable_core(const struct device *dev, static int r8a7795_cpg_enable_disable_core(const struct device *dev,
struct cpg_clk_info_table *clk_info, struct cpg_clk_info_table *clk_info, uint32_t enable)
uint32_t enable)
{ {
int ret = 0; int ret = 0;
uint32_t reg; uint32_t reg;
@ -113,8 +112,7 @@ static int r8a7795_cpg_enable_disable_core(const struct device *dev,
return ret; return ret;
} }
static int r8a7795_cpg_core_clock_endisable(const struct device *dev, static int r8a7795_cpg_core_clock_endisable(const struct device *dev, struct rcar_cpg_clk *clk,
struct rcar_cpg_clk *clk,
bool enable) bool enable)
{ {
struct cpg_clk_info_table *clk_info; struct cpg_clk_info_table *clk_info;
@ -132,7 +130,7 @@ static int r8a7795_cpg_core_clock_endisable(const struct device *dev,
uintptr_t rate = clk->rate; uintptr_t rate = clk->rate;
ret = rcar_cpg_set_rate(dev, (clock_control_subsys_t)clk, ret = rcar_cpg_set_rate(dev, (clock_control_subsys_t)clk,
(clock_control_subsys_rate_t)rate); (clock_control_subsys_rate_t)rate);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
} }
@ -146,8 +144,7 @@ static int r8a7795_cpg_core_clock_endisable(const struct device *dev,
return ret; return ret;
} }
static int r8a7795_cpg_mssr_start_stop(const struct device *dev, static int r8a7795_cpg_mssr_start_stop(const struct device *dev, clock_control_subsys_t sys,
clock_control_subsys_t sys,
bool enable) bool enable)
{ {
struct rcar_cpg_clk *clk = (struct rcar_cpg_clk *)sys; struct rcar_cpg_clk *clk = (struct rcar_cpg_clk *)sys;
@ -258,14 +255,12 @@ static int r8a7795_set_rate_helper(uint32_t module, uint32_t *divider, uint32_t
return ret; return ret;
} }
static int r8a7795_cpg_mssr_start(const struct device *dev, static int r8a7795_cpg_mssr_start(const struct device *dev, clock_control_subsys_t sys)
clock_control_subsys_t sys)
{ {
return r8a7795_cpg_mssr_start_stop(dev, sys, true); return r8a7795_cpg_mssr_start_stop(dev, sys, true);
} }
static int r8a7795_cpg_mssr_stop(const struct device *dev, static int r8a7795_cpg_mssr_stop(const struct device *dev, clock_control_subsys_t sys)
clock_control_subsys_t sys)
{ {
return r8a7795_cpg_mssr_start_stop(dev, sys, false); return r8a7795_cpg_mssr_start_stop(dev, sys, false);
} }

14
drivers/clock_control/clock_control_renesas_cpg_mssr.h
View file

@ -95,20 +95,6 @@ static const uint16_t srcr[] = {
0x0BC, 0x0C4, 0x1C8, 0x1CC, 0x0BC, 0x0C4, 0x1C8, 0x1CC,
0x920, 0x924, 0x928, 0x92C, 0x920, 0x924, 0x928, 0x92C,
}; };
/* CAN FD Clock Frequency Control Register */
#define CANFDCKCR 0x244
/* Clock stop bit */
#define CANFDCKCR_CKSTP BIT(8)
/* CANFD Clock */
#define CANFDCKCR_PARENT_CLK_RATE 800000000
#define CANFDCKCR_DIVIDER_MASK 0x1FF
/* Peripherals Clocks */
#define S3D4_CLK_RATE 66600000 /* SCIF */
#define S0D12_CLK_RATE 66600000 /* PWM */
#elif defined(CONFIG_SOC_SERIES_RCAR_GEN4) #elif defined(CONFIG_SOC_SERIES_RCAR_GEN4)
/* Software Reset Clearing Register offsets */ /* Software Reset Clearing Register offsets */
#define SRSTCLR(i) (0x2C80 + (i) * 4) #define SRSTCLR(i) (0x2C80 + (i) * 4)