Commit bc85e4adbd50ee016f218eb0a2d5c0d64d22c1d5
Committed by
Lee Jones
Lee Jones
1 parent
37ef8c2c15
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>
Showing 1 changed file with 3 additions and 11 deletions Side-by-side Diff
drivers/mfd/rk808.c
| ... | ... | @@ -121,16 +121,8 @@ |
| 121 | 121 | }; |
| 122 | 122 | |
| 123 | 123 | static struct resource rk805_key_resources[] = { |
| 124 | - { | |
| 125 | - .start = RK805_IRQ_PWRON_FALL, | |
| 126 | - .end = RK805_IRQ_PWRON_FALL, | |
| 127 | - .flags = IORESOURCE_IRQ, | |
| 128 | - }, | |
| 129 | - { | |
| 130 | - .start = RK805_IRQ_PWRON_RISE, | |
| 131 | - .end = RK805_IRQ_PWRON_RISE, | |
| 132 | - .flags = IORESOURCE_IRQ, | |
| 133 | - } | |
| 124 | + DEFINE_RES_IRQ(RK805_IRQ_PWRON_RISE), | |
| 125 | + DEFINE_RES_IRQ(RK805_IRQ_PWRON_FALL), | |
| 134 | 126 | }; |
| 135 | 127 | |
| 136 | 128 | static struct resource rk817_pwrkey_resources[] = { |
| ... | ... | @@ -167,7 +159,7 @@ |
| 167 | 159 | { .name = "rk808-clkout",}, |
| 168 | 160 | { .name = "rk808-regulator",}, |
| 169 | 161 | { |
| 170 | - .name = "rk8xx-pwrkey", | |
| 162 | + .name = "rk805-pwrkey", | |
| 171 | 163 | .num_resources = ARRAY_SIZE(rk817_pwrkey_resources), |
| 172 | 164 | .resources = &rk817_pwrkey_resources[0], |
| 173 | 165 | }, |