diff options
| author | Peng Fan <Peng.Fan@freescale.com> | 2015-07-01 17:01:49 +0800 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2015-07-10 09:35:53 +0200 |
| commit | 2d59acc70f76e6d52cc9a226c55539c9353a23cb (patch) | |
| tree | a72a267731d7e73b9644a602190aeb871e5504a4 | |
| parent | 3c73b0a49a5c974bb313f8087dd0cfc54ea90ad2 (diff) | |
imx: mx6 remove duplicated enable_cspi_clock
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>
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/clock.c | 19 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-mx6/clock.h | 1 | ||||
| -rw-r--r-- | board/compulab/cm_fx6/spl.c | 2 |
3 files changed, 1 insertions, 21 deletions
diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c index ae99945304..1134770286 100644 --- a/arch/arm/cpu/armv7/mx6/clock.c +++ b/arch/arm/cpu/armv7/mx6/clock.c @@ -102,25 +102,6 @@ void enable_uart_clk(unsigned char enable) } #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 int enable_usdhc_clk(unsigned char enable, unsigned bus_num) { diff --git a/arch/arm/include/asm/arch-mx6/clock.h b/arch/arm/include/asm/arch-mx6/clock.h index a6de5ee4bc..7b3bbb8185 100644 --- a/arch/arm/include/asm/arch-mx6/clock.h +++ b/arch/arm/include/asm/arch-mx6/clock.h @@ -57,7 +57,6 @@ void hab_caam_clock_enable(unsigned char enable); void enable_ocotp_clk(unsigned char enable); void enable_usboh3_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_sata_clock(void); void disable_sata_clock(void); diff --git a/board/compulab/cm_fx6/spl.c b/board/compulab/cm_fx6/spl.c index 5b4b76f5b7..d94ced9c65 100644 --- a/board/compulab/cm_fx6/spl.c +++ b/board/compulab/cm_fx6/spl.c @@ -303,7 +303,7 @@ static void cm_fx6_setup_uart(void) static void cm_fx6_setup_ecspi(void) { cm_fx6_set_ecspi_iomux(); - enable_cspi_clock(1, 0); + enable_spi_clk(1, 0); } #else static void cm_fx6_setup_ecspi(void) { } |