diff options
| author | Tony Lindgren <tony@atomide.com> | 2014-05-08 08:02:57 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2014-05-08 08:02:57 -0700 |
| commit | e610c9d3aeca8d7335803f816ae2e39e5103233e (patch) | |
| tree | ea54a72bce76a53ba337bfc64ef7fd41d8c52779 | |
| parent | 2347152bb7684a1f7d66b62f9fd91b30939675ad (diff) | |
| parent | 2eeddb8a5356e088021a8dd84de870de89bf793d (diff) | |
Merge branch 'pull/l3noc/dts-fixes' of https://github.com/nmenon/linux-2.6-playground into omap-for-v3.16/fixes-not-urgentomap-for-v3.16/fixes-not-urgent-signed
| -rw-r--r-- | arch/arm/boot/dts/am4372.dtsi | 6 | ||||
| -rw-r--r-- | arch/arm/boot/dts/dra7.dtsi | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/boot/dts/am4372.dtsi b/arch/arm/boot/dts/am4372.dtsi index 36d523a26831..ef2903741f54 100644 --- a/arch/arm/boot/dts/am4372.dtsi +++ b/arch/arm/boot/dts/am4372.dtsi @@ -67,11 +67,15 @@ }; ocp { - compatible = "simple-bus"; + compatible = "ti,am4372-l3-noc", "simple-bus"; #address-cells = <1>; #size-cells = <1>; ranges; 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 { compatible = "ti,am4-prcm"; diff --git a/arch/arm/boot/dts/dra7.dtsi b/arch/arm/boot/dts/dra7.dtsi index 149b55099935..ab01f2d0e590 100644 --- a/arch/arm/boot/dts/dra7.dtsi +++ b/arch/arm/boot/dts/dra7.dtsi @@ -99,13 +99,13 @@ * hierarchy. */ ocp { - compatible = "ti,omap4-l3-noc", "simple-bus"; + compatible = "ti,dra7-l3-noc", "simple-bus"; #address-cells = <1>; #size-cells = <1>; ranges; ti,hwmods = "l3_main_1", "l3_main_2"; - reg = <0x44000000 0x2000>, - <0x44800000 0x3000>; + reg = <0x44000000 0x1000000>, + <0x45000000 0x1000>; interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>, <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>; |