[openwrt/openwrt] realtek: timer driver: activate for RTL838X devices

[LEDE Commits]

svanheule pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/ec675fb7446f25e1dbbdbf72d525ba7f771b0cb1

commit ec675fb7446f25e1dbbdbf72d525ba7f771b0cb1
Author: Markus Stockhausen <markus.stockhausen at gmx.de>
AuthorDate: Mon Oct 3 14:49:35 2022 +0200

    realtek: timer driver: activate for RTL838X devices
    
    Use the new timer driver for the RTL838X devices. Remove the no
    longer needed modules.
    
    Signed-off-by: Markus Stockhausen <markus.stockhausen at gmx.de>
    [correct timer compatible order, update selected symbols]
    Signed-off-by: Sander Vanheule <sander at svanheule.net>
---
 target/linux/realtek/dts-5.10/rtl838x.dtsi                     | 10 ++++++++++
 .../realtek/patches-5.10/300-mips-add-rtl838x-platform.patch   |  4 +---
 target/linux/realtek/rtl838x/config-5.10                       |  6 +++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/target/linux/realtek/dts-5.10/rtl838x.dtsi b/target/linux/realtek/dts-5.10/rtl838x.dtsi
index 256efb1c05..64e13e1ff3 100644
--- a/target/linux/realtek/dts-5.10/rtl838x.dtsi
+++ b/target/linux/realtek/dts-5.10/rtl838x.dtsi
@@ -152,6 +152,16 @@
 			#size-cells = <0>;
 		};
 
+		timer0: timer at 3100 {
+			compatible = "realtek,rtl8380-timer", "realtek,otto-timer";
+			reg = <0x3100 0x10>, <0x3110 0x10>, <0x3120 0x10>,
+			      <0x3130 0x10>, <0x3140 0x10>;
+
+			interrupt-parent = <&intc>;
+			interrupts = <29 4>, <28 4>, <17 4>, <16 4>, <15 4>;
+			clocks = <&ccu CLK_LXB>;
+		};
+
 		uart0: uart at 2000 {
 			compatible = "ns16550a";
 			reg = <0x2000 0x100>;
diff --git a/target/linux/realtek/patches-5.10/300-mips-add-rtl838x-platform.patch b/target/linux/realtek/patches-5.10/300-mips-add-rtl838x-platform.patch
index 591b157d40..3e1ace9660 100644
--- a/target/linux/realtek/patches-5.10/300-mips-add-rtl838x-platform.patch
+++ b/target/linux/realtek/patches-5.10/300-mips-add-rtl838x-platform.patch
@@ -25,7 +25,7 @@ Submitted-by: Birger Koblitz <git at birger-koblitz.de>
  platform-$(CONFIG_SGI_IP28)		+= sgi-ip22/
 --- a/arch/mips/Kconfig
 +++ b/arch/mips/Kconfig
-@@ -1037,8 +1037,62 @@ config NLM_XLP_BOARD
+@@ -1037,8 +1037,60 @@ config NLM_XLP_BOARD
  	  This board is based on Netlogic XLP Processor.
  	  Say Y here if you have a XLP based board.
  
@@ -54,8 +54,6 @@ Submitted-by: Birger Koblitz <git at birger-koblitz.de>
 +	bool "Realtek RTL838X based platforms"
 +	depends on RTL83XX
 +	select CPU_SUPPORTS_CPUFREQ
-+	select CSRC_R4K
-+	select CEVT_R4K
 +	select MIPS_EXTERNAL_TIMER
 +
 +config RTL839X
diff --git a/target/linux/realtek/rtl838x/config-5.10 b/target/linux/realtek/rtl838x/config-5.10
index c45f10dee0..d69345e301 100644
--- a/target/linux/realtek/rtl838x/config-5.10
+++ b/target/linux/realtek/rtl838x/config-5.10
@@ -7,8 +7,8 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 # CONFIG_BMIPS_CPUFREQ is not set
-CONFIG_CEVT_R4K=y
-CONFIG_CEVT_RTL9300=y
+# CONFIG_CEVT_R4K is not set
+# CONFIG_CEVT_RTL9300 is not set
 CONFIG_CLKDEV_LOOKUP=y
 CONFIG_CLKSRC_MMIO=y
 CONFIG_CLONE_BACKWARDS=y
@@ -51,7 +51,6 @@ CONFIG_CRYPTO_BLAKE2S=y
 CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2
 CONFIG_CRYPTO_RNG2=y
-CONFIG_CSRC_R4K=y
 CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DTC=y
@@ -187,6 +186,7 @@ CONFIG_POWER_RESET=y
 CONFIG_POWER_RESET_GPIO_RESTART=y
 CONFIG_POWER_RESET_SYSCON=y
 CONFIG_RATIONAL=y
+CONFIG_REALTEK_OTTO_TIMER=y
 CONFIG_REALTEK_OTTO_WDT=y
 CONFIG_REALTEK_PHY=y
 CONFIG_REALTEK_SOC_PHY=y