From ed3ccf44e600b7f8553f84c77b29fef9498f7cd7 Mon Sep 17 00:00:00 2001
From: Daniel Golle <daniel@makrotopia.org>
Date: Thu, 5 Oct 2023 20:40:12 +0200
Subject: [PATCH] mediatek: fix wrong variable name in patch for Linux 6.1

The name of the variable holding the pointer to the private struct has
changed between Linux 5.15 and Linux 6.1 and adding the identical patch
fixing PCIe #PERST de-assert broke the build on Linux 6.1.
Also change the name in the patch to fix the build.

Fixes: 6a2e17d5c1 ("mediatek: fix PCIe #PERST being de-asserted too early")
Signed-off-by: Daniel Golle <daniel@makrotopia.org>
---
 .../611-pcie-mediatek-gen3-PERST-for-100ms.patch     | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/target/linux/mediatek/patches-6.1/611-pcie-mediatek-gen3-PERST-for-100ms.patch b/target/linux/mediatek/patches-6.1/611-pcie-mediatek-gen3-PERST-for-100ms.patch
index f88efc0732..5e343d01cc 100644
--- a/target/linux/mediatek/patches-6.1/611-pcie-mediatek-gen3-PERST-for-100ms.patch
+++ b/target/linux/mediatek/patches-6.1/611-pcie-mediatek-gen3-PERST-for-100ms.patch
@@ -1,19 +1,17 @@
 --- a/drivers/pci/controller/pcie-mediatek-gen3.c
 +++ b/drivers/pci/controller/pcie-mediatek-gen3.c
-@@ -350,9 +350,15 @@ static int mtk_pcie_startup_port(struct
+@@ -350,7 +350,13 @@ static int mtk_pcie_startup_port(struct
  	msleep(100);
  
  	/* De-assert reset signals */
 -	val &= ~(PCIE_MAC_RSTB | PCIE_PHY_RSTB | PCIE_BRG_RSTB | PCIE_PE_RSTB);
 +	val &= ~(PCIE_MAC_RSTB | PCIE_PHY_RSTB | PCIE_BRG_RSTB);
- 	writel_relaxed(val, pcie->base + PCIE_RST_CTRL_REG);
- 
++	writel_relaxed(val, pcie->base + PCIE_RST_CTRL_REG);
++
 +	msleep(100);
 +
 +	/* De-assert PERST# signals */
 +	val &= ~(PCIE_PE_RSTB);
-+	writel_relaxed(val, port->base + PCIE_RST_CTRL_REG);
-+
+ 	writel_relaxed(val, pcie->base + PCIE_RST_CTRL_REG);
+ 
  	/* Check if the link is up or not */
- 	err = readl_poll_timeout(pcie->base + PCIE_LINK_STATUS_REG, val,
- 				 !!(val & PCIE_PORT_LINKUP), 20,
-- 
2.30.2