Skip to content

Commit

Permalink
clk: en7523: Remove PCIe reset open drain configuration for EN7581
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
LorenzoBianconi authored and bebarino committed Jul 8, 2024
1 parent db7a4a1 commit bf288bd
Showing 1 changed file with 2 additions and 10 deletions.
12 changes: 2 additions & 10 deletions drivers/clk/clk-en7523.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -85,8 +83,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 };
Expand Down Expand Up @@ -411,7 +408,6 @@ static void en7581_pci_disable(struct clk_hw *hw)
}

static int en7581_clk_hw_init(struct platform_device *pdev,
void __iomem *base,
void __iomem *np_base)
{
void __iomem *pb_base;
Expand All @@ -434,10 +430,6 @@ static int en7581_clk_hw_init(struct platform_device *pdev,
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;
}

Expand Down Expand Up @@ -577,7 +569,7 @@ static int en7523_clk_probe(struct platform_device *pdev)

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;
}
Expand Down

0 comments on commit bf288bd

Please sign in to comment.