ExternalVendorCode/openwrt
1
0
Fork 0
mirror of https://github.com/openwrt/openwrt.git synced 2024-12-18 21:28:02 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

realtek: align kernel config with upstream

Browse Source 
Since the start of the Realtek target OpenWrt works with RTL83XX as the
target architecture. Upstream is using MACH_REALTEK_RTL instead. To
simplify further development align that.

Signed-off-by: Markus Stockhausen <markus.stockhausen@gmx.de>
Link: https://github.com/openwrt/openwrt/pull/16963
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
Markus Stockhausen 2024-11-15 01:32:47 -05:00 committed by Hauke Mehrtens
parent a6e98a810d
commit 65964c42f8
15 changed files with 39 additions and 144 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
target/linux/realtek/files-6.6/arch/mips/rtl838x/Platform
View File

@ -1,5 +1,5 @@
# #
# Realtek RTL838x SoCs # Realtek RTL838x SoCs
# #
cflags-$(CONFIG_RTL83XX) += -I$(srctree)/arch/mips/include/asm/mach-rtl838x/ cflags-$(CONFIG_MACH_REALTEK_RTL) += -I$(srctree)/arch/mips/include/asm/mach-rtl838x/
load-$(CONFIG_RTL83XX) += 0xffffffff80100000 load-$(CONFIG_MACH_REALTEK_RTL) += 0xffffffff80100000

4
target/linux/realtek/files-6.6/drivers/clk/realtek/Kconfig
View File

@ -2,13 +2,13 @@
menuconfig COMMON_CLK_REALTEK menuconfig COMMON_CLK_REALTEK
bool "Support for Realtek's clock controllers" bool "Support for Realtek's clock controllers"
depends on RTL83XX depends on MACH_REALTEK_RTL
if COMMON_CLK_REALTEK if COMMON_CLK_REALTEK
config COMMON_CLK_RTL83XX config COMMON_CLK_RTL83XX
bool "Clock driver for Realtek RTL83XX" bool "Clock driver for Realtek RTL83XX"
depends on RTL83XX depends on MACH_REALTEK_RTL
select SRAM select SRAM
help help
This driver adds support for the Realtek RTL83xx series basic clocks. This driver adds support for the Realtek RTL83xx series basic clocks.

2
target/linux/realtek/files-6.6/drivers/net/dsa/rtl83xx/Kconfig
View File

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only # SPDX-License-Identifier: GPL-2.0-only
config NET_DSA_RTL83XX config NET_DSA_RTL83XX
tristate "Realtek RTL838x/RTL839x switch support" tristate "Realtek RTL838x/RTL839x switch support"
depends on RTL83XX depends on MACH_REALTEK_RTL
select NET_DSA_TAG_TRAILER select NET_DSA_TAG_TRAILER
help help
This driver adds support for Realtek RTL83xx series switching. This driver adds support for Realtek RTL83xx series switching.

51
target/linux/realtek/patches-6.6/300-mips-add-rtl838x-platform.patch
View File

