svn commit: r308336 - stable/11/sys/arm/nvidia/tegra124

[Michal Meloun]

Author: mmel
Date: Sat Nov  5 11:00:19 2016
New Revision: 308336
URL: https://svnweb.freebsd.org/changeset/base/308336

Log:
  MFC r307556,r307637:
  
    r307556:
      TEGRA: Really implement early printf. The original version was cut&pasted
      from another SoC.
    r307637:
      TEGRA: Raise minimum voltage for CPU, original 0.9 V was too optimistic.
      While I'm in, remove duplicated line from CPU frequency table.

Modified:
  stable/11/sys/arm/nvidia/tegra124/tegra124_cpufreq.c
  stable/11/sys/arm/nvidia/tegra124/tegra124_machdep.c
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/arm/nvidia/tegra124/tegra124_cpufreq.c
==============================================================================
--- stable/11/sys/arm/nvidia/tegra124/tegra124_cpufreq.c	Sat Nov  5 10:56:32 2016	(r308335)
+++ stable/11/sys/arm/nvidia/tegra124/tegra124_cpufreq.c	Sat Nov  5 11:00:19 2016	(r308336)
@@ -141,7 +141,7 @@ static struct speedo_entry tegra124_spee
 
 static struct cpu_volt_def tegra124_cpu_volt_pllx_def =
 {
-	.min_uvolt =  900000,		/* 0.9 V */
+	.min_uvolt = 1000000,		/* XXX 0.9 V doesn't work on all boards */
 	.max_uvolt = 1260000,		/* 1.26 */
 	.step_uvolt =  10000,		/* 10 mV */
 	.speedo_scale = 100,
@@ -172,7 +172,6 @@ static uint64_t cpu_freq_tbl[] = {
 	2116000000ULL,
 	2218000000ULL,
 	2320000000ULL,
-	2320000000ULL,
 	2422000000ULL,
 	2524000000ULL,
 };

Modified: stable/11/sys/arm/nvidia/tegra124/tegra124_machdep.c
==============================================================================
--- stable/11/sys/arm/nvidia/tegra124/tegra124_machdep.c	Sat Nov  5 10:56:32 2016	(r308335)
+++ stable/11/sys/arm/nvidia/tegra124/tegra124_machdep.c	Sat Nov  5 11:00:19 2016	(r308336)
@@ -139,18 +139,18 @@ cpu_reset(void)
 
 /*
  * Early putc routine for EARLY_PRINTF support.  To use, add to kernel config:
- *   option SOCDEV_PA=0x02000000
- *   option SOCDEV_VA=0x02000000
+ *   option SOCDEV_PA=0x70000000
+ *   option SOCDEV_VA=0x70000000
  *   option EARLY_PRINTF
  */
-#if 0
+#ifdef EARLY_PRINTF
 static void
 tegra124_early_putc(int c)
 {
-	volatile uint32_t * UART_STAT_REG = (uint32_t *)0x02020098;
-	volatile uint32_t * UART_TX_REG   = (uint32_t *)0x02020040;
-	const uint32_t      UART_TXRDY    = (1 << 3);
 
+	volatile uint32_t * UART_STAT_REG = (uint32_t *)(0x70006314);
+	volatile uint32_t * UART_TX_REG   = (uint32_t *)(0x70006300);
+	const uint32_t      UART_TXRDY    = (1 << 6);
 	while ((*UART_STAT_REG & UART_TXRDY) == 0)
 		continue;
 	*UART_TX_REG = c;