Commit e610c9d3 authored by Tony Lindgren's avatar Tony Lindgren

Merge branch 'pull/l3noc/dts-fixes' of...

Merge branch 'pull/l3noc/dts-fixes' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.16/fixes-not-urgent
parents 2347152b 2eeddb8a
...@@ -67,11 +67,15 @@ am43xx_pinmux: pinmux@44e10800 { ...@@ -67,11 +67,15 @@ am43xx_pinmux: pinmux@44e10800 {
}; };
ocp { ocp {
compatible = "simple-bus"; compatible = "ti,am4372-l3-noc", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
ti,hwmods = "l3_main"; ti,hwmods = "l3_main";
reg = <0x44000000 0x400000
0x44800000 0x400000>;
interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
prcm: prcm@44df0000 { prcm: prcm@44df0000 {
compatible = "ti,am4-prcm"; compatible = "ti,am4-prcm";
......
...@@ -99,13 +99,13 @@ mpu { ...@@ -99,13 +99,13 @@ mpu {
* hierarchy. * hierarchy.
*/ */
ocp { ocp {
compatible = "ti,omap4-l3-noc", "simple-bus"; compatible = "ti,dra7-l3-noc", "simple-bus";
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
ranges; ranges;
ti,hwmods = "l3_main_1", "l3_main_2"; ti,hwmods = "l3_main_1", "l3_main_2";
reg = <0x44000000 0x2000>, reg = <0x44000000 0x1000000>,
<0x44800000 0x3000>; <0x45000000 0x1000>;
interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>,
<GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment