Commit 618c1ead authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

Merge branch 'pci/pwrctrl' 

- Add optional slot clock for cases where the PCIe host controller and the
  slot are supplied by different clocks (Marek Vasut)

- Fix kerneldoc tag for private fields (Bartosz Golaszewski)

* pci/pwrctrl:
  PCI/pwrctrl: Fix the kerneldoc tag for private fields
  PCI/pwrctrl: Add optional slot clock for PCI slots
parents 9fef768d 3aa54d16

drivers/pci/pwrctrl/slot.c

+8 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
 * Author: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

 */



#include <linux/clk.h>

#include <linux/device.h>

#include <linux/mod_devicetable.h>

#include <linux/module.h>
@@ -30,6 +31,7 @@ static int pci_pwrctrl_slot_probe(struct platform_device *pdev) 
{

	struct pci_pwrctrl_slot_data *slot;

	struct device *dev = &pdev->dev;

	struct clk *clk;

	int ret;



	slot = devm_kzalloc(dev, sizeof(*slot), GFP_KERNEL);
@@ -55,6 +57,12 @@ static int pci_pwrctrl_slot_probe(struct platform_device *pdev) 
	if (ret)

		goto err_regulator_disable;



	clk = devm_clk_get_optional_enabled(dev, NULL);

	if (IS_ERR(clk)) {

		return dev_err_probe(dev, PTR_ERR(clk),

				     "Failed to enable slot clock\n");

	}



	pci_pwrctrl_init(&slot->ctx, dev);



	ret = devm_pci_pwrctrl_device_set_ready(dev, &slot->ctx);

include/linux/pci-pwrctrl.h

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ struct device_link; 
struct pci_pwrctrl {

	struct device *dev;



	/* Private: don't use. */

	/* private: internal use only */

	struct notifier_block nb;

	struct device_link *link;

	struct work_struct work;