Module Name: src
Committed By: jmcneill
Date: Sat Nov 21 22:52:31 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: soc_tegra124.c tegra_fuse.c
Log Message:
Apply initial fuse offset in tegra_fuse_read instead of in each reg def
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/arm/nvidia/soc_tegra124.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/arm/nvidia/tegra_fuse.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/nvidia/soc_tegra124.c
diff -u src/sys/arch/arm/nvidia/soc_tegra124.c:1.9 src/sys/arch/arm/nvidia/soc_tegra124.c:1.10
--- src/sys/arch/arm/nvidia/soc_tegra124.c:1.9 Sat Nov 21 12:09:39 2015
+++ src/sys/arch/arm/nvidia/soc_tegra124.c Sat Nov 21 22:52:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: soc_tegra124.c,v 1.9 2015/11/21 12:09:39 jmcneill Exp $ */
+/* $NetBSD: soc_tegra124.c,v 1.10 2015/11/21 22:52:31 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -30,7 +30,7 @@
#include "opt_multiprocessor.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: soc_tegra124.c,v 1.9 2015/11/21 12:09:39 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: soc_tegra124.c,v 1.10 2015/11/21 22:52:31 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -47,17 +47,17 @@ __KERNEL_RCSID(0, "$NetBSD: soc_tegra124
#define EVP_RESET_VECTOR_0_REG 0x100
-#define FUSE_SKU_INFO_REG 0x110
-#define FUSE_CPU_SPEEDO_0_REG 0x114
-#define FUSE_CPU_IDDQ_REG 0x118
-#define FUSE_FT_REV_REG 0x128
-#define FUSE_CPU_SPEEDO_1_REG 0x12c
-#define FUSE_CPU_SPEEDO_2_REG 0x130
-#define FUSE_SOC_SPEEDO_0_REG 0x134
-#define FUSE_SOC_SPEEDO_1_REG 0x138
-#define FUSE_SOC_SPEEDO_2_REG 0x13c
-#define FUSE_SOC_IDDQ_REG 0x140
-#define FUSE_GPU_IDDQ_REG 0x228
+#define FUSE_SKU_INFO_REG 0x010
+#define FUSE_CPU_SPEEDO_0_REG 0x014
+#define FUSE_CPU_IDDQ_REG 0x018
+#define FUSE_FT_REV_REG 0x028
+#define FUSE_CPU_SPEEDO_1_REG 0x02c
+#define FUSE_CPU_SPEEDO_2_REG 0x030
+#define FUSE_SOC_SPEEDO_0_REG 0x034
+#define FUSE_SOC_SPEEDO_1_REG 0x038
+#define FUSE_SOC_SPEEDO_2_REG 0x03c
+#define FUSE_SOC_IDDQ_REG 0x040
+#define FUSE_GPU_IDDQ_REG 0x128
static void tegra124_speedo_init(void);
static int tegra124_speedo_init_ids(uint32_t);
Index: src/sys/arch/arm/nvidia/tegra_fuse.c
diff -u src/sys/arch/arm/nvidia/tegra_fuse.c:1.1 src/sys/arch/arm/nvidia/tegra_fuse.c:1.2
--- src/sys/arch/arm/nvidia/tegra_fuse.c:1.1 Sat Nov 21 12:09:39 2015
+++ src/sys/arch/arm/nvidia/tegra_fuse.c Sat Nov 21 22:52:31 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_fuse.c,v 1.1 2015/11/21 12:09:39 jmcneill Exp $ */
+/* $NetBSD: tegra_fuse.c,v 1.2 2015/11/21 22:52:31 jmcneill Exp $ */
/*-
* Copyright (c) 2015 Jared D. McNeill <[email protected]>
@@ -29,7 +29,7 @@
#include "locators.h"
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: tegra_fuse.c,v 1.1 2015/11/21 12:09:39 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_fuse.c,v 1.2 2015/11/21 22:52:31 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -96,7 +96,7 @@ tegra_fuse_read(u_int offset)
}
tegra_car_fuse_enable();
- const uint32_t v = bus_space_read_4(bst, bsh, offset);
+ const uint32_t v = bus_space_read_4(bst, bsh, 0x100 + offset);
tegra_car_fuse_disable();
return v;
