Module Name: src
Committed By: jmcneill
Date: Wed Oct 11 10:52:54 UTC 2017
Modified Files:
src/sys/arch/arm/sunxi: files.sunxi sun8i_h3_ccu.c sunxi_gpio.c
sunxi_platform.c
Log Message:
Add H5 (sun50i) support.
To generate a diff of this commit:
cvs rdiff -u -r1.34 -r1.35 src/sys/arch/arm/sunxi/files.sunxi
cvs rdiff -u -r1.13 -r1.14 src/sys/arch/arm/sunxi/sun8i_h3_ccu.c
cvs rdiff -u -r1.15 -r1.16 src/sys/arch/arm/sunxi/sunxi_gpio.c
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/arm/sunxi/sunxi_platform.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/sunxi/files.sunxi
diff -u src/sys/arch/arm/sunxi/files.sunxi:1.34 src/sys/arch/arm/sunxi/files.sunxi:1.35
--- src/sys/arch/arm/sunxi/files.sunxi:1.34 Mon Oct 9 15:53:28 2017
+++ src/sys/arch/arm/sunxi/files.sunxi Wed Oct 11 10:52:54 2017
@@ -1,4 +1,4 @@
-# $NetBSD: files.sunxi,v 1.34 2017/10/09 15:53:28 jmcneill Exp $
+# $NetBSD: files.sunxi,v 1.35 2017/10/11 10:52:54 jmcneill Exp $
#
# Configuration info for Allwinner sunxi family SoCs
#
@@ -102,7 +102,7 @@ file arch/arm/sunxi/sun5i_a13_gpio.c su
file arch/arm/sunxi/sun6i_a31_gpio.c sunxi_gpio & soc_sun6i_a31
file arch/arm/sunxi/sun7i_a20_gpio.c sunxi_gpio & soc_sun7i_a20
file arch/arm/sunxi/sun8i_a83t_gpio.c sunxi_gpio & soc_sun8i_a83t
-file arch/arm/sunxi/sun8i_h3_gpio.c sunxi_gpio & soc_sun8i_h3
+file arch/arm/sunxi/sun8i_h3_gpio.c sunxi_gpio & (soc_sun8i_h3 | soc_sun50i_h5)
file arch/arm/sunxi/sun9i_a80_gpio.c sunxi_gpio & soc_sun9i_a80
file arch/arm/sunxi/sun50i_a64_gpio.c sunxi_gpio & soc_sun50i_a64
@@ -233,3 +233,4 @@ defflag opt_soc.h SOC_SUN9I: SOC_SUNXI
defflag opt_soc.h SOC_SUN9I_A80: SOC_SUN9I
defflag opt_soc.h SOC_SUN50I: SOC_SUNXI
defflag opt_soc.h SOC_SUN50I_A64: SOC_SUN50I
+defflag opt_soc.h SOC_SUN50I_H5: SOC_SUN50I
Index: src/sys/arch/arm/sunxi/sun8i_h3_ccu.c
diff -u src/sys/arch/arm/sunxi/sun8i_h3_ccu.c:1.13 src/sys/arch/arm/sunxi/sun8i_h3_ccu.c:1.14
--- src/sys/arch/arm/sunxi/sun8i_h3_ccu.c:1.13 Thu Oct 5 01:29:49 2017
+++ src/sys/arch/arm/sunxi/sun8i_h3_ccu.c Wed Oct 11 10:52:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sun8i_h3_ccu.c,v 1.13 2017/10/05 01:29:49 jmcneill Exp $ */
+/* $NetBSD: sun8i_h3_ccu.c,v 1.14 2017/10/11 10:52:54 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: sun8i_h3_ccu.c,v 1.13 2017/10/05 01:29:49 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: sun8i_h3_ccu.c,v 1.14 2017/10/11 10:52:54 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -71,6 +71,7 @@ static void sun8i_h3_ccu_attach(device_t
static const char * const compatible[] = {
"allwinner,sun8i-h3-ccu",
+ "allwinner,sun50i-h5-ccu",
NULL
};
Index: src/sys/arch/arm/sunxi/sunxi_gpio.c
diff -u src/sys/arch/arm/sunxi/sunxi_gpio.c:1.15 src/sys/arch/arm/sunxi/sunxi_gpio.c:1.16
--- src/sys/arch/arm/sunxi/sunxi_gpio.c:1.15 Sun Oct 8 18:00:36 2017
+++ src/sys/arch/arm/sunxi/sunxi_gpio.c Wed Oct 11 10:52:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_gpio.c,v 1.15 2017/10/08 18:00:36 jmcneill Exp $ */
+/* $NetBSD: sunxi_gpio.c,v 1.16 2017/10/11 10:52:54 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -29,7 +29,7 @@
#include "opt_soc.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_gpio.c,v 1.15 2017/10/08 18:00:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_gpio.c,v 1.16 2017/10/11 10:52:54 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -101,6 +101,10 @@ static const struct of_compat_data compa
{ "allwinner,sun50i-a64-pinctrl", (uintptr_t)&sun50i_a64_padconf },
{ "allwinner,sun50i-a64-r-pinctrl", (uintptr_t)&sun50i_a64_r_padconf },
#endif
+#ifdef SOC_SUN50I_H5
+ { "allwinner,sun50i-h5-pinctrl", (uintptr_t)&sun8i_h3_padconf },
+ { "allwinner,sun50i-h5-r-pinctrl", (uintptr_t)&sun8i_h3_r_padconf },
+#endif
{ NULL }
};
Index: src/sys/arch/arm/sunxi/sunxi_platform.c
diff -u src/sys/arch/arm/sunxi/sunxi_platform.c:1.10 src/sys/arch/arm/sunxi/sunxi_platform.c:1.11
--- src/sys/arch/arm/sunxi/sunxi_platform.c:1.10 Sun Oct 8 18:00:36 2017
+++ src/sys/arch/arm/sunxi/sunxi_platform.c Wed Oct 11 10:52:54 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: sunxi_platform.c,v 1.10 2017/10/08 18:00:36 jmcneill Exp $ */
+/* $NetBSD: sunxi_platform.c,v 1.11 2017/10/11 10:52:54 jmcneill Exp $ */
/*-
* Copyright (c) 2017 Jared McNeill <jmcne...@invisible.ca>
@@ -31,7 +31,7 @@
#include "opt_fdt_arm.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.10 2017/10/08 18:00:36 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunxi_platform.c,v 1.11 2017/10/11 10:52:54 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -327,3 +327,4 @@ static const struct arm_platform sun50i_
};
ARM_PLATFORM(sun50i_a64, "allwinner,sun50i-a64", &sun50i_platform);
+ARM_PLATFORM(sun50i_h5, "allwinner,sun50i-h5", &sun50i_platform);
