Revert "[PORT FROM R2]pti: Check if pti is enabled in mipi header"
authorEric Vorbe <ericx.vorbe@intel.com>
Wed, 25 Apr 2012 09:15:16 +0000 (11:15 +0200)
committerVorbe, EricX <ericx.vorbe@intel.com>
Wed, 25 Apr 2012 09:18:12 +0000 (02:18 -0700)
BZ: 28818

This reverts commit 29baf44f0bb8d14636e58b400d9dc9a51d23c1fa.

Change-Id: Iebd395a606b6b83dad3cc9d801cd954706b12337
Signed-off-by: Eric Vorbe <ericx.vorbe@intel.com>
Reviewed-on: http://android.intel.com:8080/46022

drivers/misc/pti.c

index dac0d3e..ceaee03 100644 (file)
@@ -34,8 +34,6 @@
 #include <linux/miscdevice.h>
 #include <linux/pti.h>
 
-#include <asm/intel_scu_ipc.h>
-
 #define DRIVERNAME             "pti"
 #define PCINAME                        "pciPTI"
 #define TTYNAME                        "ttyPTI"
 #define APERTURE_14            0x3800000 /* offset to first OS write addr */
 #define APERTURE_LEN           0x400000  /* address length */
 
-#define SMIP_PTI_OFFSET                0x30C /*
-                                      * offset to PTI configuration
-                                      * in MIP header
-                                      */
-#define SMIP_PTI_EN            (1<<7) /*
-                                       * PTI enable bit in PTI
-                                       * configuration
-                                       */
-
 struct pti_tty {
        struct pti_masterchannel *mc;
 };
@@ -899,9 +888,6 @@ static struct pci_driver pti_pci_driver = {
  * pti_init()- Overall entry/init call to the pti driver.
  *             It starts the registration process with the kernel.
  *
- *             MIP header is checked if PTI is enabled and error is
- *             returned if not
- *
  * Returns:
  *     int __init, 0 for success
  *     otherwise value is an error
@@ -911,22 +897,6 @@ static int __init pti_init(void)
 {
        int retval = -EINVAL;
 
-#ifdef CONFIG_INTEL_SCU_IPC
-       u8 smip_pti;
-
-       retval = intel_scu_ipc_read_mip(&smip_pti, 1, SMIP_PTI_OFFSET, 1);
-       if (retval) {
-               pr_err("%s(%d): Mip read failed (retval = %d\n",
-                      __func__, __LINE__, retval);
-               return retval;
-       }
-       if (!(smip_pti & SMIP_PTI_EN)) {
-               pr_info("%s(%d): PTI disabled in MIP header\n",
-                       __func__, __LINE__);
-               return -EPERM;
-       }
-#endif /* CONFIG_INTEL_SCU_IPC */
-
        /* First register module as tty device */
 
        pti_tty_driver = alloc_tty_driver(1);