diff options
| author | John Crispin <john@openwrt.org> | 2012-03-25 08:50:42 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2012-03-25 08:50:42 +0000 |
| commit | b85de8f3855448a54bdb4572e724660e2d0b2ba6 (patch) | |
| tree | 9136d132a4db037899efd50481a36b193d0736bc /package/ltq-dsl | |
| parent | b982e8166bebeb79c64aae2689c06db06fe6d506 (diff) | |
| download | upstream-b85de8f3855448a54bdb4572e724660e2d0b2ba6.tar.gz upstream-b85de8f3855448a54bdb4572e724660e2d0b2ba6.tar.bz2 upstream-b85de8f3855448a54bdb4572e724660e2d0b2ba6.zip | |
fix for 3.2.9
SVN-Revision: 31065
Diffstat (limited to 'package/ltq-dsl')
| -rw-r--r-- | package/ltq-dsl/src/ifxmips_atm_amazon_se.c | 13 | ||||
| -rw-r--r-- | package/ltq-dsl/src/ifxmips_atm_ar9.c | 13 | ||||
| -rw-r--r-- | package/ltq-dsl/src/ifxmips_atm_danube.c | 13 | ||||
| -rw-r--r-- | package/ltq-dsl/src/ifxmips_compat.h | 3 |
4 files changed, 30 insertions, 12 deletions
diff --git a/package/ltq-dsl/src/ifxmips_atm_amazon_se.c b/package/ltq-dsl/src/ifxmips_atm_amazon_se.c index 35a5cd9d53..1028815927 100644 --- a/package/ltq-dsl/src/ifxmips_atm_amazon_se.c +++ b/package/ltq-dsl/src/ifxmips_atm_amazon_se.c @@ -40,6 +40,7 @@ #include <linux/proc_fs.h> #include <linux/init.h> #include <linux/ioctl.h> +#include <linux/clk.h> #include <asm/delay.h> /* @@ -107,23 +108,27 @@ static inline void init_pmu(void) { //*(unsigned long *)0xBF10201C &= ~((1 << 15) | (1 << 13) | (1 << 9)); //PPE_TOP_PMU_SETUP(IFX_PMU_ENABLE); - PPE_SLL01_PMU_SETUP(IFX_PMU_ENABLE); +/* PPE_SLL01_PMU_SETUP(IFX_PMU_ENABLE); PPE_TC_PMU_SETUP(IFX_PMU_ENABLE); PPE_EMA_PMU_SETUP(IFX_PMU_ENABLE); //PPE_QSB_PMU_SETUP(IFX_PMU_ENABLE); PPE_TPE_PMU_SETUP(IFX_PMU_ENABLE); - DSL_DFE_PMU_SETUP(IFX_PMU_ENABLE); + DSL_DFE_PMU_SETUP(IFX_PMU_ENABLE);*/ + struct clk *clk = clk_get_sys("ltq_dsl", NULL); + clk_enable(clk); } static inline void uninit_pmu(void) { - PPE_SLL01_PMU_SETUP(IFX_PMU_DISABLE); +/* PPE_SLL01_PMU_SETUP(IFX_PMU_DISABLE); PPE_TC_PMU_SETUP(IFX_PMU_DISABLE); PPE_EMA_PMU_SETUP(IFX_PMU_DISABLE); //PPE_QSB_PMU_SETUP(IFX_PMU_DISABLE); PPE_TPE_PMU_SETUP(IFX_PMU_DISABLE); DSL_DFE_PMU_SETUP(IFX_PMU_DISABLE); - //PPE_TOP_PMU_SETUP(IFX_PMU_DISABLE); + //PPE_TOP_PMU_SETUP(IFX_PMU_DISABLE);*/ + struct clk *clk = clk_get_sys("ltq_dsl", NULL); + clk_disable(clk); } static inline void reset_ppe(void) diff --git a/package/ltq-dsl/src/ifxmips_atm_ar9.c b/package/ltq-dsl/src/ifxmips_atm_ar9.c index 418863c512..31b89f5c84 100644 --- a/package/ltq-dsl/src/ifxmips_atm_ar9.c +++ b/package/ltq-dsl/src/ifxmips_atm_ar9.c @@ -40,6 +40,7 @@ #include <linux/proc_fs.h> #include <linux/init.h> #include <linux/ioctl.h> +#include <linux/clk.h> #include <asm/delay.h> /* @@ -114,23 +115,27 @@ static inline void init_pmu(void) { //*(unsigned long *)0xBF10201C &= ~((1 << 15) | (1 << 13) | (1 << 9)); //PPE_TOP_PMU_SETUP(IFX_PMU_ENABLE); - PPE_SLL01_PMU_SETUP(IFX_PMU_ENABLE); +/* PPE_SLL01_PMU_SETUP(IFX_PMU_ENABLE); PPE_TC_PMU_SETUP(IFX_PMU_ENABLE); PPE_EMA_PMU_SETUP(IFX_PMU_ENABLE); PPE_QSB_PMU_SETUP(IFX_PMU_ENABLE); PPE_TPE_PMU_SETUP(IFX_PMU_ENABLE); - DSL_DFE_PMU_SETUP(IFX_PMU_ENABLE); + DSL_DFE_PMU_SETUP(IFX_PMU_ENABLE);*/ + struct clk *clk = clk_get_sys("ltq_dsl", NULL); + clk_enable(clk); } static inline void uninit_pmu(void) { - PPE_SLL01_PMU_SETUP(IFX_PMU_DISABLE); + /* PPE_SLL01_PMU_SETUP(IFX_PMU_DISABLE); PPE_TC_PMU_SETUP(IFX_PMU_DISABLE); PPE_EMA_PMU_SETUP(IFX_PMU_DISABLE); PPE_QSB_PMU_SETUP(IFX_PMU_DISABLE); PPE_TPE_PMU_SETUP(IFX_PMU_DISABLE); - DSL_DFE_PMU_SETUP(IFX_PMU_DISABLE); + DSL_DFE_PMU_SETUP(IFX_PMU_DISABLE);*/ //PPE_TOP_PMU_SETUP(IFX_PMU_DISABLE); + struct clk *clk = clk_get_sys("ltq_dsl", NULL); + clk_disable(clk); } static inline void reset_ppe(void) diff --git a/package/ltq-dsl/src/ifxmips_atm_danube.c b/package/ltq-dsl/src/ifxmips_atm_danube.c index df7801e234..64698b8792 100644 --- a/package/ltq-dsl/src/ifxmips_atm_danube.c +++ b/package/ltq-dsl/src/ifxmips_atm_danube.c @@ -40,6 +40,7 @@ #include <linux/proc_fs.h> #include <linux/init.h> #include <linux/ioctl.h> +#include <linux/clk.h> #include <asm/delay.h> /* @@ -109,23 +110,27 @@ static inline void init_pmu(void) { //*(unsigned long *)0xBF10201C &= ~((1 << 15) | (1 << 13) | (1 << 9)); //PPE_TOP_PMU_SETUP(IFX_PMU_ENABLE); - PPE_SLL01_PMU_SETUP(IFX_PMU_ENABLE); +/* PPE_SLL01_PMU_SETUP(IFX_PMU_ENABLE); PPE_TC_PMU_SETUP(IFX_PMU_ENABLE); PPE_EMA_PMU_SETUP(IFX_PMU_ENABLE); PPE_QSB_PMU_SETUP(IFX_PMU_ENABLE); PPE_TPE_PMU_SETUP(IFX_PMU_ENABLE); - DSL_DFE_PMU_SETUP(IFX_PMU_ENABLE); + DSL_DFE_PMU_SETUP(IFX_PMU_ENABLE);*/ + struct clk *clk = clk_get_sys("ltq_dsl", NULL); + clk_enable(clk); } static inline void uninit_pmu(void) { - PPE_SLL01_PMU_SETUP(IFX_PMU_DISABLE); +/* PPE_SLL01_PMU_SETUP(IFX_PMU_DISABLE); PPE_TC_PMU_SETUP(IFX_PMU_DISABLE); PPE_EMA_PMU_SETUP(IFX_PMU_DISABLE); PPE_QSB_PMU_SETUP(IFX_PMU_DISABLE); PPE_TPE_PMU_SETUP(IFX_PMU_DISABLE); - DSL_DFE_PMU_SETUP(IFX_PMU_DISABLE); + DSL_DFE_PMU_SETUP(IFX_PMU_DISABLE);*/ //PPE_TOP_PMU_SETUP(IFX_PMU_DISABLE); + struct clk *clk = clk_get_sys("ltq_dsl", NULL); + clk_disable(clk); } static inline void reset_ppe(void) diff --git a/package/ltq-dsl/src/ifxmips_compat.h b/package/ltq-dsl/src/ifxmips_compat.h index bd357e98cf..b0c9f25f48 100644 --- a/package/ltq-dsl/src/ifxmips_compat.h +++ b/package/ltq-dsl/src/ifxmips_compat.h @@ -34,6 +34,9 @@ #define IFX_PMU_MODULE_PPE_EMA (1 << 22) #define IFX_PMU_MODULE_PPE_TOP (1 << 29) +extern void ltq_pmu_enable(unsigned int module); +extern void ltq_pmu_disable(unsigned int module); + #define ifx_pmu_set(a,b) {if(a == IFX_PMU_ENABLE) ltq_pmu_enable(b); else ltq_pmu_disable(b);} #define PPE_TOP_PMU_SETUP(__x) ifx_pmu_set(IFX_PMU_MODULE_PPE_TOP, (__x)) |