svn commit: r338070 - in head/sys: arm/allwinner arm64/conf conf

[Emmanuel Vadot]

Author: manu
Date: Sun Aug 19 18:55:33 2018
New Revision: 338070
URL: https://svnweb.freebsd.org/changeset/base/338070

Log:
  arm64: allwinner: Add aw_syscon driver to GENERIC
  
  Recent DTS use the syscon for the emac controller.
  We support this but since U-Boot is still using old DTS it was never
  needed for us to add this support, but this is a problem when using upstream
  recent DTS and will be when U-Boot will catch up.
  
  While here add a new compatible to the aw_syscon driver as Linux changed it ...

Modified:
  head/sys/arm/allwinner/aw_syscon.c
  head/sys/arm64/conf/GENERIC
  head/sys/conf/files.arm64

Modified: head/sys/arm/allwinner/aw_syscon.c
==============================================================================
--- head/sys/arm/allwinner/aw_syscon.c	Sun Aug 19 18:54:43 2018	(r338069)
+++ head/sys/arm/allwinner/aw_syscon.c	Sun Aug 19 18:55:33 2018	(r338070)
@@ -49,6 +49,7 @@ __FBSDID("$FreeBSD$");
 
 static struct ofw_compat_data compat_data[] = {
 	{"allwinner,sun50i-a64-system-controller", 1},
+	{"allwinner,sun50i-a64-system-control", 1},
 	{"allwinner,sun8i-a83t-system-controller", 1},
 	{"allwinner,sun8i-h3-system-controller", 1},
 	{NULL,             0}

Modified: head/sys/arm64/conf/GENERIC
==============================================================================
--- head/sys/arm64/conf/GENERIC	Sun Aug 19 18:54:43 2018	(r338069)
+++ head/sys/arm64/conf/GENERIC	Sun Aug 19 18:55:33 2018	(r338070)
@@ -256,6 +256,7 @@ device		hwreset
 device		nvmem
 device		regulator
 device		syscon
+device		aw_syscon
 
 # The `bpf' device enables the Berkeley Packet Filter.
 # Be aware of the administrative consequences of enabling this!

Modified: head/sys/conf/files.arm64
==============================================================================
--- head/sys/conf/files.arm64	Sun Aug 19 18:54:43 2018	(r338069)
+++ head/sys/conf/files.arm64	Sun Aug 19 18:55:33 2018	(r338070)
@@ -34,6 +34,7 @@ arm/allwinner/aw_rsb.c		optional	aw_rsb fdt
 arm/allwinner/aw_rtc.c		optional	aw_rtc fdt
 arm/allwinner/aw_sid.c		optional	aw_sid fdt
 arm/allwinner/aw_spi.c		optional	aw_spi fdt
+arm/allwinner/aw_syscon.c	optional	aw_syscon ext_resources syscon fdt
 arm/allwinner/aw_thermal.c	optional	aw_thermal fdt
 arm/allwinner/aw_usbphy.c	optional	ehci aw_usbphy fdt
 arm/allwinner/aw_wdog.c		optional	aw_wdog fdt