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

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

Merge "qpnp-revid: move pmi8998 and pm660 FAB_ID definitions to qpnp-revid.h" into msm-4.9

parents 36505e11 9625c947

drivers/iio/adc/qcom-rradc.c

+4 −9
Original line number Diff line number Diff line
@@ -163,11 +163,6 @@ 
#define FG_ADC_RR_DIE_TEMP_SLOPE		2

#define FG_ADC_RR_DIE_TEMP_OFFSET_MILLI_DEGC	25000



#define FAB_ID_GF				0x30

#define FAB_ID_SMIC				0x11

#define FAB_ID_660_GF				0x0

#define FAB_ID_660_TSMC				0x2

#define FAB_ID_660_MX				0x3

#define FG_ADC_RR_CHG_TEMP_GF_OFFSET_UV		1303168

#define FG_ADC_RR_CHG_TEMP_GF_SLOPE_UV_PER_C	3784

#define FG_ADC_RR_CHG_TEMP_SMIC_OFFSET_UV	1338433
@@ -401,11 +396,11 @@ static int rradc_get_660_fab_coeff(struct rradc_chip *chip, 
		int64_t *offset, int64_t *slope)

{

	switch (chip->pmic_fab_id->fab_id) {

	case FAB_ID_660_GF:

	case PM660_FAB_ID_GF:

		*offset = FG_ADC_RR_CHG_TEMP_660_GF_OFFSET_UV;

		*slope = FG_RR_CHG_TEMP_660_GF_SLOPE_UV_PER_C;

		break;

	case FAB_ID_660_TSMC:

	case PM660_FAB_ID_TSMC:

		*offset = FG_ADC_RR_CHG_TEMP_660_SMIC_OFFSET_UV;

		*slope = FG_RR_CHG_TEMP_660_SMIC_SLOPE_UV_PER_C;

		break;
@@ -421,11 +416,11 @@ static int rradc_get_8998_fab_coeff(struct rradc_chip *chip, 
		int64_t *offset, int64_t *slope)

{

	switch (chip->pmic_fab_id->fab_id) {

	case FAB_ID_GF:

	case PMI8998_FAB_ID_GF:

		*offset = FG_ADC_RR_CHG_TEMP_GF_OFFSET_UV;

		*slope = FG_ADC_RR_CHG_TEMP_GF_SLOPE_UV_PER_C;

		break;

	case FAB_ID_SMIC:

	case PMI8998_FAB_ID_SMIC:

		*offset = FG_ADC_RR_CHG_TEMP_SMIC_OFFSET_UV;

		*slope = FG_ADC_RR_CHG_TEMP_SMIC_SLOPE_UV_PER_C;

		break;

include/linux/qpnp/qpnp-revid.h

+11 −1
Original line number Diff line number Diff line 
/* Copyright (c) 2013-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2017, 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
@@ -181,6 +181,7 @@ 
#define PM660L_SUBTYPE	0x1A

#define PM660_SUBTYPE	0x1B



/* PMI8998 REV_ID */

#define PMI8998_V1P0_REV1	0x00

#define PMI8998_V1P0_REV2	0x00

#define PMI8998_V1P0_REV3	0x00
@@ -196,6 +197,15 @@ 
#define PMI8998_V2P0_REV3	0x00

#define PMI8998_V2P0_REV4	0x02



/* PMI8998 FAB_ID */

#define PMI8998_FAB_ID_SMIC	0x11

#define PMI8998_FAB_ID_GF	0x30



/* PM660 FAB_ID */

#define PM660_FAB_ID_GF		0x0

#define PM660_FAB_ID_TSMC	0x2

#define PM660_FAB_ID_MX		0x3



/* PM8005 */

#define PM8005_SUBTYPE		0x18