Revert "dlp_ctrl.c: Adding support for NOP command reception"

BZ: 33872

This reverts commit b6304af67f2b2f322cad8c1fae8e5c4c780c72c3.
This reverts patch http://android.intel.com:8080/#/c/46567

Change-Id: Iaea052c3da48ef7253e878b532c5e11b183dad43
Signed-off-by: lebsir <samix.lebsir@intel.com>
Reviewed-on: http://android.intel.com:8080/47664
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

diff --git a/drivers/hsi/clients/dlp_ctrl.c b/drivers/hsi/clients/dlp_ctrl.c
index 79d00e7..fe51302 100644 (file)
--- a/drivers/hsi/clients/dlp_ctrl.c
+++ b/drivers/hsi/clients/dlp_ctrl.c
@@ -600,13 +600,6 @@ static void dlp_ctrl_complete_rx(struct hsi_msg *msg)
        ch_ctx = dlp_drv.channels[hsi_channel];
 
        switch (params.id) {
-
-       case DLP_CMD_NOP:
-               /* Trace then drop the nop command */
-               PTRACE_NO_FUNC("Gotta nop: 0x40%02X%02X%02X\n",
-                               params.data1, params.data2, params.data3);
-               break;
-
        case DLP_CMD_CREDITS:
                if (msg_complete) {
                        unsigned long flags;

diff --git a/drivers/hsi/controllers/intel_mid_hsi.c b/drivers/hsi/controllers/intel_mid_hsi.c
index b1cfc72..e0eac6b 100644 (file)
--- a/drivers/hsi/controllers/intel_mid_hsi.c
+++ b/drivers/hsi/controllers/intel_mid_hsi.c
@@ -35,7 +35,11 @@
 
 /* Set the following to prevent ACWAKE toggling (for debugging). This also
  * disbales power management */
+#ifdef CONFIG_HSI_DLP
+#define PREVENT_ACWAKE_TOGGLING
+#else
 #undef PREVENT_ACWAKE_TOGGLING
+#endif
 
 /* Set the following to allow software workaround of the DMA link listing */
 #define USE_SOFWARE_WORKAROUND_FOR_DMA_LLI