aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHao Zhang2015-01-16 14:28:27 -0600
committerHao Zhang2015-01-16 14:28:27 -0600
commitee815af9b245784948812729f93e55dff3ecb29f (patch)
tree0f159ac7cc3f3a7f0c1d4af4ece19e88c836dec0
parent2b3e6148974c7c3fb7f0419f9d30fdb92b675850 (diff)
parente5273f74d8f2b5f89fb6c1612f07d3841bf4e15c (diff)
downloadlinux-ee815af9b245784948812729f93e55dff3ecb29f.tar.gz
linux-ee815af9b245784948812729f93e55dff3ecb29f.tar.xz
linux-ee815af9b245784948812729f93e55dff3ecb29f.zip
Merge branch 'master/rebuild/15-keystone-devicetree' into master/master
-rw-r--r--arch/arm/boot/dts/k2e-evm.dts7
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/k2e-evm.dts b/arch/arm/boot/dts/k2e-evm.dts
index bfddf3872be..a7309de6dcf 100644
--- a/arch/arm/boot/dts/k2e-evm.dts
+++ b/arch/arm/boot/dts/k2e-evm.dts
@@ -153,6 +153,13 @@
153 }; 153 };
154 }; 154 };
155 155
156 uio_srss: srss {
157 compatible = "ti,uio-module-drv";
158 mem = <0x02330000 0x0000400>;
159 clocks=<&clksr>;
160 interrupts = <0 0x173 0xf01>;
161 label = "srss";
162 };
156 }; 163 };
157}; 164};
158 165