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

Commit db05f7fc authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'keystone-dts-for-4.2' of... 

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

Keystone DTS update for 4.2
	- Includes NETCP related EVM updates

* tag 'keystone-dts-for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone:
  ARM: dts: k2l: fix the netcp range size
  ARM: dts: k2e: fix the netcp range size
  ARM: dts: k2hk: fix the netcp range size
  ARM: dts: k2l-evm: Add device bindings for netcp driver
  ARM: dts: k2e-evm: Add device bindings for netcp driver
  ARM: dts: k2hk-evm: Add device bindings for netcp driver
parents 62d4585f 0b239342

arch/arm/boot/dts/k2e-evm.dts

+1 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ 
};



&mdio {

	status = "ok";

	ethphy0: ethernet-phy@0 {

		compatible = "marvell,88E1514", "marvell,88E1510", "ethernet-phy-ieee802.3-c22";

		reg = <0>;

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

0 → 100644
+206 −0
Original line number Diff line number Diff line 
/*

 * Device Tree Source for Keystone 2 Edison Netcp driver

 *

 * Copyright 2015 Texas Instruments, Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



qmss: qmss@2a40000 {

	compatible = "ti,keystone-navigator-qmss";

	dma-coherent;

	#address-cells = <1>;

	#size-cells = <1>;

	clocks = <&chipclk13>;

	ranges;

	queue-range	= <0 0x2000>;

	linkram0	= <0x100000 0x4000>;

	linkram1	= <0 0x10000>;



	qmgrs {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;

		qmgr0 {

			managed-queues = <0 0x2000>;

			reg = <0x2a40000 0x20000>,

			      <0x2a06000 0x400>,

			      <0x2a02000 0x1000>,

			      <0x2a03000 0x1000>,

			      <0x23a80000 0x20000>,

			      <0x2a80000 0x20000>;

			reg-names = "peek", "status", "config",

				    "region", "push", "pop";

		};

	};

	queue-pools {

		qpend {

			qpend-0 {

				qrange = <658 8>;

				interrupts =<0 40 0xf04 0 41 0xf04 0 42 0xf04

					     0 43 0xf04 0 44 0xf04 0 45 0xf04

					     0 46 0xf04 0 47 0xf04>;

			};

			qpend-1 {

				qrange = <528 16>;

				interrupts = <0 48 0xf04 0 49 0xf04 0 50 0xf04

					      0 51 0xf04 0 52 0xf04 0 53 0xf04

					      0 54 0xf04 0 55 0xf04 0 56 0xf04

					      0 57 0xf04 0 58 0xf04 0 59 0xf04

					      0 60 0xf04 0 61 0xf04 0 62 0xf04

					      0 63 0xf04>;

				qalloc-by-id;

			};

			qpend-2 {

				qrange = <544 16>;

				interrupts = <0 64 0xf04 0 65 0xf04 0 66 0xf04

					      0 59 0xf04 0 68 0xf04 0 69 0xf04

					      0 70 0xf04 0 71 0xf04 0 72 0xf04

					      0 73 0xf04 0 74 0xf04 0 75 0xf04

					      0 76 0xf04 0 77 0xf04 0 78 0xf04

					      0 79 0xf04>;

			};

		};

		general-purpose {

			gp-0 {

				qrange = <4000 64>;

			};

			netcp-tx {

				qrange = <896 128>;

				qalloc-by-id;

			};

		};

	};

	descriptor-regions {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;

		region-12 {

			id = <12>;

			region-spec = <8192 128>;	/* num_desc desc_size */

			link-index = <0x4000>;

		};

	};

}; /* qmss */



knav_dmas: knav_dmas@0 {

	compatible = "ti,keystone-navigator-dma";

	clocks = <&papllclk>;

	#address-cells = <1>;

	#size-cells = <1>;

	ranges;

	ti,navigator-cloud-address = <0x23a80000 0x23a90000

				 0x23a80000 0x23a90000>;



	dma_gbe: dma_gbe@0 {

		reg = <0x24186000 0x100>,

			  <0x24187000 0x2a0>,

			  <0x24188000 0xb60>,

			  <0x24186100 0x80>,

			  <0x24189000 0x1000>;

		reg-names = "global", "txchan", "rxchan",

				"txsched", "rxflow";

	};

};



