[src/trunk]: src/sys/arch/arm/marvell Add mvsocts to mvsoc_periph for Armada XP.

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

details:   https://anonhg.NetBSD.org/src/rev/6c685c1f6343
branches:  trunk
changeset: 341439:6c685c1f6343
user:      kiyohara <kiyohara%NetBSD.org@localhost>
date:      Fri Nov 06 12:54:52 2015 +0000

description:
Add mvsocts to mvsoc_periph for Armada XP.

diffstat:

 sys/arch/arm/marvell/armadaxpreg.h |  8 ++++++++
 sys/arch/arm/marvell/mvsoc.c       |  9 +++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diffs (83 lines):

diff -r 12472b909251 -r 6c685c1f6343 sys/arch/arm/marvell/armadaxpreg.h
--- a/sys/arch/arm/marvell/armadaxpreg.h        Fri Nov 06 12:50:30 2015 +0000
+++ b/sys/arch/arm/marvell/armadaxpreg.h        Fri Nov 06 12:54:52 2015 +0000
@@ -208,6 +208,7 @@
 #define ARMADAXP_IRQ_XOR1CH3           95      /* XOR1 Ch3 */
 #define ARMADAXP_IRQ_PEX2              99      /* PCIe Port2 INTA/B/C/D */
 #define ARMADAXP_IRQ_PEX3              103     /* PCIe Port3 INTA/B/C/D */
+#define ARMADAXP_IRQ_PMU               107     /* Power Management Unit */
 
 #define ARMADAXP_IRQ_SOURCES           116
 
@@ -278,6 +279,13 @@
 #define ARMADAXP_GPIO2_BASE    (MVSOC_DEVBUS_BASE + 0x8140)
 
 /*
+ * Thermal Sensor and Thermal Managemer
+ */
+#define ARMADAXP_TS_BASE       (MVSOC_DEVBUS_BASE + 0x82b0)
+#define ARMADAXP_TM_BASE       (MVSOC_DEVBUS_BASE + 0x84c0)
+#define ARMADA370_TM_BASE      (MVSOC_DEVBUS_BASE + 0x8300)
+
+/*
  * Power Management Unit Registers
  */                            /* NS16550 compatible */
 #define ARMADAXP_PMU_BASE      (MVSOC_DEVBUS_BASE + 0xc000)
