Skip to content

Commit 92ab1e4

Browse files
dtorlag-linaro
authored andcommitted
mfd: mt6397: Do not use generic name for keypad sub-devices
Do not use "mtk-pmic-keys" when creating sub-device for the keypad to make sure the keypad driver will only bind to the sub-device if it has support for the variant/has matching compatible. Cc: [email protected] Fixes: 6e31bb8 ("mfd: mt6397: Add initial support for MT6328") Fixes: de58cee ("mfd: mt6397-core: Add MT6357 PMIC support") Fixes: 4a901e3 ("mfd: mt6397-core: Add resources for PMIC keys for MT6359") Reported-by: Louis-Alexis Eyraud <[email protected]> Signed-off-by: Dmitry Torokhov <[email protected]> Tested-by: Louis-Alexis Eyraud <[email protected]> # on Link: https://lore.kernel.org/r/r4k3pgd3ew3ypne7ernxuzwgniiyvzosbce4cfajbcu7equblt@yato35tjb3lw Signed-off-by: Lee Jones <[email protected]>
1 parent 1421c3a commit 92ab1e4

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

drivers/mfd/mt6397-core.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ static const struct mfd_cell mt6323_devs[] = {
136136
.name = "mt6323-led",
137137
.of_compatible = "mediatek,mt6323-led"
138138
}, {
139-
.name = "mtk-pmic-keys",
139+
.name = "mt6323-keys",
140140
.num_resources = ARRAY_SIZE(mt6323_keys_resources),
141141
.resources = mt6323_keys_resources,
142142
.of_compatible = "mediatek,mt6323-keys"
@@ -153,7 +153,7 @@ static const struct mfd_cell mt6328_devs[] = {
153153
.name = "mt6328-regulator",
154154
.of_compatible = "mediatek,mt6328-regulator"
155155
}, {
156-
.name = "mtk-pmic-keys",
156+
.name = "mt6328-keys",
157157
.num_resources = ARRAY_SIZE(mt6328_keys_resources),
158158
.resources = mt6328_keys_resources,
159159
.of_compatible = "mediatek,mt6328-keys"
@@ -175,7 +175,7 @@ static const struct mfd_cell mt6357_devs[] = {
175175
.name = "mt6357-sound",
176176
.of_compatible = "mediatek,mt6357-sound"
177177
}, {
178-
.name = "mtk-pmic-keys",
178+
.name = "mt6357-keys",
179179
.num_resources = ARRAY_SIZE(mt6357_keys_resources),
180180
.resources = mt6357_keys_resources,
181181
.of_compatible = "mediatek,mt6357-keys"
@@ -196,7 +196,7 @@ static const struct mfd_cell mt6331_mt6332_devs[] = {
196196
.name = "mt6332-regulator",
197197
.of_compatible = "mediatek,mt6332-regulator"
198198
}, {
199-
.name = "mtk-pmic-keys",
199+
.name = "mt6331-keys",
200200
.num_resources = ARRAY_SIZE(mt6331_keys_resources),
201201
.resources = mt6331_keys_resources,
202202
.of_compatible = "mediatek,mt6331-keys"
@@ -240,7 +240,7 @@ static const struct mfd_cell mt6359_devs[] = {
240240
},
241241
{ .name = "mt6359-sound", },
242242
{
243-
.name = "mtk-pmic-keys",
243+
.name = "mt6359-keys",
244244
.num_resources = ARRAY_SIZE(mt6359_keys_resources),
245245
.resources = mt6359_keys_resources,
246246
.of_compatible = "mediatek,mt6359-keys"
@@ -272,7 +272,7 @@ static const struct mfd_cell mt6397_devs[] = {
272272
.name = "mt6397-pinctrl",
273273
.of_compatible = "mediatek,mt6397-pinctrl",
274274
}, {
275-
.name = "mtk-pmic-keys",
275+
.name = "mt6397-keys",
276276
.num_resources = ARRAY_SIZE(mt6397_keys_resources),
277277
.resources = mt6397_keys_resources,
278278
.of_compatible = "mediatek,mt6397-keys"

0 commit comments

Comments
 (0)