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 <markus.stockhausen@gmx.de>
Link: https://github.com/openwrt/openwrt/pull/22005
Signed-off-by: Robert Marko <robimarko@gmail.com>

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 e824dee7b724d406744c6420250242fdb1498627..0b98b3927bde11dacd821c56db28367b21934a87 100644 (file)
--- 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
 #
 #
 # 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
 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 9258bd56750eaf45278c9ee8490dba65b41127ad..22b8030e4e8b7563dc1a3c5ee664765b6f2e727c 100644 (file)
--- 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 <asm/smp-ops.h>
 #include <linux/smp.h>
 
 #include <asm/smp-ops.h>
 #include <linux/smp.h>
 

-#include <mach-rtl83xx.h>
+#include <mach-rtl-otto.h>

 
 #define RTL_SOC_BASE                   ((volatile void *) 0xB8000000)
 
 
 #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 73d689058e7d18495aa112461181de19355a9bee..ee0b488cfd59a334270dd41aad5a530f4120315d 100644 (file)
--- 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 <asm/prom.h>
 #include <asm/smp-ops.h>
 
 #include <asm/prom.h>
 #include <asm/smp-ops.h>
 

-#include "mach-rtl83xx.h"
+#include "mach-rtl-otto.h"

 
 extern struct rtl83xx_soc_info soc_info;
 
 
 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 a4598e205fafb4e9a79b1a8122e3adfe8bca358f..8a69ef35b24d9c7277e1d51be5e64722a7ee60a1 100644 (file)
--- 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 <linux/platform_device.h>
 #include <linux/rhashtable.h>
 #include <linux/of_net.h>
 #include <linux/platform_device.h>
 #include <linux/rhashtable.h>
 #include <linux/of_net.h>

-#include <asm/mach-rtl838x/mach-rtl83xx.h>
+#include <asm/mach-rtl-otto/mach-rtl-otto.h>

 
 #include "rtl83xx.h"
 
 
 #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 4216899798609e83c104748a670b4aced3a496f9..6e0c251501ba27e8a63e5581d78609af0ae850b7 100644 (file)
--- 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 <linux/debugfs.h>
 #include <linux/kernel.h>
 
 #include <linux/debugfs.h>
 #include <linux/kernel.h>

-#include <asm/mach-rtl838x/mach-rtl83xx.h>
+#include <asm/mach-rtl-otto/mach-rtl-otto.h>

 
 #include "rtl83xx.h"
 
 
 #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 06334c812acfd254288529f5f7facb6a918b07e6..8b72c00d667c8192ff27d784c2cd8655ef344a0b 100644 (file)
--- 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 <net/dsa.h>
 #include <linux/etherdevice.h>
 #include <linux/if_bridge.h>
 #include <net/dsa.h>
 #include <linux/etherdevice.h>
 #include <linux/if_bridge.h>

-#include <asm/mach-rtl838x/mach-rtl83xx.h>
+#include <asm/mach-rtl-otto/mach-rtl-otto.h>

 
 #include "rtl83xx.h"
 
 
 #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 33e0331b0c387cf79b005b579669aa67398e7d40..b620cc6350e46824c2ee93dc7b3deb7aeedf21ef 100644 (file)
--- 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 <net/dsa.h>
 #include <linux/delay.h>
 
 #include <net/dsa.h>
 #include <linux/delay.h>

-#include <asm/mach-rtl838x/mach-rtl83xx.h>
+#include <asm/mach-rtl-otto/mach-rtl-otto.h>

 
 #include "rtl83xx.h"
 
 
 #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 87d7579f8f201cee3eab8c04951d3cb62a3e05c3..75f7fccb9157dba432faf2b1f81ee3952b5f3109 100644 (file)
--- 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
 
 // SPDX-License-Identifier: GPL-2.0-only
 

-#include <asm/mach-rtl838x/mach-rtl83xx.h>
+#include <asm/mach-rtl-otto/mach-rtl-otto.h>

 #include <linux/etherdevice.h>
 #include <linux/iopoll.h>
 #include <net/nexthop.h>
 #include <linux/etherdevice.h>
 #include <linux/iopoll.h>
 #include <net/nexthop.h>

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 a3da09f57957414d3c07ec03ee0179a5743d79b9..6750fe94dfc3a825f7fd856de91ae133cbe185bf 100644 (file)
--- 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
 
 #ifndef _RTL838X_H
 #define _RTL838X_H
 

-#include <asm/mach-rtl838x/mach-rtl83xx.h>
+#include <asm/mach-rtl-otto/mach-rtl-otto.h>

 #include <net/dsa.h>
 
 /* Register definition */
 #include <net/dsa.h>
 
 /* 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 a7e84931d72c4434c6ff0f53287613bd796fea2a..13944f136c1528028ea5adea938c53c679f58844 100644 (file)
--- 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
 
 // SPDX-License-Identifier: GPL-2.0-only
 

-#include <asm/mach-rtl838x/mach-rtl83xx.h>
+#include <asm/mach-rtl-otto/mach-rtl-otto.h>

 #include <linux/etherdevice.h>
 
 #include "rtl83xx.h"
 #include <linux/etherdevice.h>
 
 #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 83e38facd525e935279c6939ba96230b951c6b34..b079e63c70e66e018c63780f47e4e30c1c74efae 100644 (file)
--- 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
 
 // SPDX-License-Identifier: GPL-2.0-only
 

-#include <asm/mach-rtl838x/mach-rtl83xx.h>
+#include <asm/mach-rtl-otto/mach-rtl-otto.h>

 #include <linux/etherdevice.h>
 #include <linux/inetdevice.h>
 
 #include <linux/etherdevice.h>
 #include <linux/inetdevice.h>
 

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 992dc7794fd5aee394a4d5d9f3956337edb56ff0..dbf51adfd27f6c239a25a24eec5deea73e54b818 100644 (file)
--- 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
 
 // SPDX-License-Identifier: GPL-2.0-only
 

-#include <asm/mach-rtl838x/mach-rtl83xx.h>
+#include <asm/mach-rtl-otto/mach-rtl-otto.h>

 #include <linux/etherdevice.h>
 
 #include "rtl83xx.h"
 #include <linux/etherdevice.h>
 
 #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 016f59fbd0218fc5bdd91b4537308eb9e9603c94..4a9b6b8c9fce0579b9c423a6f071be297e4c7c3f 100644 (file)
--- 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 <linux/netdevice.h>
 #include <net/flow_offload.h>
 #include <linux/rhashtable.h>
 #include <linux/netdevice.h>
 #include <net/flow_offload.h>
 #include <linux/rhashtable.h>

-#include <asm/mach-rtl838x/mach-rtl83xx.h>
+#include <asm/mach-rtl-otto/mach-rtl-otto.h>

 
 #include "rtl83xx.h"
 #include "rtl838x.h"
 
 #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 4aa44fdc5542d5af3d17975b4a5f0c3e0952c603..7a557afb64d210509c3d17950f7ba8d508b0c005 100644 (file)
--- 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 <net/dsa.h>
 #include <net/switchdev.h>
 
 #include <net/dsa.h>
 #include <net/switchdev.h>
 

-#include <asm/mach-rtl838x/mach-rtl83xx.h>
+#include <asm/mach-rtl-otto/mach-rtl-otto.h>

 #include "rtl838x_eth.h"
 
 int rtl83xx_setup_tc(struct net_device *dev, enum tc_setup_type type, void *type_data);
 #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 b15decaa936de606eea66c702b3bef267fab4c7b..c0ebb3184f5298cf81aa5c6772424a6227dda366 100644 (file)
--- 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 <git@birger-koblitz.de>
  platform-$(CONFIG_PIC32MZDA)          += pic32/
  platform-$(CONFIG_RALINK)             += ralink/
  platform-$(CONFIG_MIKROTIK_RB532)     += rb532/
  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/
  platform-$(CONFIG_SGI_IP22)           += sgi-ip22/
  platform-$(CONFIG_SGI_IP27)           += sgi-ip27/
  platform-$(CONFIG_SGI_IP28)           += sgi-ip22/