Module Name: src
Committed By: jmcneill
Date: Thu Nov 12 10:31:29 UTC 2015
Modified Files:
src/sys/arch/arm/nvidia: soc_tegra124.c tegra_i2c.c
Log Message:
Standard mode for I2C needs a source divider of 20, not 2.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/sys/arch/arm/nvidia/soc_tegra124.c \
src/sys/arch/arm/nvidia/tegra_i2c.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.7 src/sys/arch/arm/nvidia/soc_tegra124.c:1.8
--- src/sys/arch/arm/nvidia/soc_tegra124.c:1.7 Wed Nov 11 12:49:10 2015
+++ src/sys/arch/arm/nvidia/soc_tegra124.c Thu Nov 12 10:31:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: soc_tegra124.c,v 1.7 2015/11/11 12:49:10 jmcneill Exp $ */
+/* $NetBSD: soc_tegra124.c,v 1.8 2015/11/12 10:31:29 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.7 2015/11/11 12:49:10 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: soc_tegra124.c,v 1.8 2015/11/12 10:31:29 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -77,7 +77,7 @@ static struct tegra124_cpufreq_rate {
void
tegra124_cpuinit(void)
{
- tegra_car_periph_i2c_enable(4, 204000000);
+ tegra_car_periph_i2c_enable(4, 20400000);
/* Set VDD_CPU voltage to 1.4V */
const u_int target_mv = 1400;
Index: src/sys/arch/arm/nvidia/tegra_i2c.c
diff -u src/sys/arch/arm/nvidia/tegra_i2c.c:1.7 src/sys/arch/arm/nvidia/tegra_i2c.c:1.8
--- src/sys/arch/arm/nvidia/tegra_i2c.c:1.7 Wed Nov 11 12:28:15 2015
+++ src/sys/arch/arm/nvidia/tegra_i2c.c Thu Nov 12 10:31:29 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: tegra_i2c.c,v 1.7 2015/11/11 12:28:15 jmcneill Exp $ */
+/* $NetBSD: tegra_i2c.c,v 1.8 2015/11/12 10:31:29 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_i2c.c,v 1.7 2015/11/11 12:28:15 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: tegra_i2c.c,v 1.8 2015/11/12 10:31:29 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -124,8 +124,11 @@ tegra_i2c_attach(device_t parent, device
}
aprint_normal_dev(self, "interrupting on irq %d\n", loc->loc_intr);
- /* Recommended setting for standard mode */
- tegra_car_periph_i2c_enable(loc->loc_port, 204000000);
+ /*
+ * Recommended setting for standard mode is to use an I2C source div
+ * of 20 (Tegra K1 Technical Reference Manual, Table 137)
+ */
+ tegra_car_periph_i2c_enable(loc->loc_port, 20400000);
tegra_i2c_init(sc);
