undo partial workaround for SDOCM00101586

diff --git a/device/k2h/policy_dsp_arm.c b/device/k2h/policy_dsp_arm.c
index 705f64b28e7e2e9836e1ec2d5eba759aaac94b3d..18e16be81048a31a468e5243d1646ef29e61d3fa 100644 (file)
--- a/device/k2h/policy_dsp_arm.c
+++ b/device/k2h/policy_dsp_arm.c
@@ -1777,16 +1777,11 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x0f,
-0xe0,
+0xa0,
 0x00,
 0x00,
-0x10,
-0x20,
-0x69,
-0x75,
-0x20,
-0x3d,
-0x20,
+0x00,
+0x40,
 0x28,
 0x2a,
 0x29,
@@ -1794,11 +1789,16 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x0f,
-0xa0,
-0x00,
+0xe0,
 0x00,
 0x00,
-0x40,
+0x10,
+0x20,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
 0x28,
 0x2a,
 0x29,
@@ -4236,16 +4236,11 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x0c,
 0x00,
 0x00,
 0x00,
-0x14,
-0x69,
-0x75,
-0x20,
-0x3d,
-0x20,
+0x00,
+0x0c,
 0x28,
 0x2a,
 0x29,
@@ -4253,11 +4248,16 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x0c,
 0x00,
 0x00,
 0x00,
-0x00,
-0x0c,
+0x14,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
 0x28,
 0x2a,
 0x29,
@@ -4304,16 +4304,11 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x0c,
 0x00,
 0x00,
 0x00,
-0x20,
-0x69,
-0x75,
-0x20,
-0x3d,
-0x20,
+0x00,
+0x0c,
 0x28,
 0x2a,
 0x29,
@@ -4321,11 +4316,16 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x0c,
 0x00,
 0x00,
 0x00,
-0x00,
-0x0c,
+0x20,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
 0x28,
 0x2a,
 0x29,
@@ -4376,16 +4376,11 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x0c,
 0x00,
 0x00,
 0x00,
-0x34,
-0x69,
-0x75,
-0x20,
-0x3d,
-0x20,
+0x00,
+0x0c,
 0x28,
 0x2a,
 0x29,
@@ -4393,11 +4388,16 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x0c,
 0x00,
 0x00,
 0x00,
-0x00,
-0x0c,
+0x34,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
 0x28,
 0x2a,
 0x29,

diff --git a/device/k2h/policy_dsp_arm.dtb b/device/k2h/policy_dsp_arm.dtb
index f6561ddcfd4e2f2cbc2eb8557d51e6b5ba21db95..370cf2ad5d475a3db9d4572741fc85c29b8e70d5 100644 (file)
Binary files a/device/k2h/policy_dsp_arm.dtb and b/device/k2h/policy_dsp_arm.dtb differ

