From dbf0e05ffbc719a285a6e5e3fae03888b3855bde Mon Sep 17 00:00:00 2001 From: Fabio Baltieri Date: Tue, 18 Dec 2012 10:12:12 +0100 Subject: [PATCH] --- yaml --- r: 348171 b: refs/heads/master c: 9fcb4cc2d7dd192ae718f0e7484c6f5c08b8af23 h: refs/heads/master i: 348169: 5129dc9c74856691c84b7ebe238c238a11dba24a 348167: e56ceb7951a2bb157c5a4b93e2a7488b785674d8 v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/dbx5x0.dtsi | 4 +++- trunk/arch/arm/mach-ux500/cpu-db8500.c | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c90b1ed93d03..9089952a8771 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4ca075decc2bffc36ecacc59f2d943a037b46543 +refs/heads/master: 9fcb4cc2d7dd192ae718f0e7484c6f5c08b8af23 diff --git a/trunk/arch/arm/boot/dts/dbx5x0.dtsi b/trunk/arch/arm/boot/dts/dbx5x0.dtsi index 2efd9c891bc9..63f2fbcfe819 100644 --- a/trunk/arch/arm/boot/dts/dbx5x0.dtsi +++ b/trunk/arch/arm/boot/dts/dbx5x0.dtsi @@ -170,7 +170,9 @@ gpio-bank = <8>; }; - pinctrl { + pinctrl@80157000 { + // This is actually the PRCMU base address + reg = <0x80157000 0x2000>; compatible = "stericsson,nmk_pinctrl"; }; diff --git a/trunk/arch/arm/mach-ux500/cpu-db8500.c b/trunk/arch/arm/mach-ux500/cpu-db8500.c index db0bb75e2c76..5b286e06474c 100644 --- a/trunk/arch/arm/mach-ux500/cpu-db8500.c +++ b/trunk/arch/arm/mach-ux500/cpu-db8500.c @@ -285,7 +285,8 @@ static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { OF_DEV_AUXDATA("st,nomadik-i2c", 0x80110000, "nmk-i2c.3", NULL), OF_DEV_AUXDATA("st,nomadik-i2c", 0x8012a000, "nmk-i2c.4", NULL), /* Requires device name bindings. */ - OF_DEV_AUXDATA("stericsson,nmk_pinctrl", 0, "pinctrl-db8500", NULL), + OF_DEV_AUXDATA("stericsson,nmk_pinctrl", U8500_PRCMU_BASE, + "pinctrl-db8500", NULL), /* Requires clock name and DMA bindings. */ OF_DEV_AUXDATA("stericsson,ux500-msp-i2s", 0x80123000, "ux500-msp-i2s.0", &msp0_platform_data),