From mboxrd@z Thu Jan 1 00:00:00 1970 From: Peng Fan Date: Thu, 25 Jun 2015 09:10:19 +0800 Subject: [U-Boot] [PATCH 1/3] imx: mx6 remove duplicated enable_cspi_clock In-Reply-To: References: <1435142674-30212-1-git-send-email-Peng.Fan@freescale.com> Message-ID: <20150625011015.GA28827@shlinux2> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de On Wed, Jun 24, 2015 at 12:53:40PM -0300, Fabio Estevam wrote: >On Wed, Jun 24, 2015 at 7:44 AM, Peng Fan wrote: >> enable_spi_clock does the same thing with enable_cspi_clock. >> >> Signed-off-by: Peng Fan >> --- >> arch/arm/cpu/armv7/mx6/clock.c | 19 ------------------- >> 1 file changed, 19 deletions(-) >> >> diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c >> index ae99945..1134770 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 >> - > >This patch causes board/compulab/cm_fx6/spl.c to fail to build. > >I see that you fix board/compulab/cm_fx6/spl.c in a later patch in >your series, but it should be part of the same patch to avoid the >build breakage. > I thought board and arch code should not be in one patch, so I splitted it into two patch. Will fix it in v2. >You should also remove the function prototype from >arch/arm/include/asm/arch-mx6/clock.h. Thanks for pointing this out. Will fix in v2. > >Regards, > >Fabio Estevam Thanks, Peng --