[U-Boot] [PATCH] dwc_ahsata: return failure for MX6 if not IMX6Q

[Tim Harvey]

On Tue, May 6, 2014 at 12:55 PM, Troy Kisky
<troy.kisky at boundarydevices.com> wrote:
> On 5/5/2014 10:22 PM, Tim Harvey wrote:
>> The IMX6QUAD/DUAL have SATA, but the IMX6SOLO/DL do not. Return an error
>> indicating no such port instead of attempting a memory access that results
>> in a data abort and reset. This dynamic detection is necessary for bootloaders
>> that support multiple variants of the IMX6 SoC.
>>
>> Signed-off-by: Tim Harvey <tharvey at gateworks.com>
>> ---
>>  drivers/block/dwc_ahsata.c | 7 +++++++
>>  1 file changed, 7 insertions(+)
>>
>> diff --git a/drivers/block/dwc_ahsata.c b/drivers/block/dwc_ahsata.c
>> index 3569214..638a585 100644
>> --- a/drivers/block/dwc_ahsata.c
>> +++ b/drivers/block/dwc_ahsata.c
>> @@ -17,6 +17,7 @@
>>  #include <asm/io.h>
>>  #include <linux/bitops.h>
>>  #include <asm/arch/clock.h>
>> +#include <asm/arch/sys_proto.h>
>>  #include "dwc_ahsata.h"
>>
>>  struct sata_port_regs {
>> @@ -558,6 +559,12 @@ int init_sata(int dev)
>>       u32 linkmap;
>>       struct ahci_probe_ent *probe_ent = NULL;
>>
>> +#if defined(CONFIG_MX6)
>> +     if (!is_cpu_type(MXC_CPU_MX6Q)) {
>
> && !is_cpu_type(MXC_CPU_MX6D)
>
>
> is needed too ?
>
>
> Troy

Troy,

Indeed - thanks for the reminder!

Tim