mirror of https://github.com/armbian/build.git
rockchip64-6.18: rewrite/rebase patches - no changes - vs v6.18-rc2
This commit is contained in:
parent
ef8102041c
commit
10585156b0
|
|
@ -637,7 +637,7 @@ diff --git a/drivers/devfreq/event/rockchip-dfi.c b/drivers/devfreq/event/rockch
|
|||
index 111111111111..222222222222 100644
|
||||
--- a/drivers/devfreq/event/rockchip-dfi.c
|
||||
+++ b/drivers/devfreq/event/rockchip-dfi.c
|
||||
@@ -24,6 +24,8 @@
|
||||
@@ -25,6 +25,8 @@
|
||||
#include <linux/perf_event.h>
|
||||
|
||||
#include <soc/rockchip/rockchip_grf.h>
|
||||
|
|
@ -646,7 +646,7 @@ index 111111111111..222222222222 100644
|
|||
#include <soc/rockchip/rk3399_grf.h>
|
||||
#include <soc/rockchip/rk3568_grf.h>
|
||||
#include <soc/rockchip/rk3588_grf.h>
|
||||
@@ -102,6 +104,7 @@ struct rockchip_dfi {
|
||||
@@ -97,6 +99,7 @@ struct rockchip_dfi {
|
||||
|
||||
struct device *dev;
|
||||
void __iomem *regs;
|
||||
|
|
@ -654,7 +654,7 @@ index 111111111111..222222222222 100644
|
|||
struct regmap *regmap_pmu;
|
||||
struct clk *clk;
|
||||
int usecount;
|
||||
@@ -712,6 +715,46 @@ static int rockchip_ddr_perf_init(struct rockchip_dfi *dfi)
|
||||
@@ -711,6 +714,46 @@ static int rockchip_ddr_perf_init(struct rockchip_dfi *dfi)
|
||||
}
|
||||
#endif
|
||||
|
||||
|
|
@ -701,7 +701,7 @@ index 111111111111..222222222222 100644
|
|||
static int rk3399_dfi_init(struct rockchip_dfi *dfi)
|
||||
{
|
||||
struct regmap *regmap_pmu = dfi->regmap_pmu;
|
||||
@@ -809,6 +852,8 @@ static int rk3588_dfi_init(struct rockchip_dfi *dfi)
|
||||
@@ -808,6 +851,8 @@ static int rk3588_dfi_init(struct rockchip_dfi *dfi)
|
||||
};
|
||||
|
||||
static const struct of_device_id rockchip_dfi_id_match[] = {
|
||||
|
|
@ -710,7 +710,7 @@ index 111111111111..222222222222 100644
|
|||
{ .compatible = "rockchip,rk3399-dfi", .data = rk3399_dfi_init },
|
||||
{ .compatible = "rockchip,rk3568-dfi", .data = rk3568_dfi_init },
|
||||
{ .compatible = "rockchip,rk3588-dfi", .data = rk3588_dfi_init },
|
||||
@@ -838,14 +883,30 @@ static int rockchip_dfi_probe(struct platform_device *pdev)
|
||||
@@ -837,14 +882,30 @@ static int rockchip_dfi_probe(struct platform_device *pdev)
|
||||
if (IS_ERR(dfi->regs))
|
||||
return PTR_ERR(dfi->regs);
|
||||
|
||||
|
|
@ -748,7 +748,7 @@ index 111111111111..222222222222 100644
|
|||
|
||||
dfi->dev = dev;
|
||||
mutex_init(&dfi->mutex);
|
||||
@@ -870,6 +931,8 @@ static int rockchip_dfi_probe(struct platform_device *pdev)
|
||||
@@ -869,6 +930,8 @@ static int rockchip_dfi_probe(struct platform_device *pdev)
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue