]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bf160c8 dc358c3)
Merge branch 'pci/brcmstb'
authorBjorn Helgaas <bhelgaas@google.com>
Tue, 4 May 2021 15:43:31 +0000 (10:43 -0500)
committerBjorn Helgaas <bhelgaas@google.com>
Tue, 4 May 2021 15:43:31 +0000 (10:43 -0500)
commit6c872473c84595738b27df42f5168a7b26a2d742
tree64ef61ecf8e531795e96ed88acc75ba7dd6041b3tree | snapshot
parentbf160c8e2069459352214640e4cc5bdfbce91718commit | diff
parentdc358c30b53a3bb8f67790b8073738b7e7438f60commit | 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()
drivers/pci/controller/pcie-brcmstb.c diff1 | diff2 | blob | history
Linux Kernel Source Tree.