From: Bjorn Helgaas Date: Wed, 3 Dec 2025 20:18:36 +0000 (-0600) Subject: Merge branch 'pci/controller/dw-rockchip' X-Git-Url: https://gentwo.org/gitweb/?a=commitdiff_plain;h=dddd6122d026b00eed28b55ed06be097f3fc78c0;p=linux%2F.git Merge branch 'pci/controller/dw-rockchip' - Use devm_regulator_get_enable_optional() to simplify probing (Anand Moon) * pci/controller/dw-rockchip: PCI: dw-rockchip: Simplify regulator setup with devm_regulator_get_enable_optional() --- dddd6122d026b00eed28b55ed06be097f3fc78c0 diff --cc drivers/pci/controller/dwc/pcie-dw-rockchip.c index bcd3a28da650,69bdc2011df7..f8605fe61a41 --- a/drivers/pci/controller/dwc/pcie-dw-rockchip.c +++ b/drivers/pci/controller/dwc/pcie-dw-rockchip.c @@@ -88,10 -82,8 +88,9 @@@ struct rockchip_pcie unsigned int clk_cnt; struct reset_control *rst; struct gpio_desc *rst_gpio; - struct regulator *vpcie3v3; struct irq_domain *irq_domain; const struct rockchip_pcie_of_data *data; + bool supports_clkreq; }; struct rockchip_pcie_of_data {