From: David Daney <david.da...@cavium.com>
The clock divisors are kept in different registers on OCTEON III.
Signed-off-by: David Daney <david.da...@cavium.com>
Signed-off-by: Aleksey Makarov <aleksey.maka...@auriga.com>
---
arch/mips/cavium-octeon/csrc-octeon.c | 34 ++++++++++++++++++++++++++++++++++
1 file changed, 34 insertions(+)
diff --git a/arch/mips/cavium-octeon/csrc-octeon.c
b/arch/mips/cavium-octeon/csrc-octeon.c
index b752c4e..a0d5029 100644
--- a/arch/mips/cavium-octeon/csrc-octeon.c
+++ b/arch/mips/cavium-octeon/csrc-octeon.c
@@ -14,11 +14,36 @@
#include <asm/cpu-info.h>
#include <asm/cpu-type.h>
#include <asm/time.h>
+#include <asm/bitfield.h>
#include <asm/octeon/octeon.h>
#include <asm/octeon/cvmx-ipd-defs.h>
#include <asm/octeon/cvmx-mio-defs.h>
+#define CVMX_RST_BOOT CVMX_ADD_IO_SEG(0x0001180006001600ull)
+
+union cvmx_rst_boot {
+ uint64_t u64;
+ struct cvmx_rst_boot_s {
+ __BITFIELD_FIELD(uint64_t chipkill : 1,
+ __BITFIELD_FIELD(uint64_t jtcsrdis : 1,
+ __BITFIELD_FIELD(uint64_t ejtagdis : 1,
+ __BITFIELD_FIELD(uint64_t romen : 1,
+ __BITFIELD_FIELD(uint64_t ckill_ppdis : 1,
+ __BITFIELD_FIELD(uint64_t jt_tstmode : 1,
+ __BITFIELD_FIELD(uint64_t vrm_err : 1,
+ __BITFIELD_FIELD(uint64_t reserved_37_56 : 20,
+ __BITFIELD_FIELD(uint64_t c_mul : 7,
+ __BITFIELD_FIELD(uint64_t pnr_mul : 6,
+ __BITFIELD_FIELD(uint64_t reserved_21_23 : 3,
+ __BITFIELD_FIELD(uint64_t lboot_oci : 3,
+ __BITFIELD_FIELD(uint64_t lboot_ext : 6,
+ __BITFIELD_FIELD(uint64_t lboot : 10,
+ __BITFIELD_FIELD(uint64_t rboot : 1,
+ __BITFIELD_FIELD(uint64_t rboot_pin : 1,
+ ;))))))))))))))))
+ } s;
+};
static u64 f;
static u64 rdiv;
@@ -39,11 +64,20 @@ void __init octeon_setup_delays(void)
if (current_cpu_type() == CPU_CAVIUM_OCTEON2) {
union cvmx_mio_rst_boot rst_boot;
+
rst_boot.u64 = cvmx_read_csr(CVMX_MIO_RST_BOOT);
rdiv = rst_boot.s.c_mul; /* CPU clock */
sdiv = rst_boot.s.pnr_mul; /* I/O clock */
f = (0x8000000000000000ull / sdiv) * 2;
+ } else if (current_cpu_type() == CPU_CAVIUM_OCTEON3) {
+ union cvmx_rst_boot rst_boot;
+
+ rst_boot.u64 = cvmx_read_csr(CVMX_RST_BOOT);
+ rdiv = rst_boot.s.c_mul; /* CPU clock */
+ sdiv = rst_boot.s.pnr_mul; /* I/O clock */
+ f = (0x8000000000000000ull / sdiv) * 2;
}
+
}
/*
--
2.1.3
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
