diff options
| author | Jean-Christophe Dubois <jcd@tribudubois.net> | 2016-03-16 17:05:59 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-03-16 17:42:18 +0000 |
| commit | c91a5883c31fa0f0b57aef24904b63d05b8673c8 (patch) | |
| tree | 654566befbd8ec1b21a0fd4617d0606015171aac | |
| parent | 4833e15f7487440243377250d7d76b96ba4c210c (diff) | |
| download | focaccia-qemu-c91a5883c31fa0f0b57aef24904b63d05b8673c8.tar.gz focaccia-qemu-c91a5883c31fa0f0b57aef24904b63d05b8673c8.zip | |
i.MX: Rename CCM NOCLK to CLK_NONE for naming consistency.
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>
| -rw-r--r-- | hw/misc/imx25_ccm.c | 2 | ||||
| -rw-r--r-- | hw/misc/imx31_ccm.c | 2 | ||||
| -rw-r--r-- | hw/timer/imx_epit.c | 2 | ||||
| -rw-r--r-- | hw/timer/imx_gpt.c | 10 | ||||
| -rw-r--r-- | include/hw/misc/imx_ccm.h | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/hw/misc/imx25_ccm.c b/hw/misc/imx25_ccm.c index 498e84c907..7a29c19da4 100644 --- a/hw/misc/imx25_ccm.c +++ b/hw/misc/imx25_ccm.c @@ -182,7 +182,7 @@ static uint32_t imx25_ccm_get_clock_frequency(IMXCCMState *dev, IMXClk clock) DPRINTF("Clock = %d)\n", clock); switch (clock) { - case NOCLK: + case CLK_NONE: break; case CLK_MPLL: freq = imx25_ccm_get_mpll_clk(dev); diff --git a/hw/misc/imx31_ccm.c b/hw/misc/imx31_ccm.c index 17640bf2ec..7a8fcd2b56 100644 --- a/hw/misc/imx31_ccm.c +++ b/hw/misc/imx31_ccm.c @@ -209,7 +209,7 @@ static uint32_t imx31_ccm_get_clock_frequency(IMXCCMState *dev, IMXClk clock) uint32_t freq = 0; switch (clock) { - case NOCLK: + case CLK_NONE: break; case CLK_MCU: freq = imx31_ccm_get_mcu_clk(dev); diff --git a/hw/timer/imx_epit.c b/hw/timer/imx_epit.c index 38fbf278fa..9f26ba85e5 100644 --- a/hw/timer/imx_epit.c +++ b/hw/timer/imx_epit.c @@ -52,7 +52,7 @@ static char const *imx_epit_reg_name(uint32_t reg) * These are typical. */ static const IMXClk imx_epit_clocks[] = { - NOCLK, /* 00 disabled */ + CLK_NONE, /* 00 disabled */ CLK_IPG, /* 01 ipg_clk, ~532MHz */ CLK_IPG, /* 10 ipg_clk_highfreq */ CLK_32k, /* 11 ipg_clk_32k -- ~32kHz */ diff --git a/hw/timer/imx_gpt.c b/hw/timer/imx_gpt.c index 916577b463..40db63cabe 100644 --- a/hw/timer/imx_gpt.c +++ b/hw/timer/imx_gpt.c @@ -81,14 +81,14 @@ static const VMStateDescription vmstate_imx_timer_gpt = { }; 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, /* 010 ipg_clk_highfreq */ - NOCLK, /* 011 not defined */ + CLK_NONE, /* 011 not defined */ CLK_32k, /* 100 ipg_clk_32k */ - NOCLK, /* 101 not defined */ - NOCLK, /* 110 not defined */ - NOCLK, /* 111 not defined */ + CLK_NONE, /* 101 not defined */ + CLK_NONE, /* 110 not defined */ + CLK_NONE, /* 111 not defined */ }; static void imx_gpt_set_freq(IMXGPTState *s) diff --git a/include/hw/misc/imx_ccm.h b/include/hw/misc/imx_ccm.h index 5c4b7958bd..74e2705934 100644 --- a/include/hw/misc/imx_ccm.h +++ b/include/hw/misc/imx_ccm.h @@ -43,7 +43,7 @@ typedef struct IMXCCMState { } IMXCCMState; typedef enum { - NOCLK, + CLK_NONE, CLK_MPLL, CLK_UPLL, CLK_MCU, |