From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Babic Date: Sun, 06 May 2012 19:04:27 +0200 Subject: [U-Boot] [PATCH, V2] Resend: i.MX6: add enable_sata_clock() In-Reply-To: <4F9C0CF4.2030400@boundarydevices.com> References: <1335397726-25922-1-git-send-email-eric.nelson@boundarydevices.com> <4F9C01DD.6030009@googlemail.com> <4F9C0CF4.2030400@boundarydevices.com> Message-ID: <4FA6AF1B.2020307@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 On 28/04/2012 17:29, Eric Nelson wrote: > Hi Dirk, > > I tried to address this global/non-const by making it explicitly public, > but Stefano nacked the patch: > http://patchwork.ozlabs.org/patch/144712/ > > As it stands, the compiler won't generate an external reference for the > local above, so it should be good. It seems ok. However, this conflicts with imx-common: Factor out get_ahb_clk() sent by Fabio Estevam. Reason is only the modified structure name : I made these changes to your patch: diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c index 3255771..52d5dc4 100644 --- a/arch/arm/cpu/armv7/mx6/clock.c +++ b/arch/arm/cpu/armv7/mx6/clock.c @@ -296,8 +296,8 @@ int enable_sata_clock(void) { u32 reg = 0; s32 timeout = 100000; - struct imx_ccm_reg *const imx_ccm - = (struct imx_ccm_reg *) CCM_BASE_ADDR; + struct mxc_ccm_reg *const imx_ccm + = (struct mxc_ccm_reg *) CCM_BASE_ADDR; /* Enable sata clock */ Change is trivial, but please take a look. Applied to u-boot-imx, thanks. Best regards, Stefano Babic -- ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel 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 =====================================================================