Inter-revision diff: patch 5

Comparing v3 (message) to v2 (message)

--- v3
+++ v2
@@ -49,7 +49,7 @@
  obj-$(CONFIG_PCI_KEYSTONE) += pci-keystone.o
 diff --git a/drivers/pci/controller/dwc/pcie-fu740.c b/drivers/pci/controller/dwc/pcie-fu740.c
 new file mode 100644
-index 000000000000..ebbcbda97490
+index 000000000000..65ca4c212fc3
 --- /dev/null
 +++ b/drivers/pci/controller/dwc/pcie-fu740.c
 @@ -0,0 +1,324 @@
@@ -93,7 +93,7 @@
 +struct fu740_pcie {
 +	struct dw_pcie pci;
 +	void __iomem *mgmt_base;
-+	struct gpio_desc *reset;
++	struct gpio_desc *perstn;
 +	struct gpio_desc *pwren;
 +	struct clk *pcie_aux;
 +	struct reset_control *rst;
@@ -138,20 +138,20 @@
 +#define PCIEX8MGMT_PHY_LANE2_BASE	(PCIEX8MGMT_PHY_LANEN_DIG_ASIC_RX_OVRD_IN_3 + 0x100 * 2)
 +#define PCIEX8MGMT_PHY_LANE3_BASE	(PCIEX8MGMT_PHY_LANEN_DIG_ASIC_RX_OVRD_IN_3 + 0x100 * 3)
 +
-+static void fu740_pcie_assert_reset(struct fu740_pcie *afp)
++static void fu740_pcie_assert_perstn(struct fu740_pcie *afp)
 +{
 +	/* Assert PERST_N GPIO */
-+	gpiod_set_value_cansleep(afp->reset, 0);
++	gpiod_set_value_cansleep(afp->perstn, 0);
 +	/* Assert controller PERST_N */
 +	writel_relaxed(0x0, afp->mgmt_base + PCIEX8MGMT_PERST_N);
 +}
 +
-+static void fu740_pcie_deassert_reset(struct fu740_pcie *afp)
++static void fu740_pcie_deassert_perstn(struct fu740_pcie *afp)
 +{
 +	/* Deassert controller PERST_N */
 +	writel_relaxed(0x1, afp->mgmt_base + PCIEX8MGMT_PERST_N);
 +	/* Deassert PERST_N GPIO */
-+	gpiod_set_value_cansleep(afp->reset, 1);
++	gpiod_set_value_cansleep(afp->perstn, 1);
 +}
 +
 +static void fu740_pcie_power_on(struct fu740_pcie *afp)
@@ -165,11 +165,11 @@
 +	msleep(100);
 +}
 +
-+static void fu740_pcie_drive_reset(struct fu740_pcie *afp)
-+{
-+	fu740_pcie_assert_reset(afp);
++static void fu740_pcie_drive_perstn(struct fu740_pcie *afp)
++{
++	fu740_pcie_assert_perstn(afp);
 +	fu740_pcie_power_on(afp);
-+	fu740_pcie_deassert_reset(afp);
++	fu740_pcie_deassert_perstn(afp);
 +}
 +
 +static void fu740_phyregwrite(const uint8_t phy, const uint16_t addr,
@@ -261,7 +261,7 @@
 +	int ret;
 +
 +	/* Power on reset */
-+	fu740_pcie_drive_reset(afp);
++	fu740_pcie_drive_perstn(afp);
 +
 +	/* Enable pcieauxclk */
 +	ret = clk_prepare_enable(afp->pcie_aux);
@@ -322,9 +322,9 @@
 +		return PTR_ERR(afp->mgmt_base);
 +
 +	/* Fetch GPIOs */
-+	afp->reset = devm_gpiod_get_optional(dev, "reset-gpios", GPIOD_OUT_LOW);
-+	if (IS_ERR(afp->reset)) {
-+		dev_err(dev, "unable to get reset-gpios\n");
++	afp->perstn = devm_gpiod_get_optional(dev, "perstn-gpios", GPIOD_OUT_LOW);
++	if (IS_ERR(afp->perstn)) {
++		dev_err(dev, "unable to get perstn-gpios\n");
 +		return ret;
 +	}
 +	afp->pwren = devm_gpiod_get_optional(dev, "pwren-gpios", GPIOD_OUT_LOW);
@@ -358,7 +358,7 @@
 +	struct fu740_pcie *afp = platform_get_drvdata(pdev);
 +
 +	/* Bring down link, so bootloader gets clean state in case of reboot */
-+	fu740_pcie_assert_reset(afp);
++	fu740_pcie_assert_perstn(afp);
 +}
 +
 +static const struct of_device_id fu740_pcie_of_match[] = {
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help