git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-next-4.16' of git://people.freedesktop.org/~agd5f/linux into drm...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
ste-nomadik-stn8815.dtsi
diff --git
a/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
b/arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
index 68aab50a73abc46610cadef08cc8d8686e543dea..733678b75b88b75d65c648896cebc6dc070d4a54 100644
(file)
--- a/
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
+++ b/
arch/arm/boot/dts/ste-nomadik-stn8815.dtsi
@@
-750,6
+750,7
@@
reg = <0x10120000 0x1000>;
interrupt-names = "combined";
interrupts = <14>;
+ interrupt-parent = <&vica>;
clocks = <&clcdclk>, <&hclkclcd>;
clock-names = "clcdclk", "apb_pclk";
status = "disabled";