Merge branch 'cn68xx-ciu2' of git://git.linux-mips.org/pub/scm/daney/upstream-daney into mips-for-linux-next

1 files changed, 36 insertions, 3 deletions

diff --git a/arch/mips/include/asm/octeon/cvmx-dbg-defs.h b/arch/mips/include/asm/octeon/cvmx-dbg-defs.h
index abbf42d05e5..40799cdae69 100644
--- a/arch/mips/include/asm/octeon/cvmx-dbg-defs.h
+++ b/arch/mips/include/asm/octeon/cvmx-dbg-defs.h
@@ -4,7 +4,7 @@
  * Contact: support@caviumnetworks.com
  * This file is part of the OCTEON SDK
  *
- * Copyright (c) 2003-2008 Cavium Networks
+ * Copyright (c) 2003-2012 Cavium Networks
  *
  * This file is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License, Version 2, as
@@ -28,27 +28,43 @@
 #ifndef __CVMX_DBG_DEFS_H__
 #define __CVMX_DBG_DEFS_H__
 
-#define CVMX_DBG_DATA \
-         CVMX_ADD_IO_SEG(0x00011F00000001E8ull)
+#define CVMX_DBG_DATA (CVMX_ADD_IO_SEG(0x00011F00000001E8ull))
 
 union cvmx_dbg_data {
         uint64_t u64;
         struct cvmx_dbg_data_s {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved_23_63:41;
                 uint64_t c_mul:5;
                 uint64_t dsel_ext:1;
                 uint64_t data:17;
+#else
+                uint64_t data:17;
+                uint64_t dsel_ext:1;
+                uint64_t c_mul:5;
+                uint64_t reserved_23_63:41;
+#endif
         } s;
         struct cvmx_dbg_data_cn30xx {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved_31_63:33;
                 uint64_t pll_mul:3;
                 uint64_t reserved_23_27:5;
                 uint64_t c_mul:5;
                 uint64_t dsel_ext:1;
                 uint64_t data:17;
+#else
+                uint64_t data:17;
+                uint64_t dsel_ext:1;
+                uint64_t c_mul:5;
+                uint64_t reserved_23_27:5;
+                uint64_t pll_mul:3;
+                uint64_t reserved_31_63:33;
+#endif
         } cn30xx;
         struct cvmx_dbg_data_cn30xx cn31xx;
         struct cvmx_dbg_data_cn38xx {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved_29_63:35;
                 uint64_t d_mul:4;
                 uint64_t dclk_mul2:1;
@@ -56,15 +72,32 @@ union cvmx_dbg_data {
                 uint64_t c_mul:5;
                 uint64_t dsel_ext:1;
                 uint64_t data:17;
+#else
+                uint64_t data:17;
+                uint64_t dsel_ext:1;
+                uint64_t c_mul:5;
+                uint64_t cclk_div2:1;
+                uint64_t dclk_mul2:1;
+                uint64_t d_mul:4;
+                uint64_t reserved_29_63:35;
+#endif
         } cn38xx;
         struct cvmx_dbg_data_cn38xx cn38xxp2;
         struct cvmx_dbg_data_cn30xx cn50xx;
         struct cvmx_dbg_data_cn58xx {
+#ifdef __BIG_ENDIAN_BITFIELD
                 uint64_t reserved_29_63:35;
                 uint64_t rem:6;
                 uint64_t c_mul:5;
                 uint64_t dsel_ext:1;
                 uint64_t data:17;
+#else
+                uint64_t data:17;
+                uint64_t dsel_ext:1;
+                uint64_t c_mul:5;
+                uint64_t rem:6;
+                uint64_t reserved_29_63:35;
+#endif
         } cn58xx;
         struct cvmx_dbg_data_cn58xx cn58xxp1;
 };