Merge tag 'xfs-for-linus-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dgc...

[firefly-linux-kernel-4.4.55.git] / drivers / mfd / stmpe.c

diff --git a/drivers/mfd/stmpe.c b/drivers/mfd/stmpe.c
index e971af86ce1ef7e495d47364aeee15f5c10b76a1..8222e374e4b17d55d3d514e9fc414b96b998008c 100644 (file)
--- a/drivers/mfd/stmpe.c
+++ b/drivers/mfd/stmpe.c
@@ -795,6 +795,7 @@ static int stmpe24xx_get_altfunc(struct stmpe *stmpe, enum stmpe_block block)
                return 2;
 
        case STMPE_BLOCK_KEYPAD:
+       case STMPE_BLOCK_PWM:
                return 1;
 
        case STMPE_BLOCK_GPIO: