aboutsummaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2017-06-14 21:28:40 -0600
committerSimon Glass <sjg@chromium.org>2017-07-11 10:08:19 -0600
commit4682c8a19b4eb69f7ad51df3f543375583ce878a (patch)
tree09ea9daa3d0f8737086c5659fb4f1428e20d235a /arch
parent322f73f473d921dbdd0fe11bd62db6a00e5b133c (diff)
downloadu-boot-4682c8a19b4eb69f7ad51df3f543375583ce878a.zip
u-boot-4682c8a19b4eb69f7ad51df3f543375583ce878a.tar.gz
u-boot-4682c8a19b4eb69f7ad51df3f543375583ce878a.tar.bz2
dm: scsi: Add a device pointer to scan_exec(), scsi_bus_reset()
With driver model these functions need a device pointer. Add one even when CONFIG_DM_SCSI is not defined. This avoids having ugly conditional function prototypes, When CONFIG_DM_SCSI is not defined we can just ignore the pointer. Signed-off-by: Simon Glass <sjg@chromium.org> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/sata.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/sata.c b/arch/arm/mach-omap2/sata.c
index 0c82689..dc68896 100644
--- a/arch/arm/mach-omap2/sata.c
+++ b/arch/arm/mach-omap2/sata.c
@@ -63,8 +63,10 @@ void scsi_init(void)
scsi_scan(1);
}
-void scsi_bus_reset(void)
+int scsi_bus_reset(struct udevice *dev)
{
ahci_reset((void __iomem *)DWC_AHSATA_BASE);
ahci_init((void __iomem *)DWC_AHSATA_BASE);
+
+ return 0;
}