mfd: axp20x: Correct AXP806 POK interrupt prefix

When AXP806 support was added, POK was incorrectly expanded to PWROK.
However, the datasheet lists them as POK[LSNP], which is the same as
on the AXP288. Furthermore, the registers associated with POK functions
are the same as the PEK on the other AXP PMICs. This suggests that
"POK" means "Power On Key", much like "PEK" means "Power Enable Key",
instead of "Power OK".

This patch changes the "PWROK" prefix to "POK" for these interrupts.

Signed-off-by: Chen-Yu Tsai <wens@csie.org>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/mfd/axp20x.c b/drivers/mfd/axp20x.c
index b3051e1..9a2ef3d 100644 (file)
--- a/drivers/mfd/axp20x.c
+++ b/drivers/mfd/axp20x.c
@@ -450,11 +450,11 @@ static const struct regmap_irq axp806_regmap_irqs[] = {
        INIT_REGMAP_IRQ(AXP806, DCDCC_V_LOW,            0, 5),
        INIT_REGMAP_IRQ(AXP806, DCDCD_V_LOW,            0, 6),
        INIT_REGMAP_IRQ(AXP806, DCDCE_V_LOW,            0, 7),
-       INIT_REGMAP_IRQ(AXP806, PWROK_LONG,             1, 0),
-       INIT_REGMAP_IRQ(AXP806, PWROK_SHORT,            1, 1),
+       INIT_REGMAP_IRQ(AXP806, POK_LONG,               1, 0),
+       INIT_REGMAP_IRQ(AXP806, POK_SHORT,              1, 1),
        INIT_REGMAP_IRQ(AXP806, WAKEUP,                 1, 4),
-       INIT_REGMAP_IRQ(AXP806, PWROK_FALL,             1, 5),
-       INIT_REGMAP_IRQ(AXP806, PWROK_RISE,             1, 6),
+       INIT_REGMAP_IRQ(AXP806, POK_FALL,               1, 5),
+       INIT_REGMAP_IRQ(AXP806, POK_RISE,               1, 6),
 };
 
 static const struct regmap_irq axp809_regmap_irqs[] = {

diff --git a/include/linux/mfd/axp20x.h b/include/linux/mfd/axp20x.h
index a248936..517e60e 100644 (file)
--- a/include/linux/mfd/axp20x.h
+++ b/include/linux/mfd/axp20x.h
@@ -592,11 +592,11 @@ enum axp806_irqs {
        AXP806_IRQ_DCDCC_V_LOW,
        AXP806_IRQ_DCDCD_V_LOW,
        AXP806_IRQ_DCDCE_V_LOW,
-       AXP806_IRQ_PWROK_LONG,
-       AXP806_IRQ_PWROK_SHORT,
+       AXP806_IRQ_POK_LONG,
+       AXP806_IRQ_POK_SHORT,
        AXP806_IRQ_WAKEUP,
-       AXP806_IRQ_PWROK_FALL,
-       AXP806_IRQ_PWROK_RISE,
+       AXP806_IRQ_POK_FALL,
+       AXP806_IRQ_POK_RISE,
 };
 
 enum axp809_irqs {