sh: sh7264: remove nonexistent GPIO_PH[0-7] to fix pinctrl registration
authorGeert Uytterhoeven <[email protected]>
Tue, 3 Oct 2017 23:14:41 +0000 (16:14 -0700)
committerLinus Torvalds <[email protected]>
Wed, 4 Oct 2017 00:54:24 +0000 (17:54 -0700)
commiteae3df7e82318d798f45dedf111e241805ec7a4a
tree5c824f82a533f1597e0fb319db020c1e7c98f6df
parentd8ce38f69843a56da044e56b6c16aecfbc3c6e39
sh: sh7264: remove nonexistent GPIO_PH[0-7] to fix pinctrl registration

Pinmux_pins[] is initialized through PINMUX_GPIO(), using designated
array initializers, where the GPIO_* enums serve as indices.  If enum
values are defined, but never used, pinmux_pins[] contains (zero-filled)
holes.  Such entries are treated as pin zero, which was registered
before, thus leading to pinctrl registration failures, as seen on
sh7722:

    sh-pfc pfc-sh7722: pin 0 already registered
    sh-pfc pfc-sh7722: error during pin registration
    sh-pfc pfc-sh7722: could not register: -22
    sh-pfc: probe of pfc-sh7722 failed with error -22

Remove GPIO_PH[0-7] from the enum to fix this.

Link: http://lkml.kernel.org/r/[email protected]
Fixes: 41797f75486d8ca3 ("sh: Add pinmux for sh7264")
Signed-off-by: Geert Uytterhoeven <[email protected]>
Reviewed-by: Laurent Pinchart <[email protected]>
Cc: Jacopo Mondi <[email protected]>
Cc: Magnus Damm <[email protected]>
Cc: Rich Felker <[email protected]>
Cc: Yoshihiro Shimoda <[email protected]>
Cc: Yoshinori Sato <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
arch/sh/include/cpu-sh2a/cpu/sh7264.h