From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Babic Date: Wed, 25 Nov 2015 11:40:20 +0100 Subject: [U-Boot] [PATCH 3/4] mx6: clock: Modify GPMI clock to support mx6sx In-Reply-To: <8624FC902C662B4D9D77440AF5EA66252C5AF26C@temmail01.mytem.ch> References: <8624FC902C662B4D9D77440AF5EA66252C5AF26C@temmail01.mytem.ch> Message-ID: <56559014.6000405@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 Peter, On 24/11/2015 15:38, B?rtsch Peter wrote: > Hello Stefano, > > > > I have seen , that my patch already exist :o but not active in master > branch. > > Follow patch is the original from Ye.Le If you take a patch from someone else, you cannot change author. Patch was ok, but it was part of a series where some changes were requested. Anyway, patch is orthogonal to the other ones. I pick it up, of course the one from Ye. Best regards, Stefano Babic > > > > Kind regards > > Peter B?rtsch > > > > > > 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); > > +#else > > clrbits_le32(&imx_ccm->CCGR2, MXC_CCM_CCGR2_IOMUX_IPT_CLK_IO_MASK); > > clrsetbits_le32(&imx_ccm->cs2cdr, > > @@ -56,6 +67,7 @@ void setup_gpmi_io_clk(u32 cfg) > > cfg); > > setbits_le32(&imx_ccm->CCGR2, MXC_CCM_CCGR2_IOMUX_IPT_CLK_IO_MASK); > > +#endif > > setbits_le32(&imx_ccm->CCGR4, > > MXC_CCM_CCGR4_RAWNAND_U_BCH_INPUT_APB_MASK | > > MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_BCH_MASK | > > -- > > > -- ===================================================================== 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 =====================================================================