fix for 3.2.9
SVN-Revision: 31065
This commit is contained in:
parent
b982e8166b
commit
b85de8f385
4 changed files with 30 additions and 12 deletions
|
@ -40,6 +40,7 @@
|
||||||
#include <linux/proc_fs.h>
|
#include <linux/proc_fs.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/ioctl.h>
|
#include <linux/ioctl.h>
|
||||||
|
#include <linux/clk.h>
|
||||||
#include <asm/delay.h>
|
#include <asm/delay.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -107,23 +108,27 @@ static inline void init_pmu(void)
|
||||||
{
|
{
|
||||||
//*(unsigned long *)0xBF10201C &= ~((1 << 15) | (1 << 13) | (1 << 9));
|
//*(unsigned long *)0xBF10201C &= ~((1 << 15) | (1 << 13) | (1 << 9));
|
||||||
//PPE_TOP_PMU_SETUP(IFX_PMU_ENABLE);
|
//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_TC_PMU_SETUP(IFX_PMU_ENABLE);
|
||||||
PPE_EMA_PMU_SETUP(IFX_PMU_ENABLE);
|
PPE_EMA_PMU_SETUP(IFX_PMU_ENABLE);
|
||||||
//PPE_QSB_PMU_SETUP(IFX_PMU_ENABLE);
|
//PPE_QSB_PMU_SETUP(IFX_PMU_ENABLE);
|
||||||
PPE_TPE_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)
|
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_TC_PMU_SETUP(IFX_PMU_DISABLE);
|
||||||
PPE_EMA_PMU_SETUP(IFX_PMU_DISABLE);
|
PPE_EMA_PMU_SETUP(IFX_PMU_DISABLE);
|
||||||
//PPE_QSB_PMU_SETUP(IFX_PMU_DISABLE);
|
//PPE_QSB_PMU_SETUP(IFX_PMU_DISABLE);
|
||||||
PPE_TPE_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);
|
//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)
|
static inline void reset_ppe(void)
|
||||||
|
|
|
@ -40,6 +40,7 @@
|
||||||
#include <linux/proc_fs.h>
|
#include <linux/proc_fs.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/ioctl.h>
|
#include <linux/ioctl.h>
|
||||||
|
#include <linux/clk.h>
|
||||||
#include <asm/delay.h>
|
#include <asm/delay.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -114,23 +115,27 @@ static inline void init_pmu(void)
|
||||||
{
|
{
|
||||||
//*(unsigned long *)0xBF10201C &= ~((1 << 15) | (1 << 13) | (1 << 9));
|
//*(unsigned long *)0xBF10201C &= ~((1 << 15) | (1 << 13) | (1 << 9));
|
||||||
//PPE_TOP_PMU_SETUP(IFX_PMU_ENABLE);
|
//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_TC_PMU_SETUP(IFX_PMU_ENABLE);
|
||||||
PPE_EMA_PMU_SETUP(IFX_PMU_ENABLE);
|
PPE_EMA_PMU_SETUP(IFX_PMU_ENABLE);
|
||||||
PPE_QSB_PMU_SETUP(IFX_PMU_ENABLE);
|
PPE_QSB_PMU_SETUP(IFX_PMU_ENABLE);
|
||||||
PPE_TPE_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)
|
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_TC_PMU_SETUP(IFX_PMU_DISABLE);
|
||||||
PPE_EMA_PMU_SETUP(IFX_PMU_DISABLE);
|
PPE_EMA_PMU_SETUP(IFX_PMU_DISABLE);
|
||||||
PPE_QSB_PMU_SETUP(IFX_PMU_DISABLE);
|
PPE_QSB_PMU_SETUP(IFX_PMU_DISABLE);
|
||||||
PPE_TPE_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);
|
//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)
|
static inline void reset_ppe(void)
|
||||||
|
|
|
@ -40,6 +40,7 @@
|
||||||
#include <linux/proc_fs.h>
|
#include <linux/proc_fs.h>
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/ioctl.h>
|
#include <linux/ioctl.h>
|
||||||
|
#include <linux/clk.h>
|
||||||
#include <asm/delay.h>
|
#include <asm/delay.h>
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
@ -109,23 +110,27 @@ static inline void init_pmu(void)
|
||||||
{
|
{
|
||||||
//*(unsigned long *)0xBF10201C &= ~((1 << 15) | (1 << 13) | (1 << 9));
|
//*(unsigned long *)0xBF10201C &= ~((1 << 15) | (1 << 13) | (1 << 9));
|
||||||
//PPE_TOP_PMU_SETUP(IFX_PMU_ENABLE);
|
//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_TC_PMU_SETUP(IFX_PMU_ENABLE);
|
||||||
PPE_EMA_PMU_SETUP(IFX_PMU_ENABLE);
|
PPE_EMA_PMU_SETUP(IFX_PMU_ENABLE);
|
||||||
PPE_QSB_PMU_SETUP(IFX_PMU_ENABLE);
|
PPE_QSB_PMU_SETUP(IFX_PMU_ENABLE);
|
||||||
PPE_TPE_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)
|
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_TC_PMU_SETUP(IFX_PMU_DISABLE);
|
||||||
PPE_EMA_PMU_SETUP(IFX_PMU_DISABLE);
|
PPE_EMA_PMU_SETUP(IFX_PMU_DISABLE);
|
||||||
PPE_QSB_PMU_SETUP(IFX_PMU_DISABLE);
|
PPE_QSB_PMU_SETUP(IFX_PMU_DISABLE);
|
||||||
PPE_TPE_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);
|
//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)
|
static inline void reset_ppe(void)
|
||||||
|
|
|
@ -34,6 +34,9 @@
|
||||||
#define IFX_PMU_MODULE_PPE_EMA (1 << 22)
|
#define IFX_PMU_MODULE_PPE_EMA (1 << 22)
|
||||||
#define IFX_PMU_MODULE_PPE_TOP (1 << 29)
|
#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 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))
|
#define PPE_TOP_PMU_SETUP(__x) ifx_pmu_set(IFX_PMU_MODULE_PPE_TOP, (__x))
|
||||||
|
|
Loading…
Reference in a new issue