@ -9,64 +9,67 @@ configurations for the SoCs, which are introduced in addition.
Submitted-by: Birger Koblitz <git@birger-koblitz.de> Submitted-by: Birger Koblitz <git@birger-koblitz.de>
--- ---
arch/mips/Kbuild.platforms | 1 +
arch/mips/Kconfig | 57 ++++++++++++++
2 files changed, 58 insertions(+)
--- a/arch/mips/Kbuild.platforms --- a/arch/mips/Kbuild.platforms
+++ b/arch/mips/Kbuild.platforms +++ b/arch/mips/Kbuild.platforms
@@ -22,6 +22,7 @@ platform-$(CONFIG_MACH_NINTENDO64) += n6 @@ -22,6 +22,7 @@ platform-$(CONFIG_MACH_NINTENDO64) += n6
platform-$(CONFIG_PIC32MZDA) += pic32/ platform-$(CONFIG_PIC32MZDA) += pic32/
platform-$(CONFIG_RALINK) += ralink/ platform-$(CONFIG_RALINK) += ralink/
platform-$(CONFIG_MIKROTIK_RB532) += rb532/ platform-$(CONFIG_MIKROTIK_RB532) += rb532/
+platform-$(CONFIG_RTL83XX) += rtl838x/ +platform-$(CONFIG_MACH_REALTEK_RTL) += rtl838x/
platform-$(CONFIG_SGI_IP22) += sgi-ip22/ platform-$(CONFIG_SGI_IP22) += sgi-ip22/
platform-$(CONFIG_SGI_IP27) += sgi-ip27/ platform-$(CONFIG_SGI_IP27) += sgi-ip27/
platform-$(CONFIG_SGI_IP28) += sgi-ip22/ platform-$(CONFIG_SGI_IP28) += sgi-ip22/
--- a/arch/mips/Kconfig --- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig +++ b/arch/mips/Kconfig
@@ -968,8 +968,58 @@ config CAVIUM_OCTEON_SOC @@ -620,21 +620,23 @@ config RALINK
Hikari
Say Y here for most Octeon reference boards.
+config RTL83XX config MACH_REALTEK_RTL
+ bool "Realtek based platforms" bool "Realtek RTL838x/RTL839x based machines"
+ select DMA_NONCOHERENT - select MIPS_GENERIC
+ select IRQ_MIPS_CPU select DMA_NONCOHERENT
select IRQ_MIPS_CPU
- select CSRC_R4K
- select CEVT_R4K
select SYS_HAS_CPU_MIPS32_R1
select SYS_HAS_CPU_MIPS32_R2
select SYS_SUPPORTS_BIG_ENDIAN
select SYS_SUPPORTS_32BIT_KERNEL
select SYS_SUPPORTS_MIPS16
- select SYS_SUPPORTS_MULTITHREADING
- select SYS_SUPPORTS_VPE_LOADER
select BOOT_RAW
select PINCTRL
select USE_OF
+ select NO_EXCEPT_FILL + select NO_EXCEPT_FILL
+ select SYS_HAS_CPU_MIPS32_R1
+ select SYS_HAS_CPU_MIPS32_R2
+ select SYS_SUPPORTS_BIG_ENDIAN
+ select SYS_SUPPORTS_HIGHMEM + select SYS_SUPPORTS_HIGHMEM
+ select SYS_SUPPORTS_32BIT_KERNEL
+ select SYS_SUPPORTS_MIPS16
+ select SYS_HAS_EARLY_PRINTK + select SYS_HAS_EARLY_PRINTK
+ select SYS_HAS_EARLY_PRINTK_8250 + select SYS_HAS_EARLY_PRINTK_8250
+ select USE_GENERIC_EARLY_PRINTK_8250 + select USE_GENERIC_EARLY_PRINTK_8250
+ select BOOT_RAW
+ select PINCTRL
+ select ARCH_HAS_RESET_CONTROLLER + select ARCH_HAS_RESET_CONTROLLER
+ select RESET_CONTROLLER + select RESET_CONTROLLER
+ select USE_OF
+ config SGI_IP22
bool "SGI IP22 (Indy/Indigo2)"
@@ -970,6 +972,36 @@ config CAVIUM_OCTEON_SOC
endchoice endchoice
+config RTL838X +config RTL838X
+ bool "Realtek RTL838X based platforms" + bool "Realtek RTL838X based platforms"
+ depends on RTL83XX + depends on MACH_REALTEK_RTL
+ select CPU_SUPPORTS_CPUFREQ + select CPU_SUPPORTS_CPUFREQ
+ select MIPS_EXTERNAL_TIMER + select MIPS_EXTERNAL_TIMER
+ +
+config RTL839X +config RTL839X
+ bool "Realtek RTL839X based platforms" + bool "Realtek RTL839X based platforms"
+ depends on RTL83XX + depends on MACH_REALTEK_RTL
+ select CPU_SUPPORTS_CPUFREQ + select CPU_SUPPORTS_CPUFREQ
+ select MIPS_EXTERNAL_TIMER + select MIPS_EXTERNAL_TIMER
+ select SYS_SUPPORTS_MULTITHREADING + select SYS_SUPPORTS_MULTITHREADING
+ +
+config RTL930X +config RTL930X
+ bool "Realtek RTL930X based platforms" + bool "Realtek RTL930X based platforms"
+ depends on RTL83XX + depends on MACH_REALTEK_RTL
+ select MIPS_CPU_SCACHE + select MIPS_CPU_SCACHE
+ select MIPS_EXTERNAL_TIMER + select MIPS_EXTERNAL_TIMER
+ select SYS_SUPPORTS_MULTITHREADING + select SYS_SUPPORTS_MULTITHREADING

2
target/linux/realtek/patches-6.6/301-gpio-add-rtl8231-driver.patch
View File

