From patchwork Wed Aug 31 12:24:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Darren Stevens X-Patchwork-Id: 664562 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sPS6Y0Hhbz9sxS for ; Thu, 1 Sep 2016 00:13:41 +1000 (AEST) Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sPS6X6bbCzDsTD for ; Thu, 1 Sep 2016 00:13:40 +1000 (AEST) X-Original-To: linuxppc-dev@lists.ozlabs.org Delivered-To: linuxppc-dev@lists.ozlabs.org X-Greylist: delayed 308 seconds by postgrey-1.35 at bilbo; Thu, 01 Sep 2016 00:10:19 AEST Received: from mout.kundenserver.de (mout.kundenserver.de [212.227.17.24]) (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 3sPS2g6dcQzDrhc for ; Thu, 1 Sep 2016 00:10:19 +1000 (AEST) Received: from [127.0.0.1] ([31.52.206.186]) by mrelayeu.kundenserver.de (mreue102) with ESMTPA (Nemesis) id 0MNKx7-1bm01T3xcH-006vTE; Wed, 31 Aug 2016 16:05:07 +0200 From: Darren Stevens To: linuxppc-dev@lists.ozlabs.org Date: Wed, 31 Aug 2016 13:24:45 +0100 (BST) Message-ID: <48ba9b708e2.6395f2f3@auth.smtp.1and1.co.uk> User-Agent: YAM/2.9p1 (AmigaOS4; PPC; rv:20140418r7798) Subject: [ RFC PATCH 3/3] powerpc:pasemi: Fix device_type of Nemo SB600 node. MIME-Version: 1.0 Content-type: multipart/mixed; boundary="--=_BOUNDARY.6dab4a807b7bb6b1.a1" X-Provags-ID: V03:K0:6k/ma8lz8FsZTqgkeDFC42V092sU4L0hnha+ykczeDQnkvedllX +TtQepTFxLvf1xr86BATgWLUiyp7wySEKKNE+Y1rs6nGaW0DoHfGjf2KrEH26aOEQQzFfh2 hksJaYec39Vj6QzmM0YndBfdVkGrgQGpb//xofaQcz9q1MIEWk2ydxvANS88McciRMaT3rf j8a9PT3MgpfCJ6goPuWjA== X-UI-Out-Filterresults: notjunk:1; V01:K0:IgiyOEG+WGQ=:uWDP5sDB3gFt+c3PJGtmcb 75L/BQzOX2mBkzdS3kamRD2Jft99EJNXmroNBDCsNkBAwKx/uQci63b2+sxLTHF1s52YKoDzY dAh+cFx45clmwhDfM1F0855Ii9KxsWhO/xOx+Kx+EJ9DFG+z2QBytPexLzvVJbNxfiTlM6QeE oZJhFcUF+m58XBX8eP2c/4uSkU932NALqivMV8VrORCof2IvbKXYUSX4TlGNwePTD3YU+1rjN N06iqT3aVs51q0EtPLDXrCchK7pO+OzVdDiezxsTC5UvdtYiUDDr4aQIR7iieUd6jTad69Y9+ goqpiv1B5iJoEputX7FFW4T2YhNeJv81LsSYOsNE5GRJmDuiov4mwgaTTmtpjxLRAPfT6JbQD Xd7mok0InFtjgqqFzYEIC69Z747hWshoQcv7isSKtY5nCMRw8nEIknyv0NJWbK+jbO5mmwhke IR/HI3uR0+e1rGKDOB8fTorwPNtWmE+flIunhiyHgWLtnlRdB4zqdgTQrX6/iPdUABtqALQTU M8kQ5XCcPDaFexr8iDsi4G5SmwlPKrLCDgJqOBklcTi1amVKBevWsvn38RMrAlS5oBhILjOWg Lpk7rwzmsqL7FvN5fimsliWJzEyWh9Es3AELm/E98yfuozcvN3TVKMHaYJT2/MiHAEIEFK8vE myh749PRD+h5zOs2DNcdjixL7tY3bgngOOGb0ViiGAsYIvf1ckYt9nVLa6o5cgBEVhO0= 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@lixom.net, Christian Zigotzky Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Sender: "Linuxppc-dev" The of_node for the SB600 (io-bridge) has its device_type set to 'io-bridge' Set it to 'isa' so that it can be found by isa_bridge_find_early() instead of using patches in the kernel. Signed-off-by: Darren Stevens diff --git a/arch/powerpc/kernel/prom_init.c b/arch/powerpc/kernel/prom_init.c index 8269093..d75937a 100644 --- a/arch/powerpc/kernel/prom_init.c +++ b/arch/powerpc/kernel/prom_init.c @@ -2697,6 +2697,24 @@ static void __init fixup_device_tree_pasemi(void) } } } + + /* + * The io-bridge has device_type set to 'io-bridge' + * change it to 'isa' so that generic isa-bridge code can add the SB600 and + * its on-board peripherals. + */ + + name = "/pxp@0,e0000000/io-bridge@0"; + iob = call_prom("finddevice", 1, 1, ADDR(name)); + if (!PHANDLE_VALID(iob)) + return; + + /* device_type is already set, just change it. */ + + prom_printf("Changing device_type of SB600 node...\n"); + + prom_setprop(iob, name, "device_type", "isa", sizeof("isa")); + #endif //CONFIG_PPC_PASEMI_NEMO } #else