005-v6.5-04-mips-ralink-rt305x-remove-clock-related-code.patch 4.5 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145
  1. From daf73c70f69386fb15960526772ef584a4efcaf2 Mon Sep 17 00:00:00 2001
  2. From: Sergio Paracuellos <[email protected]>
  3. Date: Mon, 19 Jun 2023 06:09:36 +0200
  4. Subject: [PATCH 4/9] mips: ralink: rt305x: remove clock related code
  5. A properly clock driver for ralink SoCs has been added. Hence there is no
  6. need to have clock related code in 'arch/mips/ralink' folder anymore.
  7. Signed-off-by: Sergio Paracuellos <[email protected]>
  8. Signed-off-by: Thomas Bogendoerfer <[email protected]>
  9. ---
  10. arch/mips/include/asm/mach-ralink/rt305x.h | 21 --------
  11. arch/mips/ralink/rt305x.c | 78 ------------------------------
  12. 2 files changed, 99 deletions(-)
  13. --- a/arch/mips/include/asm/mach-ralink/rt305x.h
  14. +++ b/arch/mips/include/asm/mach-ralink/rt305x.h
  15. @@ -66,26 +66,9 @@ static inline int soc_is_rt5350(void)
  16. #define CHIP_ID_ID_SHIFT 8
  17. #define CHIP_ID_REV_MASK 0xff
  18. -#define RT305X_SYSCFG_CPUCLK_SHIFT 18
  19. -#define RT305X_SYSCFG_CPUCLK_MASK 0x1
  20. -#define RT305X_SYSCFG_CPUCLK_LOW 0x0
  21. -#define RT305X_SYSCFG_CPUCLK_HIGH 0x1
  22. -
  23. #define RT305X_SYSCFG_SRAM_CS0_MODE_SHIFT 2
  24. -#define RT305X_SYSCFG_CPUCLK_MASK 0x1
  25. #define RT305X_SYSCFG_SRAM_CS0_MODE_WDT 0x1
  26. -#define RT3352_SYSCFG0_CPUCLK_SHIFT 8
  27. -#define RT3352_SYSCFG0_CPUCLK_MASK 0x1
  28. -#define RT3352_SYSCFG0_CPUCLK_LOW 0x0
  29. -#define RT3352_SYSCFG0_CPUCLK_HIGH 0x1
  30. -
  31. -#define RT5350_SYSCFG0_CPUCLK_SHIFT 8
  32. -#define RT5350_SYSCFG0_CPUCLK_MASK 0x3
  33. -#define RT5350_SYSCFG0_CPUCLK_360 0x0
  34. -#define RT5350_SYSCFG0_CPUCLK_320 0x2
  35. -#define RT5350_SYSCFG0_CPUCLK_300 0x3
  36. -
  37. #define RT5350_SYSCFG0_DRAM_SIZE_SHIFT 12
  38. #define RT5350_SYSCFG0_DRAM_SIZE_MASK 7
  39. #define RT5350_SYSCFG0_DRAM_SIZE_2M 0
  40. @@ -116,13 +99,9 @@ static inline int soc_is_rt5350(void)
  41. #define RT3352_SYSC_REG_SYSCFG0 0x010
  42. #define RT3352_SYSC_REG_SYSCFG1 0x014
  43. -#define RT3352_SYSC_REG_CLKCFG1 0x030
  44. #define RT3352_SYSC_REG_RSTCTRL 0x034
  45. #define RT3352_SYSC_REG_USB_PS 0x05c
  46. -#define RT3352_CLKCFG0_XTAL_SEL BIT(20)
  47. -#define RT3352_CLKCFG1_UPHY0_CLK_EN BIT(18)
  48. -#define RT3352_CLKCFG1_UPHY1_CLK_EN BIT(20)
  49. #define RT3352_RSTCTRL_UHST BIT(22)
  50. #define RT3352_RSTCTRL_UDEV BIT(25)
  51. #define RT3352_SYSCFG1_USB0_HOST_MODE BIT(10)
  52. --- a/arch/mips/ralink/rt305x.c
  53. +++ b/arch/mips/ralink/rt305x.c
  54. @@ -53,84 +53,6 @@ static unsigned long rt5350_get_mem_size
  55. return ret;
  56. }
  57. -void __init ralink_clk_init(void)
  58. -{
  59. - unsigned long cpu_rate, sys_rate, wdt_rate, uart_rate;
  60. - unsigned long wmac_rate = 40000000;
  61. -
  62. - u32 t = rt_sysc_r32(SYSC_REG_SYSTEM_CONFIG);
  63. -
  64. - if (soc_is_rt305x() || soc_is_rt3350()) {
  65. - t = (t >> RT305X_SYSCFG_CPUCLK_SHIFT) &
  66. - RT305X_SYSCFG_CPUCLK_MASK;
  67. - switch (t) {
  68. - case RT305X_SYSCFG_CPUCLK_LOW:
  69. - cpu_rate = 320000000;
  70. - break;
  71. - case RT305X_SYSCFG_CPUCLK_HIGH:
  72. - cpu_rate = 384000000;
  73. - break;
  74. - }
  75. - sys_rate = uart_rate = wdt_rate = cpu_rate / 3;
  76. - } else if (soc_is_rt3352()) {
  77. - t = (t >> RT3352_SYSCFG0_CPUCLK_SHIFT) &
  78. - RT3352_SYSCFG0_CPUCLK_MASK;
  79. - switch (t) {
  80. - case RT3352_SYSCFG0_CPUCLK_LOW:
  81. - cpu_rate = 384000000;
  82. - break;
  83. - case RT3352_SYSCFG0_CPUCLK_HIGH:
  84. - cpu_rate = 400000000;
  85. - break;
  86. - }
  87. - sys_rate = wdt_rate = cpu_rate / 3;
  88. - uart_rate = 40000000;
  89. - } else if (soc_is_rt5350()) {
  90. - t = (t >> RT5350_SYSCFG0_CPUCLK_SHIFT) &
  91. - RT5350_SYSCFG0_CPUCLK_MASK;
  92. - switch (t) {
  93. - case RT5350_SYSCFG0_CPUCLK_360:
  94. - cpu_rate = 360000000;
  95. - sys_rate = cpu_rate / 3;
  96. - break;
  97. - case RT5350_SYSCFG0_CPUCLK_320:
  98. - cpu_rate = 320000000;
  99. - sys_rate = cpu_rate / 4;
  100. - break;
  101. - case RT5350_SYSCFG0_CPUCLK_300:
  102. - cpu_rate = 300000000;
  103. - sys_rate = cpu_rate / 3;
  104. - break;
  105. - default:
  106. - BUG();
  107. - }
  108. - uart_rate = 40000000;
  109. - wdt_rate = sys_rate;
  110. - } else {
  111. - BUG();
  112. - }
  113. -
  114. - if (soc_is_rt3352() || soc_is_rt5350()) {
  115. - u32 val = rt_sysc_r32(RT3352_SYSC_REG_SYSCFG0);
  116. -
  117. - if (!(val & RT3352_CLKCFG0_XTAL_SEL))
  118. - wmac_rate = 20000000;
  119. - }
  120. -
  121. - ralink_clk_add("cpu", cpu_rate);
  122. - ralink_clk_add("sys", sys_rate);
  123. - ralink_clk_add("10000900.i2c", uart_rate);
  124. - ralink_clk_add("10000a00.i2s", uart_rate);
  125. - ralink_clk_add("10000b00.spi", sys_rate);
  126. - ralink_clk_add("10000b40.spi", sys_rate);
  127. - ralink_clk_add("10000100.timer", wdt_rate);
  128. - ralink_clk_add("10000120.watchdog", wdt_rate);
  129. - ralink_clk_add("10000500.uart", uart_rate);
  130. - ralink_clk_add("10000c00.uartlite", uart_rate);
  131. - ralink_clk_add("10100000.ethernet", sys_rate);
  132. - ralink_clk_add("10180000.wmac", wmac_rate);
  133. -}
  134. -
  135. void __init ralink_of_remap(void)
  136. {
  137. rt_sysc_membase = plat_of_remap_node("ralink,rt3050-sysc");