From: Massimo Pegorer <massimo.pegorer+oss@gmail.com>
To: Simon Glass <sjg@chromium.org>, Quentin Schulz <u-boot@0leil.net>,
u-boot@lists.u-boot-project.org
Cc: Tom Rini <trini@konsulko.com>,
Ilias Apalodimas <ilias.apalodimas@linaro.org>,
Kever Yang <kever.yang@rock-chips.com>,
Lukasz Majewski <lukma@denx.de>,
Anatolij Gustschin <ag.dev.uboot@gmail.com>,
Heiko Schocher <hs@nabladev.com>,
Marek Vasut <marek.vasut+usb@mailbox.org>,
Svyatoslav Ryhel <clamor95@gmail.com>,
Peter Robinson <pbrobinson@gmail.com>,
Levin Du <djw@t-chip.com.cn>,
Suniel Mahesh <sunil@amarulasolutions.com>,
Alexey Charkov <alchark@flipper.net>,
Fabio Estevam <festevam@nabladev.com>,
Jonas Karlman <jonas@kwiboo.se>,
Chris Morgan <macromorgan@hotmail.com>,
Coia Prant <coiaprant@gmail.com>,
Frank Wunderlich <frank-w@public-files.de>,
Andy Yan <andyshrk@163.com>, Liangbin Lian <jjm2473@gmail.com>,
Joseph Chen <chenjh@rock-chips.com>,
Tianling Shen <cnsztl@gmail.com>,
Klaus Goger <klaus.goger@cherry.de>,
Heiko Stuebner <heiko.stuebner@cherry.de>,
Jacobe Zang <jacobe.zang@wesion.com>,
Jiehui He <jiehui.he@foxmail.com>,
John Clark <inindev@gmail.com>,
Sebastian Kropatsch <seb-dev@mail.de>,
Jagan Teki <jagan@edgeble.ai>, Ilya Katsnelson <me@0upti.me>,
Niu Zhihong <zhihong@nzhnb.com>,
Nicolas Frattaroli <frattaroli.nicolas@gmail.com>,
Tom Fitzhenry <tom@tom-fitzhenry.me.uk>,
Akash Gajjar <gajjar04akash@gmail.com>,
Maxim Moskalets <maximmosk4@gmail.com>,
FUKAUMI Naoki <naoki@radxa.com>,
Eugen Hristev <ehristev@kernel.org>,
Jianfeng Liu <liujianfeng1994@gmail.com>,
Elon Zhang <zhangzj@rock-chips.com>,
Joshua Riek <jjriek@verizon.net>,
Martin Herren <sputnik@on-the-web.ch>,
Torsten Duwe <duwe@lst.de>,
Massimo Pegorer <massimo.pegorer+oss@gmail.com>
Subject: [PATCH RFC 01/11] arm: rockchip: include SoC-specific CRU header file
Date: Sun, 20 Sep 2026 16:15:45 +0200 [thread overview]
Message-ID: <20260920-reset-v1-1-42820216369f@gmail.com> (raw)
In-Reply-To: <20260920-reset-v1-0-42820216369f@gmail.com>
Modified ones are SoC-specific source files that do not need to include
Rockchip mach common cru.h header file: indeed, SoC-specific CRU header
files are enough, and tighten to the effective needs, thus preferable.
Partly reverts 'commit b52a199e323e ("arm: rockchip: Add common cru.h")'
Signed-off-by: Massimo Pegorer <massimo.pegorer+oss@gmail.com>
---
arch/arm/include/asm/arch-rockchip/cru_rk3399.h | 1 +
arch/arm/mach-rockchip/rk3288/clk_rk3288.c | 2 +-
arch/arm/mach-rockchip/rk3288/rk3288.c | 2 +-
arch/arm/mach-rockchip/rk3399/clk_rk3399.c | 2 +-
arch/arm/mach-rockchip/rk3399/rk3399.c | 2 +-
drivers/clk/rockchip/clk_rk3288.c | 2 +-
drivers/clk/rockchip/clk_rk3399.c | 2 +-
drivers/ram/rockchip/sdram_rk3288.c | 2 +-
drivers/ram/rockchip/sdram_rk3399.c | 2 +-
drivers/video/rockchip/rk3288_mipi.c | 2 +-
drivers/video/rockchip/rk3399_mipi.c | 2 +-
drivers/video/rockchip/rk_mipi.c | 2 +-
12 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/arch/arm/include/asm/arch-rockchip/cru_rk3399.h b/arch/arm/include/asm/arch-rockchip/cru_rk3399.h
index d941a129f3e..8d0a15efd50 100644
--- a/arch/arm/include/asm/arch-rockchip/cru_rk3399.h
+++ b/arch/arm/include/asm/arch-rockchip/cru_rk3399.h
@@ -64,6 +64,7 @@ struct rockchip_cru {
u32 sdio1_con[2];
};
check_member(rockchip_cru, sdio1_con[1], 0x594);
+#define MHz 1000000
#define KHz 1000
#define OSC_HZ (24*MHz)
#define LPLL_HZ (600*MHz)
diff --git a/arch/arm/mach-rockchip/rk3288/clk_rk3288.c b/arch/arm/mach-rockchip/rk3288/clk_rk3288.c
index af6c5d1f59b..d725730f5bd 100644
--- a/arch/arm/mach-rockchip/rk3288/clk_rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/clk_rk3288.c
@@ -7,7 +7,7 @@
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
-#include <asm/arch-rockchip/cru.h>
+#include <asm/arch-rockchip/cru_rk3288.h>
#include <linux/err.h>
int rockchip_get_clk(struct udevice **devp)
diff --git a/arch/arm/mach-rockchip/rk3288/rk3288.c b/arch/arm/mach-rockchip/rk3288/rk3288.c
index 62dd9da6578..81f9c95bc09 100644
--- a/arch/arm/mach-rockchip/rk3288/rk3288.c
+++ b/arch/arm/mach-rockchip/rk3288/rk3288.c
@@ -13,7 +13,7 @@
#include <asm/arch-rockchip/bootrom.h>
#include <asm/arch-rockchip/clock.h>
#include <asm/arch-rockchip/cpu_rk3288.h>
-#include <asm/arch-rockchip/cru.h>
+#include <asm/arch-rockchip/cru_rk3288.h>
#include <asm/arch-rockchip/hardware.h>
#include <asm/arch-rockchip/grf_rk3288.h>
#include <asm/arch-rockchip/pmu_rk3288.h>
diff --git a/arch/arm/mach-rockchip/rk3399/clk_rk3399.c b/arch/arm/mach-rockchip/rk3399/clk_rk3399.c
index de552b5903b..170071d243d 100644
--- a/arch/arm/mach-rockchip/rk3399/clk_rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/clk_rk3399.c
@@ -7,7 +7,7 @@
#include <dm.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
-#include <asm/arch-rockchip/cru.h>
+#include <asm/arch-rockchip/cru_rk3399.h>
#include <linux/err.h>
static int rockchip_get_cruclk(struct udevice **devp)
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c
index 8687a9347ec..85c95172699 100644
--- a/arch/arm/mach-rockchip/rk3399/rk3399.c
+++ b/arch/arm/mach-rockchip/rk3399/rk3399.c
@@ -12,7 +12,7 @@
#include <asm/armv8/mmu.h>
#include <asm/arch-rockchip/bootrom.h>
#include <asm/arch-rockchip/clock.h>
-#include <asm/arch-rockchip/cru.h>
+#include <asm/arch-rockchip/cru_rk3399.h>
#include <asm/arch-rockchip/gpio.h>
#include <asm/arch-rockchip/grf_rk3399.h>
#include <asm/arch-rockchip/hardware.h>
diff --git a/drivers/clk/rockchip/clk_rk3288.c b/drivers/clk/rockchip/clk_rk3288.c
index a4ff1c41abb..794cad3ea22 100644
--- a/drivers/clk/rockchip/clk_rk3288.c
+++ b/drivers/clk/rockchip/clk_rk3288.c
@@ -15,7 +15,7 @@
#include <syscon.h>
#include <asm/global_data.h>
#include <asm/arch-rockchip/clock.h>
-#include <asm/arch-rockchip/cru.h>
+#include <asm/arch-rockchip/cru_rk3288.h>
#include <asm/arch-rockchip/grf_rk3288.h>
#include <asm/arch-rockchip/hardware.h>
#include <dt-bindings/clock/rk3288-cru.h>
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
index 6e87db18be0..3df942edd34 100644
--- a/drivers/clk/rockchip/clk_rk3399.c
+++ b/drivers/clk/rockchip/clk_rk3399.c
@@ -14,7 +14,7 @@
#include <syscon.h>
#include <bitfield.h>
#include <asm/arch-rockchip/clock.h>
-#include <asm/arch-rockchip/cru.h>
+#include <asm/arch-rockchip/cru_rk3399.h>
#include <asm/arch-rockchip/hardware.h>
#include <asm/global_data.h>
#include <dm/device-internal.h>
diff --git a/drivers/ram/rockchip/sdram_rk3288.c b/drivers/ram/rockchip/sdram_rk3288.c
index 25ceab98ee9..8136ad070a6 100644
--- a/drivers/ram/rockchip/sdram_rk3288.c
+++ b/drivers/ram/rockchip/sdram_rk3288.c
@@ -18,7 +18,7 @@
#include <regmap.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
-#include <asm/arch-rockchip/cru.h>
+#include <asm/arch-rockchip/cru_rk3288.h>
#include <asm/arch-rockchip/ddr_rk3288.h>
#include <asm/arch-rockchip/grf_rk3288.h>
#include <asm/arch-rockchip/hardware.h>
diff --git a/drivers/ram/rockchip/sdram_rk3399.c b/drivers/ram/rockchip/sdram_rk3399.c
index 6fa8f268770..b792caba203 100644
--- a/drivers/ram/rockchip/sdram_rk3399.c
+++ b/drivers/ram/rockchip/sdram_rk3399.c
@@ -16,7 +16,7 @@
#include <spl.h>
#include <syscon.h>
#include <asm/arch-rockchip/clock.h>
-#include <asm/arch-rockchip/cru.h>
+#include <asm/arch-rockchip/cru_rk3399.h>
#include <asm/arch-rockchip/grf_rk3399.h>
#include <asm/arch-rockchip/pmu_rk3399.h>
#include <asm/arch-rockchip/hardware.h>
diff --git a/drivers/video/rockchip/rk3288_mipi.c b/drivers/video/rockchip/rk3288_mipi.c
index 574ba8c6957..dcda469cffd 100644
--- a/drivers/video/rockchip/rk3288_mipi.c
+++ b/drivers/video/rockchip/rk3288_mipi.c
@@ -17,7 +17,7 @@
#include <linux/err.h>
#include <linux/kernel.h>
#include <asm/arch-rockchip/clock.h>
-#include <asm/arch-rockchip/cru.h>
+#include <asm/arch-rockchip/cru_rk3288.h>
#include <asm/arch-rockchip/grf_rk3288.h>
#include <asm/arch-rockchip/hardware.h>
#include <asm/arch-rockchip/rockchip_mipi_dsi.h>
diff --git a/drivers/video/rockchip/rk3399_mipi.c b/drivers/video/rockchip/rk3399_mipi.c
index 68316df871c..2f4e99f714e 100644
--- a/drivers/video/rockchip/rk3399_mipi.c
+++ b/drivers/video/rockchip/rk3399_mipi.c
@@ -17,7 +17,7 @@
#include <linux/err.h>
#include <linux/kernel.h>
#include <asm/arch-rockchip/clock.h>
-#include <asm/arch-rockchip/cru.h>
+#include <asm/arch-rockchip/cru_rk3399.h>
#include <asm/arch-rockchip/grf_rk3399.h>
#include <asm/arch-rockchip/hardware.h>
#include <asm/arch-rockchip/rockchip_mipi_dsi.h>
diff --git a/drivers/video/rockchip/rk_mipi.c b/drivers/video/rockchip/rk_mipi.c
index e7b5973ca58..c3768ce0b0e 100644
--- a/drivers/video/rockchip/rk_mipi.c
+++ b/drivers/video/rockchip/rk_mipi.c
@@ -17,7 +17,7 @@
#include <dm/uclass-internal.h>
#include <linux/kernel.h>
#include <asm/arch-rockchip/clock.h>
-#include <asm/arch-rockchip/cru.h>
+#include <asm/arch-rockchip/cru_rk3399.h>
#include <asm/arch-rockchip/grf_rk3399.h>
#include <asm/arch-rockchip/rockchip_mipi_dsi.h>
--
2.34.1
next prev parent reply other threads:[~2026-09-20 15:49 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-09-20 14:15 [PATCH RFC 00/11] rockchip: SoC info and reset cause printouts Massimo Pegorer
2026-09-20 14:15 ` Massimo Pegorer [this message]
2026-09-20 14:15 ` [PATCH RFC 02/11] rockchip: cru: move code from header to source file Massimo Pegorer
2026-09-20 14:15 ` [PATCH RFC 03/11] rockchip: cru: remove unnecessary common cru.h file Massimo Pegorer
2026-09-20 14:15 ` [PATCH RFC 04/11] rockchip: cru: improve and simplify reset cause handling Massimo Pegorer
2026-09-20 14:15 ` [PATCH RFC 05/11] arm: rockchip: support DISPLAY_CPUINFO on all Rockchip SoC Massimo Pegorer
2026-09-20 14:15 ` [PATCH RFC 06/11] arm: rockchip: unbind cpu-info.c from DISPLAY_CPUINFO Massimo Pegorer
2026-09-20 14:15 ` [PATCH RFC 07/11] arm: rockchip: print SoC detailed info with DISPLAY_CPUINFO Massimo Pegorer
2026-09-20 14:15 ` [PATCH RFC 08/11] arm: rockchip: print reset cause only when available Massimo Pegorer
2026-09-20 14:15 ` [PATCH RFC 09/11] arm: rockchip: do not print SoC info with DISPLAY_BOARDINFO Massimo Pegorer
2026-09-20 14:15 ` [PATCH RFC 10/11] configs: rockchip: resync Anbernic RG-DS with savedefconfig Massimo Pegorer
2026-09-20 14:15 ` [PATCH RFC 11/11] configs: rockchip: add DISPLAY_CPUINFO to keep SoC info print Massimo Pegorer
2026-09-20 15:49 ` [PATCH RFC 00/11] rockchip: SoC info and reset cause printouts Jonas Karlman
2026-09-21 16:51 ` Massimo Pegorer
2026-09-21 16:58 ` Quentin Schulz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260920-reset-v1-1-42820216369f@gmail.com \
--to=massimo.pegorer+oss@gmail.com \
--cc=ag.dev.uboot@gmail.com \
--cc=alchark@flipper.net \
--cc=andyshrk@163.com \
--cc=chenjh@rock-chips.com \
--cc=clamor95@gmail.com \
--cc=cnsztl@gmail.com \
--cc=coiaprant@gmail.com \
--cc=djw@t-chip.com.cn \
--cc=duwe@lst.de \
--cc=ehristev@kernel.org \
--cc=festevam@nabladev.com \
--cc=frank-w@public-files.de \
--cc=frattaroli.nicolas@gmail.com \
--cc=gajjar04akash@gmail.com \
--cc=heiko.stuebner@cherry.de \
--cc=hs@nabladev.com \
--cc=ilias.apalodimas@linaro.org \
--cc=inindev@gmail.com \
--cc=jacobe.zang@wesion.com \
--cc=jagan@edgeble.ai \
--cc=jiehui.he@foxmail.com \
--cc=jjm2473@gmail.com \
--cc=jjriek@verizon.net \
--cc=jonas@kwiboo.se \
--cc=kever.yang@rock-chips.com \
--cc=klaus.goger@cherry.de \
--cc=liujianfeng1994@gmail.com \
--cc=lukma@denx.de \
--cc=macromorgan@hotmail.com \
--cc=marek.vasut+usb@mailbox.org \
--cc=maximmosk4@gmail.com \
--cc=me@0upti.me \
--cc=naoki@radxa.com \
--cc=pbrobinson@gmail.com \
--cc=seb-dev@mail.de \
--cc=sjg@chromium.org \
--cc=sputnik@on-the-web.ch \
--cc=sunil@amarulasolutions.com \
--cc=tom@tom-fitzhenry.me.uk \
--cc=trini@konsulko.com \
--cc=u-boot@0leil.net \
--cc=u-boot@lists.u-boot-project.org \
--cc=zhangzj@rock-chips.com \
--cc=zhihong@nzhnb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.