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

This project is archived. Its data is read-only. This project is read-only.

Commit 5468d13d authored Jul 16, 2018 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Jul 16, 2018

Merge "diag: Enable diagfwd via USB even when MHI is available"

parents 582f5092 14682078

Documentation/devicetree/bindings/arm/msm/diagfwd_usb.txt

0 → 100644

+9 −0

Original line number	Diff line number	Diff line
		QTI Diag Forward USB Driver

		Required properties:
		-compatible : should be "qcom,diagfwd-usb".

		Example:
		qcom,diag {
		compatible = "qcom,diagfwd-usb";
		};

arch/arm64/configs/msm-auto-perf_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -428,6 +428,7 @@ CONFIG_USB_DWC3=y
		CONFIG_USB_ISP1760=y
		CONFIG_USB_EHSET_TEST_FIXTURE=y
		CONFIG_USB_QTI_KS_BRIDGE=y
		CONFIG_USB_QCOM_DIAG_BRIDGE=y
		CONFIG_NOP_USB_XCEIV=y
		CONFIG_USB_MSM_SSPHY_QMP=y
		CONFIG_MSM_QUSB_PHY=y

arch/arm64/configs/msm-auto_defconfig

+1 −0

Original line number	Diff line number	Diff line
		@@ -432,6 +432,7 @@ CONFIG_USB_DWC3=y
		CONFIG_USB_ISP1760=y
		CONFIG_USB_EHSET_TEST_FIXTURE=y
		CONFIG_USB_QTI_KS_BRIDGE=y
		CONFIG_USB_QCOM_DIAG_BRIDGE=y
		CONFIG_NOP_USB_XCEIV=y
		CONFIG_USB_MSM_SSPHY_QMP=y
		CONFIG_MSM_QUSB_PHY=y

drivers/char/diag/Makefile

+0 −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_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_smd.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

drivers/char/diag/diag_debugfs.c

+1 −2

Original line number	Diff line number	Diff line
		/* Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2011-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -23,7 +23,6 @@
		#endif
		#ifdef CONFIG_USB_QCOM_DIAG_BRIDGE
		#include "diagfwd_hsic.h"
		#include "diagfwd_smux.h"
		#endif
		#ifdef CONFIG_MSM_MHI
		#include "diagfwd_mhi.h"