From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Babic Date: Tue, 10 Feb 2015 11:26:40 +0100 Subject: [U-Boot] [PATCH 3/4] mx6: clock: Modify GPMI clock to support mx6sx In-Reply-To: <1421052378-29913-3-git-send-email-B37916@freescale.com> References: <1421052378-29913-1-git-send-email-B37916@freescale.com> <1421052378-29913-3-git-send-email-B37916@freescale.com> Message-ID: <54D9DCE0.4040800@denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi Ye, On 12/01/2015 09:46, Ye.Li wrote: > On mx6sx, the CCM register bits for GPMI are different as other > mx6 platforms. Modify the GPMI clock function to support mx6sx. > > Signed-off-by: Ye.Li > --- > arch/arm/cpu/armv7/mx6/clock.c | 12 ++++++++++++ > 1 files changed, 12 insertions(+), 0 deletions(-) > > diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c > index fd57f22..ce7f0f7 100644 > --- a/arch/arm/cpu/armv7/mx6/clock.c > +++ b/arch/arm/cpu/armv7/mx6/clock.c > @@ -47,6 +47,17 @@ void setup_gpmi_io_clk(u32 cfg) > MXC_CCM_CCGR4_RAWNAND_U_GPMI_INPUT_APB_MASK | > MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_MASK); > > +#if defined(CONFIG_MX6SX) > + clrbits_le32(&imx_ccm->CCGR4, MXC_CCM_CCGR4_QSPI2_ENFC_MASK); > + > + clrsetbits_le32(&imx_ccm->cs2cdr, > + MXC_CCM_CS2CDR_QSPI2_CLK_PODF_MASK | > + MXC_CCM_CS2CDR_QSPI2_CLK_PRED_MASK | > + MXC_CCM_CS2CDR_QSPI2_CLK_SEL_MASK, > + cfg); > + > + setbits_le32(&imx_ccm->CCGR4, MXC_CCM_CCGR4_QSPI2_ENFC_MASK); > +#els If I have well understood, this code is protected by CONFIG_NAND_MXS, and that conflicts with what you are willing to do (setting clocks for QSPI). I suggest to split setup_gpmi_io_clk() function, that at the moment is ony for NAND, having something like: void setup_gpmi_io_clk() { #ifdef CONFIG_NAND_MXS ...setup nand #endif ...setup qspi } Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, Managing Director: Wolfgang Denk 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 =====================================================================