[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 08/21] i.MX: Remove CCM useless clock computation han
From: |
Peter Maydell |
Subject: |
[Qemu-devel] [PULL 08/21] i.MX: Remove CCM useless clock computation handling. |
Date: |
Wed, 16 Mar 2016 17:18:22 +0000 |
From: Jean-Christophe Dubois <address@hidden>
Most clocks supported by the CCM are useless to the qemu framework.
Only clocks related to timers (EPIT, GPT, PWM, WATCHDOG, ...) are usefull
to QEMU code.
Therefore this patch removes clock computation handling for all clocks but:
* CLK_NONE,
* CLK_IPG,
* CLK_32k
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Jean-Christophe Dubois <address@hidden>
Message-id: address@hidden
Signed-off-by: Peter Maydell <address@hidden>
---
hw/misc/imx25_ccm.c | 26 --------------------------
hw/misc/imx31_ccm.c | 32 --------------------------------
include/hw/misc/imx_ccm.h | 7 -------
3 files changed, 65 deletions(-)
diff --git a/hw/misc/imx25_ccm.c b/hw/misc/imx25_ccm.c
index 7a29c19..e138fc6 100644
--- a/hw/misc/imx25_ccm.c
+++ b/hw/misc/imx25_ccm.c
@@ -120,20 +120,6 @@ static uint32_t imx25_ccm_get_mpll_clk(IMXCCMState *dev)
return freq;
}
-static uint32_t imx25_ccm_get_upll_clk(IMXCCMState *dev)
-{
- uint32_t freq = 0;
- IMX25CCMState *s = IMX25_CCM(dev);
-
- if (!EXTRACT(s->reg[IMX25_CCM_CCTL_REG], UPLL_DIS)) {
- freq = imx_ccm_calc_pll(s->reg[IMX25_CCM_UPCTL_REG], CKIH_FREQ);
- }
-
- DPRINTF("freq = %d\n", freq);
-
- return freq;
-}
-
static uint32_t imx25_ccm_get_mcu_clk(IMXCCMState *dev)
{
uint32_t freq;
@@ -184,18 +170,6 @@ static uint32_t imx25_ccm_get_clock_frequency(IMXCCMState
*dev, IMXClk clock)
switch (clock) {
case CLK_NONE:
break;
- case CLK_MPLL:
- freq = imx25_ccm_get_mpll_clk(dev);
- break;
- case CLK_UPLL:
- freq = imx25_ccm_get_upll_clk(dev);
- break;
- case CLK_MCU:
- freq = imx25_ccm_get_mcu_clk(dev);
- break;
- case CLK_AHB:
- freq = imx25_ccm_get_ahb_clk(dev);
- break;
case CLK_IPG:
freq = imx25_ccm_get_ipg_clk(dev);
break;
diff --git a/hw/misc/imx31_ccm.c b/hw/misc/imx31_ccm.c
index 7a8fcd2..a5caabb 100644
--- a/hw/misc/imx31_ccm.c
+++ b/hw/misc/imx31_ccm.c
@@ -152,32 +152,6 @@ static uint32_t imx31_ccm_get_mcu_main_clk(IMXCCMState
*dev)
return freq;
}
-static uint32_t imx31_ccm_get_mcu_clk(IMXCCMState *dev)
-{
- uint32_t freq;
- IMX31CCMState *s = IMX31_CCM(dev);
-
- freq = imx31_ccm_get_mcu_main_clk(dev)
- / (1 + EXTRACT(s->reg[IMX31_CCM_PDR0_REG], MCU));
-
- DPRINTF("freq = %d\n", freq);
-
- return freq;
-}
-
-static uint32_t imx31_ccm_get_hsp_clk(IMXCCMState *dev)
-{
- uint32_t freq;
- IMX31CCMState *s = IMX31_CCM(dev);
-
- freq = imx31_ccm_get_mcu_main_clk(dev)
- / (1 + EXTRACT(s->reg[IMX31_CCM_PDR0_REG], HSP));
-
- DPRINTF("freq = %d\n", freq);
-
- return freq;
-}
-
static uint32_t imx31_ccm_get_hclk_clk(IMXCCMState *dev)
{
uint32_t freq;
@@ -211,12 +185,6 @@ static uint32_t imx31_ccm_get_clock_frequency(IMXCCMState
*dev, IMXClk clock)
switch (clock) {
case CLK_NONE:
break;
- case CLK_MCU:
- freq = imx31_ccm_get_mcu_clk(dev);
- break;
- case CLK_HSP:
- freq = imx31_ccm_get_hsp_clk(dev);
- break;
case CLK_IPG:
freq = imx31_ccm_get_ipg_clk(dev);
break;
diff --git a/include/hw/misc/imx_ccm.h b/include/hw/misc/imx_ccm.h
index 74e2705..378b78d 100644
--- a/include/hw/misc/imx_ccm.h
+++ b/include/hw/misc/imx_ccm.h
@@ -44,14 +44,7 @@ typedef struct IMXCCMState {
typedef enum {
CLK_NONE,
- CLK_MPLL,
- CLK_UPLL,
- CLK_MCU,
- CLK_HSP,
- CLK_MAX,
- CLK_AHB,
CLK_IPG,
- CLK_PER,
CLK_32k
} IMXClk;
--
1.9.1
- [Qemu-devel] [PULL 00/21] target-arm queue, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 16/21] bcm2835_peripherals: enable sdhci pending-insert quirk for raspberry pi, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 15/21] hw/arm: Add palmetto-bmc machine, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 14/21] hw/arm: Add ASPEED AST2400 SoC model, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 03/21] target-arm: Fix translation level on early translation faults, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 09/21] i.MX: Add the CLK_IPG_HIGH clock, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 07/21] i.MX: Rename CCM NOCLK to CLK_NONE for naming consistency., Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 05/21] arm: virt: Move machine class init code to the abstract machine type, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 08/21] i.MX: Remove CCM useless clock computation handling.,
Peter Maydell <=
- [Qemu-devel] [PULL 11/21] i.MX: Add missing descriptions in devices., Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 21/21] sd: Fix "info qtree" on boards with SD cards, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 17/21] bcm2835_aux: add emulation of BCM2835 AUX (aka UART1) block, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 19/21] bcm2835_property: implement framebuffer control/configuration properties, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 02/21] target-arm: Implement MRS (banked) and MSR (banked) instructions, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 12/21] hw/timer: Add ASPEED timer device model, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 04/21] arm: virt: Add an abstract ARM virt machine type, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 06/21] i.MX: Allow GPT timer to rollover., Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 01/21] loader: Fix incorrect parameter name in load_image_mr() macro, Peter Maydell, 2016/03/16
- [Qemu-devel] [PULL 20/21] bcm2835_dma: add emulation of Raspberry Pi DMA controller, Peter Maydell, 2016/03/16