summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab+huawei@kernel.org>2021-01-29 20:51:51 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-01-31 13:42:41 +0100
commit9d8dbe989029e6d767ed56773ac65409da625381 (patch)
tree00c4bfc099abd49a3f4b67699c1ea6c7160e582f
parenta2e904fc59e15d9e4128415579a2664ab3a1ed14 (diff)
downloadlinux-stable-9d8dbe989029e6d767ed56773ac65409da625381.tar.gz
linux-stable-9d8dbe989029e6d767ed56773ac65409da625381.tar.bz2
linux-stable-9d8dbe989029e6d767ed56773ac65409da625381.zip
staging: hikey9xx: hi6421-spmi-pmic: cleanup header file
Remove the IRQ list from the header, as this is used only inside the driver itself. Also, get rid of two unused defines. The net result is that only struct hi6421_spmi_pmic remains on it, as this is used by the regulator driver. Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org> Link: https://lore.kernel.org/r/138c3a11e4de0ebabdf27932957852136c2f7510.1611949675.git.mchehab+huawei@kernel.org Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/staging/hikey9xx/hi6421-spmi-pmic.c17
-rw-r--r--include/linux/mfd/hi6421-spmi-pmic.h20
2 files changed, 17 insertions, 20 deletions
diff --git a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c
index c8e55b7b08e2..909f7b106af4 100644
--- a/drivers/staging/hikey9xx/hi6421-spmi-pmic.c
+++ b/drivers/staging/hikey9xx/hi6421-spmi-pmic.c
@@ -17,6 +17,23 @@
#include <linux/slab.h>
#include <linux/spmi.h>
+enum hi6421_spmi_pmic_irq_list {
+ OTMP = 0,
+ VBUS_CONNECT,
+ VBUS_DISCONNECT,
+ ALARMON_R,
+ HOLD_6S,
+ HOLD_1S,
+ POWERKEY_UP,
+ POWERKEY_DOWN,
+ OCP_SCP_R,
+ COUL_R,
+ SIM0_HPD_R,
+ SIM0_HPD_F,
+ SIM1_HPD_R,
+ SIM1_HPD_F,
+ PMIC_IRQ_LIST_MAX,
+};
/* 8-bit register offset in PMIC */
#define HISI_MASK_STATE 0xff
diff --git a/include/linux/mfd/hi6421-spmi-pmic.h b/include/linux/mfd/hi6421-spmi-pmic.h
index aa8d5382f559..4d61cb266a18 100644
--- a/include/linux/mfd/hi6421-spmi-pmic.h
+++ b/include/linux/mfd/hi6421-spmi-pmic.h
@@ -14,9 +14,6 @@
#include <linux/irqdomain.h>
#include <linux/regmap.h>
-#define HISI_ECO_MODE_ENABLE (1)
-#define HISI_ECO_MODE_DISABLE (0)
-
struct hi6421_spmi_pmic {
struct resource *res;
struct device *dev;
@@ -29,21 +26,4 @@ struct hi6421_spmi_pmic {
struct regmap *regmap;
};
-enum hi6421_spmi_pmic_irq_list {
- OTMP = 0,
- VBUS_CONNECT,
- VBUS_DISCONNECT,
- ALARMON_R,
- HOLD_6S,
- HOLD_1S,
- POWERKEY_UP,
- POWERKEY_DOWN,
- OCP_SCP_R,
- COUL_R,
- SIM0_HPD_R,
- SIM0_HPD_F,
- SIM1_HPD_R,
- SIM1_HPD_F,
- PMIC_IRQ_LIST_MAX,
-};
#endif /* __HISI_PMIC_H */