Changeset 31065 for trunk


Ignore:
Timestamp:
2012-03-25T10:50:42+02:00 (4 years ago)
Author:
blogic
Message:

[ltq-dsl] fix for 3.2.9

Location:
trunk/package/ltq-dsl/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/ltq-dsl/src/ifxmips_atm_amazon_se.c

    r28406 r31065  
    4141#include <linux/init.h> 
    4242#include <linux/ioctl.h> 
     43#include <linux/clk.h> 
    4344#include <asm/delay.h> 
    4445 
     
    108109    //*(unsigned long *)0xBF10201C &= ~((1 << 15) | (1 << 13) | (1 << 9)); 
    109110    //PPE_TOP_PMU_SETUP(IFX_PMU_ENABLE); 
    110     PPE_SLL01_PMU_SETUP(IFX_PMU_ENABLE); 
     111/*    PPE_SLL01_PMU_SETUP(IFX_PMU_ENABLE); 
    111112    PPE_TC_PMU_SETUP(IFX_PMU_ENABLE); 
    112113    PPE_EMA_PMU_SETUP(IFX_PMU_ENABLE); 
    113114    //PPE_QSB_PMU_SETUP(IFX_PMU_ENABLE); 
    114115    PPE_TPE_PMU_SETUP(IFX_PMU_ENABLE); 
    115     DSL_DFE_PMU_SETUP(IFX_PMU_ENABLE); 
     116    DSL_DFE_PMU_SETUP(IFX_PMU_ENABLE);*/ 
     117        struct clk *clk = clk_get_sys("ltq_dsl", NULL); 
     118        clk_enable(clk); 
    116119} 
    117120 
    118121static inline void uninit_pmu(void) 
    119122{ 
    120     PPE_SLL01_PMU_SETUP(IFX_PMU_DISABLE); 
     123/*    PPE_SLL01_PMU_SETUP(IFX_PMU_DISABLE); 
    121124    PPE_TC_PMU_SETUP(IFX_PMU_DISABLE); 
    122125    PPE_EMA_PMU_SETUP(IFX_PMU_DISABLE); 
     
    124127    PPE_TPE_PMU_SETUP(IFX_PMU_DISABLE); 
    125128    DSL_DFE_PMU_SETUP(IFX_PMU_DISABLE); 
    126     //PPE_TOP_PMU_SETUP(IFX_PMU_DISABLE); 
     129    //PPE_TOP_PMU_SETUP(IFX_PMU_DISABLE);*/ 
     130        struct clk *clk = clk_get_sys("ltq_dsl", NULL); 
     131        clk_disable(clk); 
    127132} 
    128133 
  • trunk/package/ltq-dsl/src/ifxmips_atm_ar9.c

    r28406 r31065  
    4141#include <linux/init.h> 
    4242#include <linux/ioctl.h> 
     43#include <linux/clk.h> 
    4344#include <asm/delay.h> 
    4445 
     
    115116    //*(unsigned long *)0xBF10201C &= ~((1 << 15) | (1 << 13) | (1 << 9)); 
    116117    //PPE_TOP_PMU_SETUP(IFX_PMU_ENABLE); 
    117     PPE_SLL01_PMU_SETUP(IFX_PMU_ENABLE); 
     118/*    PPE_SLL01_PMU_SETUP(IFX_PMU_ENABLE); 
    118119    PPE_TC_PMU_SETUP(IFX_PMU_ENABLE); 
    119120    PPE_EMA_PMU_SETUP(IFX_PMU_ENABLE); 
    120121    PPE_QSB_PMU_SETUP(IFX_PMU_ENABLE); 
    121122    PPE_TPE_PMU_SETUP(IFX_PMU_ENABLE); 
    122     DSL_DFE_PMU_SETUP(IFX_PMU_ENABLE); 
     123    DSL_DFE_PMU_SETUP(IFX_PMU_ENABLE);*/ 
     124        struct clk *clk = clk_get_sys("ltq_dsl", NULL); 
     125        clk_enable(clk); 
    123126} 
    124127 
    125128static inline void uninit_pmu(void) 
    126129{ 
    127     PPE_SLL01_PMU_SETUP(IFX_PMU_DISABLE); 
     130  /*  PPE_SLL01_PMU_SETUP(IFX_PMU_DISABLE); 
    128131    PPE_TC_PMU_SETUP(IFX_PMU_DISABLE); 
    129132    PPE_EMA_PMU_SETUP(IFX_PMU_DISABLE); 
    130133    PPE_QSB_PMU_SETUP(IFX_PMU_DISABLE); 
    131134    PPE_TPE_PMU_SETUP(IFX_PMU_DISABLE); 
    132     DSL_DFE_PMU_SETUP(IFX_PMU_DISABLE); 
     135    DSL_DFE_PMU_SETUP(IFX_PMU_DISABLE);*/ 
    133136    //PPE_TOP_PMU_SETUP(IFX_PMU_DISABLE); 
     137        struct clk *clk = clk_get_sys("ltq_dsl", NULL); 
     138        clk_disable(clk); 
    134139} 
    135140 
  • trunk/package/ltq-dsl/src/ifxmips_atm_danube.c

    r28406 r31065  
    4141#include <linux/init.h> 
    4242#include <linux/ioctl.h> 
     43#include <linux/clk.h> 
    4344#include <asm/delay.h> 
    4445 
     
    110111    //*(unsigned long *)0xBF10201C &= ~((1 << 15) | (1 << 13) | (1 << 9)); 
    111112    //PPE_TOP_PMU_SETUP(IFX_PMU_ENABLE); 
    112     PPE_SLL01_PMU_SETUP(IFX_PMU_ENABLE); 
     113/*    PPE_SLL01_PMU_SETUP(IFX_PMU_ENABLE); 
    113114    PPE_TC_PMU_SETUP(IFX_PMU_ENABLE); 
    114115    PPE_EMA_PMU_SETUP(IFX_PMU_ENABLE); 
    115116    PPE_QSB_PMU_SETUP(IFX_PMU_ENABLE); 
    116117    PPE_TPE_PMU_SETUP(IFX_PMU_ENABLE); 
    117     DSL_DFE_PMU_SETUP(IFX_PMU_ENABLE); 
     118    DSL_DFE_PMU_SETUP(IFX_PMU_ENABLE);*/ 
     119    struct clk *clk = clk_get_sys("ltq_dsl", NULL); 
     120    clk_enable(clk); 
    118121} 
    119122 
    120123static inline void uninit_pmu(void) 
    121124{ 
    122     PPE_SLL01_PMU_SETUP(IFX_PMU_DISABLE); 
     125/*    PPE_SLL01_PMU_SETUP(IFX_PMU_DISABLE); 
    123126    PPE_TC_PMU_SETUP(IFX_PMU_DISABLE); 
    124127    PPE_EMA_PMU_SETUP(IFX_PMU_DISABLE); 
    125128    PPE_QSB_PMU_SETUP(IFX_PMU_DISABLE); 
    126129    PPE_TPE_PMU_SETUP(IFX_PMU_DISABLE); 
    127     DSL_DFE_PMU_SETUP(IFX_PMU_DISABLE); 
     130    DSL_DFE_PMU_SETUP(IFX_PMU_DISABLE);*/ 
    128131    //PPE_TOP_PMU_SETUP(IFX_PMU_DISABLE); 
     132    struct clk *clk = clk_get_sys("ltq_dsl", NULL); 
     133    clk_disable(clk); 
    129134} 
    130135 
  • trunk/package/ltq-dsl/src/ifxmips_compat.h

    r28406 r31065  
    3535#define IFX_PMU_MODULE_PPE_TOP    (1 << 29) 
    3636 
     37extern void ltq_pmu_enable(unsigned int module); 
     38extern void ltq_pmu_disable(unsigned int module); 
     39 
    3740#define ifx_pmu_set(a,b)        {if(a == IFX_PMU_ENABLE) ltq_pmu_enable(b); else ltq_pmu_disable(b);} 
    3841 
Note: See TracChangeset for help on using the changeset viewer.