commit 7cb1e5ae8b8014edca64f1fd187f4e1e6f3e99e3
author Mihail Zenkov <mihail.zenkov@gmail.com> Fri Apr 22 12:17:35 2016 +0000
committer Mihail Zenkov <mihail.zenkov@gmail.com> Fri Apr 22 20:43:45 2016 +0000
tree 813600c507d997521fd54dd740921cbac4026b35
parent 79ca6d4e3cf6fcd2f05cca0a703200394920741f

Fix AMSv2 variant 1 detection if rockbox loaded from SD card

Change-Id: Ie7c9c06170601e109f8d3de9686773c38a6e224a

bootloader/sansa_as3525.c

diff --git a/bootloader/sansa_as3525.c b/bootloader/sansa_as3525.c
index fb3ba98..3938f81 100644
--- a/bootloader/sansa_as3525.c
+++ b/bootloader/sansa_as3525.c
@@ -160,6 +160,13 @@
 #endif
     }
 
+#if defined(SANSA_FUZEV2) || defined(SANSA_CLIPPLUS) || defined(SANSA_CLIPZIP)
+    /* It is necessary for proper detection AMSv2 variant 1.
+     * We should restore initial state of GPIOB_PIN(5) as it used for
+     * variant detection, but can be changed if we switch SD card. */
+    if (amsv2_variant == 1)
+        GPIOB_PIN(5) = 1 << 5;
+#endif
     kernel_entry = (void*) loadbuffer;
     commit_discard_idcache();
     printf("Executing");

firmware/rolo.c

diff --git a/firmware/rolo.c b/firmware/rolo.c
index 266ba79..d432642 100644
--- a/firmware/rolo.c
+++ b/firmware/rolo.c
@@ -275,6 +275,13 @@
     /* Set CVDD1 power supply to default*/
     ascodec_write_pmu(0x17, 1, 0);
 #endif
+#if defined(SANSA_FUZEV2) || defined(SANSA_CLIPPLUS) || defined(SANSA_CLIPZIP)
+    /* It is necessary for proper detection AMSv2 variant 1.
+     * We should restore initial state of GPIOB_PIN(5) as it used for
+     * variant detection, but can be changed if we switch SD card. */
+    if (amsv2_variant == 1)
+        GPIOB_PIN(5) = 1 << 5;
+#endif
 
 #if CONFIG_CPU != IMX31L /* We're not finished yet */
 #ifdef CPU_ARM