<p>Kévin Redon has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/12800">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">use XOSC1 directly for DPLL1<br><br>DPLL1 can take directly XOSC1 as input and divide it to 2 MHz.<br>thus the intermediate GCLK11 is not needed.<br>we now also completely de-configure GCLK11<br>this configuration is not supported by Atmel START since it does<br>not know about the division and thinks the input frequency<br>exceeds the maximum<br>GCLK2 is also disabled for now because it is not used<br><br>Change-Id: Icee7f5a13019c47cebc23376cabb18cb31178ece<br>---<br>M sysmoOCTSIM/config/hpl_gclk_config.h<br>M sysmoOCTSIM/config/hpl_oscctrl_config.h<br>2 files changed, 4 insertions(+), 4 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/00/12800/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/sysmoOCTSIM/config/hpl_gclk_config.h b/sysmoOCTSIM/config/hpl_gclk_config.h</span><br><span>index 398a617..0ad8ead 100644</span><br><span>--- a/sysmoOCTSIM/config/hpl_gclk_config.h</span><br><span>+++ b/sysmoOCTSIM/config/hpl_gclk_config.h</span><br><span>@@ -218,7 +218,7 @@</span><br><span> // <i> Indicates whether Generic Clock Generator Enable is enabled or not</span><br><span> // <id> gclk_arch_gen_2_enable</span><br><span> #ifndef CONF_GCLK_GEN_2_GENEN</span><br><span style="color: hsl(0, 100%, 40%);">-#define CONF_GCLK_GEN_2_GENEN 1</span><br><span style="color: hsl(120, 100%, 40%);">+#define CONF_GCLK_GEN_2_GENEN 0</span><br><span> #endif</span><br><span> // </h></span><br><span> </span><br><span>@@ -843,7 +843,7 @@</span><br><span> // <i> Indicates whether generic clock 11 configuration is enabled or not</span><br><span> // <id> enable_gclk_gen_11</span><br><span> #ifndef CONF_GCLK_GENERATOR_11_CONFIG</span><br><span style="color: hsl(0, 100%, 40%);">-#define CONF_GCLK_GENERATOR_11_CONFIG 1</span><br><span style="color: hsl(120, 100%, 40%);">+#define CONF_GCLK_GENERATOR_11_CONFIG 0</span><br><span> #endif</span><br><span> </span><br><span> // <h> Generic Clock Generator Control</span><br><span>diff --git a/sysmoOCTSIM/config/hpl_oscctrl_config.h b/sysmoOCTSIM/config/hpl_oscctrl_config.h</span><br><span>index 06ee571..0676cb5 100644</span><br><span>--- a/sysmoOCTSIM/config/hpl_oscctrl_config.h</span><br><span>+++ b/sysmoOCTSIM/config/hpl_oscctrl_config.h</span><br><span>@@ -507,7 +507,7 @@</span><br><span> // <i> Indicates whether configuration for FDPLL1 is enabled or not</span><br><span> // <id> enable_fdpll1</span><br><span> #ifndef CONF_FDPLL1_CONFIG</span><br><span style="color: hsl(0, 100%, 40%);">-#define CONF_FDPLL1_CONFIG 0</span><br><span style="color: hsl(120, 100%, 40%);">+#define CONF_FDPLL1_CONFIG 1</span><br><span> #endif</span><br><span> </span><br><span> // <y> Reference Clock Source</span><br><span>@@ -529,7 +529,7 @@</span><br><span> // <i> Select the clock source.</span><br><span> // <id> fdpll1_ref_clock</span><br><span> #ifndef CONF_FDPLL1_GCLK</span><br><span style="color: hsl(0, 100%, 40%);">-#define CONF_FDPLL1_GCLK GCLK_PCHCTRL_GEN_GCLK11_Val</span><br><span style="color: hsl(120, 100%, 40%);">+#define CONF_FDPLL1_GCLK GCLK_GENCTRL_SRC_XOSC1</span><br><span> #endif</span><br><span> </span><br><span> // <h> Digital Phase Locked Loop Control</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12800">change 12800</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/12800"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmo-ccid-firmware </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Icee7f5a13019c47cebc23376cabb18cb31178ece </div>
<div style="display:none"> Gerrit-Change-Number: 12800 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Kévin Redon <kredon@sysmocom.de> </div>