Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

Documentation/devicetree/bindings/arm/keystone/keystone.txt

+3 −3
Original line number Diff line number Diff line
@@ -17,11 +17,11 @@ SoC families: 
SoCs:



- Keystone 2 Hawking/Kepler

   compatible = ti,k2hk", "ti,keystone"

   compatible = "ti,k2hk", "ti,keystone"

- Keystone 2 Lamarr

   compatible = ti,k2l", "ti,keystone"

   compatible = "ti,k2l", "ti,keystone"

- Keystone 2 Edison

   compatible = ti,k2e", "ti,keystone"

   compatible = "ti,k2e", "ti,keystone"



Boards:

-  Keystone 2 Hawking/Kepler EVM

arch/arm/boot/dts/k2e-netcp.dtsi

+23 −0
Original line number Diff line number Diff line
@@ -72,7 +72,17 @@ qmss: qmss@2a40000 { 
				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 {

		#address-cells = <1>;

		#size-cells = <1>;
@@ -83,6 +93,19 @@ qmss: qmss@2a40000 { 
			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 */



knav_dmas: knav_dmas@0 {

arch/arm/boot/dts/k2hk-netcp.dtsi

+24 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ qmss: qmss@2a40000 { 
				    "region", "push", "pop";

		};

	};



	queue-pools {

		qpend {

			qpend-0 {
@@ -88,7 +89,17 @@ qmss: qmss@2a40000 { 
				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 {

		#address-cells = <1>;

		#size-cells = <1>;
@@ -99,6 +110,19 @@ qmss: qmss@2a40000 { 
			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 */



knav_dmas: knav_dmas@0 {

arch/arm/boot/dts/k2l-netcp.dtsi

+23 −0
Original line number Diff line number Diff line
@@ -72,7 +72,16 @@ qmss: qmss@2a40000 { 
				qalloc-by-id;

			};

		};

		accumulator {

			acc-low-0 {

				qrange = <480 32>;

				accumulator = <0 47 16 2 50>;

				interrupts = <0 226 0xf01>;

				multi-queue;

			};

		};

	};



	descriptor-regions {

		#address-cells = <1>;

		#size-cells = <1>;
@@ -83,6 +92,20 @@ qmss: qmss@2a40000 { 
			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 */



knav_dmas: knav_dmas@0 {