From c323abe7dc3543059aedf638cb574c906db89f72 Mon Sep 17 00:00:00 2001 From: Peter Ujfalusi Date: Wed, 29 Aug 2012 16:31:06 +0300 Subject: [PATCH] --- yaml --- r: 326840 b: refs/heads/master c: 63467cf23284588901f2edfcaabbfdef489ffc9b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/boot/dts/omap4.dtsi | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 5abccf162898..d3b6054830f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2995a10002e20b5acfbaf9553ca1f22d9575f032 +refs/heads/master: 63467cf23284588901f2edfcaabbfdef489ffc9b diff --git a/trunk/arch/arm/boot/dts/omap4.dtsi b/trunk/arch/arm/boot/dts/omap4.dtsi index 5ed3b944965b..9f851dfe7507 100644 --- a/trunk/arch/arm/boot/dts/omap4.dtsi +++ b/trunk/arch/arm/boot/dts/omap4.dtsi @@ -273,6 +273,7 @@ compatible = "ti,omap4-mcpdm"; reg = <0x40132000 0x7f>, /* MPU private access */ <0x49032000 0x7f>; /* L3 Interconnect */ + reg-names = "mpu", "dma"; interrupts = <0 112 0x4>; interrupt-parent = <&gic>; ti,hwmods = "mcpdm"; @@ -282,6 +283,7 @@ compatible = "ti,omap4-dmic"; reg = <0x4012e000 0x7f>, /* MPU private access */ <0x4902e000 0x7f>; /* L3 Interconnect */ + reg-names = "mpu", "dma"; interrupts = <0 114 0x4>; interrupt-parent = <&gic>; ti,hwmods = "dmic";