Commit a706a042 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'add-dsa-switch-support-for-ar9331' 



Oleksij Rempel says:

====================
add dsa switch support for ar9331

changes v6:
- remove ag71xx changes from this patch set. It needs more work.
- ar9331: fix register definition and add ASCII art switch documentation.

changes v6:
- rebase against net-next

changes v5:
- remote support for port5. The effort of using this port is
  questionable. Currently, it is better to not use it at all, then
  adding buggy support.
- remove port enable call back. There is nothing what we actually need
  to enable.
- rebase it against v5.5-rc1

changes v4:
- ag71xx: ag71xx_mac_validate fix always false comparison (&& -> ||)
- tag_ar9331: use skb_pull_rcsum() instead of skb_pull().
- tag_ar9331: drop skb_set_mac_header()

changes v3:
- ag71xx: ag71xx_mac_config: ignore MLO_AN_INBAND mode. It is not
  supported by HW and SW.
- ag71xx: ag71xx_mac_validate: return all supported bits on
  PHY_INTERFACE_MODE_NA

changes v2:
- move Atheros AR9331 TAG format to separate patch
- use netdev_warn_once in the tag driver to reduce potential message spam
- typo fixes
- reorder tag driver alphabetically
- configure switch to maximal frame size
- use mdiobus_read/write
- fail if mdio sub node is not found
- add comment for post reset state
- remove deprecated comment about device id
- remove phy-handle option for node with fixed-link
- ag71xx: set 1G support only for GMII mode

This patch series provides dsa switch support for Atheros ar9331 WiSoC.
As side effect ag71xx needed to be ported to phylink to make the switch
driver (as well phylink based) work properly.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 50808326 ec6698c2

Documentation/devicetree/bindings/net/dsa/ar9331.txt

0 → 100644
+148 −0
Original line number Diff line number Diff line 
Atheros AR9331 built-in switch

=============================



It is a switch built-in to Atheros AR9331 WiSoC and addressable over internal

MDIO bus. All PHYs are built-in as well.



Required properties:



 - compatible: should be: "qca,ar9331-switch"

 - reg: Address on the MII bus for the switch.

 - resets : Must contain an entry for each entry in reset-names.

 - reset-names : Must include the following entries: "switch"

 - interrupt-parent: Phandle to the parent interrupt controller

 - interrupts: IRQ line for the switch

 - interrupt-controller: Indicates the switch is itself an interrupt

   controller. This is used for the PHY interrupts.

 - #interrupt-cells: must be 1

 - mdio: Container of PHY and devices on the switches MDIO bus.



See Documentation/devicetree/bindings/net/dsa/dsa.txt for a list of additional

required and optional properties.

Examples:



eth0: ethernet@19000000 {

	compatible = "qca,ar9330-eth";

	reg = <0x19000000 0x200>;

	interrupts = <4>;



	resets = <&rst 9>, <&rst 22>;

	reset-names = "mac", "mdio";

	clocks = <&pll ATH79_CLK_AHB>, <&pll ATH79_CLK_AHB>;

	clock-names = "eth", "mdio";



	phy-mode = "mii";

	phy-handle = <&phy_port4>;

};



eth1: ethernet@1a000000 {

	compatible = "qca,ar9330-eth";

	reg = <0x1a000000 0x200>;

	interrupts = <5>;

	resets = <&rst 13>, <&rst 23>;

	reset-names = "mac", "mdio";

	clocks = <&pll ATH79_CLK_AHB>, <&pll ATH79_CLK_AHB>;

	clock-names = "eth", "mdio";



	phy-mode = "gmii";



	fixed-link {

		speed = <1000>;

		full-duplex;

	};



	mdio {

		#address-cells = <1>;

		#size-cells = <0>;



		switch10: switch@10 {

			#address-cells = <1>;

			#size-cells = <0>;



			compatible = "qca,ar9331-switch";

			reg = <0x10>;

			resets = <&rst 8>;

			reset-names = "switch";



			interrupt-parent = <&miscintc>;

			interrupts = <12>;



			interrupt-controller;

			#interrupt-cells = <1>;



			ports {

				#address-cells = <1>;

				#size-cells = <0>;



				switch_port0: port@0 {

					reg = <0x0>;

					label = "cpu";

					ethernet = <&eth1>;



					phy-mode = "gmii";



					fixed-link {

						speed = <1000>;

						full-duplex;

					};

				};



				switch_port1: port@1 {

					reg = <0x1>;

					phy-handle = <&phy_port0>;

					phy-mode = "internal";

				};



				switch_port2: port@2 {

					reg = <0x2>;

					phy-handle = <&phy_port1>;

					phy-mode = "internal";

				};



				switch_port3: port@3 {

					reg = <0x3>;

					phy-handle = <&phy_port2>;

					phy-mode = "internal";

				};



				switch_port4: port@4 {

					reg = <0x4>;

					phy-handle = <&phy_port3>;

					phy-mode = "internal";

				};

			};



			mdio {

				#address-cells = <1>;

				#size-cells = <0>;



				interrupt-parent = <&switch10>;



				phy_port0: phy@0 {

					reg = <0x0>;

					interrupts = <0>;

				};



				phy_port1: phy@1 {

					reg = <0x1>;

					interrupts = <0>;

				};



				phy_port2: phy@2 {

					reg = <0x2>;

					interrupts = <0>;

				};



				phy_port3: phy@3 {

					reg = <0x3>;

					interrupts = <0>;

				};



				phy_port4: phy@4 {

					reg = <0x4>;

					interrupts = <0>;

				};

			};

		};

	};

};

