From patchwork Sun Dec 31 22:16:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darren Stevens X-Patchwork-Id: 854268 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3z8vqF2Gbsz9t3q for ; Mon, 1 Jan 2018 09:18:33 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3z8vqF0gFXzDr93 for ; Mon, 1 Jan 2018 09:18:33 +1100 (AEDT) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=stevens-zone.net (client-ip=212.227.17.24; helo=mout.kundenserver.de; envelope-from=darren@stevens-zone.net; receiver=) Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3z8vnM23CSzDr0N for ; Mon, 1 Jan 2018 09:16:51 +1100 (AEDT) Received: from [127.0.0.1] ([86.161.101.150]) by mrelayeu.kundenserver.de (mreue105 [212.227.15.179]) with ESMTPA (Nemesis) id 0Lxfpr-1eyhnd2fgx-017FuZ; Sun, 31 Dec 2017 23:16:42 +0100 From: Darren Stevens To: linuxppc-dev Date: Sun, 31 Dec 2017 22:16:41 +0000 (GMT) Message-ID: <4b3d22a081a.208ad70e@auth.smtp.1and1.co.uk> User-Agent: YAM/2.9p1 (AmigaOS4; PPC; rv:20140418r7798) Subject: [PATCH NEXT 4/4] powerpc/pasemi: Connect Nemo boot code. MIME-Version: 1.0 Content-type: multipart/mixed; boundary="--=_BOUNDARY.6c368940208d079b.fc" X-Provags-ID: V03:K0:apA9SdiyXc1YxrUfD/8fQnavGYqY/FhCthcafP8wK4AdmUv4F6G l9dqVgqItYrrweRUm9MkOdWsiLs7s7zgcnyLbnuotfY13wdoXB+LX2/WtFBzutu5W1Rcc7k w171Ehb9EYd+FK9w4KuNznE5iU0CD0T2symHUHcbG26nzsQ9FRbXnuuI9d5qRttCZ7rXSFg zaOGe5FN/MB9KYyvTfeZQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:+o1R6vUikJ0=:kcM7HsXaZ244S9/JOee3Ea siL8jgzVYow8Y8aNbxJJ+4r98eaa9xB24P6zO6SXFtp8G6wBhZ12DO4KKcbQ1QKu0yB2cc+b8 IFBF8S3+VQAsuqBvE8rhArqdMue3cU/HiXXngtt7Yf5aybXYO9yu4gcLo5uATjuYr9eUuTZT7 wYktvU+2hYuHfx1vxpn2K4FvXh26ccLxV+0iES1ChPTMWJRx8h8fw+d3YzoIRtYPtDz+ypynz 39gXm8T1y9mfrTD36Zbify4yxejR2aYWLUQObaWs6gJH6CFSlrK+U60oCPgZ4rLMRW1imxLpm oJXhyZtll8380BKtcLt9PN+e3zbWj8R39ObLVyztTiRoqhSHr3NXYIH2fpvgyY2ocDg7vV69+ IuIsHDbbIbl9h/g5mTi2tneZmIAv6wtVTocH1QcYfXCIMX2vm3XKSuPxhlVnUVhDJRTVPFHq7 j3mWeSk7Pnu3FpRjXTsAKjchDY/E5a2G+3Ulgkq8wuVXyIoDCKTyUWxbHQ0uPBFs0POHSLLy0 R9Ukd2HLjB6vZssWbJSuEBPVekFmxhPfW7DCggcQCghjCWbX6uulPfDKO1TdgofqI5NIjoSvr OejxkQLZvQ9rECX4EtzJvaSntgX0vHkdJTrrlEWk7KFaGNbExUSNY2onMpTuK7mb36dX9lju4 lpUR1Yr8W5vRiflja0rrdNQAmFnPxjsKRFlV0p+48TsqP9RlWTyWQfq8gL3G07uFe1DwAe8s7 QqbY7XBKG10+caCNBRtGHemCpnfu/iyVB9xSgA== X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.24 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Christian Zigotzky Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" 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 diff --git a/arch/powerpc/platforms/pasemi/setup.c b/arch/powerpc/platforms/pasemi/setup.c index 8d3664f..bb3a4d5 100644 --- a/arch/powerpc/platforms/pasemi/setup.c +++ b/arch/powerpc/platforms/pasemi/setup.c @@ -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;