| Message ID | c7a2c57b695804f52927ed5fd865bc8a9988335a.1379590036.git.jsarha@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Sep 26, 2013 at 08:18:35PM +0100, Jyri Sarha wrote: > This patch adds an optional address range to reg property. The range > describes the register location for DMA controller on am33xx. The both > address ranges are named accordingly in the reg-names property. > > Signed-off-by: Hebbar, Gururaja <gururaja.hebbar@ti.com> > Signed-off-by: Darren Etheridge <detheridge@ti.com> > Signed-off-by: Jyri Sarha <jsarha@ti.com> > --- > arch/arm/boot/dts/am33xx.dtsi | 14 ++++++++++++-- > 1 file changed, 12 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi > index fe53ce0..4dc388a 100644 > --- a/arch/arm/boot/dts/am33xx.dtsi > +++ b/arch/arm/boot/dts/am33xx.dtsi > @@ -556,19 +556,29 @@ > mcasp0: mcasp@48038000 { > compatible = "ti,omap2-mcasp-audio"; > ti,hwmods = "mcasp0"; > - reg = <0x48038000 0x2000>; > + reg = <0x48038000 0x2000>, > + <0x46400000 0x400000>; > + reg-names = "mpu", "dma"; > interrupts = <80 81>; > interrupts-names = "tx", "rx"; > status = "disabled"; > + dmas = <&edma 8 > + &edma 9>; For consistency with reg and other composite value properties, I'd prefer that each entry in the list were individually bracketed: dmas = <&edma 8>, <&edma 9>; It would also be nice if interrupts were written this way. > + dma-names = "tx", "rx"; > }; > > mcasp1: mcasp@4803C000 { > compatible = "ti,omap2-mcasp-audio"; > ti,hwmods = "mcasp1"; > - reg = <0x4803C000 0x2000>; > + reg = <0x4803C000 0x2000>, > + <0x46400000 0x400000>; > + reg-names = "mpu", "dma"; > interrupts = <82 83>; > interrupts-names = "tx", "rx"; > status = "disabled"; > + dmas = <&edma 10 > + &edma 11>; Similarly here. Cheers, Mark. -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 10/08/2013 01:00 AM, Mark Rutland wrote: > For consistency with reg and other composite value properties, I'd prefer that > each entry in the list were individually bracketed: > > dmas = <&edma 8>, > <&edma 9>; > Makes sense. I'll do that. Thanks! > It would also be nice if interrupts were written this way. I'll change that too. Cheers, Jyri -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/arm/boot/dts/am33xx.dtsi b/arch/arm/boot/dts/am33xx.dtsi index fe53ce0..4dc388a 100644 --- a/arch/arm/boot/dts/am33xx.dtsi +++ b/arch/arm/boot/dts/am33xx.dtsi @@ -556,19 +556,29 @@ mcasp0: mcasp@48038000 { compatible = "ti,omap2-mcasp-audio"; ti,hwmods = "mcasp0"; - reg = <0x48038000 0x2000>; + reg = <0x48038000 0x2000>, + <0x46400000 0x400000>; + reg-names = "mpu", "dma"; interrupts = <80 81>; interrupts-names = "tx", "rx"; status = "disabled"; + dmas = <&edma 8 + &edma 9>; + dma-names = "tx", "rx"; }; mcasp1: mcasp@4803C000 { compatible = "ti,omap2-mcasp-audio"; ti,hwmods = "mcasp1"; - reg = <0x4803C000 0x2000>; + reg = <0x4803C000 0x2000>, + <0x46400000 0x400000>; + reg-names = "mpu", "dma"; interrupts = <82 83>; interrupts-names = "tx", "rx"; status = "disabled"; + dmas = <&edma 10 + &edma 11>; + dma-names = "tx", "rx"; }; };