@ -31,7 +31,7 @@ Submitted-by: John Crispin <john@phrozen.org>
+config GPIO_RTL8231 +config GPIO_RTL8231
+ tristate "RTL8231 GPIO" + tristate "RTL8231 GPIO"
+ depends on RTL83XX + depends on MACH_REALTEK_RTL
+ help + help
+ Say yes here to support Realtek RTL8231 GPIO expansion chips. + Say yes here to support Realtek RTL8231 GPIO expansion chips.
+ +

26
target/linux/realtek/patches-6.6/303-gpio-update-dependencies-for-gpio-realtek-otto.patch
View File

@ -1,26 +0,0 @@
From 9bac1c20b8f39f2e0e342b087add5093b94feaed Mon Sep 17 00:00:00 2001
From: INAGAKI Hiroshi <musashino.open@gmail.com>
Date: Wed, 5 May 2021 22:05:39 +0900
Subject: realtek: backport gpio-realtek-otto driver from 5.13 to 5.10
This patch backports "gpio-realtek-otto" driver to Kernel 5.10.
"MACH_REALTEK_RTL" is used as a platform name in upstream, but "RTL838X"
is used in OpenWrt, so update the dependency by the additional patch.
Submitted-by: INAGAKI Hiroshi <musashino.open@gmail.com>
---
drivers/gpio/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/gpio/Kconfig
+++ b/drivers/gpio/Kconfig
@@ -527,8 +527,8 @@ config GPIO_RDA
config GPIO_REALTEK_OTTO
tristate "Realtek Otto GPIO support"
- depends on MACH_REALTEK_RTL
- default MACH_REALTEK_RTL
+ depends on RTL83XX
+ default RTL838X
select GPIO_GENERIC
select GPIOLIB_IRQCHIP
help

25
target/linux/realtek/patches-6.6/304-spi-update-dependency-for-spi-realtek-rtl.patch
View File

@ -1,25 +0,0 @@
From 0b000cbfe0aa0323bffa855ef8449c0687a4c071 Mon Sep 17 00:00:00 2001
From: INAGAKI Hiroshi <musashino.open@gmail.com>
Date: Thu, 6 May 2021 19:30:58 +0900
Subject: realtek: backport spi-realtek-rtl driver from 5.12 to 5.10
This patch backports "spi-realtek-rtl" driver to Kernel 5.10 from 5.12.
"MACH_REALTEK_RTL" is used as a platform name in upstream, but "RTL838X"
is used in OpenWrt, so update the dependency by the additional patch.
Submitted-by: INAGAKI Hiroshi <musashino.open@gmail.com>
---
drivers/spi/Makefile | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/spi/Makefile
+++ b/drivers/spi/Makefile
@@ -114,7 +114,7 @@ obj-$(CONFIG_SPI_QUP) += spi-qup.o
obj-$(CONFIG_SPI_ROCKCHIP) += spi-rockchip.o
obj-$(CONFIG_SPI_ROCKCHIP_SFC) += spi-rockchip-sfc.o
obj-$(CONFIG_SPI_RB4XX) += spi-rb4xx.o
-obj-$(CONFIG_MACH_REALTEK_RTL) += spi-realtek-rtl.o
+obj-$(CONFIG_RTL83XX) += spi-realtek-rtl.o
obj-$(CONFIG_SPI_RPCIF) += spi-rpc-if.o
obj-$(CONFIG_SPI_RSPI) += spi-rspi.o
obj-$(CONFIG_SPI_RZV2M_CSI) += spi-rzv2m-csi.o

25
target/linux/realtek/patches-6.6/305-irqchip-update-dependency-for-irq-realtek-rtl.patch
View File

