highbank: use scsi_init hook

Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Acked-by: Rob Herring <robh@kernel.org>

highbank: use scsi_init hook
Signed-off-by: Ian Campbell <ijc@hellion.org.uk> Acked-by: Rob Herring <robh@kernel.org>
Ian Campbell · Tom Rini
1 parent c6f3d50b9b
Showing 1 changed file with 10 additions and 4 deletions Side-by-side Diff
board/highbank/highbank.c
@@ -51,17 +51,23 @@
 	return rc;
 }
  
-#ifdef CONFIG_MISC_INIT_R
-int misc_init_r(void)
+#ifdef CONFIG_SCSI_AHCI_PLAT
+void scsi_init(void)
 {
-	char envbuffer[16];
-	u32 boot_choice;
 	u32 reg = readl(HB_SREG_A9_PWRDOM_STAT);
  
 	if (reg & PWRDOM_STAT_SATA) {
 		ahci_init(HB_AHCI_BASE);
 		scsi_scan(1);
 	}
+}
+#endif
+
+#ifdef CONFIG_MISC_INIT_R
+int misc_init_r(void)
+{
+	char envbuffer[16];
+	u32 boot_choice;
  
 	boot_choice = readl(HB_SREG_A9_BOOT_SRC_STAT) & 0xff;
 	sprintf(envbuffer, "bootcmd%d", boot_choice);
...	...	@@ -51,17 +51,23 @@
51	51	return rc;
52	52	}
53	53
54		-#ifdef CONFIG_MISC_INIT_R
55		-int misc_init_r(void)
	54	+#ifdef CONFIG_SCSI_AHCI_PLAT
	55	+void scsi_init(void)
56	56	{
57		- char envbuffer[16];
58		- u32 boot_choice;
59	57	u32 reg = readl(HB_SREG_A9_PWRDOM_STAT);
60	58
61	59	if (reg & PWRDOM_STAT_SATA) {
62	60	ahci_init(HB_AHCI_BASE);
63	61	scsi_scan(1);
64	62	}
	63	+}
	64	+#endif
	65	+
	66	+#ifdef CONFIG_MISC_INIT_R
	67	+int misc_init_r(void)
	68	+{
	69	+ char envbuffer[16];
	70	+ u32 boot_choice;
65	71
66	72	boot_choice = readl(HB_SREG_A9_BOOT_SRC_STAT) & 0xff;
67	73	sprintf(envbuffer, "bootcmd%d", boot_choice);