Skip to content

Commit daf73c7

Browse files
parakatsbogend
authored andcommitted
mips: ralink: rt305x: remove clock related code
A properly clock driver for ralink SoCs has been added. Hence there is no need to have clock related code in 'arch/mips/ralink' folder anymore. Signed-off-by: Sergio Paracuellos <[email protected]> Signed-off-by: Thomas Bogendoerfer <[email protected]>
1 parent ffcdf47 commit daf73c7

File tree

2 files changed

+0
-99
lines changed

2 files changed

+0
-99
lines changed

arch/mips/include/asm/mach-ralink/rt305x.h

Lines changed: 0 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -67,26 +67,9 @@ static inline int soc_is_rt5350(void)
6767
#define CHIP_ID_ID_SHIFT 8
6868
#define CHIP_ID_REV_MASK 0xff
6969

70-
#define RT305X_SYSCFG_CPUCLK_SHIFT 18
71-
#define RT305X_SYSCFG_CPUCLK_MASK 0x1
72-
#define RT305X_SYSCFG_CPUCLK_LOW 0x0
73-
#define RT305X_SYSCFG_CPUCLK_HIGH 0x1
74-
7570
#define RT305X_SYSCFG_SRAM_CS0_MODE_SHIFT 2
76-
#define RT305X_SYSCFG_CPUCLK_MASK 0x1
7771
#define RT305X_SYSCFG_SRAM_CS0_MODE_WDT 0x1
7872

79-
#define RT3352_SYSCFG0_CPUCLK_SHIFT 8
80-
#define RT3352_SYSCFG0_CPUCLK_MASK 0x1
81-
#define RT3352_SYSCFG0_CPUCLK_LOW 0x0
82-
#define RT3352_SYSCFG0_CPUCLK_HIGH 0x1
83-
84-
#define RT5350_SYSCFG0_CPUCLK_SHIFT 8
85-
#define RT5350_SYSCFG0_CPUCLK_MASK 0x3
86-
#define RT5350_SYSCFG0_CPUCLK_360 0x0
87-
#define RT5350_SYSCFG0_CPUCLK_320 0x2
88-
#define RT5350_SYSCFG0_CPUCLK_300 0x3
89-
9073
#define RT5350_SYSCFG0_DRAM_SIZE_SHIFT 12
9174
#define RT5350_SYSCFG0_DRAM_SIZE_MASK 7
9275
#define RT5350_SYSCFG0_DRAM_SIZE_2M 0
@@ -117,13 +100,9 @@ static inline int soc_is_rt5350(void)
117100

118101
#define RT3352_SYSC_REG_SYSCFG0 0x010
119102
#define RT3352_SYSC_REG_SYSCFG1 0x014
120-
#define RT3352_SYSC_REG_CLKCFG1 0x030
121103
#define RT3352_SYSC_REG_RSTCTRL 0x034
122104
#define RT3352_SYSC_REG_USB_PS 0x05c
123105

124-
#define RT3352_CLKCFG0_XTAL_SEL BIT(20)
125-
#define RT3352_CLKCFG1_UPHY0_CLK_EN BIT(18)
126-
#define RT3352_CLKCFG1_UPHY1_CLK_EN BIT(20)
127106
#define RT3352_RSTCTRL_UHST BIT(22)
128107
#define RT3352_RSTCTRL_UDEV BIT(25)
129108
#define RT3352_SYSCFG1_USB0_HOST_MODE BIT(10)

arch/mips/ralink/rt305x.c

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -56,84 +56,6 @@ static unsigned long rt5350_get_mem_size(void)
5656
return ret;
5757
}
5858

59-
void __init ralink_clk_init(void)
60-
{
61-
unsigned long cpu_rate, sys_rate, wdt_rate, uart_rate;
62-
unsigned long wmac_rate = 40000000;
63-
64-
u32 t = rt_sysc_r32(SYSC_REG_SYSTEM_CONFIG);
65-
66-
if (soc_is_rt305x() || soc_is_rt3350()) {
67-
t = (t >> RT305X_SYSCFG_CPUCLK_SHIFT) &
68-
RT305X_SYSCFG_CPUCLK_MASK;
69-
switch (t) {
70-
case RT305X_SYSCFG_CPUCLK_LOW:
71-
cpu_rate = 320000000;
72-
break;
73-
case RT305X_SYSCFG_CPUCLK_HIGH:
74-
cpu_rate = 384000000;
75-
break;
76-
}
77-
sys_rate = uart_rate = wdt_rate = cpu_rate / 3;
78-
} else if (soc_is_rt3352()) {
79-
t = (t >> RT3352_SYSCFG0_CPUCLK_SHIFT) &
80-
RT3352_SYSCFG0_CPUCLK_MASK;
81-
switch (t) {
82-
case RT3352_SYSCFG0_CPUCLK_LOW:
83-
cpu_rate = 384000000;
84-
break;
85-
case RT3352_SYSCFG0_CPUCLK_HIGH:
86-
cpu_rate = 400000000;
87-
break;
88-
}
89-
sys_rate = wdt_rate = cpu_rate / 3;
90-
uart_rate = 40000000;
91-
} else if (soc_is_rt5350()) {
92-
t = (t >> RT5350_SYSCFG0_CPUCLK_SHIFT) &
93-
RT5350_SYSCFG0_CPUCLK_MASK;
94-
switch (t) {
95-
case RT5350_SYSCFG0_CPUCLK_360:
96-
cpu_rate = 360000000;
97-
sys_rate = cpu_rate / 3;
98-
break;
99-
case RT5350_SYSCFG0_CPUCLK_320:
100-
cpu_rate = 320000000;
101-
sys_rate = cpu_rate / 4;
102-
break;
103-
case RT5350_SYSCFG0_CPUCLK_300:
104-
cpu_rate = 300000000;
105-
sys_rate = cpu_rate / 3;
106-
break;
107-
default:
108-
BUG();
109-
}
110-
uart_rate = 40000000;
111-
wdt_rate = sys_rate;
112-
} else {
113-
BUG();
114-
}
115-
116-
if (soc_is_rt3352() || soc_is_rt5350()) {
117-
u32 val = rt_sysc_r32(RT3352_SYSC_REG_SYSCFG0);
118-
119-
if (!(val & RT3352_CLKCFG0_XTAL_SEL))
120-
wmac_rate = 20000000;
121-
}
122-
123-
ralink_clk_add("cpu", cpu_rate);
124-
ralink_clk_add("sys", sys_rate);
125-
ralink_clk_add("10000900.i2c", uart_rate);
126-
ralink_clk_add("10000a00.i2s", uart_rate);
127-
ralink_clk_add("10000b00.spi", sys_rate);
128-
ralink_clk_add("10000b40.spi", sys_rate);
129-
ralink_clk_add("10000100.timer", wdt_rate);
130-
ralink_clk_add("10000120.watchdog", wdt_rate);
131-
ralink_clk_add("10000500.uart", uart_rate);
132-
ralink_clk_add("10000c00.uartlite", uart_rate);
133-
ralink_clk_add("10100000.ethernet", sys_rate);
134-
ralink_clk_add("10180000.wmac", wmac_rate);
135-
}
136-
13759
void __init ralink_of_remap(void)
13860
{
13961
rt_sysc_membase = plat_of_remap_node("ralink,rt3050-sysc");

0 commit comments

Comments
 (0)