arch/mips/boot/dts/qca/ar9331.dtsi

+118 −1
Original line number Diff line number Diff line
@@ -126,6 +126,9 @@ 
			clocks = <&pll ATH79_CLK_AHB>, <&pll ATH79_CLK_AHB>;

			clock-names = "eth", "mdio";



			phy-mode = "mii";

			phy-handle = <&phy_port4>;



			status = "disabled";

		};
@@ -133,15 +136,129 @@ 
			compatible = "qca,ar9330-eth";

			reg = <0x1a000000 0x200>;

			interrupts = <5>;



			resets = <&rst 13>, <&rst 23>;

			reset-names = "mac", "mdio";

			clocks = <&pll ATH79_CLK_AHB>, <&pll ATH79_CLK_AHB>;

			clock-names = "eth", "mdio";



			phy-mode = "gmii";



			status = "disabled";



			fixed-link {

				speed = <1000>;

				full-duplex;

			};



			mdio {

				#address-cells = <1>;

				#size-cells = <0>;



				switch10: switch@10 {

					#address-cells = <1>;

					#size-cells = <0>;



					compatible = "qca,ar9331-switch";

					reg = <0x10>;

					resets = <&rst 8>;

					reset-names = "switch";



					interrupt-parent = <&miscintc>;

					interrupts = <12>;



					interrupt-controller;

					#interrupt-cells = <1>;



					ports {

						#address-cells = <1>;

						#size-cells = <0>;



						switch_port0: port@0 {

							reg = <0x0>;

							label = "cpu";

							ethernet = <&eth1>;



							phy-mode = "gmii";



							fixed-link {

								speed = <1000>;

								full-duplex;

							};

						};



						switch_port1: port@1 {

							reg = <0x1>;

							phy-handle = <&phy_port0>;

							phy-mode = "internal";



							status = "disabled";

						};



						switch_port2: port@2 {

							reg = <0x2>;

							phy-handle = <&phy_port1>;

							phy-mode = "internal";



							status = "disabled";

						};



						switch_port3: port@3 {

							reg = <0x3>;

							phy-handle = <&phy_port2>;

							phy-mode = "internal";



							status = "disabled";

						};



						switch_port4: port@4 {

							reg = <0x4>;

							phy-handle = <&phy_port3>;

							phy-mode = "internal";



							status = "disabled";

						};

					};



					mdio {

						#address-cells = <1>;

						#size-cells = <0>;



						interrupt-parent = <&switch10>;



						phy_port0: phy@0 {

							reg = <0x0>;

							interrupts = <0>;

							status = "disabled";

						};



						phy_port1: phy@1 {

							reg = <0x1>;

							interrupts = <0>;

							status = "disabled";

						};



						phy_port2: phy@2 {

							reg = <0x2>;

							interrupts = <0>;

							status = "disabled";

						};



						phy_port3: phy@3 {

							reg = <0x3>;

							interrupts = <0>;

							status = "disabled";

						};



						phy_port4: phy@4 {

							reg = <0x4>;

							interrupts = <0>;

							status = "disabled";

						};

					};

				};

			};

		};



		usb: usb@1b000100 {

			compatible = "chipidea,usb2";

			reg = <0x1b000000 0x200>;

arch/mips/boot/dts/qca/ar9331_dpt_module.dts

+13 −0
Original line number Diff line number Diff line
@@ -84,3 +84,16 @@ 
&eth1 {

	status = "okay";

};



&switch_port1 {

	label = "lan0";

	status = "okay";

};



&phy_port0 {

	status = "okay";

};



&phy_port4 {

	status = "okay";

};

drivers/net/dsa/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -54,6 +54,8 @@ source "drivers/net/dsa/mv88e6xxx/Kconfig" 


source "drivers/net/dsa/ocelot/Kconfig"



source "drivers/net/dsa/qca/Kconfig"



source "drivers/net/dsa/sja1105/Kconfig"



config NET_DSA_QCA8K

drivers/net/dsa/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -21,4 +21,5 @@ obj-y += b53/ 
obj-y				+= microchip/

obj-y				+= mv88e6xxx/

obj-y				+= ocelot/

obj-y				+= qca/

obj-y				+= sja1105/

CRA Git | Maintained and supported by SUSTech CRA and CCSE