Merge "drivers: qcom: socinfo: Add support for ADP hardware type" (31e40c14) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/soc/qcom/socinfo.c

+9 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,7 @@ enum {
		HW_PLATFORM_RCM = 21,
		HW_PLATFORM_STP = 23,
		HW_PLATFORM_SBC = 24,
		HW_PLATFORM_ADP = 25,
		HW_PLATFORM_HDK = 31,
		HW_PLATFORM_ATP = 33,
		HW_PLATFORM_IDP = 34,
		@@ -76,6 +77,7 @@ static const char * const hw_platform[] = {
		[HW_PLATFORM_DTV] = "DTV",
		[HW_PLATFORM_STP] = "STP",
		[HW_PLATFORM_SBC] = "SBC",
		[HW_PLATFORM_ADP] = "ADP",
		[HW_PLATFORM_HDK] = "HDK",
		[HW_PLATFORM_ATP] = "ATP",
		[HW_PLATFORM_IDP] = "IDP",
		@@ -99,6 +101,10 @@ static const char * const qrd_hw_platform_subtype[] = {
		[PLATFORM_SUBTYPE_QRD_INVALID] = "INVALID",
		};

		static const char * const adp_hw_platform_subtype[] = {
		[0] = "ADP",
		};

		enum {
		PLATFORM_SUBTYPE_UNKNOWN = 0x0,
		PLATFORM_SUBTYPE_CHARM = 0x1,
		@@ -440,6 +446,9 @@ msm_get_platform_subtype(struct device *dev,
		}
		return snprintf(buf, PAGE_SIZE, "%-.32s\n",
		qrd_hw_platform_subtype[hw_subtype]);
		} else if (socinfo_get_platform_type() == HW_PLATFORM_ADP) {
		return scnprintf(buf, PAGE_SIZE, "%-.32s\n",
		adp_hw_platform_subtype[0]);
		} else {
		if (hw_subtype >= PLATFORM_SUBTYPE_INVALID) {
		pr_err("Invalid hardware platform subtype\n");