Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / misc / Kconfig

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index d80dcdee88f3e588dbf2e0903719b22267794fa6..4e349cd98bcfd6e70a27fdcf08d6dafbec6aa181 100644 (file)
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -144,6 +144,19 @@ config PHANTOM
          If you choose to build module, its name will be phantom. If unsure,
          say N here.
 
+config INTEL_MID_PTI
+       tristate "Parallel Trace Interface for MIPI P1149.7 cJTAG standard"
+       default n
+       help
+         The PTI (Parallel Trace Interface) driver directs
+         trace data routed from various parts in the system out
+         through an Intel Penwell PTI port and out of the mobile
+         device for analysis with a debugging tool (Lauterbach or Fido).
+
+         You should select this driver if the target kernel is meant for
+         an Intel Atom (non-netbook) mobile device containing a MIPI
+         P1149.7 standard implementation.
+
 config SGI_IOC4
        tristate "SGI IOC4 Base IO support"
        depends on PCI
@@ -459,7 +472,7 @@ config BMP085
          module will be called bmp085.
 
 config PCH_PHUB
-       tristate "PCH Packet Hub of Intel Topcliff / OKI SEMICONDUCTOR ML7213"
+       tristate "Intel EG20T PCH / OKI SEMICONDUCTOR IOH(ML7213/ML7223) PHUB"
        depends on PCI
        help
          This driver is for PCH(Platform controller Hub) PHUB(Packet Hub) of
@@ -467,10 +480,12 @@ config PCH_PHUB
          processor. The Topcliff has MAC address and Option ROM data in SROM.
          This driver can access MAC address and Option ROM data in SROM.
 
-         This driver also can be used for OKI SEMICONDUCTOR's ML7213 which is
-         for IVI(In-Vehicle Infotainment) use.
-         ML7213 is companion chip for Intel Atom E6xx series.
-         ML7213 is completely compatible for Intel EG20T PCH.
+         This driver also can be used for OKI SEMICONDUCTOR IOH(Input/
+         Output Hub), ML7213 and ML7223.
+         ML7213 IOH is for IVI(In-Vehicle Infotainment) use and ML7223 IOH is
+         for MP(Media Phone) use.
+         ML7213/ML7223 is companion chip for Intel Atom E6xx series.
+         ML7213/ML7223 is completely compatible for Intel EG20T PCH.
 
          To compile this driver as a module, choose M here: the module will
          be called pch_phub.