From 6581d6ec7fbefeab58fb29278e3639a080335f6a Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Fri, 11 Jan 2013 15:45:28 +0000
Subject: [PATCH] --- yaml --- r: 350485 b: refs/heads/master c:
 8979cfef26a74f0df154d4e991bdafb4105af8f1 h: refs/heads/master i:   350483:
 065258ff31604ea21e1be401505c13a4f89c3ba4 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/boot/dts/dbx5x0.dtsi | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f203a20e1032..d6ad574a2db2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7452b64d0154ab8ae4933b8e97feebc1ae98d1a4
+refs/heads/master: 8979cfef26a74f0df154d4e991bdafb4105af8f1
diff --git a/trunk/arch/arm/boot/dts/dbx5x0.dtsi b/trunk/arch/arm/boot/dts/dbx5x0.dtsi
index 63f2fbcfe819..96f518b9ae2c 100644
--- a/trunk/arch/arm/boot/dts/dbx5x0.dtsi
+++ b/trunk/arch/arm/boot/dts/dbx5x0.dtsi
@@ -170,10 +170,9 @@
 			gpio-bank = <8>;
 		};
 
-		pinctrl@80157000 {
-			// This is actually the PRCMU base address
-			reg = <0x80157000 0x2000>;
+		pinctrl {
 			compatible = "stericsson,nmk_pinctrl";
+			prcm = <&prcmu>;
 		};
 
 		usb@a03e0000 {
@@ -190,9 +189,10 @@
 			interrupts = <0 25 0x4>;
 		};
 
-		prcmu@80157000 {
+		prcmu: prcmu@80157000 {
 			compatible = "stericsson,db8500-prcmu";
 			reg = <0x80157000 0x1000>;
+			reg-names = "prcmu";
 			interrupts = <0 47 0x4>;
 			#address-cells = <1>;
 			#size-cells = <1>;