From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 4 May 2021 15:43:31 +0000 (-0500)
Subject: Merge branch 'pci/brcmstb'
X-Git-Tag: v5.13-rc1~43^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a147995c9f565258d849bf5e425f7dc00bdc5c29;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pci/brcmstb'

- Add reset_control_rearm() stub for !CONFIG_RESET_CONTROLLER (Jim Quinlan)

- Fix use of BCM7216 reset controller (Jim Quinlan)

- Use reset/rearm for Broadcom STB pulse reset instead of deassert/assert
  (Jim Quinlan)

* pci/brcmstb:
  PCI: brcmstb: Use reset/rearm instead of deassert/assert
  ata: ahci_brcm: Fix use of BCM7216 reset controller
  reset: add missing empty function reset_control_rearm()
---

a147995c9f565258d849bf5e425f7dc00bdc5c29