@ -1,25 +0,0 @@
From 2cd00b51470a30198b048a5fca48a04db77e29cc Mon Sep 17 00:00:00 2001
From: INAGAKI Hiroshi <musashino.open@gmail.com>
Date: Fri, 21 May 2021 23:16:37 +0900
Subject: [PATCH] realtek: backport irq-realtek-rtl driver from 5.12 to 5.10
This patch backports "irq-realtek-rtl" driver to Kernel 5.10 from 5.12.
"MACH_REALTEK_RTL" is used as a platform name in upstream, but "RTL838X"
is used in OpenWrt, so update the dependency by the additional patch.
Submitted-by: INAGAKI Hiroshi <musashino.open@gmail.com>
---
drivers/irqchip/Makefile | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@ -114,7 +114,7 @@ obj-$(CONFIG_LOONGSON_PCH_MSI) += irq-l
obj-$(CONFIG_LOONGSON_PCH_LPC) += irq-loongson-pch-lpc.o
obj-$(CONFIG_MST_IRQ) += irq-mst-intc.o
obj-$(CONFIG_SL28CPLD_INTC) += irq-sl28cpld.o
-obj-$(CONFIG_MACH_REALTEK_RTL) += irq-realtek-rtl.o
+obj-$(CONFIG_RTL83XX) += irq-realtek-rtl.o
obj-$(CONFIG_WPCM450_AIC) += irq-wpcm450-aic.o
obj-$(CONFIG_IRQ_IDT3243X) += irq-idt3243x.o
obj-$(CONFIG_APPLE_AIC) += irq-apple-aic.o

32
target/linux/realtek/patches-6.6/307-wdt-update-dependency-for-realtek-otto-wdt.patch
View File

@ -1,32 +0,0 @@
From b8fc5eecdc5d33cf261986436597b5482ab856da Mon Sep 17 00:00:00 2001
From: Sander Vanheule <sander@svanheule.net>
Date: Sun, 14 Nov 2021 19:45:32 +0100
Subject: [PATCH] realtek: Backport Realtek Otto WDT driver
Add patch submitted upstream to linux-watchdog and replace the MIPS
architecture symbols. Requires one extra patch for the DIV_ROUND_*
macros, which have moved to a different header since 5.10.
Submitted-by: Sander Vanheule <sander@svanheule.net>
Tested-by: Stijn Segers <foss@volatilesystems.org>
Tested-by: Paul Fertser <fercerpav@gmail.com>
Tested-by: Stijn Tintel <stijn@linux-ipv6.be>
---
drivers/watchdog/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/watchdog/Kconfig
+++ b/drivers/watchdog/Kconfig
@@ -977,10 +977,10 @@ config RTD119X_WATCHDOG
config REALTEK_OTTO_WDT
tristate "Realtek Otto MIPS watchdog support"
- depends on MACH_REALTEK_RTL || COMPILE_TEST
+ depends on RTL83XX
depends on COMMON_CLK
select WATCHDOG_CORE
- default MACH_REALTEK_RTL
+ default RTL83XX
help
Say Y here to include support for the watchdog timer on Realtek
RTL838x, RTL839x, RTL930x SoCs. This watchdog has pretimeout

2
target/linux/realtek/patches-6.6/716-net-ethernet-add-support-for-rtl838x-ethernet.patch
View File

@ -29,7 +29,7 @@ Submitted-by: John Crispin <john@phrozen.org>
+ +
+config NET_RTL838X +config NET_RTL838X
+ tristate "Realtek rtl838x Ethernet MAC support" + tristate "Realtek rtl838x Ethernet MAC support"
+ depends on RTL83XX + depends on MACH_REALTEK_RTL
+ help + help
+ Say Y here if you want to use the Realtek rtl838x Gbps Ethernet MAC. + Say Y here if you want to use the Realtek rtl838x Gbps Ethernet MAC.
+ +

2
target/linux/realtek/patches-6.6/720-add-rtl-phy.patch
View File

@ -20,7 +20,7 @@ Submitted-by: Birger Koblitz <mail@birger-koblitz.de>
+config REALTEK_SOC_PHY +config REALTEK_SOC_PHY
+ tristate "Realtek SoC PHYs" + tristate "Realtek SoC PHYs"
+ depends on RTL83XX + depends on MACH_REALTEK_RTL
+ help + help
+ Supports the PHYs found in combination with Realtek Switch SoCs + Supports the PHYs found in combination with Realtek Switch SoCs
+ +

2
target/linux/realtek/rtl838x/config-6.6
View File

