<p>steve-m has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmocom-bb/+/15149">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fw/abb/twl3025: Add function to query PWON state<br><br>This allows us to detect power button presses on the Pirelli<br>DP-L10 and the Huawei GTM900-B module. Polling will only be<br>activated once the power button has been pressed and we received<br>the interrupt. The goal is to reduce the required amount of<br>TWL3025 register accesses to a minimum.<br><br>Change-Id: I31be61c8089173aed616abd1ede6c4cf5c9b6770<br>---<br>M src/target/firmware/abb/twl3025.c<br>M src/target/firmware/include/abb/twl3025.h<br>2 files changed, 30 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/49/15149/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/target/firmware/abb/twl3025.c b/src/target/firmware/abb/twl3025.c</span><br><span>index e4fcf4f..ad2b01f 100644</span><br><span>--- a/src/target/firmware/abb/twl3025.c</span><br><span>+++ b/src/target/firmware/abb/twl3025.c</span><br><span>@@ -60,8 +60,15 @@</span><br><span>         ABB_RAMP_VAL( 0,  0),</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+typedef enum pwon_state {</span><br><span style="color: hsl(120, 100%, 40%);">+    PWON_IDLE,</span><br><span style="color: hsl(120, 100%, 40%);">+    PWON_DETECTED,</span><br><span style="color: hsl(120, 100%, 40%);">+        PWON_REPORTED,</span><br><span style="color: hsl(120, 100%, 40%);">+} pwon_state_t;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct twl3025 {</span><br><span>        uint8_t page;</span><br><span style="color: hsl(120, 100%, 40%);">+ pwon_state_t pwon;</span><br><span> };</span><br><span> static struct twl3025 twl3025_state;</span><br><span> </span><br><span>@@ -106,6 +113,8 @@</span><br><span>   case IRQ_EXTERNAL: // charger in/out, pwrbtn, adc done</span><br><span>               src = twl3025_reg_read(ITSTATREG);</span><br><span> //                printd("itstatreg 0x%02x\n", src);</span><br><span style="color: hsl(120, 100%, 40%);">+          if ((src & 0x04) && twl3025_state.pwon == PWON_IDLE)</span><br><span style="color: hsl(120, 100%, 40%);">+                      twl3025_state.pwon = PWON_DETECTED;</span><br><span>          if (src & 0x08)</span><br><span>                  handle_charger();</span><br><span>            if (src & 0x20)</span><br><span>@@ -127,6 +136,7 @@</span><br><span>    twl3025_clk13m(1);</span><br><span>   twl3025_reg_write(AFCCTLADD, 0x01);     /* AFCCK(1:0) must not be zero! */</span><br><span>   twl3025_unit_enable(TWL3025_UNIT_AFC, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+     twl3025_state.pwon = PWON_IDLE;</span><br><span> </span><br><span>  irq_register_handler(IRQ_EXTERNAL, &twl3025_irq);</span><br><span>        irq_config(IRQ_EXTERNAL, 0, 0, 0);</span><br><span>@@ -185,6 +195,24 @@</span><br><span>    delay_ms(1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int twl3025_get_pwon(void)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+  switch (twl3025_state.pwon) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case PWON_DETECTED:</span><br><span style="color: hsl(120, 100%, 40%);">+           twl3025_state.pwon = PWON_REPORTED;</span><br><span style="color: hsl(120, 100%, 40%);">+           break;</span><br><span style="color: hsl(120, 100%, 40%);">+        case PWON_REPORTED:</span><br><span style="color: hsl(120, 100%, 40%);">+           if (twl3025_reg_read(VRPCSTS) & 0x10)</span><br><span style="color: hsl(120, 100%, 40%);">+                     twl3025_state.pwon = PWON_IDLE;</span><br><span style="color: hsl(120, 100%, 40%);">+               break;</span><br><span style="color: hsl(120, 100%, 40%);">+        case PWON_IDLE:</span><br><span style="color: hsl(120, 100%, 40%);">+       default:</span><br><span style="color: hsl(120, 100%, 40%);">+              break;</span><br><span style="color: hsl(120, 100%, 40%);">+        }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+   return (twl3025_state.pwon != PWON_IDLE);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void twl3025_power_off(void)</span><br><span> {</span><br><span>  unsigned long flags;</span><br><span>diff --git a/src/target/firmware/include/abb/twl3025.h b/src/target/firmware/include/abb/twl3025.h</span><br><span>index 3640644..938a425 100755</span><br><span>--- a/src/target/firmware/include/abb/twl3025.h</span><br><span>+++ b/src/target/firmware/include/abb/twl3025.h</span><br><span>@@ -144,6 +144,8 @@</span><br><span> void twl3025_reg_write(uint8_t reg, uint16_t data);</span><br><span> uint16_t twl3025_reg_read(uint8_t reg);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+int twl3025_get_pwon(void);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> void twl3025_power_off(void);</span><br><span> </span><br><span> void twl3025_clk13m(int enable);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmocom-bb/+/15149">change 15149</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/c/osmocom-bb/+/15149"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: osmocom-bb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I31be61c8089173aed616abd1ede6c4cf5c9b6770 </div>
<div style="display:none"> Gerrit-Change-Number: 15149 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: steve-m <steve@steve-m.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>