Patchwork [U-Boot,1/7] tegra: fdt: add apbdma node

login
register
mail settings
Submitter Allen Martin
Date Jan. 11, 2013, 6:44 p.m.
Message ID <1357929877-18671-2-git-send-email-amartin@nvidia.com>
Download mbox | patch
Permalink /patch/211402/
State Superseded
Headers show

Comments

Allen Martin - Jan. 11, 2013, 6:44 p.m.
Add apbdma node for tegra20 and tegra30, copied directly from tegra
Linux dtsi files.

Signed-off-by: Allen Martin <amartin@nvidia.com>
---
 arch/arm/dts/tegra20.dtsi |   21 +++++++++++++++++++++
 arch/arm/dts/tegra30.dtsi |   37 +++++++++++++++++++++++++++++++++++++
 2 files changed, 58 insertions(+)
Stephen Warren - Jan. 12, 2013, 12:08 a.m.
On 01/11/2013 11:44 AM, Allen Martin wrote:
> Add apbdma node for tegra20 and tegra30, copied directly from tegra
> Linux dtsi files.

> diff --git a/arch/arm/dts/tegra20.dtsi b/arch/arm/dts/tegra20.dtsi

> +	apbdma: dma {
> +		compatible = "nvidia,tegra20-apbdma";
> +		reg = <0x6000a000 0x1200>;
...
>  	intc: interrupt-controller@50041000 {

Can the nodes be kept sorted by address?
Allen Martin - Jan. 12, 2013, 3:19 a.m.
On Fri, Jan 11, 2013 at 04:08:55PM -0800, Stephen Warren wrote:
> On 01/11/2013 11:44 AM, Allen Martin wrote:
> > Add apbdma node for tegra20 and tegra30, copied directly from tegra
> > Linux dtsi files.
> 
> > diff --git a/arch/arm/dts/tegra20.dtsi b/arch/arm/dts/tegra20.dtsi
> 
> > +	apbdma: dma {
> > +		compatible = "nvidia,tegra20-apbdma";
> > +		reg = <0x6000a000 0x1200>;
> ...
> >  	intc: interrupt-controller@50041000 {
> 
> Can the nodes be kept sorted by address?
> 

They're already unsorted.  I'll add a new patch to sort them, then add
this one on top.

-Allen
Stephen Warren - Jan. 12, 2013, 6:07 a.m.
On 01/11/2013 08:19 PM, Allen Martin wrote:
> On Fri, Jan 11, 2013 at 04:08:55PM -0800, Stephen Warren wrote:
>> On 01/11/2013 11:44 AM, Allen Martin wrote:
>>> Add apbdma node for tegra20 and tegra30, copied directly from tegra
>>> Linux dtsi files.
>>
>>> diff --git a/arch/arm/dts/tegra20.dtsi b/arch/arm/dts/tegra20.dtsi
>>
>>> +	apbdma: dma {
>>> +		compatible = "nvidia,tegra20-apbdma";
>>> +		reg = <0x6000a000 0x1200>;
>> ...
>>>  	intc: interrupt-controller@50041000 {
>>
>> Can the nodes be kept sorted by address?
>>
> 
> They're already unsorted.  I'll add a new patch to sort them, then add
> this one on top.

Ah yes.

You can use the kernel as a reference, but FYI the order I have
attempted to impose there is:

1) Any nodes that already exist in any /include/d file, in the order
they appear in the /include/d file.

2) Any nodes with a reg property, in order of their address.

3) Any nodes without a reg property, alphabetically by node name.

If U-Boot follows the same rules, diff'ing the .dts files between U-Boot
and the kernel should be easy.
Allen Martin - Jan. 12, 2013, 6:49 a.m.
On Fri, Jan 11, 2013 at 10:07:41PM -0800, Stephen Warren wrote:
> On 01/11/2013 08:19 PM, Allen Martin wrote:
> > On Fri, Jan 11, 2013 at 04:08:55PM -0800, Stephen Warren wrote:
> >> On 01/11/2013 11:44 AM, Allen Martin wrote:
> >>> Add apbdma node for tegra20 and tegra30, copied directly from tegra
> >>> Linux dtsi files.
> >>
> >>> diff --git a/arch/arm/dts/tegra20.dtsi b/arch/arm/dts/tegra20.dtsi
> >>
> >>> +	apbdma: dma {
> >>> +		compatible = "nvidia,tegra20-apbdma";
> >>> +		reg = <0x6000a000 0x1200>;
> >> ...
> >>>  	intc: interrupt-controller@50041000 {
> >>
> >> Can the nodes be kept sorted by address?
> >>
> > 
> > They're already unsorted.  I'll add a new patch to sort them, then add
> > this one on top.
> 
> Ah yes.
> 
> You can use the kernel as a reference, but FYI the order I have
> attempted to impose there is:
> 
> 1) Any nodes that already exist in any /include/d file, in the order
> they appear in the /include/d file.
> 
> 2) Any nodes with a reg property, in order of their address.
> 
> 3) Any nodes without a reg property, alphabetically by node name.
> 
> If U-Boot follows the same rules, diff'ing the .dts files between U-Boot
> and the kernel should be easy.

Ok, thanks, I'll try to follow the same rules.  

BTW: cache-controller and interrupt-controller are out of order in the
kernel dtsi files. 

-Allen

Patch

diff --git a/arch/arm/dts/tegra20.dtsi b/arch/arm/dts/tegra20.dtsi
index 636ec2c..707975c 100644
--- a/arch/arm/dts/tegra20.dtsi
+++ b/arch/arm/dts/tegra20.dtsi
@@ -20,6 +20,27 @@ 
 		};
 	};
 
