From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stefano Babic Date: Thu, 05 Jun 2014 12:53:22 +0200 Subject: [U-Boot] [PATCH] imx: sata: return failure if not IMX6Q/IMX6D In-Reply-To: References: <1399353758-1351-1-git-send-email-tharvey@gateworks.com> <1399526687-12257-1-git-send-email-tharvey@gateworks.com> Message-ID: <53904C22.9030403@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 Tim, On 05/06/2014 12:44, Tim Harvey wrote: > On Wed, May 7, 2014 at 10:24 PM, Tim Harvey wrote: >> The IMX6QUAD/DUAL have SATA, but the IMX6SOLO/DL do not. Return >> instead of configuring the SATA clock and GPR13 registers. >> >> Signed-off-by: Tim Harvey >> --- >> arch/arm/imx-common/sata.c | 7 ++++++- >> 1 file changed, 6 insertions(+), 1 deletion(-) >> >> diff --git a/arch/arm/imx-common/sata.c b/arch/arm/imx-common/sata.c >> index 2e69486..c10dd28 100644 >> --- a/arch/arm/imx-common/sata.c >> +++ b/arch/arm/imx-common/sata.c >> @@ -8,13 +8,18 @@ >> #include >> #include >> #include >> +#include >> >> int setup_sata(void) >> { >> struct iomuxc_base_regs *const iomuxc_regs >> = (struct iomuxc_base_regs *)IOMUXC_BASE_ADDR; >> + int ret; >> >> - int ret = enable_sata_clock(); >> + if (!is_cpu_type(MXC_CPU_MX6Q) && !is_cpu_type(MXC_CPU_MX6D)) >> + return 1; >> + >> + ret = enable_sata_clock(); >> if (ret) >> return ret; >> >> -- >> 1.8.3.2 >> > > Stefano, > > Any comments? > No comments. In my queue it is ready-to-be-applied. I will do it after the whole SPL series. My plan is to apply them until the end of the week. 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 =====================================================================