projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'iio-fixes-for-4.4a' of ssh://ra.kernel.org/pub/scm/linux/kernel/git/jic23...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
dra7.dtsi
diff --git
a/arch/arm/boot/dts/dra7.dtsi
b/arch/arm/boot/dts/dra7.dtsi
index
a635f36
..
bc672fb
100644
(file)
--- a/
arch/arm/boot/dts/dra7.dtsi
+++ b/
arch/arm/boot/dts/dra7.dtsi
@@
-1508,6
+1508,7
@@
<GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>;
ranges;
<GIC_SPI 336 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 337 IRQ_TYPE_LEVEL_HIGH>;
ranges;
+ syscon = <&scm_conf>;
status = "disabled";
davinci_mdio: mdio@48485000 {
status = "disabled";
davinci_mdio: mdio@48485000 {