svn commit: r350868 - in stable/12: . sys/arm/allwinner sys/conf sys/dev/iicbus

[Ian Lepore]

Author: ian
Date: Sun Aug 11 21:12:29 2019
New Revision: 350868
URL: https://svnweb.freebsd.org/changeset/base/350868

Log:
  MFC r349072, r349316-r349318
  
  r349072:
  Remove pcf8563reg.h, the driver it was associated with was replaced in 2017
  with the nxprtc multi-chip driver.
  
  r349316:
  Remove some unused header files from the ad7418 driver.
  
  r349317:
  Add the rtc8583 driver to conf/files.  Also, move sy8106a from
  file.allwinner to conf/files... it's not allwinner-specific, some day
  other platforms could use the same regulator chip.
  
  r349318:
  The sy8106a and syr827 drviers require FDT and the ext_resources subsystem.

Modified:
  stable/12/ObsoleteFiles.inc
  stable/12/sys/arm/allwinner/files.allwinner
  stable/12/sys/conf/files
  stable/12/sys/dev/iicbus/ad7418.c
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/ObsoleteFiles.inc
==============================================================================
--- stable/12/ObsoleteFiles.inc	Sun Aug 11 20:50:41 2019	(r350867)
+++ stable/12/ObsoleteFiles.inc	Sun Aug 11 21:12:29 2019	(r350868)
@@ -1477,6 +1477,8 @@ OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1/cat1
 OLD_DIRS+=usr/share/openssl/man/en.ISO8859-1/cat3
 # 20170802: ksyms(4) ioctl interface was removed
 OLD_FILES+=usr/include/sys/ksyms.h
+# 20170729: the iicbus/pcf8563 driver is replaced with iicbus/nxprtc
+OLD_FILES+=usr/include/dev/iicbus/pcf8563reg.h
 # 20170722: new clang import which bumps version from 4.0.0 to 5.0.0.
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/allocator_interface.h
 OLD_FILES+=usr/lib/clang/4.0.0/include/sanitizer/asan_interface.h

Modified: stable/12/sys/arm/allwinner/files.allwinner
==============================================================================
--- stable/12/sys/arm/allwinner/files.allwinner	Sun Aug 11 20:50:41 2019	(r350867)
+++ stable/12/sys/arm/allwinner/files.allwinner	Sun Aug 11 21:12:29 2019	(r350868)
@@ -28,7 +28,6 @@ dev/usb/controller/generic_ohci.c	optional	ohci
 dev/usb/controller/generic_usb_if.m	optional	ohci
 arm/allwinner/aw_sid.c			optional	aw_sid
 arm/allwinner/aw_thermal.c		optional	aw_thermal
-dev/iicbus/sy8106a.c			optional	sy8106a
 arm/allwinner/aw_cir.c			optional	aw_cir evdev
 
 arm/allwinner/aw_reset.c		standard

Modified: stable/12/sys/conf/files
==============================================================================
--- stable/12/sys/conf/files	Sun Aug 11 20:50:41 2019	(r350867)
+++ stable/12/sys/conf/files	Sun Aug 11 21:12:29 2019	(r350868)
@@ -1848,7 +1848,7 @@ dev/iicbus/ds13rtc.c		optional ds13rtc | ds133x | ds13
 dev/iicbus/ds1672.c		optional ds1672
 dev/iicbus/ds3231.c		optional ds3231
 dev/iicbus/rtc8583.c		optional rtc8583
-dev/iicbus/syr827.c		optional ext_resources syr827
+dev/iicbus/syr827.c		optional syr827 ext_resources fdt
 dev/iicbus/icee.c		optional icee
 dev/iicbus/if_ic.c		optional ic
 dev/iicbus/iic.c		optional iic
@@ -1865,7 +1865,9 @@ dev/iicbus/isl12xx.c		optional isl12xx
 dev/iicbus/lm75.c		optional lm75
 dev/iicbus/nxprtc.c		optional nxprtc | pcf8563
 dev/iicbus/ofw_iicbus.c		optional fdt iicbus
+dev/iicbus/rtc8583.c		optional rtc8583
 dev/iicbus/s35390a.c		optional s35390a
+dev/iicbus/sy8106a.c		optional sy8106a ext_resources fdt
 dev/iir/iir.c			optional iir
 dev/iir/iir_ctrl.c		optional iir
 dev/iir/iir_pci.c		optional iir pci

Modified: stable/12/sys/dev/iicbus/ad7418.c
==============================================================================
--- stable/12/sys/dev/iicbus/ad7418.c	Sun Aug 11 20:50:41 2019	(r350867)
+++ stable/12/sys/dev/iicbus/ad7418.c	Sun Aug 11 21:12:29 2019	(r350868)
@@ -35,17 +35,8 @@ __FBSDID("$FreeBSD$");
 #include <sys/lock.h>
 #include <sys/module.h>
 #include <sys/bus.h>
-#include <sys/resource.h>
-#include <sys/rman.h>
 #include <sys/sysctl.h>
 #include <sys/sx.h>
-
-#include <machine/bus.h>
-#include <machine/cpu.h>
-#include <machine/cpufunc.h>
-#include <machine/frame.h>
-#include <machine/resource.h>
-#include <machine/intr.h>
 
 #include <dev/iicbus/iiconf.h>