[U-Boot] [PATCH 1/7] mx35: Move clock enums to clock.h

[Stefano Babic]

On 14/08/2012 22:32, Benoît Thébaudeau wrote:
> Signed-off-by: Benoît Thébaudeau <benoit.thebaudeau at advansee.com>
> Cc: Stefano Babic <sbabic at denx.de>
> ---
>  .../arch/arm/cpu/arm1136/mx35/generic.c            |    4 +--
>  .../arch/arm/include/asm/arch-mx35/clock.h         |   28 +++++++++++++++++++-
>  .../arch/arm/include/asm/arch-mx35/imx-regs.h      |   26 ------------------
>  3 files changed, 29 insertions(+), 29 deletions(-)
> 
> diff --git u-boot-4d3c95f.orig/arch/arm/cpu/arm1136/mx35/generic.c u-boot-4d3c95f/arch/arm/cpu/arm1136/mx35/generic.c
> index 986b1f9..dba4903 100644
> --- u-boot-4d3c95f.orig/arch/arm/cpu/arm1136/mx35/generic.c
> +++ u-boot-4d3c95f/arch/arm/cpu/arm1136/mx35/generic.c
> @@ -205,7 +205,7 @@ u32 imx_get_uartclk(void)
>  	return freq;
>  }
>  
> -unsigned int mxc_get_main_clock(enum mxc_main_clocks clk)
> +unsigned int mxc_get_main_clock(enum mxc_main_clock clk)
>  {
>  	u32 nfc_pdf, hsp_podf;
>  	u32 pll, ret_val = 0, usb_prdf, usb_podf;
> @@ -270,7 +270,7 @@ unsigned int mxc_get_main_clock(enum mxc_main_clocks clk)
>  
>  	return ret_val;
>  }
> -unsigned int mxc_get_peri_clock(enum mxc_peri_clocks clk)
> +unsigned int mxc_get_peri_clock(enum mxc_peri_clock clk)
>  {
>  	u32 ret_val = 0, pdf, pre_pdf, clk_sel;
>  	struct ccm_regs *ccm =
> diff --git u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/clock.h u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/clock.h
> index 4c0ddfd..5dc53ba 100644
> --- u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/clock.h
> +++ u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/clock.h
> @@ -25,7 +25,7 @@
>  #define __ASM_ARCH_CLOCK_H
>  
>  enum mxc_clock {
> -	MXC_ARM_CLK = 0,
> +	MXC_ARM_CLK,
>  	MXC_AHB_CLK,
>  	MXC_IPG_CLK,
>  	MXC_IPG_PERCLK,
> @@ -36,6 +36,32 @@ enum mxc_clock {
>  	MXC_FEC_CLK,
>  };
>  
> +enum mxc_main_clock {
> +	CPU_CLK,
> +	AHB_CLK,
> +	IPG_CLK,
> +	IPG_PER_CLK,
> +	NFC_CLK,
> +	USB_CLK,
> +	HSP_CLK,
> +};
> +
> +enum mxc_peri_clock {
> +	UART1_BAUD,
> +	UART2_BAUD,
> +	UART3_BAUD,
> +	SSI1_BAUD,
> +	SSI2_BAUD,
> +	CSI_BAUD,
> +	MSHC_CLK,
> +	ESDHC1_CLK,
> +	ESDHC2_CLK,
> +	ESDHC3_CLK,
> +	SPDIF_CLK,
> +	SPI1_CLK,
> +	SPI2_CLK,
> +};
> +
>  unsigned int imx_decode_pll(unsigned int pll, unsigned int f_ref);
>  
>  u32 imx_get_uartclk(void);
> diff --git u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/imx-regs.h u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/imx-regs.h
> index 3146006..fba29b2 100644
> --- u-boot-4d3c95f.orig/arch/arm/include/asm/arch-mx35/imx-regs.h
> +++ u-boot-4d3c95f/arch/arm/include/asm/arch-mx35/imx-regs.h
> @@ -216,32 +216,6 @@
>  #if !(defined(__KERNEL_STRICT_NAMES) || defined(__ASSEMBLY__))
>  #include <asm/types.h>
>  
> -enum mxc_main_clocks {
> -	CPU_CLK,
> -	AHB_CLK,
> -	IPG_CLK,
> -	IPG_PER_CLK,
> -	NFC_CLK,
> -	USB_CLK,
> -	HSP_CLK,
> -};
> -
> -enum mxc_peri_clocks {
> -	UART1_BAUD,
> -	UART2_BAUD,
> -	UART3_BAUD,
> -	SSI1_BAUD,
> -	SSI2_BAUD,
> -	CSI_BAUD,
> -	MSHC_CLK,
> -	ESDHC1_CLK,
> -	ESDHC2_CLK,
> -	ESDHC3_CLK,
> -	SPDIF_CLK,
> -	SPI1_CLK,
> -	SPI2_CLK,
> -};
> -
>  /* Clock Control Module (CCM) registers */
>  struct ccm_regs {
>  	u32 ccmr;	/* Control */
> 

Acked-by: Stefano Babic <sbabic at denx.de>

Best regards,
Stefano Babic

-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================