---

yaml --- r: 311797 b: refs/heads/master c: 2b667a2 h: refs/heads/master i: 311795: 750b506 v: v3
git-mirror · Jul 6, 2012 · 8e64dbf · 8e64dbf
1 parent 7bf4fc2
commit 8e64dbf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c57920e6c23350b08c1b05606aafe356ebc6d8cc
+refs/heads/master: 2b667a2d8005e7c8362a77365cedbcd71fa5d6c1
diff --git a/trunk/arch/arm/mach-ux500/board-mop500.c b/trunk/arch/arm/mach-ux500/board-mop500.c
@@ -786,6 +786,8 @@ struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = {
 	OF_DEV_AUXDATA("st,nomadik-gpio", 0x8011e000, "gpio.6", NULL),
 	OF_DEV_AUXDATA("st,nomadik-gpio", 0x8011e080, "gpio.7", NULL),
 	OF_DEV_AUXDATA("st,nomadik-gpio", 0xa03fe000, "gpio.8", NULL),
+	/* Requires device name bindings. */
+	OF_DEV_AUXDATA("stericsson,nmk_pinctrl", 0, "pinctrl-db8500", NULL),
 	{},
 };