IKXCLOCK-830 : PPG - Change Initialization and Access Method

Change-Id: I3285a2d8285d003431e294ff0cec2537efffaf63

8 files changed, 36 insertions, 36 deletions

diff --git a/drivers/mfd/m4sensorhub-irq.c b/drivers/mfd/m4sensorhub-irq.c
index 3bba4204107..7cafe559472 100644
--- a/drivers/mfd/m4sensorhub-irq.c
+++ b/drivers/mfd/m4sensorhub-irq.c
@@ -74,7 +74,7 @@ static const char *irq_name[] = {
 	[M4SH_IRQ_WRIST_READY]            = "WRIST_READY",
 	[M4SH_IRQ_PASSIVE_BUFFER_FULL]    = "PASSIVE_BUFFER_FULL",
 	[M4SH_IRQ_LIGHTSENSOR_DATA_READY] = "ALS_DATA_READY",
-	[M4SH_IRQ_HEARTRATESENSOR_DATA_READY] = "HR_DATA_READY",
+	[M4SH_IRQ_HRSENSOR_DATA_READY]    = "HR_DATA_READY",
 	[M4SH_IRQ_AP_ALARM_EXPIRED]       = "AP_ALARM_EXPIRED",
 };
 
diff --git a/drivers/mfd/m4sensorhub-reg.h b/drivers/mfd/m4sensorhub-reg.h
index abc8aeb6808..962c9ccf3d5 100644
--- a/drivers/mfd/m4sensorhub-reg.h
+++ b/drivers/mfd/m4sensorhub-reg.h
@@ -162,20 +162,20 @@ static const struct {
 	[M4SH_REG_GESTURE_VALUE3]            = {M4SH_TYPE_GESTURE, 0x9, 1},
 	[M4SH_REG_PASSIVE_TIMESTAMP]         = {M4SH_TYPE_PASSIVE, 0x0, 48},
 	[M4SH_REG_PASSIVE_STEPS]             = {M4SH_TYPE_PASSIVE, 0x30, 48},
-	[M4SH_REG_PASSIVE_METS]              = {M4SH_TYPE_PASSIVE, 0x60, 48},
+	[M4SH_REG_PASSIVE_CALORIES]          = {M4SH_TYPE_PASSIVE, 0x60, 48},
 	[M4SH_REG_PASSIVE_FLOORSCLIMBED]     = {M4SH_TYPE_PASSIVE, 0x90, 48},
 	[M4SH_REG_EMG_SIGNALCOUNT]           = {M4SH_TYPE_EMG, 0x0, 1},
 	[M4SH_REG_EMG_DUMMY]                 = {M4SH_TYPE_EMG, 0x1, 1},
 	[M4SH_REG_EMG_SAMPLERATE]            = {M4SH_TYPE_EMG, 0x2, 2},
 	[M4SH_REG_EMG_SIGNALS]               = {M4SH_TYPE_EMG, 0x4, 326},
 	[M4SH_REG_HEARTRATE_HEARTRATE]       = {M4SH_TYPE_HEARTRATE, 0x0, 2},
-	[M4SH_REG_HEARTRATESENSOR_VERSION]   = {M4SH_TYPE_HEARTRATESENSOR, 0x0, 1},
-	[M4SH_REG_HEARTRATESENSOR_DUMMY]     = {M4SH_TYPE_HEARTRATESENSOR, 0x1, 1},
-	[M4SH_REG_HEARTRATESENSOR_SAMPLERATE] = {M4SH_TYPE_HEARTRATESENSOR, 0x2, 2},
-	[M4SH_REG_HEARTRATESENSOR_RAWHRVALUE] = {M4SH_TYPE_HEARTRATESENSOR, 0x4, 24},
-	[M4SH_REG_HEARTRATESENSOR_REGADDR]   = {M4SH_TYPE_HEARTRATESENSOR, 0x1c, 1},
-	[M4SH_REG_HEARTRATESENSOR_REGVALUE]  = {M4SH_TYPE_HEARTRATESENSOR, 0x1d, 3},
-	[M4SH_REG_HEARTRATESENSOR_REGRWCMD]  = {M4SH_TYPE_HEARTRATESENSOR, 0x20, 1},
+	[M4SH_REG_HRSENSOR_VERSION]          = {M4SH_TYPE_HRSENSOR, 0x0, 1},
+	[M4SH_REG_HRSENSOR_DUMMY]            = {M4SH_TYPE_HRSENSOR, 0x1, 1},
+	[M4SH_REG_HRSENSOR_SAMPLERATE]       = {M4SH_TYPE_HRSENSOR, 0x2, 2},
+	[M4SH_REG_HRSENSOR_RAWVALUE]         = {M4SH_TYPE_HRSENSOR, 0x4, 4},
+	[M4SH_REG_HRSENSOR_REGADDR]          = {M4SH_TYPE_HRSENSOR, 0x8, 1},
+	[M4SH_REG_HRSENSOR_REGVALUE]         = {M4SH_TYPE_HRSENSOR, 0x9, 3},
+	[M4SH_REG_HRSENSOR_REGRWCMD]         = {M4SH_TYPE_HRSENSOR, 0xc, 1},
 	[M4SH_REG_LIGHTSENSOR_VERSION]       = {M4SH_TYPE_LIGHTSENSOR, 0x0, 1},
 	[M4SH_REG_LIGHTSENSOR_DUMMY]         = {M4SH_TYPE_LIGHTSENSOR, 0x1, 1},
 	[M4SH_REG_LIGHTSENSOR_SAMPLERATE]    = {M4SH_TYPE_LIGHTSENSOR, 0x2, 2},
@@ -205,7 +205,7 @@ static const unsigned int bank_size_tbl[M4SH_TYPE__NUM] = {
 	[M4SH_TYPE_PASSIVE]                  = 192,
 	[M4SH_TYPE_EMG]                      = 330,
 	[M4SH_TYPE_HEARTRATE]                = 2,
-	[M4SH_TYPE_HEARTRATESENSOR]          = 33,
+	[M4SH_TYPE_HRSENSOR]                 = 13,
 	[M4SH_TYPE_LIGHTSENSOR]              = 6,
 };
 #endif /*__M4SENSORHUB_MEM_INTERNAL_H__ */
diff --git a/drivers/misc/m4sensorhub_heartrate.c b/drivers/misc/m4sensorhub_heartrate.c
index 5e83d200166..56cd00777f4 100644
--- a/drivers/misc/m4sensorhub_heartrate.c
+++ b/drivers/misc/m4sensorhub_heartrate.c
@@ -97,8 +97,8 @@ static int m4hrt_set_samplerate(struct iio_dev *iio, int16_t rate)
 		goto m4hrt_set_samplerate_irq_check;
 
 	size = m4sensorhub_reg_getsize(dd->m4,
-		M4SH_REG_HEARTRATESENSOR_SAMPLERATE);
-	err = m4sensorhub_reg_write(dd->m4, M4SH_REG_HEARTRATESENSOR_SAMPLERATE,
+		M4SH_REG_HRSENSOR_SAMPLERATE);
+	err = m4sensorhub_reg_write(dd->m4, M4SH_REG_HRSENSOR_SAMPLERATE,
 		(char *)&rate, m4sh_no_mask);
 	if (err < 0) {
 		m4hrt_err("%s: Failed to set sample rate.\n", __func__);
@@ -116,7 +116,7 @@ m4hrt_set_samplerate_irq_check:
 		/* Enable the IRQ if necessary */
 		if (!(dd->status & (1 << M4HRT_IRQ_ENABLED_BIT))) {
 			err = m4sensorhub_irq_enable(dd->m4,
-				M4SH_IRQ_HEARTRATESENSOR_DATA_READY);
+				M4SH_IRQ_HRSENSOR_DATA_READY);
 			if (err < 0) {
 				m4hrt_err("%s: Failed to enable irq.\n",
 					  __func__);
@@ -128,7 +128,7 @@ m4hrt_set_samplerate_irq_check:
 		/* Disable the IRQ if necessary */
 		if (dd->status & (1 << M4HRT_IRQ_ENABLED_BIT)) {
 			err = m4sensorhub_irq_disable(dd->m4,
-				M4SH_IRQ_HEARTRATESENSOR_DATA_READY);
+				M4SH_IRQ_HRSENSOR_DATA_READY);
 			if (err < 0) {
 				m4hrt_err("%s: Failed to disable irq.\n",
 					  __func__);
@@ -482,7 +482,7 @@ static int m4hrt_driver_init(struct init_calldata *p_arg)
 	}
 
 	err = m4sensorhub_irq_register(dd->m4,
-		M4SH_IRQ_HEARTRATESENSOR_DATA_READY, m4hrt_isr, iio);
+		M4SH_IRQ_HRSENSOR_DATA_READY, m4hrt_isr, iio);
 	if (err < 0) {
 		m4hrt_err("%s: Failed to register M4 IRQ.\n", __func__);
 		goto m4hrt_driver_init_fail;
@@ -553,11 +553,11 @@ static int __exit m4hrt_remove(struct platform_device *pdev)
 	mutex_lock(&(dd->mutex));
 	if (dd->status & (1 << M4HRT_IRQ_ENABLED_BIT)) {
 		m4sensorhub_irq_disable(dd->m4,
-					M4SH_IRQ_HEARTRATESENSOR_DATA_READY);
+					M4SH_IRQ_HRSENSOR_DATA_READY);
 		dd->status = dd->status & ~(1 << M4HRT_IRQ_ENABLED_BIT);
 	}
 	m4sensorhub_irq_unregister(dd->m4,
-				   M4SH_IRQ_HEARTRATESENSOR_DATA_READY);
+				   M4SH_IRQ_HRSENSOR_DATA_READY);
 	m4sensorhub_unregister_initcall(m4hrt_driver_init);
 	mutex_destroy(&(dd->mutex));
 	m4hrt_remove_iiodev(iio);  /* dd is freed here */
diff --git a/drivers/misc/m4sensorhub_passive.c b/drivers/misc/m4sensorhub_passive.c
index 555a6d007d3..e072d8b0a5e 100644
--- a/drivers/misc/m4sensorhub_passive.c
+++ b/drivers/misc/m4sensorhub_passive.c
@@ -58,7 +58,7 @@ static void m4pas_isr(enum m4sensorhub_irqs int_event, void *handle)
 	int size = 0;
 	uint32_t passive_timestamp[M4PAS_NUM_PASSIVE_BUFFERS];
 	uint32_t steps[M4PAS_NUM_PASSIVE_BUFFERS];
-	uint32_t mets[M4PAS_NUM_PASSIVE_BUFFERS];
+	uint32_t calories[M4PAS_NUM_PASSIVE_BUFFERS];
 	uint32_t floors_climbed[M4PAS_NUM_PASSIVE_BUFFERS];
 	int i = 0;
 
@@ -91,15 +91,15 @@ static void m4pas_isr(enum m4sensorhub_irqs int_event, void *handle)
 		goto m4pas_isr_fail;
 	}
 
