From 163ee7d9d2a71d0d289246c3bf50db7cc9db4a50 Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 25 Jul 2015 08:37:16 +0200 Subject: [PATCH] arm: socfpga: clock: Get rid of cm_config_t typedef Get rid of this cryptic typedef and replace it with explicit struct cm_config. Signed-off-by: Marek Vasut --- arch/arm/mach-socfpga/clock_manager.c | 2 +- arch/arm/mach-socfpga/include/mach/clock_manager.h | 6 +++--- arch/arm/mach-socfpga/spl.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/arm/mach-socfpga/clock_manager.c b/arch/arm/mach-socfpga/clock_manager.c index fa3b93a257..74aa1d9be6 100644 --- a/arch/arm/mach-socfpga/clock_manager.c +++ b/arch/arm/mach-socfpga/clock_manager.c @@ -88,7 +88,7 @@ static void cm_write_with_phase(uint32_t value, * Ungate clocks */ -void cm_basic_init(const cm_config_t *cfg) +void cm_basic_init(const struct cm_config *cfg) { uint32_t start, timeout; diff --git a/arch/arm/mach-socfpga/include/mach/clock_manager.h b/arch/arm/mach-socfpga/include/mach/clock_manager.h index 5449726180..8a3362f4ab 100644 --- a/arch/arm/mach-socfpga/include/mach/clock_manager.h +++ b/arch/arm/mach-socfpga/include/mach/clock_manager.h @@ -17,7 +17,7 @@ unsigned int cm_get_qspi_controller_clk_hz(void); unsigned int cm_get_spi_controller_clk_hz(void); #endif -typedef struct { +struct cm_config { /* main group */ uint32_t main_vco_base; uint32_t mpuclk; @@ -49,9 +49,9 @@ typedef struct { uint32_t ddr2xdqsclk; uint32_t ddrdqclk; uint32_t s2fuser2clk; -} cm_config_t; +}; -extern void cm_basic_init(const cm_config_t *cfg); +extern void cm_basic_init(const struct cm_config *cfg); struct socfpga_clock_manager_main_pll { u32 vco; diff --git a/arch/arm/mach-socfpga/spl.c b/arch/arm/mach-socfpga/spl.c index 400e46393b..6850fbff15 100644 --- a/arch/arm/mach-socfpga/spl.c +++ b/arch/arm/mach-socfpga/spl.c @@ -85,7 +85,7 @@ void spl_board_init(void) { unsigned long sdram_size; #ifndef CONFIG_SOCFPGA_VIRTUAL_TARGET - cm_config_t cm_default_cfg = { + struct cm_config cm_default_cfg = { /* main group */ MAIN_VCO_BASE, (CONFIG_HPS_MAINPLLGRP_MPUCLK_CNT <<