diff options
| author | John Crispin <john@openwrt.org> | 2012-04-16 12:31:48 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2012-04-16 12:31:48 +0000 |
| commit | 83948d6385c9ce23545a159ffd64f5b2854332ed (patch) | |
| tree | 1d79b701055f05ca319d5ac3623af6615f394844 /target/linux/lantiq/patches-3.3/0060-MIPS-lantiq-fixes-danube-clock.patch | |
| parent | fb2b2b958e9da0d9ea0195a0829da52a0eda667c (diff) | |
| download | upstream-83948d6385c9ce23545a159ffd64f5b2854332ed.tar.gz upstream-83948d6385c9ce23545a159ffd64f5b2854332ed.tar.bz2 upstream-83948d6385c9ce23545a159ffd64f5b2854332ed.zip | |
adds 3.3 patches and files
SVN-Revision: 31307
Diffstat (limited to 'target/linux/lantiq/patches-3.3/0060-MIPS-lantiq-fixes-danube-clock.patch')
| -rw-r--r-- | target/linux/lantiq/patches-3.3/0060-MIPS-lantiq-fixes-danube-clock.patch | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/target/linux/lantiq/patches-3.3/0060-MIPS-lantiq-fixes-danube-clock.patch b/target/linux/lantiq/patches-3.3/0060-MIPS-lantiq-fixes-danube-clock.patch new file mode 100644 index 0000000000..549038ba02 --- /dev/null +++ b/target/linux/lantiq/patches-3.3/0060-MIPS-lantiq-fixes-danube-clock.patch @@ -0,0 +1,57 @@ +From e8f13d2824871027e8b6d374a2db3672db043915 Mon Sep 17 00:00:00 2001 +From: John Crispin <blogic@openwrt.org> +Date: Mon, 19 Mar 2012 15:53:37 +0100 +Subject: [PATCH 60/70] MIPS: lantiq: fixes danube clock + +--- + arch/mips/lantiq/xway/clk.c | 20 ++++++++++---------- + 1 files changed, 10 insertions(+), 10 deletions(-) + +diff --git a/arch/mips/lantiq/xway/clk.c b/arch/mips/lantiq/xway/clk.c +index 2bafc04..5d850dc 100644 +--- a/arch/mips/lantiq/xway/clk.c ++++ b/arch/mips/lantiq/xway/clk.c +@@ -181,7 +181,7 @@ unsigned long ltq_danube_io_region_clock(void) + { + unsigned int ret = ltq_get_pll0_fosc(); + +- switch (ltq_cgu_r32(LTQ_CGU_PLL2_CFG) & CGU_SYS_DDR_SEL) { ++ switch (ltq_cgu_r32(LTQ_CGU_SYS) & 0x3) { + default: + case 0: + return (ret + 1) / 2; +@@ -203,6 +203,15 @@ unsigned long ltq_danube_fpi_bus_clock(int fpi) + return ret; + } + ++unsigned long ltq_danube_fpi_hz(void) ++{ ++ unsigned long ddr_clock = DDR_HZ; ++ ++ if (ltq_cgu_r32(LTQ_CGU_SYS) & 0x40) ++ return ddr_clock >> 1; ++ return ddr_clock; ++} ++ + unsigned long ltq_danube_cpu_hz(void) + { + switch (ltq_cgu_r32(LTQ_CGU_SYS) & 0xc) { +@@ -241,15 +250,6 @@ unsigned long ltq_ar9_cpu_hz(void) + return ltq_ar9_sys_hz(); + } + +-unsigned long ltq_danube_fpi_hz(void) +-{ +- unsigned long ddr_clock = DDR_HZ; +- +- if (ltq_cgu_r32(LTQ_CGU_SYS) & 0x40) +- return ddr_clock >> 1; +- return ddr_clock; +-} +- + unsigned long ltq_vr9_cpu_hz(void) + { + unsigned int cpu_sel; +-- +1.7.9.1 + |