From owner-svn-src-head@freebsd.org Sun Jul 12 07:27:22 2020 Return-Path: Delivered-To: svn-src-head@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 18DC335ACEB; Sun, 12 Jul 2020 07:27:22 +0000 (UTC) (envelope-from mmel@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 4B4JJT6w50z4FG2; Sun, 12 Jul 2020 07:27:21 +0000 (UTC) (envelope-from mmel@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 D049F20F0A; Sun, 12 Jul 2020 07:27:21 +0000 (UTC) (envelope-from mmel@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 06C7RLXC036350; Sun, 12 Jul 2020 07:27:21 GMT (envelope-from mmel@FreeBSD.org) Received: (from mmel@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06C7RLU3036348; Sun, 12 Jul 2020 07:27:21 GMT (envelope-from mmel@FreeBSD.org) Message-Id: <202007120727.06C7RLU3036348@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mmel set sender to mmel@FreeBSD.org using -f From: Michal Meloun Date: Sun, 12 Jul 2020 07:27:21 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r363121 - in head/sys/arm: broadcom/bcm2835 mv X-SVN-Group: head X-SVN-Commit-Author: mmel X-SVN-Commit-Paths: in head/sys/arm: broadcom/bcm2835 mv X-SVN-Commit-Revision: 363121 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 12 Jul 2020 07:27:22 -0000 Author: mmel Date: Sun Jul 12 07:27:21 2020 New Revision: 363121 URL: https://svnweb.freebsd.org/changeset/base/363121 Log: Fix the module name for some arm drivers. Module name (unlike of the of driver name) must be system wide unique. Reported by: Mark Millard(bcm_pci), andrew(mvebu_gpio) MFC with: r362954, r362385 Modified: head/sys/arm/broadcom/bcm2835/bcm2838_pci.c head/sys/arm/mv/mvebu_gpio.c Modified: head/sys/arm/broadcom/bcm2835/bcm2838_pci.c ============================================================================== --- head/sys/arm/broadcom/bcm2835/bcm2838_pci.c Sun Jul 12 07:25:02 2020 (r363120) +++ head/sys/arm/broadcom/bcm2835/bcm2838_pci.c Sun Jul 12 07:27:21 2020 (r363121) @@ -739,5 +739,5 @@ DEFINE_CLASS_1(pcib, bcm_pcib_driver, bcm_pcib_methods sizeof(struct bcm_pcib_softc), generic_pcie_fdt_driver); static devclass_t bcm_pcib_devclass; -DRIVER_MODULE(pcib, simplebus, bcm_pcib_driver, bcm_pcib_devclass, 0, 0); +DRIVER_MODULE(bcm_pcib, simplebus, bcm_pcib_driver, bcm_pcib_devclass, 0, 0); Modified: head/sys/arm/mv/mvebu_gpio.c ============================================================================== --- head/sys/arm/mv/mvebu_gpio.c Sun Jul 12 07:25:02 2020 (r363120) +++ head/sys/arm/mv/mvebu_gpio.c Sun Jul 12 07:27:21 2020 (r363121) @@ -864,6 +864,6 @@ static device_method_t mvebu_gpio_methods[] = { static devclass_t mvebu_gpio_devclass; static DEFINE_CLASS_0(gpio, mvebu_gpio_driver, mvebu_gpio_methods, sizeof(struct mvebu_gpio_softc)); -EARLY_DRIVER_MODULE(gpio, simplebus, mvebu_gpio_driver, +EARLY_DRIVER_MODULE(mvebu_gpio, simplebus, mvebu_gpio_driver, mvebu_gpio_devclass, NULL, NULL, BUS_PASS_TIMER + BUS_PASS_ORDER_LAST);