mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-30 18:47:06 +00:00
66 lines
2.2 KiB
Diff
66 lines
2.2 KiB
Diff
|
From bf288bd25d6232310abb81db417376ce460eb032 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lorenzo Bianconi <lorenzo@kernel.org>
|
||
|
|
Date: Thu, 27 Jun 2024 13:04:25 +0200
|
||
|
|
Subject: [PATCH 3/4] clk: en7523: Remove PCIe reset open drain configuration
|
||
|
|
for EN7581
|
||
|
|
|
||
|
|
PCIe reset open drain configuration will be managed by pinctrl driver.
|
||
|
|
|
||
|
|
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
|
||
|
|
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
|
||
|
|
Link: https://lore.kernel.org/r/43276af5f08a554b4ab2e52e8d437fff5c06a732.1719485847.git.lorenzo@kernel.org
|
||
|
|
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
|
||
|
|
---
|
||
|
|
drivers/clk/clk-en7523.c | 12 ++----------
|
||
|
|
1 file changed, 2 insertions(+), 10 deletions(-)
|
||
|
|
|
||
|
|
--- a/drivers/clk/clk-en7523.c
|
||
|
|
+++ b/drivers/clk/clk-en7523.c
|
||
|
|
@@ -37,8 +37,6 @@
|
||
|
|
#define REG_PCIE1_MEM_MASK 0x0c
|
||
|
|
#define REG_PCIE2_MEM 0x10
|
||
|
|
#define REG_PCIE2_MEM_MASK 0x14
|
||
|
|
-#define REG_PCIE_RESET_OPEN_DRAIN 0x018c
|
||
|
|
-#define REG_PCIE_RESET_OPEN_DRAIN_MASK GENMASK(2, 0)
|
||
|
|
#define REG_NP_SCU_PCIC 0x88
|
||
|
|
#define REG_NP_SCU_SSTR 0x9c
|
||
|
|
#define REG_PCIE_XSI0_SEL_MASK GENMASK(14, 13)
|
||
|
|
@@ -86,8 +84,7 @@ struct en_clk_soc_data {
|
||
|
|
const u16 *idx_map;
|
||
|
|
u16 idx_map_nr;
|
||
|
|
} reset;
|
||
|
|
- int (*hw_init)(struct platform_device *pdev, void __iomem *base,
|
||
|
|
- void __iomem *np_base);
|
||
|
|
+ int (*hw_init)(struct platform_device *pdev, void __iomem *np_base);
|
||
|
|
};
|
||
|
|
|
||
|
|
static const u32 gsw_base[] = { 400000000, 500000000 };
|
||
|
|
@@ -416,7 +413,6 @@ static void en7581_pci_disable(struct cl
|
||
|
|
}
|
||
|
|
|
||
|
|
static int en7581_clk_hw_init(struct platform_device *pdev,
|
||
|
|
- void __iomem *base,
|
||
|
|
void __iomem *np_base)
|
||
|
|
{
|
||
|
|
void __iomem *pb_base;
|
||
|
|
@@ -439,10 +435,6 @@ static int en7581_clk_hw_init(struct pla
|
||
|
|
writel(0x28000000, pb_base + REG_PCIE2_MEM);
|
||
|
|
writel(0xfc000000, pb_base + REG_PCIE2_MEM_MASK);
|
||
|
|
|
||
|
|
- val = readl(base + REG_PCIE_RESET_OPEN_DRAIN);
|
||
|
|
- writel(val | REG_PCIE_RESET_OPEN_DRAIN_MASK,
|
||
|
|
- base + REG_PCIE_RESET_OPEN_DRAIN);
|
||
|
|
-
|
||
|
|
return 0;
|
||
|
|
}
|
||
|
|
|
||
|
|
@@ -582,7 +574,7 @@ static int en7523_clk_probe(struct platf
|
||
|
|
|
||
|
|
soc_data = device_get_match_data(&pdev->dev);
|
||
|
|
if (soc_data->hw_init) {
|
||
|
|
- r = soc_data->hw_init(pdev, base, np_base);
|
||
|
|
+ r = soc_data->hw_init(pdev, np_base);
|
||
|
|
if (r)
|
||
|
|
return r;
|
||
|
|
}
|