build/patch/kernel/archive/sunxi-5.15/patches.megous/clk-sunxi-ng-Export-CLK_DRAM-for-devfreq.patch

116 lines
3.5 KiB
Diff

From 007e49fce7e70c3ed4edd0469bd7d5b907d495f0 Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Sat, 3 Apr 2021 17:14:49 -0500
Subject: [PATCH 417/478] clk: sunxi-ng: Export CLK_DRAM for devfreq
MBUS needs to reference the CLK_DRAM clock, as it is responsible for
DRAM frequency scaling.
Signed-off-by: Samuel Holland <samuel@sholland.org>
---
drivers/clk/sunxi-ng/ccu-sun50i-a64.h | 2 --
drivers/clk/sunxi-ng/ccu-sun8i-a83t.h | 4 ----
drivers/clk/sunxi-ng/ccu-sun8i-h3.h | 2 --
include/dt-bindings/clock/sun50i-a64-ccu.h | 2 +-
include/dt-bindings/clock/sun8i-a83t-ccu.h | 5 ++---
include/dt-bindings/clock/sun8i-h3-ccu.h | 2 +-
6 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/drivers/clk/sunxi-ng/ccu-sun50i-a64.h b/drivers/clk/sunxi-ng/ccu-sun50i-a64.h
index 54d1f96f4b68..a8c11c0b4e06 100644
--- a/drivers/clk/sunxi-ng/ccu-sun50i-a64.h
+++ b/drivers/clk/sunxi-ng/ccu-sun50i-a64.h
@@ -51,8 +51,6 @@
#define CLK_USB_OHCI1_12M 92
-#define CLK_DRAM 94
-
/* All the DRAM gates are exported */
/* And the DSI and GPU module clock is exported */
diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-a83t.h b/drivers/clk/sunxi-ng/ccu-sun8i-a83t.h
index 40e575ba51d2..6c927bc75224 100644
--- a/drivers/clk/sunxi-ng/ccu-sun8i-a83t.h
+++ b/drivers/clk/sunxi-ng/ccu-sun8i-a83t.h
@@ -42,12 +42,8 @@
/* module and usb clocks exported */
-#define CLK_DRAM 82
-
/* dram gates and more module clocks exported */
-#define CLK_MBUS 95
-
/* more module clocks exported */
#define CLK_NUMBER (CLK_GPU_HYD + 1)
diff --git a/drivers/clk/sunxi-ng/ccu-sun8i-h3.h b/drivers/clk/sunxi-ng/ccu-sun8i-h3.h
index d8c38447e11b..e13f3c4b57d0 100644
--- a/drivers/clk/sunxi-ng/ccu-sun8i-h3.h
+++ b/drivers/clk/sunxi-ng/ccu-sun8i-h3.h
@@ -42,8 +42,6 @@
/* The first bunch of module clocks are exported */
-#define CLK_DRAM 96
-
/* All the DRAM gates are exported */
/* Some more module clocks are exported */
diff --git a/include/dt-bindings/clock/sun50i-a64-ccu.h b/include/dt-bindings/clock/sun50i-a64-ccu.h
index 318eb15c414c..175892189e9d 100644
--- a/include/dt-bindings/clock/sun50i-a64-ccu.h
+++ b/include/dt-bindings/clock/sun50i-a64-ccu.h
@@ -113,7 +113,7 @@
#define CLK_USB_OHCI0 91
#define CLK_USB_OHCI1 93
-
+#define CLK_DRAM 94
#define CLK_DRAM_VE 95
#define CLK_DRAM_CSI 96
#define CLK_DRAM_DEINTERLACE 97
diff --git a/include/dt-bindings/clock/sun8i-a83t-ccu.h b/include/dt-bindings/clock/sun8i-a83t-ccu.h
index 78af5085f630..affe1857eb54 100644
--- a/include/dt-bindings/clock/sun8i-a83t-ccu.h
+++ b/include/dt-bindings/clock/sun8i-a83t-ccu.h
@@ -116,10 +116,9 @@
#define CLK_USB_HSIC 79
#define CLK_USB_HSIC_12M 80
#define CLK_USB_OHCI0 81
-
+#define CLK_DRAM 82
#define CLK_DRAM_VE 83
#define CLK_DRAM_CSI 84
-
#define CLK_TCON0 85
#define CLK_TCON1 86
#define CLK_CSI_MISC 87
@@ -130,7 +129,7 @@
#define CLK_AVS 92
#define CLK_HDMI 93
#define CLK_HDMI_SLOW 94
-
+#define CLK_MBUS 95
#define CLK_MIPI_DSI0 96
#define CLK_MIPI_DSI1 97
#define CLK_GPU_CORE 98
diff --git a/include/dt-bindings/clock/sun8i-h3-ccu.h b/include/dt-bindings/clock/sun8i-h3-ccu.h
index 30d2d15373a2..5d4ada2c22e6 100644
--- a/include/dt-bindings/clock/sun8i-h3-ccu.h
+++ b/include/dt-bindings/clock/sun8i-h3-ccu.h
@@ -126,7 +126,7 @@
#define CLK_USB_OHCI1 93
#define CLK_USB_OHCI2 94
#define CLK_USB_OHCI3 95
-
+#define CLK_DRAM 96
#define CLK_DRAM_VE 97
#define CLK_DRAM_CSI 98
#define CLK_DRAM_DEINTERLACE 99
--
2.35.3