Commit ce96d1d7 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/rockchip' 

- Make 'ep-gpios' DT property optional (Chen-Yu Tsai)

- Add FriendlyARM NanoPi M4B to rockchip DT binding (Chen-Yu Tsai)

* pci/rockchip:
  dt-bindings: arm: rockchip: Add FriendlyARM NanoPi M4B
  PCI: rockchip: Make 'ep-gpios' DT property optional
parents 4ab5718c 8e61744d

Documentation/devicetree/bindings/arm/rockchip.yaml

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ properties: 
          - enum:

              - friendlyarm,nanopc-t4

              - friendlyarm,nanopi-m4

              - friendlyarm,nanopi-m4b

              - friendlyarm,nanopi-neo4

          - const: rockchip,rk3399

drivers/pci/controller/pcie-rockchip.c

+6 −6
Original line number Diff line number Diff line
@@ -118,11 +118,11 @@ int rockchip_pcie_parse_dt(struct rockchip_pcie *rockchip) 
	}



	if (rockchip->is_rc) {

		rockchip->ep_gpio = devm_gpiod_get(dev, "ep", GPIOD_OUT_HIGH);

		if (IS_ERR(rockchip->ep_gpio)) {

			dev_err(dev, "missing ep-gpios property in node\n");

			return PTR_ERR(rockchip->ep_gpio);

		}

		rockchip->ep_gpio = devm_gpiod_get_optional(dev, "ep",

							    GPIOD_OUT_HIGH);

		if (IS_ERR(rockchip->ep_gpio))

			return dev_err_probe(dev, PTR_ERR(rockchip->ep_gpio),

					     "failed to get ep GPIO\n");

	}



	rockchip->aclk_pcie = devm_clk_get(dev, "aclk");