From: Bjorn Helgaas <bhelgaas@google.com>
Date: Wed, 3 Dec 2025 20:18:39 +0000 (-0600)
Subject: Merge branch 'pci/controller/meson'
X-Git-Tag: v6.19-rc1~135^2~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=88b8b5b3eab25cdd3ef9b4efafd1db1d1b83d5e7;p=thirdparty%2Fkernel%2Flinux.git

Merge branch 'pci/controller/meson'

- Update DT binding to name DBI region "dbi", not "elbi", and update driver
  to support both (Manivannan Sadhasivam)

* pci/controller/meson:
  PCI: meson: Fix parsing the DBI register region
  dt-bindings: PCI: amlogic: Fix the register name of the DBI region
---

88b8b5b3eab25cdd3ef9b4efafd1db1d1b83d5e7
diff --cc Documentation/devicetree/bindings/pci/amlogic,axg-pcie.yaml
index bee694ff45f33,c8258ef403283..d67cb7a850a37
--- a/Documentation/devicetree/bindings/pci/amlogic,axg-pcie.yaml
+++ b/Documentation/devicetree/bindings/pci/amlogic,axg-pcie.yaml
@@@ -114,10 -113,10 +114,10 @@@ examples
      pcie: pcie@f9800000 {
          compatible = "amlogic,axg-pcie", "snps,dw-pcie";
          reg = <0xf9800000 0x400000>, <0xff646000 0x2000>, <0xf9f00000 0x100000>;
-         reg-names = "elbi", "cfg", "config";
+         reg-names = "dbi", "cfg", "config";
          interrupts = <GIC_SPI 177 IRQ_TYPE_EDGE_RISING>;
 -        clocks = <&pclk>, <&clk_port>, <&clk_phy>;
 -        clock-names = "pclk", "port", "general";
 +        clocks = <&clk_phy>, <&pclk>, <&clk_port>;
 +        clock-names = "general", "pclk", "port";
          resets = <&reset_pcie_port>, <&reset_pcie_apb>;
          reset-names = "port", "apb";
          phys = <&pcie_phy>;