[src/trunk]: src/sys/arch/arm/sunxi Add H5 (sun50i) support.

[jmcneill <jmcneill%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a37d675f2d3b
branches:  trunk
changeset: 356764:a37d675f2d3b
user:      jmcneill <jmcneill%NetBSD.org@localhost>
date:      Wed Oct 11 10:52:54 2017 +0000

description:
Add H5 (sun50i) support.

diffstat:

 sys/arch/arm/sunxi/files.sunxi      |  5 +++--
 sys/arch/arm/sunxi/sun8i_h3_ccu.c   |  5 +++--
 sys/arch/arm/sunxi/sunxi_gpio.c     |  8 ++++++--
 sys/arch/arm/sunxi/sunxi_platform.c |  5 +++--
 4 files changed, 15 insertions(+), 8 deletions(-)

diffs (101 lines):

diff -r 06759e5e9fcf -r a37d675f2d3b sys/arch/arm/sunxi/files.sunxi
--- a/sys/arch/arm/sunxi/files.sunxi    Wed Oct 11 09:53:14 2017 +0000
+++ b/sys/arch/arm/sunxi/files.sunxi    Wed Oct 11 10:52:54 2017 +0000
@@ -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/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_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
diff -r 06759e5e9fcf -r a37d675f2d3b sys/arch/arm/sunxi/sun8i_h3_ccu.c
--- a/sys/arch/arm/sunxi/sun8i_h3_ccu.c Wed Oct 11 09:53:14 2017 +0000
+++ b/sys/arch/arm/sunxi/sun8i_h3_ccu.c Wed Oct 11 10:52:54 2017 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 const char * const compatible[] = {
        "allwinner,sun8i-h3-ccu",
+       "allwinner,sun50i-h5-ccu",
        NULL
 };
 
diff -r 06759e5e9fcf -r a37d675f2d3b sys/arch/arm/sunxi/sunxi_gpio.c
--- a/sys/arch/arm/sunxi/sunxi_gpio.c   Wed Oct 11 09:53:14 2017 +0000
+++ b/sys/arch/arm/sunxi/sunxi_gpio.c   Wed Oct 11 10:52:54 2017 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
        { "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 }
 };
 
diff -r 06759e5e9fcf -r a37d675f2d3b sys/arch/arm/sunxi/sunxi_platform.c
--- a/sys/arch/arm/sunxi/sunxi_platform.c       Wed Oct 11 09:53:14 2017 +0000
+++ b/sys/arch/arm/sunxi/sunxi_platform.c       Wed Oct 11 10:52:54 2017 +0000
@@ -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 <jmcneill%invisible.ca@localhost>
@@ -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 @@
 };
 
 ARM_PLATFORM(sun50i_a64, "allwinner,sun50i-a64", &sun50i_platform);
+ARM_PLATFORM(sun50i_h5, "allwinner,sun50i-h5", &sun50i_platform);