From 2b4cdb6941965df1b6f8abd68348b71117b09262 Mon Sep 17 00:00:00 2001 From: Markus Stockhausen Date: Fri, 13 Feb 2026 09:26:20 +0100 Subject: [PATCH] realtek: convert mach includes to rtl-otto Right now the global includes are all named rtl838x. This suggests that they are only for one of the four SoC types (RTL838x aka Maple) required. As we are talking about the Otto platform rename that accordingly. All the drivers have already adapted that some time ago. Signed-off-by: Markus Stockhausen Link: https://github.com/openwrt/openwrt/pull/22005 Signed-off-by: Robert Marko --- .../mips/include/asm/{mach-rtl838x => mach-rtl-otto}/ioremap.h | 0 .../mach-rtl83xx.h => mach-rtl-otto/mach-rtl-otto.h} | 0 .../realtek/files-6.12/arch/mips/{rtl838x => rtl-otto}/Makefile | 0 .../realtek/files-6.12/arch/mips/{rtl838x => rtl-otto}/Platform | 2 +- .../realtek/files-6.12/arch/mips/{rtl838x => rtl-otto}/prom.c | 2 +- .../realtek/files-6.12/arch/mips/{rtl838x => rtl-otto}/setup.c | 2 +- .../linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c | 2 +- .../linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/debugfs.c | 2 +- target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/dsa.c | 2 +- target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/qos.c | 2 +- .../linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.c | 2 +- .../linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.h | 2 +- .../linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl839x.c | 2 +- .../linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl930x.c | 2 +- .../linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl931x.c | 2 +- target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/tc.c | 2 +- .../linux/realtek/files-6.12/drivers/net/ethernet/rtl838x_eth.c | 2 +- .../realtek/patches-6.12/300-mips-add-rtl838x-platform.patch | 2 +- 18 files changed, 15 insertions(+), 15 deletions(-) rename target/linux/realtek/files-6.12/arch/mips/include/asm/{mach-rtl838x => mach-rtl-otto}/ioremap.h (100%) rename target/linux/realtek/files-6.12/arch/mips/include/asm/{mach-rtl838x/mach-rtl83xx.h => mach-rtl-otto/mach-rtl-otto.h} (100%) rename target/linux/realtek/files-6.12/arch/mips/{rtl838x => rtl-otto}/Makefile (100%) rename target/linux/realtek/files-6.12/arch/mips/{rtl838x => rtl-otto}/Platform (85%) rename target/linux/realtek/files-6.12/arch/mips/{rtl838x => rtl-otto}/prom.c (99%) rename target/linux/realtek/files-6.12/arch/mips/{rtl838x => rtl-otto}/setup.c (98%) diff --git a/target/linux/realtek/files-6.12/arch/mips/include/asm/mach-rtl838x/ioremap.h b/target/linux/realtek/files-6.12/arch/mips/include/asm/mach-rtl-otto/ioremap.h similarity index 100% rename from target/linux/realtek/files-6.12/arch/mips/include/asm/mach-rtl838x/ioremap.h rename to target/linux/realtek/files-6.12/arch/mips/include/asm/mach-rtl-otto/ioremap.h diff --git a/target/linux/realtek/files-6.12/arch/mips/include/asm/mach-rtl838x/mach-rtl83xx.h b/target/linux/realtek/files-6.12/arch/mips/include/asm/mach-rtl-otto/mach-rtl-otto.h similarity index 100% rename from target/linux/realtek/files-6.12/arch/mips/include/asm/mach-rtl838x/mach-rtl83xx.h rename to target/linux/realtek/files-6.12/arch/mips/include/asm/mach-rtl-otto/mach-rtl-otto.h diff --git a/target/linux/realtek/files-6.12/arch/mips/rtl838x/Makefile b/target/linux/realtek/files-6.12/arch/mips/rtl-otto/Makefile similarity index 100% rename from target/linux/realtek/files-6.12/arch/mips/rtl838x/Makefile rename to target/linux/realtek/files-6.12/arch/mips/rtl-otto/Makefile diff --git a/target/linux/realtek/files-6.12/arch/mips/rtl838x/Platform b/target/linux/realtek/files-6.12/arch/mips/rtl-otto/Platform similarity index 85% rename from target/linux/realtek/files-6.12/arch/mips/rtl838x/Platform rename to target/linux/realtek/files-6.12/arch/mips/rtl-otto/Platform index e824dee7b7..0b98b3927b 100644 --- a/target/linux/realtek/files-6.12/arch/mips/rtl838x/Platform +++ b/target/linux/realtek/files-6.12/arch/mips/rtl-otto/Platform @@ -1,5 +1,5 @@ # # Realtek RTL838x SoCs # -cflags-$(CONFIG_MACH_REALTEK_RTL) += -I$(srctree)/arch/mips/include/asm/mach-rtl838x/ +cflags-$(CONFIG_MACH_REALTEK_RTL) += -I$(srctree)/arch/mips/include/asm/mach-rtl-otto/ load-$(CONFIG_MACH_REALTEK_RTL) += 0xffffffff80100000 diff --git a/target/linux/realtek/files-6.12/arch/mips/rtl838x/prom.c b/target/linux/realtek/files-6.12/arch/mips/rtl-otto/prom.c similarity index 99% rename from target/linux/realtek/files-6.12/arch/mips/rtl838x/prom.c rename to target/linux/realtek/files-6.12/arch/mips/rtl-otto/prom.c index 9258bd5675..22b8030e4e 100644 --- a/target/linux/realtek/files-6.12/arch/mips/rtl838x/prom.c +++ b/target/linux/realtek/files-6.12/arch/mips/rtl-otto/prom.c @@ -15,7 +15,7 @@ #include #include -#include +#include #define RTL_SOC_BASE ((volatile void *) 0xB8000000) diff --git a/target/linux/realtek/files-6.12/arch/mips/rtl838x/setup.c b/target/linux/realtek/files-6.12/arch/mips/rtl-otto/setup.c similarity index 98% rename from target/linux/realtek/files-6.12/arch/mips/rtl838x/setup.c rename to target/linux/realtek/files-6.12/arch/mips/rtl-otto/setup.c index 73d689058e..ee0b488cfd 100644 --- a/target/linux/realtek/files-6.12/arch/mips/rtl838x/setup.c +++ b/target/linux/realtek/files-6.12/arch/mips/rtl-otto/setup.c @@ -25,7 +25,7 @@ #include #include -#include "mach-rtl83xx.h" +#include "mach-rtl-otto.h" extern struct rtl83xx_soc_info soc_info; diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c index a4598e205f..8a69ef35b2 100644 --- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c +++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/common.c @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include "rtl83xx.h" diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/debugfs.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/debugfs.c index 4216899798..6e0c251501 100644 --- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/debugfs.c +++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/debugfs.c @@ -2,7 +2,7 @@ #include #include -#include +#include #include "rtl83xx.h" diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/dsa.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/dsa.c index 06334c812a..8b72c00d66 100644 --- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/dsa.c +++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/dsa.c @@ -3,7 +3,7 @@ #include #include #include -#include +#include #include "rtl83xx.h" diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/qos.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/qos.c index 33e0331b0c..b620cc6350 100644 --- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/qos.c +++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/qos.c @@ -2,7 +2,7 @@ #include #include -#include +#include #include "rtl83xx.h" diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.c index 87d7579f8f..75f7fccb91 100644 --- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.c +++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only -#include +#include #include #include #include diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.h b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.h index a3da09f579..6750fe94df 100644 --- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.h +++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl838x.h @@ -3,7 +3,7 @@ #ifndef _RTL838X_H #define _RTL838X_H -#include +#include #include /* Register definition */ diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl839x.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl839x.c index a7e84931d7..13944f136c 100644 --- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl839x.c +++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl839x.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only -#include +#include #include #include "rtl83xx.h" diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl930x.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl930x.c index 83e38facd5..b079e63c70 100644 --- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl930x.c +++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl930x.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only -#include +#include #include #include diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl931x.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl931x.c index 992dc7794f..dbf51adfd2 100644 --- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl931x.c +++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/rtl931x.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only -#include +#include #include #include "rtl83xx.h" diff --git a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/tc.c b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/tc.c index 016f59fbd0..4a9b6b8c9f 100644 --- a/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/tc.c +++ b/target/linux/realtek/files-6.12/drivers/net/dsa/rtl83xx/tc.c @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include "rtl83xx.h" #include "rtl838x.h" diff --git a/target/linux/realtek/files-6.12/drivers/net/ethernet/rtl838x_eth.c b/target/linux/realtek/files-6.12/drivers/net/ethernet/rtl838x_eth.c index 4aa44fdc55..7a557afb64 100644 --- a/target/linux/realtek/files-6.12/drivers/net/ethernet/rtl838x_eth.c +++ b/target/linux/realtek/files-6.12/drivers/net/ethernet/rtl838x_eth.c @@ -20,7 +20,7 @@ #include #include -#include +#include #include "rtl838x_eth.h" int rtl83xx_setup_tc(struct net_device *dev, enum tc_setup_type type, void *type_data); diff --git a/target/linux/realtek/patches-6.12/300-mips-add-rtl838x-platform.patch b/target/linux/realtek/patches-6.12/300-mips-add-rtl838x-platform.patch index b15decaa93..c0ebb3184f 100644 --- a/target/linux/realtek/patches-6.12/300-mips-add-rtl838x-platform.patch +++ b/target/linux/realtek/patches-6.12/300-mips-add-rtl838x-platform.patch @@ -15,7 +15,7 @@ Submitted-by: Birger Koblitz platform-$(CONFIG_PIC32MZDA) += pic32/ platform-$(CONFIG_RALINK) += ralink/ platform-$(CONFIG_MIKROTIK_RB532) += rb532/ -+platform-$(CONFIG_MACH_REALTEK_RTL) += rtl838x/ ++platform-$(CONFIG_MACH_REALTEK_RTL) += rtl-otto/ platform-$(CONFIG_SGI_IP22) += sgi-ip22/ platform-$(CONFIG_SGI_IP27) += sgi-ip27/ platform-$(CONFIG_SGI_IP28) += sgi-ip22/