projects / linux-2.6-microblaze.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a4ffbb7 bb61075)
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)
commita147995c9f565258d849bf5e425f7dc00bdc5c29
tree64ef61ecf8e531795e96ed88acc75ba7dd6041b3tree | snapshot
parenta4ffbb7a96eab872ead38f8013883e958180c730commit | diff
parentbb610757fcd74558ad94fe19993fd4470208dd02commit | 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
MicroBlaze GIT Repository