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

[Emmanuel Vadot]

Author: manu
Date: Wed Aug  2 20:19:19 2017
New Revision: 321942
URL: https://svnweb.freebsd.org/changeset/base/321942

Log:
  arm64: Add Allwinner H5 SoC
  
  Allwinner H5 is an H3 (arm32) with Cortex A53 cores.
  Add support for it and enable it in GENERIC kernel config
  
  Tested on: OrangePi PC2

Modified:
  head/sys/arm/allwinner/aw_ccu.c
  head/sys/arm/allwinner/clkng/aw_ccung.c
  head/sys/arm64/conf/GENERIC
  head/sys/conf/files.arm64
  head/sys/conf/options.arm64

Modified: head/sys/arm/allwinner/aw_ccu.c
==============================================================================
--- head/sys/arm/allwinner/aw_ccu.c	Wed Aug  2 20:17:04 2017	(r321941)
+++ head/sys/arm/allwinner/aw_ccu.c	Wed Aug  2 20:19:19 2017	(r321942)
@@ -80,6 +80,7 @@ static struct ofw_compat_data compat_data[] = {
 	{ "allwinner,sun6i-a31",	CLOCK_CCU },
 	{ "allwinner,sun6i-a31s",	CLOCK_CCU },
 	{ "allwinner,sun50i-a64",	CLOCK_CCU },
+	{ "allwinner,sun50i-h5",	CLOCK_CCU },
 	{ "allwinner,sun8i-a33",	CLOCK_CCU },
 	{ "allwinner,sun8i-a83t",	CLOCK_CCU|CLOCK_PRCM|CLOCK_SYSCTRL },
 	{ "allwinner,sun8i-h2-plus",	CLOCK_CCU|CLOCK_PRCM },

Modified: head/sys/arm/allwinner/clkng/aw_ccung.c
==============================================================================
--- head/sys/arm/allwinner/clkng/aw_ccung.c	Wed Aug  2 20:17:04 2017	(r321941)
+++ head/sys/arm/allwinner/clkng/aw_ccung.c	Wed Aug  2 20:19:19 2017	(r321942)
@@ -66,7 +66,7 @@ __FBSDID("$FreeBSD$");
 #include <arm/allwinner/clkng/ccu_a64.h>
 #endif
 
-#if defined(SOC_ALLWINNER_H3)
+#if defined(SOC_ALLWINNER_H3) || defined(SOC_ALLWINNER_H5)
 #include <arm/allwinner/clkng/ccu_h3.h>
 #endif
 
@@ -78,7 +78,7 @@ static struct resource_spec aw_ccung_spec[] = {
 	{ -1, 0 }
 };
 
-#if defined(SOC_ALLWINNER_H3)
+#if defined(SOC_ALLWINNER_H3) || defined(SOC_ALLWINNER_H5)
 #define	H3_CCU	1
 #endif
 
@@ -91,7 +91,7 @@ static struct resource_spec aw_ccung_spec[] = {
 #endif
 
 static struct ofw_compat_data compat_data[] = {
-#if defined(SOC_ALLWINNER_H3)
+#if defined(SOC_ALLWINNER_H3) || defined(SOC_ALLWINNER_H5)
 	{ "allwinner,sun8i-h3-ccu", H3_CCU },
 #endif
 #if defined(SOC_ALLWINNER_A31)
@@ -316,7 +316,7 @@ aw_ccung_attach(device_t dev)
 		panic("Cannot create clkdom\n");
 
 	switch (sc->type) {
-#if defined(SOC_ALLWINNER_H3)
+#if defined(SOC_ALLWINNER_H3) || defined(SOC_ALLWINNER_H5)
 	case H3_CCU:
 		ccu_h3_register_clocks(sc);
 		break;

Modified: head/sys/arm64/conf/GENERIC
==============================================================================
--- head/sys/arm64/conf/GENERIC	Wed Aug  2 20:17:04 2017	(r321941)
+++ head/sys/arm64/conf/GENERIC	Wed Aug  2 20:19:19 2017	(r321942)
@@ -89,6 +89,7 @@ options 	MALLOC_DEBUG_MAXZONES=8	# Separate malloc(9) 
 
 # SoC support
 options 	SOC_ALLWINNER_A64
+options 	SOC_ALLWINNER_H5
 options 	SOC_CAVM_THUNDERX
 options 	SOC_HISI_HI6220
 options 	SOC_BRCM_BCM2837

Modified: head/sys/conf/files.arm64
==============================================================================
--- head/sys/conf/files.arm64	Wed Aug  2 20:17:04 2017	(r321941)
+++ head/sys/conf/files.arm64	Wed Aug  2 20:19:19 2017	(r321942)
@@ -42,6 +42,7 @@ arm/allwinner/clkng/aw_clk_nkmp.c	optional	aw_ccu fdt
 arm/allwinner/clkng/aw_clk_nm.c	optional	aw_ccu fdt
 arm/allwinner/clkng/aw_clk_prediv_mux.c	optional	aw_ccu fdt
 arm/allwinner/clkng/ccu_a64.c	optional	aw_ccu fdt
+arm/allwinner/clkng/ccu_h3.c	optional	aw_ccu fdt
 
 arm/allwinner/if_awg.c		optional	awg fdt
 arm/annapurna/alpine/alpine_ccu.c		optional	al_ccu fdt

Modified: head/sys/conf/options.arm64
==============================================================================
--- head/sys/conf/options.arm64	Wed Aug  2 20:17:04 2017	(r321941)
+++ head/sys/conf/options.arm64	Wed Aug  2 20:19:19 2017	(r321942)
@@ -11,6 +11,7 @@ DEV_PSCI			opt_platform.h
 
 # SoC Support
 SOC_ALLWINNER_A64		opt_soc.h
+SOC_ALLWINNER_H5		opt_soc.h
 SOC_BRCM_BCM2837		opt_soc.h
 SOC_CAVM_THUNDERX		opt_soc.h
 SOC_HISI_HI6220			opt_soc.h