Commit 82f88174 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'keystone-dts-part2' of...

Merge tag 'keystone-dts-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone into next/dt

Merge "ARM Keystone DTS part2 for 4.4" from Santosh Shilimkar:

	- Typo fix the soc binding documentation
	- NETCP Accumulator nodes

* tag 'keystone-dts-part2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: dts: keystone: enable accumulator channels
  Documentation: dt: keystone: Fix up missing quotes
parents 2dc71a68 9d45708f
...@@ -17,11 +17,11 @@ SoC families: ...@@ -17,11 +17,11 @@ SoC families:
SoCs: SoCs:
- Keystone 2 Hawking/Kepler - Keystone 2 Hawking/Kepler
compatible = ti,k2hk", "ti,keystone" compatible = "ti,k2hk", "ti,keystone"
- Keystone 2 Lamarr - Keystone 2 Lamarr
compatible = ti,k2l", "ti,keystone" compatible = "ti,k2l", "ti,keystone"
- Keystone 2 Edison - Keystone 2 Edison
compatible = ti,k2e", "ti,keystone" compatible = "ti,k2e", "ti,keystone"
Boards: Boards:
- Keystone 2 Hawking/Kepler EVM - Keystone 2 Hawking/Kepler EVM
......
...@@ -72,7 +72,17 @@ netcp-tx { ...@@ -72,7 +72,17 @@ netcp-tx {
qalloc-by-id; qalloc-by-id;
}; };
}; };
accumulator {
acc-low-0 {
qrange = <480 32>;
accumulator = <0 47 16 2 50>;
interrupts = <0 226 0xf01>;
multi-queue;
qalloc-by-id;
};
};
}; };
descriptor-regions { descriptor-regions {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -83,6 +93,19 @@ region-12 { ...@@ -83,6 +93,19 @@ region-12 {
link-index = <0x4000>; link-index = <0x4000>;
}; };
}; };
pdsps {
#address-cells = <1>;
#size-cells = <1>;
ranges;
pdsp0@0x2a10000 {
reg = <0x2a10000 0x1000 /*iram */
0x2a0f000 0x100 /*reg*/
0x2a0c000 0x3c8 /*intd */
0x2a20000 0x4000>; /*cmd*/
id = <0>;
};
};
}; /* qmss */ }; /* qmss */
knav_dmas: knav_dmas@0 { knav_dmas: knav_dmas@0 {
......
...@@ -47,6 +47,7 @@ qmgr1 { ...@@ -47,6 +47,7 @@ qmgr1 {
"region", "push", "pop"; "region", "push", "pop";
}; };
}; };
queue-pools { queue-pools {
qpend { qpend {
qpend-0 { qpend-0 {
...@@ -88,7 +89,17 @@ netcpx-tx { ...@@ -88,7 +89,17 @@ netcpx-tx {
qalloc-by-id; qalloc-by-id;
}; };
}; };
accumulator {
acc-low-0 {
qrange = <480 32>;
accumulator = <0 47 16 2 50>;
interrupts = <0 226 0xf01>;
multi-queue;
qalloc-by-id;
};
};
}; };
descriptor-regions { descriptor-regions {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -99,6 +110,19 @@ region-12 { ...@@ -99,6 +110,19 @@ region-12 {
link-index = <0x4000>; link-index = <0x4000>;
}; };
}; };
pdsps {
#address-cells = <1>;
#size-cells = <1>;
ranges;
pdsp0@0x2a10000 {
reg = <0x2a10000 0x1000 /*iram */
0x2a0f000 0x100 /*reg*/
0x2a0c000 0x3c8 /*intd */
0x2a20000 0x4000>; /*cmd*/
id = <0>;
};
};
}; /* qmss */ }; /* qmss */
knav_dmas: knav_dmas@0 { knav_dmas: knav_dmas@0 {
......
...@@ -72,7 +72,16 @@ netcp-tx { ...@@ -72,7 +72,16 @@ netcp-tx {
qalloc-by-id; qalloc-by-id;
}; };
}; };
accumulator {
acc-low-0 {
qrange = <480 32>;
accumulator = <0 47 16 2 50>;
interrupts = <0 226 0xf01>;
multi-queue;
};
};
}; };
descriptor-regions { descriptor-regions {
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
...@@ -83,6 +92,20 @@ region-12 { ...@@ -83,6 +92,20 @@ region-12 {
link-index = <0x4000>; link-index = <0x4000>;
}; };
}; };
pdsps {
#address-cells = <1>;
#size-cells = <1>;
ranges;
pdsp0@0x2a10000 {
reg = <0x2a10000 0x1000 /*iram */
0x2a0f000 0x100 /*reg*/
0x2a0c000 0x3c8 /*intd */
0x2a20000 0x4000>; /*cmd*/
id = <0>;
};
};
}; /* qmss */ }; /* qmss */
knav_dmas: knav_dmas@0 { knav_dmas: knav_dmas@0 {
......
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