dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-26 21:11:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

imx: mx6 remove duplicated enable_cspi_clock

Browse Source 
enable_spi_clock does the same thing with enable_cspi_clock, so
remove enable_cspi_clock.
Remove enable_cspi_clock prototype in header file
convert cm_fx6/spl.c to use enable_spi_clk

Signed-off-by: Peng Fan <Peng.Fan@freescale.com>
Acked-by: Stefano Babic <sbabic@denx.de>
This commit is contained in:
Peng Fan
2015-07-01 17:01:49 +08:00
committed by Stefano Babic
parent 3c73b0a49a
commit 2d59acc70f
3 changed files with 1 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
arch/arm/cpu/armv7/mx6/clock.c
View File

@@ -102,25 +102,6 @@ void enable_uart_clk(unsigned char enable)
} }
#endif #endif
#ifdef CONFIG_SPI
/* spi_num can be from 0 - 4 */
int enable_cspi_clock(unsigned char enable, unsigned spi_num)
{
u32 mask;
if (spi_num > 4)
return -EINVAL;
mask = MXC_CCM_CCGR_CG_MASK << (spi_num * 2);
if (enable)
setbits_le32(&imx_ccm->CCGR1, mask);
else
clrbits_le32(&imx_ccm->CCGR1, mask);
return 0;
}
#endif
#ifdef CONFIG_MMC #ifdef CONFIG_MMC
int enable_usdhc_clk(unsigned char enable, unsigned bus_num) int enable_usdhc_clk(unsigned char enable, unsigned bus_num)
{ {

1
arch/arm/include/asm/arch-mx6/clock.h
View File

@@ -57,7 +57,6 @@ void hab_caam_clock_enable(unsigned char enable);
void enable_ocotp_clk(unsigned char enable); void enable_ocotp_clk(unsigned char enable);
void enable_usboh3_clk(unsigned char enable); void enable_usboh3_clk(unsigned char enable);
void enable_uart_clk(unsigned char enable); void enable_uart_clk(unsigned char enable);
int enable_cspi_clock(unsigned char enable, unsigned spi_num);
int enable_usdhc_clk(unsigned char enable, unsigned bus_num); int enable_usdhc_clk(unsigned char enable, unsigned bus_num);
int enable_sata_clock(void); int enable_sata_clock(void);
void disable_sata_clock(void); void disable_sata_clock(void);

2
board/compulab/cm_fx6/spl.c
View File

@@ -303,7 +303,7 @@ static void cm_fx6_setup_uart(void)
static void cm_fx6_setup_ecspi(void) static void cm_fx6_setup_ecspi(void)
{ {
cm_fx6_set_ecspi_iomux(); cm_fx6_set_ecspi_iomux();
enable_cspi_clock(1, 0); enable_spi_clk(1, 0);
} }
#else #else
static void cm_fx6_setup_ecspi(void) { } static void cm_fx6_setup_ecspi(void) { }