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@gmx.de>
[correct timer compatible order, update selected symbols]
Signed-off-by: Sander Vanheule <sander@svanheule.net>

diff --git a/target/linux/realtek/dts-5.10/rtl838x.dtsi b/target/linux/realtek/dts-5.10/rtl838x.dtsi
index 256efb1c059b7913598fe90ea8df71ddbc3603c2..64e13e1ff37af88a294d5e85a378a2a785965ca6 100644 (file)
--- 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@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@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 591b157d40fe03f5833847ddc8d61b09da5ea5e4..3e1ace96602a53208da00fbfec7385a7ad6461b4 100644 (file)
--- 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@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@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 c45f10dee0c59dbf7bd5b9990756a2b845a5abe8..d69345e30120639842315e1f27d8155a9e1eee9b 100644 (file)
--- 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