netcp: netcp@24000000 {

	reg = <0x2620110 0x8>;

	reg-names = "efuse";

	compatible = "ti,netcp-1.0";

	#address-cells = <1>;

	#size-cells = <1>;



	/* NetCP address range */

	ranges = <0 0x24000000 0x1000000>;



	clocks = <&papllclk>, <&clkcpgmac>, <&chipclk12>;

	dma-coherent;



	ti,navigator-dmas = <&dma_gbe 0>,

			<&dma_gbe 8>,

			<&dma_gbe 0>;

	ti,navigator-dma-names = "netrx0", "netrx1", "nettx";



	netcp-devices {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;

		gbe@200000 { /* ETHSS */

			label = "netcp-gbe";

			compatible = "ti,netcp-gbe-9";

			reg = <0x200000 0x900>, <0x220000 0x20000>;

			/* enable-ale; */

			tx-queue = <896>;

			tx-channel = "nettx";



			interfaces {

				gbe0: interface-0 {

					slave-port = <0>;

					link-interface	= <1>;

					phy-handle	= <&ethphy0>;

				};

				gbe1: interface-1 {

					slave-port = <1>;

					link-interface	= <1>;

					phy-handle	= <&ethphy1>;

				};

			};



			secondary-slave-ports {

				port-2 {

					slave-port = <2>;

					link-interface	= <2>;

				};

				port-3 {

					slave-port = <3>;

					link-interface	= <2>;

				};

				port-4 {

					slave-port = <4>;

					link-interface	= <2>;

				};

				port-5 {

					slave-port = <5>;

					link-interface	= <2>;

				};

				port-6 {

					slave-port = <6>;

					link-interface	= <2>;

				};

				port-7 {

					slave-port = <7>;

					link-interface	= <2>;

				};

			};

		};

	};



	netcp-interfaces {

		interface-0 {

			rx-channel = "netrx0";

			rx-pool = <1024 12>;

			tx-pool = <1024 12>;

			rx-queue-depth = <128 128 0 0>;

			rx-buffer-size = <1518 4096 0 0>;

			rx-queue = <528>;

			tx-completion-queue = <530>;

			efuse-mac = <1>;

			netcp-gbe = <&gbe0>;



		};

		interface-1 {

			rx-channel = "netrx1";

			rx-pool = <1024 12>;

			tx-pool = <1024 12>;

			rx-queue-depth = <128 128 0 0>;

			rx-buffer-size = <1518 4096 0 0>;

			rx-queue = <529>;

			tx-completion-queue = <531>;

			efuse-mac = <0>;

			local-mac-address = [02 18 31 7e 3e 00];

			netcp-gbe = <&gbe1>;

		};

	};

};

arch/arm/boot/dts/k2e.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ 
					<GIC_SPI 376 IRQ_TYPE_EDGE_RISING>;

			};

		};

		/include/ "k2e-netcp.dtsi"

	};

};

arch/arm/boot/dts/k2hk-evm.dts

+1 −0
Original line number Diff line number Diff line
@@ -169,6 +169,7 @@ 
};



&mdio {

	status = "ok";

	ethphy0: ethernet-phy@0 {

		compatible = "marvell,88E1111", "ethernet-phy-ieee802.3-c22";

		reg = <0>;

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

0 → 100644
+208 −0
Original line number Diff line number Diff line 
/*

 * Device Tree Source for Keystone 2 Hawking Netcp driver

 *

 * Copyright 2015 Texas Instruments, Inc.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



qmss: qmss@2a40000 {

	compatible = "ti,keystone-navigator-qmss";

	dma-coherent;

	#address-cells = <1>;

	#size-cells = <1>;

	clocks = <&chipclk13>;

	ranges;

	queue-range	= <0 0x4000>;

	linkram0	= <0x100000 0x8000>;

	linkram1	= <0x0 0x10000>;



	qmgrs {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;

		qmgr0 {

			managed-queues = <0 0x2000>;

			reg = <0x2a40000 0x20000>,

			      <0x2a06000 0x400>,

			      <0x2a02000 0x1000>,

			      <0x2a03000 0x1000>,

			      <0x23a80000 0x20000>,

			      <0x2a80000 0x20000>;

			reg-names = "peek", "status", "config",

				    "region", "push", "pop";

		};



		qmgr1 {

			managed-queues = <0x2000 0x2000>;

			reg = <0x2a60000 0x20000>,

			      <0x2a06400 0x400>,

			      <0x2a04000 0x1000>,

			      <0x2a05000 0x1000>,

			      <0x23aa0000 0x20000>,

			      <0x2aa0000 0x20000>;

			reg-names = "peek", "status", "config",

				    "region", "push", "pop";

		};

	};

	queue-pools {

		qpend {

			qpend-0 {

				qrange = <658 8>;

				interrupts =<0 40 0xf04 0 41 0xf04 0 42 0xf04

					     0 43 0xf04 0 44 0xf04 0 45 0xf04

					     0 46 0xf04 0 47 0xf04>;

			};

			qpend-1 {

				qrange = <8704 16>;

				interrupts = <0 48 0xf04 0 49 0xf04 0 50 0xf04

					      0 51 0xf04 0 52 0xf04 0 53 0xf04

					      0 54 0xf04 0 55 0xf04 0 56 0xf04

					      0 57 0xf04 0 58 0xf04 0 59 0xf04

					      0 60 0xf04 0 61 0xf04 0 62 0xf04

					      0 63 0xf04>;

				qalloc-by-id;

			};

			qpend-2 {

				qrange = <8720 16>;

				interrupts = <0 64 0xf04 0 65 0xf04 0 66 0xf04

					      0 59 0xf04 0 68 0xf04 0 69 0xf04

					      0 70 0xf04 0 71 0xf04 0 72 0xf04

					      0 73 0xf04 0 74 0xf04 0 75 0xf04

					      0 76 0xf04 0 77 0xf04 0 78 0xf04

					      0 79 0xf04>;

			};

		};

		general-purpose {

			gp-0 {

				qrange = <4000 64>;

			};

			netcp-tx {

				qrange = <640 9>;

				qalloc-by-id;

			};

			netcpx-tx {

				qrange = <8752 8>;

				qalloc-by-id;

			};

		};

	};

	descriptor-regions {

		#address-cells = <1>;

		#size-cells = <1>;

		ranges;

		region-12 {

			id = <12>;

			region-spec = <8192 128>;	/* num_desc desc_size */

			link-index = <0x4000>;

		};

	};

}; /* qmss */



