| commit | a147995c9f565258d849bf5e425f7dc00bdc5c29 | [log] [tgz] |
|---|---|---|
| author | Bjorn Helgaas <bhelgaas@google.com> | Tue May 04 10:43:31 2021 -0500 |
| committer | Bjorn Helgaas <bhelgaas@google.com> | Tue May 04 10:43:31 2021 -0500 |
| tree | 64ef61ecf8e531795e96ed88acc75ba7dd6041b3 | |
| parent | a4ffbb7a96eab872ead38f8013883e958180c730 [diff] | |
| parent | bb610757fcd74558ad94fe19993fd4470208dd02 [diff] |
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()