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

Commit b643f6b4 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "usb: config: Fix incorrect use of keywords"

parents e65e3233 3d5f9d70

arch/arm64/configs/vendor/sdmsteppe-auto-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -453,7 +453,7 @@ CONFIG_USB_ISP1760=y 
CONFIG_USB_ISP1760_HOST_ROLE=y

CONFIG_USB_EHSET_TEST_FIXTURE=y

CONFIG_USB_LINK_LAYER_TEST=y

CONFIG_USB_QCOM_DIAG_BRIDGE=y

CONFIG_USB_QTI_DIAG_BRIDGE=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_USB_QCOM_EMU_PHY=y

CONFIG_USB_MSM_SSPHY_QMP=y

arch/arm64/configs/vendor/sdmsteppe-auto_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -471,7 +471,7 @@ CONFIG_USB_ISP1760=y 
CONFIG_USB_ISP1760_HOST_ROLE=y

CONFIG_USB_EHSET_TEST_FIXTURE=y

CONFIG_USB_LINK_LAYER_TEST=y

CONFIG_USB_QCOM_DIAG_BRIDGE=y

CONFIG_USB_QTI_DIAG_BRIDGE=y

CONFIG_NOP_USB_XCEIV=y

CONFIG_USB_QCOM_EMU_PHY=y

CONFIG_USB_MSM_SSPHY_QMP=y

drivers/char/diag/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ config DIAG_OVER_USB 
config DIAGFWD_BRIDGE_CODE

	bool "Enable remote DIAG traffic over MHI/HSIC"

	depends on DIAG_CHAR

	depends on USB_QCOM_DIAG_BRIDGE || MHI_BUS

	depends on USB_QTI_DIAG_BRIDGE || MHI_BUS

	default y

	help

	  MHI/HSIC Transport Layer for DIAG Router. When the MHI/HSIC endpoints

drivers/char/diag/Makefile

+1 −1
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_QTI_DIAG_BRIDGE) += diagfwd_hsic.o

obj-$(CONFIG_MHI_BUS) += diagfwd_mhi.o

diagchar-objs := diagchar_core.o diagchar_hdlc.o diagfwd.o diagfwd_peripheral.o diagfwd_socket.o diagfwd_rpmsg.o diag_mux.o diag_memorydevice.o diag_usb.o diagmem.o diagfwd_cntl.o diag_dci.o diag_masks.o diag_debugfs.o diag_pcie.o

drivers/char/diag/diag_debugfs.c

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#ifdef CONFIG_DIAGFWD_BRIDGE_CODE

#include "diagfwd_bridge.h"

#endif

#ifdef CONFIG_USB_QCOM_DIAG_BRIDGE

#ifdef CONFIG_USB_QTI_DIAG_BRIDGE

#include "diagfwd_hsic.h"

#endif

#ifdef CONFIG_MHI_BUS
@@ -781,7 +781,7 @@ static ssize_t diag_dbgfs_write_debug(struct file *fp, const char __user *buf, 
#endif



#ifdef CONFIG_DIAGFWD_BRIDGE_CODE

#ifdef CONFIG_USB_QCOM_DIAG_BRIDGE

#ifdef CONFIG_USB_QTI_DIAG_BRIDGE

static ssize_t diag_dbgfs_read_hsicinfo(struct file *file, char __user *ubuf,

					size_t count, loff_t *ppos)

{
@@ -1104,7 +1104,7 @@ int diag_debugfs_init(void) 
				    &diag_dbgfs_bridge_ops);

	if (!entry)

		goto err;

#ifdef CONFIG_USB_QCOM_DIAG_BRIDGE

#ifdef CONFIG_USB_QTI_DIAG_BRIDGE

	entry = debugfs_create_file("hsicinfo", 0444, diag_dbgfs_dent, 0,

				    &diag_dbgfs_hsicinfo_ops);

	if (!entry)