knav_dmas: knav_dmas@0 {

	compatible = "ti,keystone-navigator-dma";

	clocks = <&papllclk>;

	#address-cells = <1>;

	#size-cells = <1>;

	ranges;

	ti,navigator-cloud-address = <0x23a80000 0x23a90000

				   0x23aa0000 0x23ab0000>;



	dma_gbe: dma_gbe@0 {

		reg = <0x2004000 0x100>,

			  <0x2004400 0x120>,

			  <0x2004800 0x300>,

			  <0x2004c00 0x120>,

			  <0x2005000 0x400>;

		reg-names = "global", "txchan", "rxchan",

				"txsched", "rxflow";

	};

};



netcp: netcp@2000000 {

	reg = <0x2620110 0x8>;

	reg-names = "efuse";

	compatible = "ti,netcp-1.0";

	#address-cells = <1>;

	#size-cells = <1>;



	/* NetCP address range */

	ranges  = <0 0x2000000 0x100000>;



	clocks = <&papllclk>, <&clkcpgmac>, <&chipclk12>;

	dma-coherent;



	ti,navigator-dmas = <&dma_gbe 22>,

			<&dma_gbe 23>,

			<&dma_gbe 8>;

	ti,navigator-dma-names = "netrx0", "netrx1", "nettx";



	netcp-devices {

		ranges;

		#address-cells = <1>;

		#size-cells = <1>;

		gbe@90000 { /* ETHSS */

			#address-cells = <1>;

			#size-cells = <1>;

			label = "netcp-gbe";

			compatible = "ti,netcp-gbe";

			reg = <0x90000 0x300>, <0x90400 0x400>, <0x90800 0x700>;

			/* enable-ale; */

			tx-queue = <648>;

			tx-channel = "nettx";



			interfaces {

				gbe0: interface-0 {

					slave-port = <0>;

					link-interface = <1>;

					phy-handle = <&ethphy0>;

				};

				gbe1: interface-1 {

					slave-port = <1>;

					link-interface = <1>;

					phy-handle = <&ethphy1>;

				};

			};



			secondary-slave-ports {

				port-2 {

					slave-port = <2>;

					link-interface	= <2>;

				};

				port-3 {

					slave-port = <3>;

					link-interface	= <2>;

				};

			};

		};

	};



	netcp-interfaces {

		interface-0 {

			rx-channel = "netrx0";

			rx-pool = <1024 12>;

			tx-pool = <1024 12>;

			rx-queue-depth = <128 128 0 0>;

			rx-buffer-size = <1518 4096 0 0>;

			rx-queue = <8704>;

			tx-completion-queue = <8706>;

			efuse-mac = <1>;

			netcp-gbe = <&gbe0>;



		};

		interface-1 {

			rx-channel = "netrx1";

			rx-pool = <1024 12>;

			tx-pool = <1024 12>;

			rx-queue-depth = <128 128 0 0>;

			rx-buffer-size = <1518 4096 0 0>;

			rx-queue = <8705>;

			tx-completion-queue = <8707>;

			efuse-mac = <0>;

			local-mac-address = [02 18 31 7e 3e 6f];

			netcp-gbe = <&gbe1>;

		};

	};

};