Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 974132c3 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "diag: Add snapshot of Diag" into msm-4.8

parents 267c1da6 cb8893db
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -48,6 +48,8 @@ config SGI_MBCS

source "drivers/tty/serial/Kconfig"

source "drivers/char/diag/Kconfig"

config TTY_PRINTK
	tristate "TTY driver to output user messages via printk"
	depends on EXPERT && TTY
+1 −0
Original line number Diff line number Diff line
@@ -58,5 +58,6 @@ obj-$(CONFIG_JS_RTC) += js-rtc.o
js-rtc-y = rtc.o

obj-$(CONFIG_TILE_SROM)		+= tile-srom.o
obj-$(CONFIG_DIAG_CHAR)		+= diag/
obj-$(CONFIG_XILLYBUS)		+= xillybus/
obj-$(CONFIG_POWERNV_OP_PANEL)	+= powernv-op-panel.o
+37 −0
Original line number Diff line number Diff line
menu "Diag Support"

config DIAG_CHAR
	tristate "DIAG CHAR Interface Core"
	default m
	depends on USB_CONFIGFS_F_DIAG || USB_FUNCTION_DIAG || USB_QCOM_MAEMO
	depends on ARCH_QCOM
	depends on POWER_RESET_QCOM
	select CRC_CCITT
	help
	  Char driver interface for SoC Diagnostic information. The DIAG Char
	  driver provides diag forwarding to user space and SoC Peripherals.
	  This enables diagchar for maemo usb gadget or android usb gadget
	  based on config selected.

config DIAG_OVER_USB
	bool "Enable DIAG traffic to go over USB"
	depends on DIAG_CHAR
	depends on ARCH_QCOM
	default y
	help
	  Diag over USB enables sending DIAG traffic over a USB transport. When
	  the USB endpoints become available, the DIAG driver will enable Diag
	  traffic over USB. This allows for host side tools to parse and display
	  Diag traffic from the USB endpoint.

config DIAGFWD_BRIDGE_CODE
	bool "Enable QSC/9K DIAG traffic over SMUX/HSIC"
	depends on DIAG_CHAR
	depends on USB_QCOM_DIAG_BRIDGE || MSM_MHI
	default y
	help
	  SMUX/HSIC Transport Layer for DIAG Router. When the MHI/SMUX endpoints
	  become available, this bridge driver enables DIAG traffic over MHI
	  and SMUX.

endmenu
+6 −0
Original line number Diff line number Diff line
obj-$(CONFIG_DIAG_CHAR) := diagchar.o
obj-$(CONFIG_DIAGFWD_BRIDGE_CODE) += diagfwd_bridge.o
obj-$(CONFIG_USB_QCOM_DIAG_BRIDGE) += diagfwd_hsic.o
obj-$(CONFIG_USB_QCOM_DIAG_BRIDGE) += diagfwd_smux.o
obj-$(CONFIG_MSM_MHI) += diagfwd_mhi.o
diagchar-objs := diagchar_core.o diagchar_hdlc.o diagfwd.o diagfwd_glink.o diagfwd_peripheral.o diagfwd_socket.o diag_mux.o diag_memorydevice.o diag_usb.o diagmem.o diagfwd_cntl.o diag_dci.o diag_masks.o diag_debugfs.o
+3169 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading