diff options
| author | Gregory Nutt <gnutt@nuttx.org> | 2014-07-28 17:48:55 -0600 |
|---|---|---|
| committer | Gregory Nutt <gnutt@nuttx.org> | 2014-07-28 17:48:55 -0600 |
| commit | fe3a5935568332ca2e36e54849f5006fc8ba3f51 (patch) | |
| tree | 7ae4736f37e2fe019335d912a8b8b73505d1968d | |
| parent | 4bcbce3323afdbd617fb5755b84a26797403f96b (diff) | |
| download | nuttx-fe3a5935568332ca2e36e54849f5006fc8ba3f51.tar.gz nuttx-fe3a5935568332ca2e36e54849f5006fc8ba3f51.tar.bz2 nuttx-fe3a5935568332ca2e36e54849f5006fc8ba3f51.zip | |
SAMA5D4-EK: Disable PMIC workaround... it does not work
| -rw-r--r-- | nuttx/configs/sama5d4-ek/Kconfig | 9 | ||||
| -rw-r--r-- | nuttx/configs/sama5d4-ek/src/dram_main.c | 2 | ||||
| -rw-r--r-- | nuttx/configs/sama5d4-ek/src/sama5d4-ek.h | 6 |
3 files changed, 15 insertions, 2 deletions
diff --git a/nuttx/configs/sama5d4-ek/Kconfig b/nuttx/configs/sama5d4-ek/Kconfig index 27d3112a4..500b8f825 100644 --- a/nuttx/configs/sama5d4-ek/Kconfig +++ b/nuttx/configs/sama5d4-ek/Kconfig @@ -6,6 +6,15 @@ if ARCH_BOARD_SAMA5D4_EK choice + prompt "SAMA5D4-EK Board Version" + default SAMA5D4_MB_REVC + +config SAMA5D4_MB_REVC + bool "SAMA5D4-MB Rev. C" + +endchoice # SAMA5D4-EK Board Version + +choice prompt "CPU Frequency" default SAMA5D4EK_396MHZ diff --git a/nuttx/configs/sama5d4-ek/src/dram_main.c b/nuttx/configs/sama5d4-ek/src/dram_main.c index 6c7ccf03c..667ae5388 100644 --- a/nuttx/configs/sama5d4-ek/src/dram_main.c +++ b/nuttx/configs/sama5d4-ek/src/dram_main.c @@ -102,7 +102,7 @@ int dram_main(int argc, char *argv) /* Disable the PMC. This is necessary on the SAMA5D4-MB Rev C. board. On * that board, the PMIC can lock up the I2C bus. The work around is - * difficult: + * awkward: * * 1. Open JP23 (disabling the WM8904 data line) * 2. Execute DRAMBOOT. The PMIC will be disabled while JP23 is closed. diff --git a/nuttx/configs/sama5d4-ek/src/sama5d4-ek.h b/nuttx/configs/sama5d4-ek/src/sama5d4-ek.h index 56ac91f7e..f974a393f 100644 --- a/nuttx/configs/sama5d4-ek/src/sama5d4-ek.h +++ b/nuttx/configs/sama5d4-ek/src/sama5d4-ek.h @@ -372,10 +372,14 @@ /* PMIC */ -#ifndef CONFIG_SAMA5_TWI0 +#if !defined(CONFIG_SAMA5_TWI0) || !defined(CONFIG_SAMA5D4_MB_REVC) # undef HAVE_PMIC #endif +#ifndef CONFIG_EXPERIMENTAL +# undef HAVE_PMIC /* REVISIT: Disable anyway because it does not yet work */ +#endif + /* LEDs *****************************************************************************/ /* There are 3 LEDs on the SAMA5D4-EK: * |