motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-07-27 04:13:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

i.MX: Rename CCM NOCLK to CLK_NONE for naming consistency.

Browse source 
This way all CCM clock defines/enums are named CLK_XXX

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Jean-Christophe Dubois <jcd@tribudubois.net>
Message-id: 8537df765c1713625c7a8b9aca4c7ca60b42e0c0.1456868959.git.jcd@tribudubois.net
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Jean-Christophe Dubois 2016-03-16 17:05:59 +00:00 • committed by Peter Maydell
parent 4833e15f74
commit c91a5883c3
5 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/misc/imx25_ccm.c
View file

@ -182,7 +182,7 @@ static uint32_t imx25_ccm_get_clock_frequency(IMXCCMState *dev, IMXClk clock)
DPRINTF("Clock = %d)\n", clock); DPRINTF("Clock = %d)\n", clock);
switch (clock) { switch (clock) {
case NOCLK: case CLK_NONE:
break; break;
case CLK_MPLL: case CLK_MPLL:
freq = imx25_ccm_get_mpll_clk(dev); freq = imx25_ccm_get_mpll_clk(dev);

2
hw/misc/imx31_ccm.c
View file

@ -209,7 +209,7 @@ static uint32_t imx31_ccm_get_clock_frequency(IMXCCMState *dev, IMXClk clock)
uint32_t freq = 0; uint32_t freq = 0;
switch (clock) { switch (clock) {
case NOCLK: case CLK_NONE:
break; break;
case CLK_MCU: case CLK_MCU:
freq = imx31_ccm_get_mcu_clk(dev); freq = imx31_ccm_get_mcu_clk(dev);

2
hw/timer/imx_epit.c
View file

@ -52,7 +52,7 @@ static char const *imx_epit_reg_name(uint32_t reg)
* These are typical. * These are typical.
*/ */
static const IMXClk imx_epit_clocks[] = { static const IMXClk imx_epit_clocks[] = {
NOCLK, /* 00 disabled */ CLK_NONE, /* 00 disabled */
CLK_IPG, /* 01 ipg_clk, ~532MHz */ CLK_IPG, /* 01 ipg_clk, ~532MHz */
CLK_IPG, /* 10 ipg_clk_highfreq */ CLK_IPG, /* 10 ipg_clk_highfreq */
CLK_32k, /* 11 ipg_clk_32k -- ~32kHz */ CLK_32k, /* 11 ipg_clk_32k -- ~32kHz */

10
hw/timer/imx_gpt.c
View file

@ -81,14 +81,14 @@ static const VMStateDescription vmstate_imx_timer_gpt = {
}; };
static const IMXClk imx_gpt_clocks[] = { static const IMXClk imx_gpt_clocks[] = {
NOCLK, /* 000 No clock source */ CLK_NONE, /* 000 No clock source */
CLK_IPG, /* 001 ipg_clk, 532MHz*/ CLK_IPG, /* 001 ipg_clk, 532MHz*/
CLK_IPG, /* 010 ipg_clk_highfreq */ CLK_IPG, /* 010 ipg_clk_highfreq */
NOCLK, /* 011 not defined */ CLK_NONE, /* 011 not defined */
CLK_32k, /* 100 ipg_clk_32k */ CLK_32k, /* 100 ipg_clk_32k */
NOCLK, /* 101 not defined */ CLK_NONE, /* 101 not defined */
NOCLK, /* 110 not defined */ CLK_NONE, /* 110 not defined */
NOCLK, /* 111 not defined */ CLK_NONE, /* 111 not defined */
}; };
static void imx_gpt_set_freq(IMXGPTState *s) static void imx_gpt_set_freq(IMXGPTState *s)

2
include/hw/misc/imx_ccm.h
View file

@ -43,7 +43,7 @@ typedef struct IMXCCMState {
} IMXCCMState; } IMXCCMState;
typedef enum { typedef enum {
NOCLK, CLK_NONE,
CLK_MPLL, CLK_MPLL,
CLK_UPLL, CLK_UPLL,
CLK_MCU, CLK_MCU,