diff -r 12472b909251 -r 6c685c1f6343 sys/arch/arm/marvell/mvsoc.c
--- a/sys/arch/arm/marvell/mvsoc.c      Fri Nov 06 12:50:30 2015 +0000
+++ b/sys/arch/arm/marvell/mvsoc.c      Fri Nov 06 12:54:52 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mvsoc.c,v 1.23 2015/06/03 04:20:02 hsuenaga Exp $      */
+/*     $NetBSD: mvsoc.c,v 1.24 2015/11/06 12:54:52 kiyohara Exp $      */
 /*
  * Copyright (c) 2007, 2008, 2013, 2014 KIYOHARA Takashi
  * All rights reserved.
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: mvsoc.c,v 1.23 2015/06/03 04:20:02 hsuenaga Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mvsoc.c,v 1.24 2015/11/06 12:54:52 kiyohara Exp $");
 
 #include "opt_cputypes.h"
 #include "opt_mvsoc.h"
@@ -678,6 +678,7 @@
     { ARMADAXP(MV78130), "gttwsi", 1, ARMADAXP_TWSI1_BASE,ARMADAXP_IRQ_TWSI1 },
     { ARMADAXP(MV78130), "gtidmac",0, ARMADAXP_XORE0_BASE,IRQ_DEFAULT },
     { ARMADAXP(MV78130), "gtidmac",1, ARMADAXP_XORE1_BASE,IRQ_DEFAULT },
+    { ARMADAXP(MV78130), "mvsocts",0, ARMADAXP_TS_BASE,        ARMADAXP_IRQ_PMU },
     { ARMADAXP(MV78130), "ehci",   0, ARMADAXP_USB0_BASE,ARMADAXP_IRQ_USB0 },
     { ARMADAXP(MV78130), "ehci",   1, ARMADAXP_USB1_BASE,ARMADAXP_IRQ_USB1 },
     { ARMADAXP(MV78130), "ehci",   2, ARMADAXP_USB2_BASE,ARMADAXP_IRQ_USB2 },
@@ -715,6 +716,7 @@
     { ARMADAXP(MV78160), "gttwsi", 1, ARMADAXP_TWSI1_BASE,ARMADAXP_IRQ_TWSI1 },
     { ARMADAXP(MV78160), "gtidmac",0, ARMADAXP_XORE0_BASE,IRQ_DEFAULT },
     { ARMADAXP(MV78160), "gtidmac",1, ARMADAXP_XORE1_BASE,IRQ_DEFAULT },
+    { ARMADAXP(MV78160), "mvsocts",0, ARMADAXP_TS_BASE,        ARMADAXP_IRQ_PMU },
     { ARMADAXP(MV78160), "ehci",   0, ARMADAXP_USB0_BASE,ARMADAXP_IRQ_USB0 },
     { ARMADAXP(MV78160), "ehci",   1, ARMADAXP_USB1_BASE,ARMADAXP_IRQ_USB1 },
     { ARMADAXP(MV78160), "ehci",   2, ARMADAXP_USB2_BASE,ARMADAXP_IRQ_USB2 },
@@ -756,6 +758,7 @@
     { ARMADAXP(MV78230), "gttwsi", 1, ARMADAXP_TWSI1_BASE,ARMADAXP_IRQ_TWSI1 },
     { ARMADAXP(MV78230), "gtidmac",0, ARMADAXP_XORE0_BASE,IRQ_DEFAULT },
     { ARMADAXP(MV78230), "gtidmac",1, ARMADAXP_XORE1_BASE,IRQ_DEFAULT },
+    { ARMADAXP(MV78230), "mvsocts",0, ARMADAXP_TS_BASE,        ARMADAXP_IRQ_PMU },
     { ARMADAXP(MV78230), "ehci",   0, ARMADAXP_USB0_BASE,ARMADAXP_IRQ_USB0 },
     { ARMADAXP(MV78230), "ehci",   1, ARMADAXP_USB1_BASE,ARMADAXP_IRQ_USB1 },
     { ARMADAXP(MV78230), "ehci",   2, ARMADAXP_USB2_BASE,ARMADAXP_IRQ_USB2 },
@@ -795,6 +798,7 @@
     { ARMADAXP(MV78260), "gttwsi", 1, ARMADAXP_TWSI1_BASE,ARMADAXP_IRQ_TWSI1 },
     { ARMADAXP(MV78260), "gtidmac",0, ARMADAXP_XORE0_BASE,IRQ_DEFAULT },
     { ARMADAXP(MV78260), "gtidmac",1, ARMADAXP_XORE1_BASE,IRQ_DEFAULT },
+    { ARMADAXP(MV78260), "mvsocts",0, ARMADAXP_TS_BASE,        ARMADAXP_IRQ_PMU },
     { ARMADAXP(MV78260), "ehci",   0, ARMADAXP_USB0_BASE,ARMADAXP_IRQ_USB0 },
     { ARMADAXP(MV78260), "ehci",   1, ARMADAXP_USB1_BASE,ARMADAXP_IRQ_USB1 },
     { ARMADAXP(MV78260), "ehci",   2, ARMADAXP_USB2_BASE,ARMADAXP_IRQ_USB2 },
@@ -836,6 +840,7 @@
     { ARMADAXP(MV78460), "gttwsi", 1, ARMADAXP_TWSI1_BASE,ARMADAXP_IRQ_TWSI1 },
     { ARMADAXP(MV78460), "gtidmac",0, ARMADAXP_XORE0_BASE,IRQ_DEFAULT },
     { ARMADAXP(MV78460), "gtidmac",1, ARMADAXP_XORE1_BASE,IRQ_DEFAULT },
+    { ARMADAXP(MV78460), "mvsocts",0, ARMADAXP_TS_BASE,        ARMADAXP_IRQ_PMU },
     { ARMADAXP(MV78460), "ehci",   0, ARMADAXP_USB0_BASE,ARMADAXP_IRQ_USB0 },
     { ARMADAXP(MV78460), "ehci",   1, ARMADAXP_USB1_BASE,ARMADAXP_IRQ_USB1 },
     { ARMADAXP(MV78460), "ehci",   2, ARMADAXP_USB2_BASE,ARMADAXP_IRQ_USB2 },