From owner-svn-src-head@freebsd.org Tue Sep 5 05:42:38 2017 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 9DE11E1B318; Tue, 5 Sep 2017 05:42:38 +0000 (UTC) (envelope-from mw@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 mx1.freebsd.org (Postfix) with ESMTPS id 6AFB176091; Tue, 5 Sep 2017 05:42:38 +0000 (UTC) (envelope-from mw@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v855gbGw083258; Tue, 5 Sep 2017 05:42:37 GMT (envelope-from mw@FreeBSD.org) Received: (from mw@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v855gb2n083255; Tue, 5 Sep 2017 05:42:37 GMT (envelope-from mw@FreeBSD.org) Message-Id: <201709050542.v855gb2n083255@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mw set sender to mw@FreeBSD.org using -f From: Marcin Wojtas Date: Tue, 5 Sep 2017 05:42:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r323171 - in head/sys/arm: conf mv/armada38x X-SVN-Group: head X-SVN-Commit-Author: mw X-SVN-Commit-Paths: in head/sys/arm: conf mv/armada38x X-SVN-Commit-Revision: 323171 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.23 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: Tue, 05 Sep 2017 05:42:38 -0000 Author: mw Date: Tue Sep 5 05:42:37 2017 New Revision: 323171 URL: https://svnweb.freebsd.org/changeset/base/323171 Log: Change name of Marvell Armada38x RTC driver Two modules with the same name cannot be loaded, so Marvell specific drivers cannot have the same name as generic drivers. Files with the same name, even in different folder overlaps their .o files. Change armada38x/rtc.c to armada38x/armada38x_rtc.c fix it. Preparation for adding this driver to GENERIC config for ARMv7 Marvell platforms. Submitted by: Rafal Kozik Obtained from: Semihalf Sponsored by: Semihalf Differential Revision: https://reviews.freebsd.org/D12185 Added: head/sys/arm/mv/armada38x/armada38x_rtc.c - copied, changed from r323170, head/sys/arm/mv/armada38x/rtc.c Deleted: head/sys/arm/mv/armada38x/rtc.c Modified: head/sys/arm/conf/ARMADA38X head/sys/arm/mv/armada38x/files.armada38x Modified: head/sys/arm/conf/ARMADA38X ============================================================================== --- head/sys/arm/conf/ARMADA38X Tue Sep 5 05:28:52 2017 (r323170) +++ head/sys/arm/conf/ARMADA38X Tue Sep 5 05:42:37 2017 (r323171) @@ -48,6 +48,9 @@ device neta # PCI device pci +# RTC +device mv_rtc + # Interrupt controllers device gic options INTRNG Copied and modified: head/sys/arm/mv/armada38x/armada38x_rtc.c (from r323170, head/sys/arm/mv/armada38x/rtc.c) ============================================================================== --- head/sys/arm/mv/armada38x/rtc.c Tue Sep 5 05:28:52 2017 (r323170, copy source) +++ head/sys/arm/mv/armada38x/armada38x_rtc.c Tue Sep 5 05:42:37 2017 (r323171) @@ -128,7 +128,7 @@ static driver_t mv_rtc_driver = { static devclass_t mv_rtc_devclass; -DRIVER_MODULE(mv_rtc, simplebus, mv_rtc_driver, mv_rtc_devclass, 0, 0); +DRIVER_MODULE(a38x_rtc, simplebus, mv_rtc_driver, mv_rtc_devclass, 0, 0); static void mv_rtc_reset(device_t dev) Modified: head/sys/arm/mv/armada38x/files.armada38x ============================================================================== --- head/sys/arm/mv/armada38x/files.armada38x Tue Sep 5 05:28:52 2017 (r323170) +++ head/sys/arm/mv/armada38x/files.armada38x Tue Sep 5 05:42:37 2017 (r323171) @@ -7,6 +7,6 @@ arm/mv/armada/wdt.c optional fdt arm/mv/armada38x/armada38x.c standard arm/mv/armada38x/armada38x_mp.c optional smp arm/mv/armada38x/pmsu.c standard -arm/mv/armada38x/rtc.c standard +arm/mv/armada38x/armada38x_rtc.c optional mv_rtc fdt arm/mv/armada38x/armada38x_pl310.c optional pl310 dev/sdhci/sdhci_fdt.c optional sdhci