From patchwork Sun Jul 17 18:46:41 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darren Stevens X-Patchwork-Id: 649275 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 AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rsxj14pz3z9s4x for ; Mon, 18 Jul 2016 05:49:41 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3rsxj10Y0RzDrKZ for ; Mon, 18 Jul 2016 05:49:41 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.13]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3rsxfX2TZ5zDqLw for ; Mon, 18 Jul 2016 05:47:32 +1000 (AEST) Received: from mintppc.lan ([86.186.86.83]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0LjJuR-1ancsR44VT-00dSqH; Sun, 17 Jul 2016 21:47:29 +0200 From: Darren Stevens To: linuxppc-dev@lists.ozlabs.org Date: Sun, 17 Jul 2016 19:46:41 +0100 (BST) Message-ID: <487fa17881e.5524720d@auth.smtp.1and1.co.uk> User-Agent: YAM/2.9p1 (AmigaOS4; PPC; rv:20140418r7798) Subject: [PATCH 1/1] pasemi: Add fixup_device_tree function to prom_init MIME-Version: 1.0 Content-type: multipart/mixed; boundary="--=_BOUNDARY.6cfd9cc03cd2f6d6.0b" X-Provags-ID: V03:K0:wtiFXVcD9RpT0kVmM+0h2LR/e4DYhksAquuD2inlyGyTatcp8vS kTX0MX+L5meKukcueUma65DmnuaPGXZqOurMI+6VTmNlbtTteElpv8rZjYL0MbTdmN20/lh 3S5n8heE5ElVSWVwp1YscKG/kA2VJYvk9CudU1A6Qq5nLUGOjsZGALHyYw2O6inAPlTYLQf s1Zfbq7vevMM89u2/qIvQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:AhRTTLoZBTY=:2oWfm/LmUl3WyH6WVlsU4y uFZfl5wimuVmlFhyBmNQa/0rSbLrGWUE+g2JwFRJD3pNNsOmOJoqOIP3AWGWa+IPGSzXje2m9 JBcybSFFbtc1sUIC3DO348aoAo0lY4y/JYAi26lUn37c6FB3ggOqsM8sE4ilTm1t1ltRXVLUj Hf7hBLVu42U8Xhei8uttrQbbAmxxkA4Da8skjl9g6VBQeeAz6Eyh5g1H8gVQ3P7WjQxuYZQF6 7UAECOoPAD8paF5XIRXsxlQLmWivOgNcx3EdOOVryfrzhA/yw1pgOu6uvTpnxna5Lh8EUwTna SK30ZbPbHtS+78f+dmvQ5qOV3lOlGg4qesFalyTdxrtkBl1YXBZ/3FDFlKTa7eQeueUFfJtMB Az2q5yJJT6+3UKPAXDThBFKbAet6NDjVmkYDhtUkfS0wcjbQlRlRkHmzjG6FaLRqP0LUtV08C rI0gLG2UG3VvilZe/NqweNqy3u1j7EmU2/XRGSWxpat6NBEBPj5Fzxt/MD6tKCVEyCn8FVLGL xZ9wWrEX7srhDwoEeJQ8FuRflBpqJKY9z5rJvRi9dFiLckUdLHMj6fAbRy+7WHMplIFVqY1+1 xNwDQPk7C4TvRLLX+dTbzoATS2pvkhdCpn0jz0Kj0g9gaggpxnAYPGII9T6QUrxQNvFj9KdSN TsYDTQJLgTrIAs++UFXkQonDZOm8nCtrr1SjVl6ltlXGaoFruZcnqdsGhsHAzNjBQLGQ= X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Olof Johansson , Christian Zigotzky Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" Add a pasmei platform specific entry in the fixup_device_tree() call in prom_init.c. This call will be used to fix the broken device tree passed by CFE on AmigaOneX1000 machines. Signed-off-by: Darren Stevens diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 6ee4b72..287ce4b 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -2639,6 +2639,13 @@ static void __init fixup_device_tree_efika(void) #else #define fixup_device_tree_efika() #endif +#ifdef CONFIG_PPC_PASEMI +static void __init fixup_device_tree_pasemi(void) +{ +} +#else +#define fixup_device_tree_pasemi() +#endif static void __init fixup_device_tree(void) { @@ -2647,6 +2654,7 @@ static void __init fixup_device_tree(void) fixup_device_tree_chrp(); fixup_device_tree_pmac(); fixup_device_tree_efika(); + fixup_device_tree_pasemi(); } static void __init prom_find_boot_cpu(void)