projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[cascardo/linux.git]
/
arch
/
arm
/
boot
/
dts
/
omap5.dtsi
diff --git
a/arch/arm/boot/dts/omap5.dtsi
b/arch/arm/boot/dts/omap5.dtsi
index
30ce71a
..
256b7f6
100644
(file)
--- a/
arch/arm/boot/dts/omap5.dtsi
+++ b/
arch/arm/boot/dts/omap5.dtsi
@@
-104,8
+104,9
@@
soc {
compatible = "ti,omap-infra";
mpu {
soc {
compatible = "ti,omap-infra";
mpu {
- compatible = "ti,omap
5
-mpu";
+ compatible = "ti,omap
4
-mpu";
ti,hwmods = "mpu";
ti,hwmods = "mpu";
+ sram = <&ocmcram>;
};
};
};
};
@@
-131,6
+132,7
@@
prm: prm@4ae06000 {
compatible = "ti,omap5-prm";
reg = <0x4ae06000 0x3000>;
prm: prm@4ae06000 {
compatible = "ti,omap5-prm";
reg = <0x4ae06000 0x3000>;
+ interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>;
prm_clocks: clocks {
#address-cells = <1>;
prm_clocks: clocks {
#address-cells = <1>;
@@
-223,6
+225,11
@@
};
};
};
};
+ ocmcram: ocmcram@40300000 {
+ compatible = "mmio-sram";
+ reg = <0x40300000 0x20000>; /* 128k */
+ };
+
sdma: dma-controller@4a056000 {
compatible = "ti,omap4430-sdma";
reg = <0x4a056000 0x1000>;
sdma: dma-controller@4a056000 {
compatible = "ti,omap4430-sdma";
reg = <0x4a056000 0x1000>;