From 6778948f9de86c3cfaf36725a7c87dcff9ba247f Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Mon, 11 Dec 2023 08:20:59 +0000
Subject: [PATCH] kernel_5.10 no rt
---
kernel/drivers/clk/davinci/psc.c | 24 ++----------------------
1 files changed, 2 insertions(+), 22 deletions(-)
diff --git a/kernel/drivers/clk/davinci/psc.c b/kernel/drivers/clk/davinci/psc.c
index 4fc13e4..7387e7f 100644
--- a/kernel/drivers/clk/davinci/psc.c
+++ b/kernel/drivers/clk/davinci/psc.c
@@ -235,7 +235,7 @@
const char *parent_name, struct regmap *regmap,
u32 md, u32 pd, u32 flags)
{
- struct clk_init_data init = {};
+ struct clk_init_data init;
struct davinci_lpsc_clk *lpsc;
int ret;
bool is_on;
@@ -302,24 +302,6 @@
return 0;
}
-
-/*
- * REVISIT: These exported functions can be removed after a non-DT lookup is
- * added to the reset controller framework and the davinci-rproc driver is
- * updated to use the generic reset controller framework.
- */
-
-int davinci_clk_reset_assert(struct clk *clk)
-{
- return davinci_lpsc_clk_reset(clk, true);
-}
-EXPORT_SYMBOL(davinci_clk_reset_assert);
-
-int davinci_clk_reset_deassert(struct clk *clk)
-{
- return davinci_lpsc_clk_reset(clk, false);
-}
-EXPORT_SYMBOL(davinci_clk_reset_deassert);
static int davinci_psc_reset_assert(struct reset_controller_dev *rcdev,
unsigned long id)
@@ -549,7 +531,6 @@
struct device *dev = &pdev->dev;
const struct of_device_id *of_id;
const struct davinci_psc_init_data *init_data = NULL;
- struct resource *res;
void __iomem *base;
int ret;
@@ -564,8 +545,7 @@
return -EINVAL;
}
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- base = devm_ioremap_resource(dev, res);
+ base = devm_platform_ioremap_resource(pdev, 0);
if (IS_ERR(base))
return PTR_ERR(base);
--
Gitblit v1.6.2