Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 6327ccdfcdfd7be75a21fa6245259fd2b4e1dc34

Authored by BJ DevOps Team
2 parents ff2b924f39 8793c3d8af
Exists in smarc_8mq_lf_v2020.04 and in 4 other branches pitx_8mp_lf_v2020.04, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mp_lf_v2020.04

Merge remote-tracking branch 'origin/dn_uboot' into lf_uboot 

* origin/dn_uboot:
  watchdog: sbsa: timeout should be in "millisecond"
  usb: xhci: Fix armv7 compile warning

Showing 2 changed files Side-by-side Diff

drivers/usb/host/xhci-ring.c
Diff comments   View file @ 6327ccd
... ... @@ -725,7 +725,8 @@
725 725 return -ETIMEDOUT;
726 726 }
727 727  
728   - if ((void *)event->trans_event.buffer != last_transfer_trb_addr) {
  728 + if ((uintptr_t)event->trans_event.buffer !=
  729 + (uintptr_t)last_transfer_trb_addr) {
729 730 available_length -=
730 731 (int)EVENT_TRB_LEN(le32_to_cpu(event->trans_event.transfer_len));
731 732 xhci_acknowledge_event(ctrl);
drivers/watchdog/sbsa_gwdt.c
Diff comments   View file @ 6327ccd
... ... @@ -61,7 +61,7 @@
61 61 * to half value of timeout.
62 62 */
63 63 clk = get_tbclk();
64   - writel(clk / 2 * timeout,
  64 + writel(clk / (2 * 1000) * timeout,
65 65 priv->reg_control + SBSA_GWDT_WOR);
66 66  
67 67 /* writing WCS will cause an explicit watchdog refresh */