From e388e46ebbf42cacf061b948c231006fbe4831f2 Mon Sep 17 00:00:00 2001 From: juhosg Date: Wed, 26 Jan 2011 20:48:39 +0000 Subject: ramips: implement clock API for RT288x git-svn-id: svn://svn.openwrt.org/openwrt/trunk@25125 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../arch/mips/include/asm/mach-ralink/rt288x.h | 6 +- .../ramips/files/arch/mips/ralink/rt288x/Makefile | 2 +- .../ramips/files/arch/mips/ralink/rt288x/clock.c | 99 ++++++++++++++++++++++ .../ramips/files/arch/mips/ralink/rt288x/common.h | 16 ++++ .../ramips/files/arch/mips/ralink/rt288x/devices.c | 12 ++- .../ramips/files/arch/mips/ralink/rt288x/rt288x.c | 31 ------- .../ramips/files/arch/mips/ralink/rt288x/setup.c | 31 +++++-- 7 files changed, 152 insertions(+), 45 deletions(-) create mode 100644 target/linux/ramips/files/arch/mips/ralink/rt288x/clock.c create mode 100644 target/linux/ramips/files/arch/mips/ralink/rt288x/common.h diff --git a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h index 7dfc5e321..3eb036fbb 100644 --- a/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h +++ b/target/linux/ramips/files/arch/mips/include/asm/mach-ralink/rt288x.h @@ -1,7 +1,7 @@ /* * Ralink RT288x SoC specific definitions * - * Copyright (C) 2008-2009 Gabor Juhos + * Copyright (C) 2008-2011 Gabor Juhos * Copyright (C) 2008 Imre Kaloz * * Parts of this file are based on Ralink's 2.6.21 BSP @@ -18,10 +18,6 @@ #include void rt288x_detect_sys_type(void); -void rt288x_detect_sys_freq(void); - -extern unsigned long rt288x_cpu_freq; -extern unsigned long rt288x_sys_freq; #define RT288X_CPU_IRQ_BASE 0 #define RT288X_INTC_IRQ_BASE 8 diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/Makefile b/target/linux/ramips/files/arch/mips/ralink/rt288x/Makefile index dda3e063f..103081aaa 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt288x/Makefile +++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/Makefile @@ -9,7 +9,7 @@ # under the terms of the GNU General Public License version 2 as published # by the Free Software Foundation. -obj-y := irq.o setup.o rt288x.o devices.o +obj-y := irq.o setup.o rt288x.o devices.o clock.o obj-$(CONFIG_EARLY_PRINTK) += early_printk.o diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/clock.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/clock.c new file mode 100644 index 000000000..36d754dbf --- /dev/null +++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/clock.c @@ -0,0 +1,99 @@ +/* + * Ralink RT288X clock API + * + * Copyright (C) 2011 Gabor Juhos + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include + +#include +#include +#include +#include "common.h" + +struct clk { + unsigned long rate; +}; + +static struct clk rt288x_cpu_clk; +static struct clk rt288x_sys_clk; +static struct clk rt288x_wdt_clk; +static struct clk rt288x_uart_clk; + +void __init rt288x_clocks_init(void) +{ + u32 t; + + t = rt288x_sysc_rr(SYSC_REG_SYSTEM_CONFIG); + t = ((t >> SYSTEM_CONFIG_CPUCLK_SHIFT) & SYSTEM_CONFIG_CPUCLK_MASK); + + switch (t) { + case SYSTEM_CONFIG_CPUCLK_250: + rt288x_cpu_clk.rate = 250000000; + break; + case SYSTEM_CONFIG_CPUCLK_266: + rt288x_cpu_clk.rate = 266666667; + break; + case SYSTEM_CONFIG_CPUCLK_280: + rt288x_cpu_clk.rate = 280000000; + break; + case SYSTEM_CONFIG_CPUCLK_300: + rt288x_cpu_clk.rate = 300000000; + break; + } + + rt288x_sys_clk.rate = rt288x_cpu_clk.rate / 2; + rt288x_uart_clk.rate = rt288x_sys_clk.rate; + rt288x_wdt_clk.rate = rt288x_sys_clk.rate; +} + +/* + * Linux clock API + */ +struct clk *clk_get(struct device *dev, const char *id) +{ + if (!strcmp(id, "sys")) + return &rt288x_sys_clk; + + if (!strcmp(id, "cpu")) + return &rt288x_cpu_clk; + + if (!strcmp(id, "wdt")) + return &rt288x_wdt_clk; + + if (!strcmp(id, "uart")) + return &rt288x_uart_clk; + + return ERR_PTR(-ENOENT); +} +EXPORT_SYMBOL(clk_get); + +int clk_enable(struct clk *clk) +{ + return 0; +} +EXPORT_SYMBOL(clk_enable); + +void clk_disable(struct clk *clk) +{ +} +EXPORT_SYMBOL(clk_disable); + +unsigned long clk_get_rate(struct clk *clk) +{ + return clk->rate; +} +EXPORT_SYMBOL(clk_get_rate); + +void clk_put(struct clk *clk) +{ +} +EXPORT_SYMBOL(clk_put); diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/common.h b/target/linux/ramips/files/arch/mips/ralink/rt288x/common.h new file mode 100644 index 000000000..f2415c58b --- /dev/null +++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/common.h @@ -0,0 +1,16 @@ +/* + * Ralink RT288X SoC common defines + * + * Copyright (C) 2011 Gabor Juhos + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 as published + * by the Free Software Foundation. + */ + +#ifndef _RT288X_COMMON_H +#define _RT288X_COMMON_H + +void rt288x_clocks_init(void); + +#endif /* _RT288X_COMMON_H */ \ No newline at end of file diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.c index 3b575f620..6a5cf392e 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.c +++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/devices.c @@ -1,7 +1,7 @@ /* * Ralink RT288x SoC platform device registration * - * Copyright (C) 2008 Gabor Juhos + * Copyright (C) 2008-2011 Gabor Juhos * Copyright (C) 2008 Imre Kaloz * * This program is free software; you can redistribute it and/or modify it @@ -14,6 +14,8 @@ #include #include #include +#include +#include #include @@ -154,7 +156,13 @@ static struct platform_device rt288x_eth_device = { void __init rt288x_register_ethernet(void) { - rt288x_eth_data.sys_freq = rt288x_sys_freq; + struct clk *clk; + + clk = clk_get(NULL, "sys"); + if (IS_ERR(clk)) + panic("unable to get SYS clock, err=%ld", PTR_ERR(clk)); + + rt288x_eth_data.sys_freq = clk_get_rate(clk); rt288x_eth_data.reset_fe = rt288x_fe_reset; rt288x_eth_data.min_pkt_len = 64; diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/rt288x.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/rt288x.c index 49a301a1e..467a637e4 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt288x/rt288x.c +++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/rt288x.c @@ -20,12 +20,6 @@ #include #include -unsigned long rt288x_cpu_freq; -EXPORT_SYMBOL_GPL(rt288x_cpu_freq); - -unsigned long rt288x_sys_freq; -EXPORT_SYMBOL_GPL(rt288x_sys_freq); - void __iomem * rt288x_sysc_base; void __iomem * rt288x_memc_base; @@ -49,31 +43,6 @@ void __init rt288x_detect_sys_type(void) (id & CHIP_ID_REV_MASK)); } -void __init rt288x_detect_sys_freq(void) -{ - u32 t; - - t = rt288x_sysc_rr(SYSC_REG_SYSTEM_CONFIG); - t = ((t >> SYSTEM_CONFIG_CPUCLK_SHIFT) & SYSTEM_CONFIG_CPUCLK_MASK); - - switch (t) { - case SYSTEM_CONFIG_CPUCLK_250: - rt288x_cpu_freq = 250000000; - break; - case SYSTEM_CONFIG_CPUCLK_266: - rt288x_cpu_freq = 266666667; - break; - case SYSTEM_CONFIG_CPUCLK_280: - rt288x_cpu_freq = 280000000; - break; - case SYSTEM_CONFIG_CPUCLK_300: - rt288x_cpu_freq = 300000000; - break; - } - - rt288x_sys_freq = rt288x_cpu_freq / 2; -} - static void rt288x_gpio_reserve(int first, int last) { for (; first <= last; first++) diff --git a/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c b/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c index e2328fe5e..65e187d3a 100644 --- a/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c +++ b/target/linux/ramips/files/arch/mips/ralink/rt288x/setup.c @@ -14,6 +14,8 @@ #include #include #include +#include +#include #include #include @@ -22,6 +24,7 @@ #include #include #include +#include "common.h" static void rt288x_restart(char *command) { @@ -44,27 +47,43 @@ unsigned int __cpuinit get_c0_compare_irq(void) void __init ramips_soc_setup(void) { + struct clk *clk; + rt288x_sysc_base = ioremap_nocache(RT2880_SYSC_BASE, RT2880_SYSC_SIZE); rt288x_memc_base = ioremap_nocache(RT2880_MEMC_BASE, RT2880_MEMC_SIZE); rt288x_detect_sys_type(); - rt288x_detect_sys_freq(); + rt288x_clocks_init(); + + clk = clk_get(NULL, "cpu"); + if (IS_ERR(clk)) + panic("unable to get CPU clock, err=%ld", PTR_ERR(clk)); printk(KERN_INFO "%s running at %lu.%02lu MHz\n", ramips_sys_type, - rt288x_cpu_freq / 1000000, - (rt288x_cpu_freq % 1000000) * 100 / 1000000); + clk_get_rate(clk) / 1000000, + (clk_get_rate(clk) % 1000000) * 100 / 1000000); _machine_restart = rt288x_restart; _machine_halt = rt288x_halt; pm_power_off = rt288x_halt; - ramips_early_serial_setup(0, RT2880_UART0_BASE, rt288x_sys_freq, + clk = clk_get(NULL, "uart"); + if (IS_ERR(clk)) + panic("unable to get UART clock, err=%ld", PTR_ERR(clk)); + + ramips_early_serial_setup(0, RT2880_UART0_BASE, clk_get_rate(clk), RT2880_INTC_IRQ_UART0); - ramips_early_serial_setup(1, RT2880_UART1_BASE, rt288x_sys_freq, + ramips_early_serial_setup(1, RT2880_UART1_BASE, clk_get_rate(clk), RT2880_INTC_IRQ_UART1); } void __init plat_time_init(void) { - mips_hpt_frequency = rt288x_cpu_freq / 2; + struct clk *clk; + + clk = clk_get(NULL, "cpu"); + if (IS_ERR(clk)) + panic("unable to get CPU clock, err=%ld", PTR_ERR(clk)); + + mips_hpt_frequency = clk_get_rate(clk) / 2; } -- cgit v1.2.3