From 8e64dbfec4946993edf5b79b9a3f53af791e9815 Mon Sep 17 00:00:00 2001 From: Lee Jones Date: Fri, 6 Jul 2012 15:59:01 +0100 Subject: [PATCH] --- yaml --- r: 311797 b: refs/heads/master c: 2b667a2d8005e7c8362a77365cedbcd71fa5d6c1 h: refs/heads/master i: 311795: 750b506989b11f7130fa49b6cf2d90b1daeff56a v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-ux500/board-mop500.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index db7fa5c15a8f..2a5e9a04e738 100644 --- 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 index 461012a16e74..4fd93f5c49ec 100644 --- 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), {}, };