-	size = m4sensorhub_reg_getsize(dd->m4, M4SH_REG_PASSIVE_METS);
-	err = m4sensorhub_reg_read(dd->m4, M4SH_REG_PASSIVE_METS,
-		(char *)&(mets));
+	size = m4sensorhub_reg_getsize(dd->m4, M4SH_REG_PASSIVE_CALORIES);
+	err = m4sensorhub_reg_read(dd->m4, M4SH_REG_PASSIVE_CALORIES,
+		(char *)&(calories));
 	if (err < 0) {
-		m4pas_err("%s: Failed to read mets data.\n", __func__);
+		m4pas_err("%s: Failed to read calories data.\n", __func__);
 		goto m4pas_isr_fail;
 	} else if (err != size) {
 		m4pas_err("%s: Read %d bytes instead of %d for %s.\n",
-			  __func__, err, size, "mets");
+			  __func__, err, size, "calories");
 		err = -EBADE;
 		goto m4pas_isr_fail;
 	}
@@ -121,7 +121,7 @@ static void m4pas_isr(enum m4sensorhub_irqs int_event, void *handle)
 	for (i = 0; i < M4PAS_NUM_PASSIVE_BUFFERS; i++) {
 		dd->iiodat[i].passive_timestamp = passive_timestamp[i];
 		dd->iiodat[i].steps = steps[i];
-		dd->iiodat[i].mets = mets[i];
+		dd->iiodat[i].calories = calories[i];
 		dd->iiodat[i].floors_climbed = floors_climbed[i];
 		dd->iiodat[i].timestamp = iio_get_time_ns();
 		iio_push_to_buffers(iio, (unsigned char *)&(dd->iiodat[i]));
@@ -250,7 +250,7 @@ static ssize_t m4pas_iiodata_show(struct device *dev,
 			buf, "Buffer ", i,
 			"passive_timestamp: ", dd->iiodat[i].passive_timestamp,
 			"steps: ", dd->iiodat[i].steps,
-			"mets: ", dd->iiodat[i].mets,
+			"calories: ", dd->iiodat[i].calories,
 			"floors_climbed: ", dd->iiodat[i].floors_climbed);
 	}
 	mutex_unlock(&(dd->mutex));
