[src/trunk]: src/sys/arch/arm/samsung Add the missing mpcaa_memh to reflect t...

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

details:   https://anonhg.NetBSD.org/src/rev/71dd798df18a
branches:  trunk
changeset: 328892:71dd798df18a
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Tue Apr 22 16:10:48 2014 +0000

description:
Add the missing mpcaa_memh to reflect the correct offset.

The offsets are not actually used now on matt's request.

diffstat:

 sys/arch/arm/samsung/exynos_soc.c |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (49 lines):

diff -r a51b49ee7de1 -r 71dd798df18a sys/arch/arm/samsung/exynos_soc.c
--- a/sys/arch/arm/samsung/exynos_soc.c Tue Apr 22 16:08:24 2014 +0000
+++ b/sys/arch/arm/samsung/exynos_soc.c Tue Apr 22 16:10:48 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: exynos_soc.c,v 1.5 2014/04/16 21:28:51 reinoud Exp $   */
+/*     $NetBSD: exynos_soc.c,v 1.6 2014/04/22 16:10:48 reinoud Exp $   */
 /*-
  * Copyright (c) 2014 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -33,7 +33,7 @@
 #define        _ARM32_BUS_DMA_PRIVATE
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: exynos_soc.c,v 1.5 2014/04/16 21:28:51 reinoud Exp $");
+__KERNEL_RCSID(1, "$NetBSD: exynos_soc.c,v 1.6 2014/04/22 16:10:48 reinoud Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -255,11 +255,15 @@
                 * The Exynos4420 armgic is located at a different location!
                 */
 
+               struct mpcore_attach_args * const mpcaa = aux;
                extern uint32_t exynos_soc_id;
+
                switch (EXYNOS_PRODUCT_ID(exynos_soc_id)) {
 #if defined(EXYNOS5)
                case 0xe5410:
+                       /* offsets not changed on matt's request */
 #if 0
+                       mpcaa->mpcaa_memh = EXYNOS_CORE_VBASE;
                        mpcaa->mpcaa_off1 = EXYNOS5_GIC_IOP_DISTRIBUTOR_OFFSET;
                        mpcaa->mpcaa_off2 = EXYNOS5_GIC_IOP_CONTROLLER_OFFSET;
 #endif
@@ -267,13 +271,11 @@
 #endif
 #if defined(EXYNOS4)
                case 0xe4410:
-               case 0xe4412: {
-                       struct mpcore_attach_args * const mpcaa = aux;
+               case 0xe4412:
                        mpcaa->mpcaa_memh = EXYNOS_CORE_VBASE;
                        mpcaa->mpcaa_off1 = EXYNOS4_GIC_DISTRIBUTOR_OFFSET;
                        mpcaa->mpcaa_off2 = EXYNOS4_GIC_CNTR_OFFSET;
                        break;
-               }
 #endif
                default:
                        panic("%s: unknown SoC product id %#x", __func__,