mfd: regulator: clk: Split rohm-bd718x7.h

Split the bd718x7.h to ROHM common and bd718x7 specific parts
so that we do not need to add same things in every new ROHM
PMIC header. Please note that this change requires changes also
in bd718x7 sub-device drivers for regulators and clk.

Signed-off-by: Matti Vaittinen <matti.vaittinen@fi.rohmeurope.com>
Acked-by: Mark Brown <broonie@kernel.org>
Acked-by: Stephen Boyd <sboyd@kernel.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

2 files changed, 28 insertions, 14 deletions

diff --git a/include/linux/mfd/rohm-bd718x7.h b/include/linux/mfd/rohm-bd718x7.h
index fd194bfc836f..7f2dbde402a1 100644
--- a/include/linux/mfd/rohm-bd718x7.h
+++ b/include/linux/mfd/rohm-bd718x7.h
@@ -4,15 +4,10 @@
 #ifndef __LINUX_MFD_BD718XX_H__
 #define __LINUX_MFD_BD718XX_H__
 
+#include <linux/mfd/rohm-generic.h>
 #include <linux/regmap.h>
 
 enum {
-        BD718XX_TYPE_BD71837 = 0,
-        BD718XX_TYPE_BD71847,
-        BD718XX_TYPE_AMOUNT
-};
-
-enum {
         BD718XX_BUCK1 = 0,
         BD718XX_BUCK2,
         BD718XX_BUCK3,
@@ -321,18 +316,17 @@ enum {
         BD718XX_PWRBTN_LONG_PRESS_15S
 };
 
-struct bd718xx_clk;
-
 struct bd718xx {
-        unsigned int chip_type;
-        struct device *dev;
-        struct regmap *regmap;
-        unsigned long int id;
+        /*
+         * Please keep this as the first member here as some
+         * drivers (clk) supporting more than one chip may only know this
+         * generic struct 'struct rohm_regmap_dev' and assume it is
+         * the first chunk of parent device's private data.
+         */
+        struct rohm_regmap_dev chip;
 
         int chip_irq;
         struct regmap_irq_chip_data *irq_data;
-
-        struct bd718xx_clk *clk;
 };
 
 #endif /* __LINUX_MFD_BD718XX_H__ */
diff --git a/include/linux/mfd/rohm-generic.h b/include/linux/mfd/rohm-generic.h
new file mode 100644
index 000000000000..bff15ac26f2c
--- /dev/null
+++ b/include/linux/mfd/rohm-generic.h
@@ -0,0 +1,20 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* Copyright (C) 2018 ROHM Semiconductors */
+
+#ifndef __LINUX_MFD_ROHM_H__
+#define __LINUX_MFD_ROHM_H__
+
+enum {
+        ROHM_CHIP_TYPE_BD71837 = 0,
+        ROHM_CHIP_TYPE_BD71847,
+        ROHM_CHIP_TYPE_BD70528,
+        ROHM_CHIP_TYPE_AMOUNT
+};
+
+struct rohm_regmap_dev {
+        unsigned int chip_type;
+        struct device *dev;
+        struct regmap *regmap;
+};
+
+#endif