Changeset 31065

Timestamp:

2012-03-25T10:50:42+02:00 (6 years ago)

Author:

blogic

Message:

[ltq-dsl] fix for 3.2.9

Location:

trunk/package/ltq-dsl/src

Files:

• ifxmips_atm_amazon_se.c (modified) (3 diffs)
• ifxmips_atm_ar9.c (modified) (2 diffs)
• ifxmips_atm_danube.c (modified) (2 diffs)
• ifxmips_compat.h (modified) (1 diff)

trunk/package/ltq-dsl/src/ifxmips_atm_amazon_se.c

@@ -41 +41 @@
 #include <linux/init.h>
 #include <linux/ioctl.h>
+#include <linux/clk.h>
 #include <asm/delay.h>
 
@@ -108 +109 @@
     //*(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);
@@ -124 +127 @@
     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);
 }
 

trunk/package/ltq-dsl/src/ifxmips_atm_ar9.c

@@ -41 +41 @@
 #include <linux/init.h>
 #include <linux/ioctl.h>
+#include <linux/clk.h>
 #include <asm/delay.h>
 
@@ -115 +116 @@
     //*(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);
 }
 

trunk/package/ltq-dsl/src/ifxmips_atm_danube.c

@@ -41 +41 @@
 #include <linux/init.h>
 #include <linux/ioctl.h>
+#include <linux/clk.h>
 #include <asm/delay.h>
 
@@ -110 +111 @@
     //*(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);
 }
 

trunk/package/ltq-dsl/src/ifxmips_compat.h

@@ -35 +35 @@
 #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);}