Merge branch 'master' of git://git.denx.de/u-boot-socfpga

[karo-tx-uboot.git] / drivers / block / sata_sil3114.c

diff --git a/drivers/block/sata_sil3114.c b/drivers/block/sata_sil3114.c
index 62cc99d3953b932352ceafd9ec9142380e4f99da..61ffb66a7711db09f72b37cf3dc76001e409a333 100644 (file)
--- a/drivers/block/sata_sil3114.c
+++ b/drivers/block/sata_sil3114.c
@@ -1,21 +1,8 @@
 /*
- * Copyright (C) Excito Elektronik i Skåne AB, All rights reserved.
+ * Copyright (C) Excito Elektronik i Skåne AB, All rights reserved.
  * Author: Tor Krill <tor@excito.com>
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
+ * SPDX-License-Identifier:    GPL-2.0+
  *
  * This is a driver for Silicon Image sil3114 sata chip modelled on
  * the ata_piix driver
@@ -28,6 +15,7 @@
 #include <asm/byteorder.h>
 #include <asm/io.h>
 #include <ide.h>
+#include <sata.h>
 #include <libata.h>
 #include "sata_sil3114.h"
 
@@ -48,7 +36,6 @@ static u8 sata_chk_status (struct sata_ioports *ioaddr, u8 usealtstatus);
 static void msleep (int count);
 
 static u32 iobase[6] = { 0, 0, 0, 0, 0, 0};    /* PCI BAR registers for device */
-extern block_dev_desc_t sata_dev_desc[CONFIG_SYS_SATA_MAX_DEVICE];
 
 static struct sata_port port[CONFIG_SYS_SATA_MAX_DEVICE];
 
@@ -171,7 +158,7 @@ static void sata_identify (int num, int dev)
        sata_dev_desc[devno].removable = 0;
 
        sata_dev_desc[devno].lba = (u32) n_sectors;
-       debug ("lba=0x%x\n", sata_dev_desc[devno].lba);
+       debug("lba=0x%lx\n", sata_dev_desc[devno].lba);
 
 #ifdef CONFIG_LBA48
        if (iobuf[83] & (1 << 10)) {
@@ -715,6 +702,11 @@ int init_sata (int dev)
        return res;
 }
 
+int reset_sata(int dev)
+{
+       return 0;
+}
+
 /* Check if device is connected to port */
 int sata_bus_probe (int portno)
 {
@@ -782,6 +774,7 @@ int scan_sata (int dev)
                    (iobase[5] + VND_TF2_CH0) | ATA_PCI_CTL_OFS;
                port[0].ioaddr.bmdma_addr = iobase[5] + VND_BMDMA_CH0;
                break;
+#if (CONFIG_SYS_SATA_MAX_DEVICE >= 1)
        case 1:
                port[1].port_no = 0;
                port[1].ioaddr.cmd_addr = iobase[5] + VND_TF0_CH1;
@@ -789,6 +782,7 @@ int scan_sata (int dev)
                    (iobase[5] + VND_TF2_CH1) | ATA_PCI_CTL_OFS;
                port[1].ioaddr.bmdma_addr = iobase[5] + VND_BMDMA_CH1;
                break;
+#elif (CONFIG_SYS_SATA_MAX_DEVICE >= 2)
        case 2:
                port[2].port_no = 0;
                port[2].ioaddr.cmd_addr = iobase[5] + VND_TF0_CH2;
@@ -796,6 +790,7 @@ int scan_sata (int dev)
                    (iobase[5] + VND_TF2_CH2) | ATA_PCI_CTL_OFS;
                port[2].ioaddr.bmdma_addr = iobase[5] + VND_BMDMA_CH2;
                break;
+#elif (CONFIG_SYS_SATA_MAX_DEVICE >= 3)
        case 3:
                port[3].port_no = 0;
                port[3].ioaddr.cmd_addr = iobase[5] + VND_TF0_CH3;
@@ -803,6 +798,7 @@ int scan_sata (int dev)
                    (iobase[5] + VND_TF2_CH3) | ATA_PCI_CTL_OFS;
                port[3].ioaddr.bmdma_addr = iobase[5] + VND_BMDMA_CH3;
                break;
+#endif
        default:
                printf ("Tried to scan unknown port: ata%d\n", dev);
                return 1;