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

Commit d272dc74 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 APQ8084 QPST string"

parents 346d9185 7b225760

drivers/char/diag/diagfwd.c

+29 −27
Original line number Diff line number Diff line
@@ -122,14 +122,6 @@ int chk_config_get_id(void) 
	if (machine_is_msm8x60_fusion() || machine_is_msm8x60_fusn_ffa())

		return 0;



	if (driver->use_device_tree) {

		if (machine_is_msm8974())

			return MSM8974_TOOLS_ID;

		else if (machine_is_apq8074())

			return APQ8074_TOOLS_ID;

		else

			return 0;

	} else {

	switch (socinfo_get_msm_cpu()) {

	case MSM_CPU_8X60:

		return APQ8060_TOOLS_ID;
@@ -148,7 +140,17 @@ int chk_config_get_id(void) 
		return MSM8974_TOOLS_ID;

	case MSM_CPU_8625:

		return MSM8625_TOOLS_ID;

	case MSM_CPU_8084:

		return APQ8084_TOOLS_ID;

	default:

		if (driver->use_device_tree) {

			if (machine_is_msm8974())

				return MSM8974_TOOLS_ID;

			else if (machine_is_apq8074())

				return APQ8074_TOOLS_ID;

			else

				return 0;

		} else {

			return 0;

		}

	}

include/linux/diagchar.h

+1 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ 
#define MSM8227_TOOLS_ID	4081

#define MSM8974_TOOLS_ID	4083

#define APQ8074_TOOLS_ID	4090

#define APQ8084_TOOLS_ID	4095



#define MSG_MASK_0			(0x00000001)

#define MSG_MASK_1			(0x00000002)