diff --git a/include/linux/iio/m4sensorhub/m4sensorhub_passive.h b/include/linux/iio/m4sensorhub/m4sensorhub_passive.h
index 52b3fce375a..4663fc767d1 100644
--- a/include/linux/iio/m4sensorhub/m4sensorhub_passive.h
+++ b/include/linux/iio/m4sensorhub/m4sensorhub_passive.h
@@ -26,7 +26,7 @@
 struct m4sensorhub_passive_iio_data {
 	uint32_t        passive_timestamp;
 	uint32_t        steps;
-	uint32_t        mets;
+	uint32_t        calories;
 	uint32_t        floors_climbed;
 	long long       timestamp;
 } __packed;
diff --git a/include/linux/m4sensorhub/m4sensorhub_bank_enum.h b/include/linux/m4sensorhub/m4sensorhub_bank_enum.h
index 12fd8c06995..e83120b191f 100644
--- a/include/linux/m4sensorhub/m4sensorhub_bank_enum.h
+++ b/include/linux/m4sensorhub/m4sensorhub_bank_enum.h
@@ -47,7 +47,7 @@ enum m4sensorhub_type {
 	M4SH_TYPE_PASSIVE,
 	M4SH_TYPE_EMG,
 	M4SH_TYPE_HEARTRATE,
-	M4SH_TYPE_HEARTRATESENSOR,
+	M4SH_TYPE_HRSENSOR,
 	M4SH_TYPE_LIGHTSENSOR,
 
 	M4SH_TYPE__NUM
diff --git a/include/linux/m4sensorhub/m4sensorhub_irqs.h b/include/linux/m4sensorhub/m4sensorhub_irqs.h
index e32a60b484d..562365e679e 100644
--- a/include/linux/m4sensorhub/m4sensorhub_irqs.h
+++ b/include/linux/m4sensorhub/m4sensorhub_irqs.h
@@ -76,7 +76,7 @@ enum m4sensorhub_irqs {
 	M4SH_IRQ_LIGHTSENSOR_DATA_READY,
 
 	/* INT2 0x01 : heartratesensor data ready */
-	M4SH_IRQ_HEARTRATESENSOR_DATA_READY = M4SH_IRQ_INT2_INDEX,
+	M4SH_IRQ_HRSENSOR_DATA_READY = M4SH_IRQ_INT2_INDEX,
 
 	/* INT2 0x02 : AP-RTC alarm expired */
 	M4SH_IRQ_AP_ALARM_EXPIRED,
diff --git a/include/linux/m4sensorhub/m4sensorhub_reg_enum.h b/include/linux/m4sensorhub/m4sensorhub_reg_enum.h
index b144a9368e8..276180dd015 100644
--- a/include/linux/m4sensorhub/m4sensorhub_reg_enum.h
+++ b/include/linux/m4sensorhub/m4sensorhub_reg_enum.h
@@ -156,20 +156,20 @@ enum m4sensorhub_reg {
 	M4SH_REG_GESTURE_VALUE3,
 	M4SH_REG_PASSIVE_TIMESTAMP,
 	M4SH_REG_PASSIVE_STEPS,
-	M4SH_REG_PASSIVE_METS,
+	M4SH_REG_PASSIVE_CALORIES,
 	M4SH_REG_PASSIVE_FLOORSCLIMBED,
 	M4SH_REG_EMG_SIGNALCOUNT,
 	M4SH_REG_EMG_DUMMY,
 	M4SH_REG_EMG_SAMPLERATE,
 	M4SH_REG_EMG_SIGNALS,
 	M4SH_REG_HEARTRATE_HEARTRATE,
-	M4SH_REG_HEARTRATESENSOR_VERSION,
-	M4SH_REG_HEARTRATESENSOR_DUMMY,
-	M4SH_REG_HEARTRATESENSOR_SAMPLERATE,
-	M4SH_REG_HEARTRATESENSOR_RAWHRVALUE,
-	M4SH_REG_HEARTRATESENSOR_REGADDR,
-	M4SH_REG_HEARTRATESENSOR_REGVALUE,
-	M4SH_REG_HEARTRATESENSOR_REGRWCMD,
+	M4SH_REG_HRSENSOR_VERSION,
+	M4SH_REG_HRSENSOR_DUMMY,
+	M4SH_REG_HRSENSOR_SAMPLERATE,
+	M4SH_REG_HRSENSOR_RAWVALUE,
+	M4SH_REG_HRSENSOR_REGADDR,
+	M4SH_REG_HRSENSOR_REGVALUE,
+	M4SH_REG_HRSENSOR_REGRWCMD,
 	M4SH_REG_LIGHTSENSOR_VERSION,
 	M4SH_REG_LIGHTSENSOR_DUMMY,
 	M4SH_REG_LIGHTSENSOR_SAMPLERATE,