+	apbdma: dma {
+		compatible = "nvidia,tegra20-apbdma";
+		reg = <0x6000a000 0x1200>;
+		interrupts = <0 104 0x04
+			      0 105 0x04
+			      0 106 0x04
+			      0 107 0x04
+			      0 108 0x04
+			      0 109 0x04
+			      0 110 0x04
+			      0 111 0x04
+			      0 112 0x04
+			      0 113 0x04
+			      0 114 0x04
+			      0 115 0x04
+			      0 116 0x04
+			      0 117 0x04
+			      0 118 0x04
+			      0 119 0x04>;
+	};
+
 	intc: interrupt-controller@50041000 {
 		compatible = "nvidia,tegra20-gic";
 		interrupt-controller;
diff --git a/arch/arm/dts/tegra30.dtsi b/arch/arm/dts/tegra30.dtsi
index 664c397..d5f761e 100644
--- a/arch/arm/dts/tegra30.dtsi
+++ b/arch/arm/dts/tegra30.dtsi
@@ -19,6 +19,43 @@ 
 		};
 	};
 
+	apbdma: dma {
+		compatible = "nvidia,tegra30-apbdma", "nvidia,tegra20-apbdma";
+		reg = <0x6000a000 0x1400>;
+		interrupts = <0 104 0x04
+			      0 105 0x04
+			      0 106 0x04
+			      0 107 0x04
+			      0 108 0x04
+			      0 109 0x04
+			      0 110 0x04
+			      0 111 0x04
+			      0 112 0x04
+			      0 113 0x04
+			      0 114 0x04
+			      0 115 0x04
+			      0 116 0x04
+			      0 117 0x04
+			      0 118 0x04
+			      0 119 0x04
+			      0 128 0x04
+			      0 129 0x04
+			      0 130 0x04
+			      0 131 0x04
+			      0 132 0x04
+			      0 133 0x04
+			      0 134 0x04
+			      0 135 0x04
+			      0 136 0x04
+			      0 137 0x04
+			      0 138 0x04
+			      0 139 0x04
+			      0 140 0x04
+			      0 141 0x04
+			      0 142 0x04
+			      0 143 0x04>;
+	};
+
 	i2c@7000c000 {
 		#address-cells = <1>;
 		#size-cells = <0>;