realtek: timer driver: activate for RTL839X devices

Use the	new timer driver for the RTL839X devices and 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/rtl839x.dtsi b/target/linux/realtek/dts-5.10/rtl839x.dtsi
index 78e2454b7e28ccbcd1ddb6cc4dc75b45a15212e9..91d6e17a9ea1b78dfcd0deb84760519d453d8fbd 100644 (file)
--- a/target/linux/realtek/dts-5.10/rtl839x.dtsi
+++ b/target/linux/realtek/dts-5.10/rtl839x.dtsi
@@ -177,6 +177,16 @@
                        #size-cells = <0>;
                };
 
+               timer0: timer@3100 {
+                       compatible = "realtek,rtl8390-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 3e1ace96602a53208da00fbfec7385a7ad6461b4..eaf03c74f9c3e14abb30c3d9acde9af7718a66de 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,60 @@ config NLM_XLP_BOARD
+@@ -1037,8 +1037,58 @@ config NLM_XLP_BOARD
          This board is based on Netlogic XLP Processor.
          Say Y here if you have a XLP based board.
  
@@ -60,8 +60,6 @@ Submitted-by: Birger Koblitz <git@birger-koblitz.de>
 +      bool "Realtek RTL839X based platforms"
 +      depends on RTL83XX
 +      select CPU_SUPPORTS_CPUFREQ
-+      select CSRC_R4K
-+      select CEVT_R4K
 +      select MIPS_EXTERNAL_TIMER
 +      select SYS_SUPPORTS_MULTITHREADING
 +

diff --git a/target/linux/realtek/rtl839x/config-5.10 b/target/linux/realtek/rtl839x/config-5.10
index c685a3f24bed3a5950189322bb7d13dd15186819..57eded97fcd998d47c41e478b8058770e9e947dd 100644 (file)
--- a/target/linux/realtek/rtl839x/config-5.10
+++ b/target/linux/realtek/rtl839x/config-5.10
@@ -7,10 +7,7 @@ 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_CLKDEV_LOOKUP=y
-CONFIG_CLKSRC_MMIO=y
 CONFIG_CLONE_BACKWARDS=y
 CONFIG_COMMON_CLK=y
 CONFIG_COMMON_CLK_BOSTON=y
@@ -53,7 +50,6 @@ CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y
 CONFIG_CRYPTO_LIB_POLY1305_RSIZE=2
 CONFIG_CRYPTO_NULL2=y
 CONFIG_CRYPTO_RNG2=y
-CONFIG_CSRC_R4K=y
 CONFIG_DEBUG_SECTION_MISMATCH=y
 CONFIG_DMA_NONCOHERENT=y
 CONFIG_DTC=y
@@ -185,6 +181,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