From owner-svn-src-all@freebsd.org Tue Jun 9 20:27:36 2020 Return-Path: Delivered-To: svn-src-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 71B9B33BC4D; Tue, 9 Jun 2020 20:27:36 +0000 (UTC) (envelope-from andreast@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49hMB029yWz4bg3; Tue, 9 Jun 2020 20:27:36 +0000 (UTC) (envelope-from andreast@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 45EF01B674; Tue, 9 Jun 2020 20:27:36 +0000 (UTC) (envelope-from andreast@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 059KRa5R044967; Tue, 9 Jun 2020 20:27:36 GMT (envelope-from andreast@FreeBSD.org) Received: (from andreast@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 059KRadA044966; Tue, 9 Jun 2020 20:27:36 GMT (envelope-from andreast@FreeBSD.org) Message-Id: <202006092027.059KRadA044966@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: andreast set sender to andreast@FreeBSD.org using -f From: Andreas Tobler Date: Tue, 9 Jun 2020 20:27:36 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361985 - head/sys/arm/freescale/imx X-SVN-Group: head X-SVN-Commit-Author: andreast X-SVN-Commit-Paths: head/sys/arm/freescale/imx X-SVN-Commit-Revision: 361985 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 09 Jun 2020 20:27:36 -0000 Author: andreast Date: Tue Jun 9 20:27:35 2020 New Revision: 361985 URL: https://svnweb.freebsd.org/changeset/base/361985 Log: Fix boot of wandquad after DTS update In the recent dts sync the name of the aips-bus@ changed to bus@. Reflect this change and add an additional OF_finddevice in fix_fdt_interrupt_data() and in fix_fdt_iomuxc_data() with bus@ only. Iow, keep the old naming for compatibility. Discussed with: ian@ Modified: head/sys/arm/freescale/imx/imx6_machdep.c Modified: head/sys/arm/freescale/imx/imx6_machdep.c ============================================================================== --- head/sys/arm/freescale/imx/imx6_machdep.c Tue Jun 9 20:19:11 2020 (r361984) +++ head/sys/arm/freescale/imx/imx6_machdep.c Tue Jun 9 20:27:35 2020 (r361985) @@ -134,6 +134,8 @@ fix_fdt_interrupt_data(void) if (gpcnode == -1) gpcnode = OF_finddevice("/soc/aips-bus@2000000/gpc@20dc000"); if (gpcnode == -1) + gpcnode = OF_finddevice("/soc/bus@2000000/gpc@20dc000"); + if (gpcnode == -1) return; result = OF_getencprop(gpcnode, "interrupt-parent", &gpcipar, sizeof(gpcipar)); @@ -172,6 +174,8 @@ fix_fdt_iomuxc_data(void) * uses for register access. */ node = OF_finddevice("/soc/aips-bus@2000000/iomuxc-gpr@20e0000"); + if (node == -1) + node = OF_finddevice("/soc/bus@2000000/iomuxc-gpr@20e0000"); if (node != -1) OF_setprop(node, "status", "disabled", sizeof("disabled")); }