On Thu, Nov 19, 2015 at 12:40 PM, Jean-Christophe Dubois
<j...@tribudubois.net> wrote:
> This is to prepare for CCM code refactoring.
>
> This is just a bit of function and enum values renaming.
>
> We also remove some useless intermediate variables.
>
> Signed-off-by: Jean-Christophe Dubois <j...@tribudubois.net>
Reviewed-by: Peter Crosthwaite <crosthwaite.pe...@gmail.com>
> ---
>
> Changes since v1:
> * Not present
>
> Changes since v2:
> * Not present
>
> hw/misc/imx_ccm.c | 8 ++++----
> hw/timer/imx_epit.c | 20 +++++++++-----------
> hw/timer/imx_gpt.c | 16 ++++++++--------
> include/hw/misc/imx_ccm.h | 8 ++++----
> 4 files changed, 25 insertions(+), 27 deletions(-)
>
> diff --git a/hw/misc/imx_ccm.c b/hw/misc/imx_ccm.c
> index 4cc2bbc..415937f 100644
> --- a/hw/misc/imx_ccm.c
> +++ b/hw/misc/imx_ccm.c
> @@ -49,18 +49,18 @@ static const VMStateDescription vmstate_imx_ccm = {
> .post_load = imx_ccm_post_load,
> };
>
> -uint32_t imx_clock_frequency(DeviceState *dev, IMXClk clock)
> +uint32_t imx_ccm_get_clock_frequency(DeviceState *dev, IMXClk clock)
> {
> IMXCCMState *s = IMX_CCM(dev);
>
> switch (clock) {
> case NOCLK:
> return 0;
> - case MCU:
> + case CLK_MCU:
> return s->mcu_clk_freq;
> - case HSP:
> + case CLK_HSP:
> return s->hsp_clk_freq;
> - case IPG:
> + case CLK_IPG:
> return s->ipg_clk_freq;
> case CLK_32k:
> return CKIL_FREQ;
> diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c
> index 967be4a..50bf83c 100644
> --- a/hw/timer/imx_epit.c
> +++ b/hw/timer/imx_epit.c
> @@ -51,9 +51,9 @@ static char const *imx_epit_reg_name(uint32_t reg)
> * These are typical.
> */
> static const IMXClk imx_epit_clocks[] = {
> - 0, /* 00 disabled */
> - IPG, /* 01 ipg_clk, ~532MHz */
> - IPG, /* 10 ipg_clk_highfreq */
> + NOCLK, /* 00 disabled */
> + CLK_IPG, /* 01 ipg_clk, ~532MHz */
> + CLK_IPG, /* 10 ipg_clk_highfreq */
> CLK_32k, /* 11 ipg_clk_32k -- ~32kHz */
> };
>
> @@ -73,20 +73,18 @@ static void imx_epit_set_freq(IMXEPITState *s)
> {
> uint32_t clksrc;
> uint32_t prescaler;
> - uint32_t freq;
>
> clksrc = extract32(s->cr, CR_CLKSRC_SHIFT, 2);
> prescaler = 1 + extract32(s->cr, CR_PRESCALE_SHIFT, 12);
>
> - freq = imx_clock_frequency(s->ccm, imx_epit_clocks[clksrc]) / prescaler;
> + s->freq = imx_ccm_get_clock_frequency(s->ccm,
> + imx_epit_clocks[clksrc]) / prescaler;
>
> - s->freq = freq;
> + DPRINTF("Setting ptimer frequency to %u\n", s->freq);
>
> - DPRINTF("Setting ptimer frequency to %u\n", freq);
> -
> - if (freq) {
> - ptimer_set_freq(s->timer_reload, freq);
> - ptimer_set_freq(s->timer_cmp, freq);
> + if (s->freq) {
> + ptimer_set_freq(s->timer_reload, s->freq);
> + ptimer_set_freq(s->timer_cmp, s->freq);
> }
> }
>
> diff --git a/hw/timer/imx_gpt.c b/hw/timer/imx_gpt.c
> index 7257f42..b1893b8 100644
> --- a/hw/timer/imx_gpt.c
> +++ b/hw/timer/imx_gpt.c
> @@ -81,8 +81,8 @@ static const VMStateDescription vmstate_imx_timer_gpt = {
>
> static const IMXClk imx_gpt_clocks[] = {
> NOCLK, /* 000 No clock source */
> - IPG, /* 001 ipg_clk, 532MHz*/
> - IPG, /* 010 ipg_clk_highfreq */
> + CLK_IPG, /* 001 ipg_clk, 532MHz*/
> + CLK_IPG, /* 010 ipg_clk_highfreq */
> NOCLK, /* 011 not defined */
> CLK_32k, /* 100 ipg_clk_32k */
> NOCLK, /* 101 not defined */
> @@ -93,14 +93,14 @@ static const IMXClk imx_gpt_clocks[] = {
> static void imx_gpt_set_freq(IMXGPTState *s)
> {
> uint32_t clksrc = extract32(s->cr, GPT_CR_CLKSRC_SHIFT, 3);
> - uint32_t freq = imx_clock_frequency(s->ccm, imx_gpt_clocks[clksrc])
> - / (1 + s->pr);
> - s->freq = freq;
>
> - DPRINTF("Setting clksrc %d to frequency %d\n", clksrc, freq);
> + s->freq = imx_ccm_get_clock_frequency(s->ccm,
> + imx_gpt_clocks[clksrc]) / (1 + s->pr);
>
> - if (freq) {
> - ptimer_set_freq(s->timer, freq);
> + DPRINTF("Setting clksrc %d to frequency %d\n", clksrc, s->freq);
> +
> + if (s->freq) {
> + ptimer_set_freq(s->timer, s->freq);
> }
> }
>
> diff --git a/include/hw/misc/imx_ccm.h b/include/hw/misc/imx_ccm.h
> index 0f2e469..09f6248 100644
> --- a/include/hw/misc/imx_ccm.h
> +++ b/include/hw/misc/imx_ccm.h
> @@ -80,12 +80,12 @@ typedef struct IMXCCMState {
>
> typedef enum {
> NOCLK,
> - MCU,
> - HSP,
> - IPG,
> + CLK_MCU,
> + CLK_HSP,
> + CLK_IPG,
> CLK_32k
> } IMXClk;
>
> -uint32_t imx_clock_frequency(DeviceState *s, IMXClk clock);
> +uint32_t imx_ccm_get_clock_frequency(DeviceState *s, IMXClk clock);
>
> #endif /* IMX_CCM_H */
> --
> 2.5.0
>
