Merge "diag: Add snapshot of Diag driver" into msm-next

	  how to partition a single ROM for multiple purposes.

source "drivers/char/xillybus/Kconfig"

source "drivers/char/diag/Kconfig"

endmenu

obj-$(CONFIG_TILE_SROM)		+= tile-srom.o

obj-$(CONFIG_XILLYBUS)		+= xillybus/

obj-$(CONFIG_POWERNV_OP_PANEL)	+= powernv-op-panel.o

obj-$(CONFIG_DIAG_CHAR)		+= diag/

menu "Diag Support"

config DIAG_CHAR

	tristate "DIAG CHAR Interface Core"

	default n

	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

obj-$(CONFIG_DIAG_CHAR) += diagchar_core.o diagchar_hdlc.o diagfwd.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

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