@ -116,6 +116,7 @@ CONFIG_JFFS2_ZLIB=y
CONFIG_LEDS_GPIO=y CONFIG_LEDS_GPIO=y
CONFIG_LIBFDT=y CONFIG_LIBFDT=y
CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y
CONFIG_MACH_REALTEK_RTL=y
CONFIG_MARVELL_PHY=y CONFIG_MARVELL_PHY=y
CONFIG_MDIO_BUS=y CONFIG_MDIO_BUS=y
CONFIG_MDIO_DEVICE=y CONFIG_MDIO_DEVICE=y
@ -192,7 +193,6 @@ CONFIG_REGMAP_MMIO=y
CONFIG_RESET_CONTROLLER=y CONFIG_RESET_CONTROLLER=y
CONFIG_RTL838X=y CONFIG_RTL838X=y
# CONFIG_RTL839X is not set # CONFIG_RTL839X is not set
CONFIG_RTL83XX=y
# CONFIG_RTL930X is not set # CONFIG_RTL930X is not set
CONFIG_SERIAL_MCTRL_GPIO=y CONFIG_SERIAL_MCTRL_GPIO=y
CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_OF_PLATFORM=y

2
target/linux/realtek/rtl839x/config-6.6
View File

@ -115,6 +115,7 @@ CONFIG_JFFS2_ZLIB=y
CONFIG_LEDS_GPIO=y CONFIG_LEDS_GPIO=y
CONFIG_LIBFDT=y CONFIG_LIBFDT=y
CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y
CONFIG_MACH_REALTEK_RTL=y
CONFIG_MARVELL_PHY=y CONFIG_MARVELL_PHY=y
CONFIG_MDIO_BUS=y CONFIG_MDIO_BUS=y
CONFIG_MDIO_DEVICE=y CONFIG_MDIO_DEVICE=y
@ -204,7 +205,6 @@ CONFIG_RFS_ACCEL=y
CONFIG_RPS=y CONFIG_RPS=y
# CONFIG_RTL838X is not set # CONFIG_RTL838X is not set
CONFIG_RTL839X=y CONFIG_RTL839X=y
CONFIG_RTL83XX=y
# CONFIG_RTL930X is not set # CONFIG_RTL930X is not set
CONFIG_SERIAL_MCTRL_GPIO=y CONFIG_SERIAL_MCTRL_GPIO=y
CONFIG_SERIAL_OF_PLATFORM=y CONFIG_SERIAL_OF_PLATFORM=y

2
target/linux/realtek/rtl930x/config-6.6
View File

@ -97,6 +97,7 @@ CONFIG_JFFS2_ZLIB=y
CONFIG_LEDS_GPIO=y CONFIG_LEDS_GPIO=y
CONFIG_LIBFDT=y CONFIG_LIBFDT=y
CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y
CONFIG_MACH_REALTEK_RTL=y
CONFIG_MARVELL_PHY=y CONFIG_MARVELL_PHY=y
CONFIG_MDIO_BUS=y CONFIG_MDIO_BUS=y
CONFIG_MDIO_DEVICE=y CONFIG_MDIO_DEVICE=y
@ -172,7 +173,6 @@ CONFIG_REGMAP_MMIO=y
CONFIG_RESET_CONTROLLER=y CONFIG_RESET_CONTROLLER=y
# CONFIG_RTL838X is not set # CONFIG_RTL838X is not set
# CONFIG_RTL839X is not set # CONFIG_RTL839X is not set
CONFIG_RTL83XX=y
CONFIG_RTL930X=y CONFIG_RTL930X=y
# CONFIG_RTL931X is not set # CONFIG_RTL931X is not set
CONFIG_SERIAL_MCTRL_GPIO=y CONFIG_SERIAL_MCTRL_GPIO=y

2
target/linux/realtek/rtl931x/config-6.6
View File

@ -106,6 +106,7 @@ CONFIG_KMAP_LOCAL=y
CONFIG_LEDS_GPIO=y CONFIG_LEDS_GPIO=y
CONFIG_LIBFDT=y CONFIG_LIBFDT=y
CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y
CONFIG_MACH_REALTEK_RTL=y
CONFIG_MARVELL_PHY=y CONFIG_MARVELL_PHY=y
CONFIG_MDIO_BUS=y CONFIG_MDIO_BUS=y
CONFIG_MDIO_DEVICE=y CONFIG_MDIO_DEVICE=y
@ -195,7 +196,6 @@ CONFIG_RFS_ACCEL=y
CONFIG_RPS=y CONFIG_RPS=y
# CONFIG_RTL838X is not set # CONFIG_RTL838X is not set
# CONFIG_RTL839X is not set # CONFIG_RTL839X is not set
CONFIG_RTL83XX=y
CONFIG_RTL930X=y CONFIG_RTL930X=y
CONFIG_RTL931X=y CONFIG_RTL931X=y
CONFIG_SENSORS_GPIO_FAN=y CONFIG_SENSORS_GPIO_FAN=y