aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPraneeth Bajjuri2016-03-16 16:57:51 -0500
committerPraneeth Bajjuri2016-03-16 16:57:51 -0500
commit718acbdcfdff50f67d855a47a81c189ce0456eac (patch)
treee9933d17c366ad0cb3d61d3083fb761e871d1690
parent3a96195f1064726bae6dfe431becef0af4be6f20 (diff)
parentaf250e7ac7b5cfb870fd8e4cb1b07157d8b279e0 (diff)
downloadkernel-video-718acbdcfdff50f67d855a47a81c189ce0456eac.tar.gz
kernel-video-718acbdcfdff50f67d855a47a81c189ce0456eac.tar.xz
kernel-video-718acbdcfdff50f67d855a47a81c189ce0456eac.zip
Merge branch 'p-ti-linux-3.14.y-common' into p-ti-linux-3.14.y-android
* p-ti-linux-3.14.y-common: ARM: dtsi: jamr3: Update SR0 range for UIO Change-Id: I45f60e708d807bf8ccbebc6e5e022fb91cdc2c4d Signed-off-by: Praneeth Bajjuri <praneeth@ti.com>
-rw-r--r--arch/arm/boot/dts/dra7xx-jamr3.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/dra7xx-jamr3.dtsi b/arch/arm/boot/dts/dra7xx-jamr3.dtsi
index c83fd339029..6c4a18d62e9 100644
--- a/arch/arm/boot/dts/dra7xx-jamr3.dtsi
+++ b/arch/arm/boot/dts/dra7xx-jamr3.dtsi
@@ -58,7 +58,7 @@
58 58
59 sr0 { 59 sr0 {
60 compatible = "generic-uio"; 60 compatible = "generic-uio";
61 reg = <0xbfd00000 0x100000>; 61 reg = <0xbfb00000 0x100000>;
62 }; 62 };
63}; 63};
64 64