@@ -136,7 +136,14 @@ static void __init pas_setup_arch(void)
smp_ops = &pas_smp_ops;
#endif
/* Lookup PCI hosts */
+#ifdef CONFIG_PPC_PASEMI_NEMO
+ if (nemo_board)
+ nemo_pci_init();
+ else
+ pas_pci_init();
+#else
pas_pci_init();
+#endif
#ifdef CONFIG_DUMMY_CONSOLE
conswitchp = &dummy_con;
@@ -548,6 +555,19 @@ static int __init pas_probe(void)
!of_machine_is_compatible("pasemi,pwrficient"))
return 0;
+#ifdef CONFIG_PPC_PASEMI_NEMO
+ /*
+ * Check for the Nemo motherboard here, if we are running on one
+ * change the machine definition to fit
+ */
+ if (of_machine_is_compatible("pasemi,nemo")) {
+ pm_power_off = pas_shutdown;
+ ppc_md.name = "A-EON Amigaone X1000";
+ ppc_md.init_IRQ = nemo_init_IRQ;
+ nemo_board = true;
+ }
+#endif
+
iommu_init_early_pasemi();
return 1;
The previous 3 commits added support code for the Nemo motherbard as used in the Amigaone X1000, now wire them up so the board can be detected and initalised at boot time. Signed-off-by: Darren Stevens <Darren@stevens-zone.net> ---