mfd: rk808: Fix RK817 powerkey integration

The pwrkey integration seems to stem from the vendor kernel, as the
compatible is wrong and also the order of key-irqs is swapped.

So fix these issues to make the pwrkey on rk817 actually work.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c
index 050478c..9668417 100644 (file)
--- a/drivers/mfd/rk808.c
+++ b/drivers/mfd/rk808.c
@@ -121,16 +121,8 @@ static struct resource rk817_rtc_resources[] = {
 };
 
 static struct resource rk805_key_resources[] = {
-       {
-               .start  = RK805_IRQ_PWRON_FALL,
-               .end    = RK805_IRQ_PWRON_FALL,
-               .flags  = IORESOURCE_IRQ,
-       },
-       {
-               .start  = RK805_IRQ_PWRON_RISE,
-               .end    = RK805_IRQ_PWRON_RISE,
-               .flags  = IORESOURCE_IRQ,
-       }
+       DEFINE_RES_IRQ(RK805_IRQ_PWRON_RISE),
+       DEFINE_RES_IRQ(RK805_IRQ_PWRON_FALL),
 };
 
 static struct resource rk817_pwrkey_resources[] = {
@@ -167,7 +159,7 @@ static const struct mfd_cell rk817s[] = {
        { .name = "rk808-clkout",},
        { .name = "rk808-regulator",},
        {
-               .name = "rk8xx-pwrkey",
+               .name = "rk805-pwrkey",
                .num_resources = ARRAY_SIZE(rk817_pwrkey_resources),
                .resources = &rk817_pwrkey_resources[0],
        },