diff --git a/device/k2h/policy_dsp_arm.dts b/device/k2h/policy_dsp_arm.dts
index 5ac2c923a174666da2a12ce58ba024a29f5dd24e..108a8db987cd155d27967017bb117640408c4f64 100644 (file)
--- a/device/k2h/policy_dsp_arm.dts
+++ b/device/k2h/policy_dsp_arm.dts
@@ -107,8 +107,8 @@
         }; 
         GENERAL_PURPOSE_QUEUE-qm1 {
             assignments = <896  3104>,  "iu = (*)",
-                          <4064 4128>, "iu = (*)",
-                          <4000 64>,   "(*)";             /* Used by Kernel */
+                          <4000 64>,   "(*)",             /* Used by Kernel */
+                          <4064 4128>, "iu = (*)";
         };    
         LOW_PRIORITY_QUEUE-qm2 {
             assignments = <8192 512>, "iu = (*)";
@@ -249,16 +249,16 @@
         };   
 
         qmss-qm1-rx-ch {
-            assignments = <12 20>, "iu = (*)",
-                           <0 12>, "(*)";   /* Used by kernel */
+            assignments = <0 12>, "(*)",   /* Used by kernel */
+                          <12 20>, "iu = (*)";
         };
         qmss-qm1-tx-ch {
-            assignments = <12 32>, "iu = (*)",
-                          <0 12>, "(*)"; /* Used by kernel */
+            assignments = <0 12>, "(*)", /* Used by kernel */
+                          <12 32>, "iu = (*)";
         };
         qmss-qm1-rx-flow-id {
-            assignments = <12 52>, "iu = (*)",
-                          <0 12>, "(*)";    /* Used by kernel */
+            assignments = <0 12>, "(*)",    /* Used by kernel */
+                          <12 52>, "iu = (*)";
         };   
 
         qmss-qm2-rx-ch {

diff --git a/device/k2k/policy_dsp_arm.c b/device/k2k/policy_dsp_arm.c
index e5ca0d40e453a2ed8f195580244fb1eba8d59c9a..82ccb3de2b23b1391bb5237fa24903188223b7b8 100644 (file)
--- a/device/k2k/policy_dsp_arm.c
+++ b/device/k2k/policy_dsp_arm.c
@@ -1777,16 +1777,11 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x0f,
-0xe0,
+0xa0,
 0x00,
 0x00,
-0x10,
-0x20,
-0x69,
-0x75,
-0x20,
-0x3d,
-0x20,
+0x00,
+0x40,
 0x28,
 0x2a,
 0x29,
@@ -1794,11 +1789,16 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x0f,
-0xa0,
-0x00,
+0xe0,
 0x00,
 0x00,
-0x40,
+0x10,
+0x20,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
 0x28,
 0x2a,
 0x29,
@@ -4236,16 +4236,11 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x0c,
 0x00,
 0x00,
 0x00,
-0x14,
-0x69,
-0x75,
-0x20,
-0x3d,
-0x20,
+0x00,
+0x0c,
 0x28,
 0x2a,
 0x29,
@@ -4253,11 +4248,16 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x0c,
 0x00,
 0x00,
 0x00,
-0x00,
-0x0c,
+0x14,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
 0x28,
 0x2a,
 0x29,
@@ -4304,16 +4304,11 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x0c,
 0x00,
 0x00,
 0x00,
-0x20,
-0x69,
-0x75,
-0x20,
-0x3d,
-0x20,
+0x00,
+0x0c,
 0x28,
 0x2a,
 0x29,
@@ -4321,11 +4316,16 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x0c,
 0x00,
 0x00,
 0x00,
-0x00,
-0x0c,
+0x20,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
 0x28,
 0x2a,
 0x29,
@@ -4376,16 +4376,11 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
-0x0c,
 0x00,
 0x00,
 0x00,
-0x34,
-0x69,
-0x75,
-0x20,
-0x3d,
-0x20,
+0x00,
+0x0c,
 0x28,
 0x2a,
 0x29,
@@ -4393,11 +4388,16 @@ const char rmDspPlusArmPolicy[] = {
 0x00,
 0x00,
 0x00,
+0x0c,
 0x00,
 0x00,
 0x00,
-0x00,
-0x0c,
+0x34,
+0x69,
+0x75,
+0x20,
+0x3d,
+0x20,
 0x28,
 0x2a,
 0x29,

diff --git a/device/k2k/policy_dsp_arm.dtb b/device/k2k/policy_dsp_arm.dtb
index 9e82e1f0a6ad019f1a6ee207c5e449aef9f3b515..d1235a9467b138a4c25d7b22db2e6aa32028852a 100644 (file)
Binary files a/device/k2k/policy_dsp_arm.dtb and b/device/k2k/policy_dsp_arm.dtb differ

diff --git a/device/k2k/policy_dsp_arm.dts b/device/k2k/policy_dsp_arm.dts
index 71556d52a719c1f475778b5675a94f51d1e8f385..5a6a715130c2d537b4d4c8ca0d0dc1ba61bdcea7 100644 (file)
--- a/device/k2k/policy_dsp_arm.dts
+++ b/device/k2k/policy_dsp_arm.dts
@@ -107,8 +107,8 @@
         }; 
         GENERAL_PURPOSE_QUEUE-qm1 {
             assignments = <896  3104>,  "iu = (*)",
-                          <4064 4128>, "iu = (*)",
-                          <4000 64>,   "(*)";             /* Used by Kernel */
+                          <4000 64>,   "(*)",             /* Used by Kernel */
+                          <4064 4128>, "iu = (*)";
         };    
         LOW_PRIORITY_QUEUE-qm2 {
             assignments = <8192 512>, "iu = (*)";
@@ -249,16 +249,16 @@
         };   
 
         qmss-qm1-rx-ch {
-            assignments = <12 20>, "iu = (*)",
-                           <0 12>, "(*)";   /* Used by kernel */
+            assignments = <0 12>, "(*)",   /* Used by kernel */
+                          <12 20>, "iu = (*)";
         };
         qmss-qm1-tx-ch {
-            assignments = <12 32>, "iu = (*)",
-                          <0 12>, "(*)"; /* Used by kernel */
+            assignments = <0 12>, "(*)", /* Used by kernel */
+                          <12 32>, "iu = (*)";
         };
         qmss-qm1-rx-flow-id {
-            assignments = <12 52>, "iu = (*)",
-                          <0 12>, "(*)";    /* Used by kernel */
+            assignments = <0 12>, "(*)",    /* Used by kernel */
+                          <12 52>, "iu = (*)";
         };   
 
         qmss-qm2-rx-ch {