diff options
| author |   Heiko Stuebner <heiko@sntech.de> | 2019-09-17 10:12:54 +0200 |
|---|---|---|
| committer |   Lee Jones <lee.jones@linaro.org> | 2019-11-11 08:45:01 +0000 |
| commit | bc85e4adbd50ee016f218eb0a2d5c0d64d22c1d5 (patch) | |
| tree | 7dbb873135671f603188634ef76516d11b393c1f /drivers/mfd | |
| parent | mfd: rk808: Fix RK818 ID template (diff) | |
| download | linux-dev-bc85e4adbd50ee016f218eb0a2d5c0d64d22c1d5.tar.xz linux-dev-bc85e4adbd50ee016f218eb0a2d5c0d64d22c1d5.zip | |
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>
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/rk808.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/drivers/mfd/rk808.c b/drivers/mfd/rk808.c index 050478cabc95..966841744ee6 100644 --- 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], }, |