<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/simtrace2/+/26027">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">firmware: remove usb pullup that dates back to simtrace1<br><br>All the parts are DNP and never existed on the simtrace2 with sam3; the<br>sam3 has internal pullups that are part of the usb peripheral.<br><br>Change-Id: I04a703a2eba6ff1dc64692c089213389d0c1066d<br>---<br>M firmware/apps/dfu/main.c<br>M firmware/libboard/octsimtest/include/board.h<br>M firmware/libboard/sam3p256/include/board.h<br>M firmware/libboard/simtrace/include/board.h<br>M firmware/libcommon/source/usb.c<br>5 files changed, 0 insertions(+), 32 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/firmware/apps/dfu/main.c b/firmware/apps/dfu/main.c</span><br><span>index d5a6fa6..4813881 100644</span><br><span>--- a/firmware/apps/dfu/main.c</span><br><span>+++ b/firmware/apps/dfu/main.c</span><br><span>@@ -342,16 +342,7 @@</span><br><span> TRACE_INFO("USB init...\n\r");</span><br><span> /* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */</span><br><span> USBD_Disconnect();</span><br><span style="color: hsl(0, 100%, 40%);">-#ifdef PIN_USB_PULLUP</span><br><span style="color: hsl(0, 100%, 40%);">- const Pin usb_dp_pullup = PIN_USB_PULLUP;</span><br><span style="color: hsl(0, 100%, 40%);">- PIO_Configure(&usb_dp_pullup, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- PIO_Set(&usb_dp_pullup);</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> mdelay(50);</span><br><span style="color: hsl(0, 100%, 40%);">-#ifdef PIN_USB_PULLUP</span><br><span style="color: hsl(0, 100%, 40%);">- PIO_Clear(&usb_dp_pullup);</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> USBDFU_Initialize(&dfu_descriptors);</span><br><span> </span><br><span> while (USBD_GetState() < USBD_STATE_CONFIGURED) {</span><br><span>diff --git a/firmware/libboard/octsimtest/include/board.h b/firmware/libboard/octsimtest/include/board.h</span><br><span>index 530f27b..697619c 100644</span><br><span>--- a/firmware/libboard/octsimtest/include/board.h</span><br><span>+++ b/firmware/libboard/octsimtest/include/board.h</span><br><span>@@ -87,11 +87,6 @@</span><br><span> /* SPI flash write protect pin (active low, pulled low) */</span><br><span> #define PIN_SPI_WP {PA15, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/** Pin configuration to control USB pull-up on D+</span><br><span style="color: hsl(0, 100%, 40%);">- * @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-#define PIN_USB_PULLUP {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /** USB definitions */</span><br><span> /* OpenMoko SIMtrace 2 USB vendor ID */</span><br><span> #define BOARD_USB_VENDOR_ID USB_VENDOR_OPENMOKO</span><br><span>diff --git a/firmware/libboard/sam3p256/include/board.h b/firmware/libboard/sam3p256/include/board.h</span><br><span>index 58e8a24..06cfdce 100644</span><br><span>--- a/firmware/libboard/sam3p256/include/board.h</span><br><span>+++ b/firmware/libboard/sam3p256/include/board.h</span><br><span>@@ -135,11 +135,6 @@</span><br><span> #define PIN_SPI_WP {PA15, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/** Pin configuration to control USB pull-up on D+</span><br><span style="color: hsl(0, 100%, 40%);">- * @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-#define PIN_USB_PULLUP {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /** USB definitions */</span><br><span> /* OpenMoko SIMtrace 2 USB vendor ID */</span><br><span> #define BOARD_USB_VENDOR_ID USB_VENDOR_OPENMOKO</span><br><span>diff --git a/firmware/libboard/simtrace/include/board.h b/firmware/libboard/simtrace/include/board.h</span><br><span>index be18f64..6e4cd98 100644</span><br><span>--- a/firmware/libboard/simtrace/include/board.h</span><br><span>+++ b/firmware/libboard/simtrace/include/board.h</span><br><span>@@ -134,11 +134,6 @@</span><br><span> /* SPI flash write protect pin (active low, pulled low) */</span><br><span> #define PIN_SPI_WP {PA15, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/** Pin configuration to control USB pull-up on D+</span><br><span style="color: hsl(0, 100%, 40%);">- * @details the USB pull-up on D+ is enable by default on the board but can be disabled by setting PA16 high</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-#define PIN_USB_PULLUP {PIO_PA16, PIOA, ID_PIOA, PIO_OUTPUT_0, PIO_DEFAULT}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /** USB definitions */</span><br><span> /* OpenMoko SIMtrace 2 USB vendor ID */</span><br><span> #define BOARD_USB_VENDOR_ID USB_VENDOR_OPENMOKO</span><br><span>diff --git a/firmware/libcommon/source/usb.c b/firmware/libcommon/source/usb.c</span><br><span>index e75646e..0868263 100644</span><br><span>--- a/firmware/libcommon/source/usb.c</span><br><span>+++ b/firmware/libcommon/source/usb.c</span><br><span>@@ -689,16 +689,8 @@</span><br><span> {</span><br><span> unsigned int i;</span><br><span> /* Signal USB reset by disabling the pull-up on USB D+ for at least 10 ms */</span><br><span style="color: hsl(0, 100%, 40%);">-#ifdef PIN_USB_PULLUP</span><br><span style="color: hsl(0, 100%, 40%);">- const Pin usb_dp_pullup = PIN_USB_PULLUP;</span><br><span style="color: hsl(0, 100%, 40%);">- PIO_Configure(&usb_dp_pullup, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- PIO_Set(&usb_dp_pullup);</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> USBD_HAL_Suspend();</span><br><span> mdelay(20);</span><br><span style="color: hsl(0, 100%, 40%);">-#ifdef PIN_USB_PULLUP</span><br><span style="color: hsl(0, 100%, 40%);">- PIO_Clear(&usb_dp_pullup);</span><br><span style="color: hsl(0, 100%, 40%);">-#endif</span><br><span> USBD_HAL_Activate();</span><br><span> </span><br><span> // Get std USB driver</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/simtrace2/+/26027">change 26027</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/simtrace2/+/26027"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: simtrace2 </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I04a703a2eba6ff1dc64692c089213389d0c1066d </div>
<div style="display:none"> Gerrit-Change-Number: 26027 </div>
<div style="display:none"> Gerrit-PatchSet: 5 </div>
<div style="display:none"> Gerrit-Owner: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>