svn commit: r323171 - in head/sys/arm: conf mv/armada38x

[Marcin Wojtas]

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 <rk at semihalf.com>
  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