OMAP5+: sata/scsi: Implement scsi_init()

On OMAP platforms, SATA controller provides the SCSI subsystem so implement scsi_init(). Get rid of the unnecessary sata_init() call from dra7xx-evm and omap5-uevm board files. Signed-off-by: Roger Quadros <rogerq@ti.com>

OMAP5+: sata/scsi: Implement scsi_init()
On OMAP platforms, SATA controller provides the SCSI subsystem so implement scsi_init(). Get rid of the unnecessary sata_init() call from dra7xx-evm and omap5-uevm board files. Signed-off-by: Roger Quadros <rogerq@ti.com>
Roger Quadros · Tom Rini
1 parent 02590aa31c
Showing 4 changed files with 6 additions and 8 deletions Side-by-side Diff
arch/arm/cpu/armv7/omap-common/sata.c
board/ti/dra7xx/evm.c
board/ti/omap5_uevm/evm.c
include/configs/omap5_uevm.h
@@ -74,4 +74,10 @@
  
 	return ret;
 }
+
+/* On OMAP platforms SATA provides the SCSI subsystem */
+void scsi_init(void)
+{
+	init_sata(0);
+}
@@ -93,7 +93,6 @@
 	else
 		setenv("board_name", "dra7xx");
 #endif
-	init_sata(0);
 	return 0;
 }
  
@@ -69,12 +69,6 @@
 	return 0;
 }
  
-int board_late_init(void)
-{
-	init_sata(0);
-	return 0;
-}
-
 int board_eth_init(bd_t *bis)
 {
 	return 0;
@@ -72,7 +72,6 @@
 /* Max time to hold reset on this board, see doc/README.omap-reset-time */
 #define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC	16296
  
-#define CONFIG_BOARD_LATE_INIT
 #define CONFIG_CMD_SCSI
 #define CONFIG_LIBATA
 #define CONFIG_SCSI_AHCI
...	...	@@ -74,4 +74,10 @@
74	74
75	75	return ret;
76	76	}
	77	+
	78	+/* On OMAP platforms SATA provides the SCSI subsystem */
	79	+void scsi_init(void)
	80	+{
	81	+ init_sata(0);
	82	+}
...	...	@@ -93,7 +93,6 @@
93	93	else
94	94	setenv("board_name", "dra7xx");
95	95	#endif
96		- init_sata(0);
97	96	return 0;
98	97	}
99	98
...	...	@@ -69,12 +69,6 @@
69	69	return 0;
70	70	}
71	71
72		-int board_late_init(void)
73		-{
74		- init_sata(0);
75		- return 0;
76		-}
77		-
78	72	int board_eth_init(bd_t *bis)
79	73	{
80	74	return 0;
...	...	@@ -72,7 +72,6 @@
72	72	/* Max time to hold reset on this board, see doc/README.omap-reset-time */
73	73	#define CONFIG_OMAP_PLATFORM_RESET_TIME_MAX_USEC 16296
74	74
75		-#define CONFIG_BOARD_LATE_INIT
76	75	#define CONFIG_CMD_SCSI
77	76	#define CONFIG_LIBATA
78	77	#define CONFIG_SCSI_AHCI