projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'dt' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
pinctrl
/
pinctrl-nomadik.c
diff --git
a/drivers/pinctrl/pinctrl-nomadik.c
b/drivers/pinctrl/pinctrl-nomadik.c
index 3c80dd98304bc6ce08a021b60d664cc9641b05c9..36d20293de5c6b479da51c5120ec68ea105c5110 100644
(file)
--- a/
drivers/pinctrl/pinctrl-nomadik.c
+++ b/
drivers/pinctrl/pinctrl-nomadik.c
@@
-2103,6
+2103,10
@@
static struct pinctrl_desc nmk_pinctrl_desc = {
};
static const struct of_device_id nmk_pinctrl_match[] = {
+ {
+ .compatible = "stericsson,nmk-pinctrl-stn8815",
+ .data = (void *)PINCTRL_NMK_STN8815,
+ },
{
.compatible = "stericsson,nmk-pinctrl",
.data = (void *)PINCTRL_NMK_DB8500,