commit 8ae10fbea3031f02fef0eaa9324b5809d16bc07d
author Linux Build Service Account <lnxbuild@localhost> Thu Apr 25 13:28:47 2013 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Thu Apr 25 13:28:46 2013 -0700
tree 86addf86fe6684e6b6ce77f1325589d0944b7d86
parent 0e497f7e1a7139e7b96c898651993f4906d060cd
parent b2b93678730026ac2df9338939cbf854713db76d

Merge "arm/dt: msm8x10: Add FIQ register"

arch/arm/boot/dts/msm8610.dtsi

diff --git a/arch/arm/boot/dts/msm8610.dtsi b/arch/arm/boot/dts/msm8610.dtsi
index e406ba8..b794dc7 100644
--- a/arch/arm/boot/dts/msm8610.dtsi
+++ b/arch/arm/boot/dts/msm8610.dtsi
@@ -584,8 +584,9 @@
 
 	qcom,wcnss-wlan@fb000000 {
 		compatible = "qcom,wcnss_wlan";
-		reg = <0xfb000000 0x280000>;
-		reg-names = "wcnss_mmio";
+		reg = <0xfb000000 0x280000>,
+			<0xf9011008 0x04>;
+		reg-names = "wcnss_mmio", "wcnss_fiq";
 		interrupts = <0 145 0>, <0 146 0>;
 		interrupt-names = "wcnss_wlantx_irq", "wcnss_wlanrx_irq";