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

Commit facba1f8 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "diag: Add support for MSM8929 QPST string"

parents 0be31fea 4fdd9353

drivers/char/diag/diagfwd.c

+3 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2008-2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2008-2015, 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
@@ -119,6 +119,8 @@ int chk_config_get_id(void) 
		return MSM8992_TOOLS_ID;

	case MSM_CPU_TELLURIUM:

		return MSMTELLURIUM_TOOLS_ID;

	case MSM_CPU_8929:

		return MSM8929_TOOLS_ID;

	default:

		if (driver->use_device_tree) {

			if (machine_is_msm8974())

include/linux/diagchar.h

+2 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2008-2014, The Linux Foundation. All rights reserved.

/* Copyright (c) 2008-2015, 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
@@ -83,6 +83,7 @@ 
#define MSM8909_TOOLS_ID	4108

#define MSM8992_TOOLS_ID	4111

#define MSMTELLURIUM_TOOLS_ID	4110

#define MSM8929_TOOLS_ID	4113



#define MSG_MASK_0			(0x00000001)

#define MSG_MASK_1			(0x00000002)