From: Bjorn Helgaas Date: Wed, 6 Jun 2018 21:10:41 +0000 (-0500) Subject: Merge branch 'lorenzo/pci/rcar' X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=1c2bef0a3fd14287a66edd7ead57fd2e439485a2;p=linux.git Merge branch 'lorenzo/pci/rcar' - clean up clocks, MSI, IRQ mappings in R-Car probe failure paths (Marek Vasut) - poll more frequently (5us vs 5ms) while waiting for R-Car data link active (Marek Vasut) - use generic OF parsing interface in R-Car (Vladimir Zapolskiy) - add R-Car V3H (R8A77980) "compatible" string (Sergei Shtylyov) - add R-Car gen3 PHY support (Sergei Shtylyov) - improve R-Car PHYRDY polling (Sergei Shtylyov) - clean up R-Car macros (Marek Vasut) - use runtime PM for R-Car controller clock (Dien Pham) * lorenzo/pci/rcar: PCI: rcar: Remove IRQ mappings in rcar_pcie_enable_msi() failpath PCI: rcar: Teardown MSI setup if rcar_pcie_enable() fails PCI: rcar: Add missing irq_dispose_mapping() into failpath PCI: rcar: Pull bus clock enable/disable from rcar_pcie_get_resources() PCI: rcar: Poll more often in rcar_pcie_wait_for_dl() PCI: rcar: Reuse generic pci_parse_request_of_pci_ranges() function DT: pci: rcar-pci: document R8A77980 bindings PCI: rcar: Factor out rcar_pcie_hw_init() call PCI: rcar: Add R-Car gen3 PHY support PCI: rcar: Remove PHYRDY polling from rcar_pcie_hw_init_h1() PCI: rcar: Poll PHYRDY in rcar_pcie_hw_init() PCI: rcar: Clean up the macros PCI: rcar: Use runtime PM to control controller clock # Conflicts: # drivers/pci/host/pcie-rcar.c --- 1c2bef0a3fd14287a66edd7ead57fd2e439485a2 diff --cc drivers/pci/host/pcie-rcar.c index 4493b4238fbf4,636c3c5095d25..874d75c9ee4ac --- a/drivers/pci/host/pcie-rcar.c +++ b/drivers/pci/host/pcie-rcar.c @@@ -28,13 -30,11 +30,13 @@@ #include #include +#include "../pci.h" + #define PCIECAR 0x000010 #define PCIECCTLR 0x000018 - #define CONFIG_SEND_ENABLE (1 << 31) + #define CONFIG_SEND_ENABLE BIT(31) #define TYPE0 (0 << 8) - #define TYPE1 (1 << 8) + #define TYPE1 BIT(8) #define PCIECDR 0x000020 #define PCIEMSR 0x000028 #define PCIEINTXR 0x000400