[v5,09/18] mfd: intel_soc_pmic: Add SCU IPC member to struct intel_soc_pmic

Commit Message

Mika Westerberg Feb. 11, 2020, 1:25 p.m. UTC

Both PMIC drivers (intel_soc_pmic_mrfld and intel_soc_pmic_bxtwc) will
be using this field going forward to access the SCU IPC instance.

While there add kernel-doc for the intel_soc_pmic structure.

Signed-off-by: Mika Westerberg <[e-mail]>
Reviewed-by: Andy Shevchenko <[e-mail]>
---
 include/linux/mfd/intel_soc_pmic.h | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

Comments

Andy Shevchenko Feb. 11, 2020, 3:57 p.m. UTC | #1

On Tue, Feb 11, 2020 at 04:25:54PM +0300, Mika Westerberg wrote:
> Both PMIC drivers (intel_soc_pmic_mrfld and intel_soc_pmic_bxtwc) will
> be using this field going forward to access the SCU IPC instance.
> 
> While there add kernel-doc for the intel_soc_pmic structure.

> + * @irq_chip_data_pwrbtn: Chained IRQ chip data for the power button
> + * @irq_chip_data_tmu: Chained IRQ chip data for the time management unit
> + * @irq_chip_data_bcu: Chained IRQ chip data for the burst control unit
> + * @irq_chip_data_adc: Chained IRQ chip data for the general purpose ADC
> + * @irq_chip_data_chgr: Chained IRQ chip data for the external charger
> + * @irq_chip_data_crit: Chained IRQ chip data for the critical event handler

Perhaps capitalize the decoded abbreviation, e.g.
general purpose ADC -> General Purpose ADC ?

Mika Westerberg Feb. 12, 2020, 11:44 a.m. UTC | #2

On Tue, Feb 11, 2020 at 05:57:06PM +0200, Andy Shevchenko wrote:
> On Tue, Feb 11, 2020 at 04:25:54PM +0300, Mika Westerberg wrote:
> > Both PMIC drivers (intel_soc_pmic_mrfld and intel_soc_pmic_bxtwc) will
> > be using this field going forward to access the SCU IPC instance.
> > 
> > While there add kernel-doc for the intel_soc_pmic structure.
> 
> > + * @irq_chip_data_pwrbtn: Chained IRQ chip data for the power button
> > + * @irq_chip_data_tmu: Chained IRQ chip data for the time management unit
> > + * @irq_chip_data_bcu: Chained IRQ chip data for the burst control unit
> > + * @irq_chip_data_adc: Chained IRQ chip data for the general purpose ADC
> > + * @irq_chip_data_chgr: Chained IRQ chip data for the external charger
> > + * @irq_chip_data_crit: Chained IRQ chip data for the critical event handler
> 
> Perhaps capitalize the decoded abbreviation, e.g.
> general purpose ADC -> General Purpose ADC ?

Sure.

Patch

diff --git a/include/linux/mfd/intel_soc_pmic.h b/include/linux/mfd/intel_soc_pmic.h
index bfecd6bd4990..1e462549f5f1 100644
--- a/include/linux/mfd/intel_soc_pmic.h
+++ b/include/linux/mfd/intel_soc_pmic.h
@@ -13,6 +13,20 @@ 
 
 #include <linux/regmap.h>
 
+/**
+ * struct intel_soc_pmic - Intel SoC PMIC data
+ * @irq: Master interrupt number of the parent PMIC device
+ * @regmap: Pointer to the parent PMIC device regmap structure
+ * @irq_chip_data: IRQ chip data for the PMIC itself
+ * @irq_chip_data_pwrbtn: Chained IRQ chip data for the power button
+ * @irq_chip_data_tmu: Chained IRQ chip data for the time management unit
+ * @irq_chip_data_bcu: Chained IRQ chip data for the burst control unit
+ * @irq_chip_data_adc: Chained IRQ chip data for the general purpose ADC
+ * @irq_chip_data_chgr: Chained IRQ chip data for the external charger
+ * @irq_chip_data_crit: Chained IRQ chip data for the critical event handler
+ * @dev: Pointer to the parent PMIC device
+ * @scu: Pointer to the SCU IPC device data structure
+ */
 struct intel_soc_pmic {
 	int irq;
 	struct regmap *regmap;
@@ -24,6 +38,7 @@  struct intel_soc_pmic {
 	struct regmap_irq_chip_data *irq_chip_data_chgr;
 	struct regmap_irq_chip_data *irq_chip_data_crit;
 	struct device *dev;
+	struct intel_scu_ipc_dev *scu;
 };
 
 int intel_soc_pmic_exec_mipi_pmic_seq_element(u16 i2c_address, u32 reg_address,