| Message ID | 20210506094116.638527-3-mkorpershoek@baylibre.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | MT6358 PMIC button support | expand |
On Thu, 06 May 2021, Mattijs Korpershoek wrote: > Some pmics of the mt6397 family (such as MT6358), have two IRQs per > physical key: one for press event, another for release event. > > The mtk-pmic-keys driver assumes that each key only has one > IRQ. The key index and the RES_IRQ resource index have a 1/1 mapping. > > This won't work for MT6358, as we have multiple resources (2) for one key. > > To prepare mtk-pmic-keys to support MT6358, retrieve IRQs by name > instead of by index. > > Note: The keys_resources are not part of the device-tree bindings so > this won't break any DT schemas. > > Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> > --- > drivers/mfd/mt6397-core.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) Applied, thanks.
diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c index a83fbc486d26..5818e0c328c9 100644 --- a/drivers/mfd/mt6397-core.c +++ b/drivers/mfd/mt6397-core.c @@ -46,13 +46,13 @@ static const struct resource mt6397_rtc_resources[] = { }; static const struct resource mt6323_keys_resources[] = { - DEFINE_RES_IRQ(MT6323_IRQ_STATUS_PWRKEY), - DEFINE_RES_IRQ(MT6323_IRQ_STATUS_FCHRKEY), + DEFINE_RES_IRQ_NAMED(MT6323_IRQ_STATUS_PWRKEY, "powerkey"), + DEFINE_RES_IRQ_NAMED(MT6323_IRQ_STATUS_FCHRKEY, "homekey"), }; static const struct resource mt6397_keys_resources[] = { - DEFINE_RES_IRQ(MT6397_IRQ_PWRKEY), - DEFINE_RES_IRQ(MT6397_IRQ_HOMEKEY), + DEFINE_RES_IRQ_NAMED(MT6397_IRQ_PWRKEY, "powerkey"), + DEFINE_RES_IRQ_NAMED(MT6397_IRQ_HOMEKEY, "homekey"), }; static const struct resource mt6323_pwrc_resources[] = {
Some pmics of the mt6397 family (such as MT6358), have two IRQs per physical key: one for press event, another for release event. The mtk-pmic-keys driver assumes that each key only has one IRQ. The key index and the RES_IRQ resource index have a 1/1 mapping. This won't work for MT6358, as we have multiple resources (2) for one key. To prepare mtk-pmic-keys to support MT6358, retrieve IRQs by name instead of by index. Note: The keys_resources are not part of the device-tree bindings so this won't break any DT schemas. Signed-off-by: Mattijs Korpershoek <mkorpershoek@baylibre.com> --- drivers/mfd/mt6397-core.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)