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

Merge branch 'qca7000_spi' 

Stefan Wahren says:

====================
add Qualcomm QCA7000 ethernet driver

This patch series adds support for the Qualcomm QCA7000 Homeplug GreenPHY.
The QCA7000 is serial-to-powerline bridge with two interfaces: UART and SPI.
These patches handles only the last one, with an Ethernet over SPI protocol
driver.

This driver based on the Qualcomm code [1], but contains a lot of changes
since last year:

* devicetree support
* DebugFS support
* ethtool support
* better error handling
* performance improvements
* code cleanup
* some bugfixes

The code has been tested only on Freescale i.MX28 boards, but should work
on other platforms.

[1] - https://github.com/IoE/qca7000



Changes in V3:
- Use ether_addr_copy instead of memcpy
- Remove qcaspi_set_mac_address
- Improve DT parsing
- replace OF_GPIO dependancy with OF
- fix compile error caused by SET_ETHTOOL_OPS
- fix possible endless loop when spi read fails
- fix DT documentation
- fix coding style
- fix sparse warnings

Changes in V2:
- replace in DT the SPI intr GPIO with pure interrupt
- make legacy mode a boolean DT property and remove it as module parameter
- make burst length a module parameter instead of DT property
- make pluggable a module parameter instead of DT property
- improve DT documentation
- replace debugFS register dump with ethtool function
- replace debugFS stats with ethtool function
- implement function to get ring parameter via ethtool
- implement function to set TX ring count via ethtool
- fix TX ring state in debugFS
- optimize tx ring flush
- add byte limit for TX ring to avoid bufferbloat
- fix TX queue full and write buffer miss counter
- fix SPI clk speed module parameter
- fix possible packet loss
- fix possible race during transmit
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents a11238ec 291ab06e

Documentation/devicetree/bindings/net/qca-qca7000-spi.txt

0 → 100644
+47 −0
Original line number Diff line number Diff line 
* Qualcomm QCA7000 (Ethernet over SPI protocol)



Note: The QCA7000 is useable as a SPI device. In this case it must be defined

as a child of a SPI master in the device tree.



Required properties:

- compatible : Should be "qca,qca7000"

- reg : Should specify the SPI chip select

- interrupts : The first cell should specify the index of the source interrupt

  and the second cell should specify the trigger type as rising edge

- spi-cpha : Must be set

- spi-cpol: Must be set



Optional properties:

- interrupt-parent : Specify the pHandle of the source interrupt

- spi-max-frequency : Maximum frequency of the SPI bus the chip can operate at.

  Numbers smaller than 1000000 or greater than 16000000 are invalid. Missing

  the property will set the SPI frequency to 8000000 Hertz.

- local-mac-address: 6 bytes, MAC address

- qca,legacy-mode : Set the SPI data transfer of the QCA7000 to legacy mode.

  In this mode the SPI master must toggle the chip select between each data

  word. In burst mode these gaps aren't necessary, which is faster.

  This setting depends on how the QCA7000 is setup via GPIO pin strapping.

  If the property is missing the driver defaults to burst mode.



Example:



/* Freescale i.MX28 SPI master*/

ssp2: spi@80014000 {

	#address-cells = <1>;

	#size-cells = <0>;

	compatible = "fsl,imx28-spi";

	pinctrl-names = "default";

	pinctrl-0 = <&spi2_pins_a>;

	status = "okay";



	qca7000: ethernet@0 {

		compatible = "qca,qca7000";

		reg = <0x0>;

		interrupt-parent = <&gpio3>;      /* GPIO Bank 3 */

		interrupts = <25 0x1>;            /* Index: 25, rising edge */

		spi-cpha;                         /* SPI mode: CPHA=1 */

		spi-cpol;                         /* SPI mode: CPOL=1 */

		spi-max-frequency = <8000000>;    /* freq: 8 MHz */

		local-mac-address = [ A0 B0 C0 D0 E0 F0 ];

	};

};

drivers/net/ethernet/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ config ETHOC 
source "drivers/net/ethernet/packetengines/Kconfig"

source "drivers/net/ethernet/pasemi/Kconfig"

source "drivers/net/ethernet/qlogic/Kconfig"

source "drivers/net/ethernet/qualcomm/Kconfig"

source "drivers/net/ethernet/realtek/Kconfig"

source "drivers/net/ethernet/renesas/Kconfig"

source "drivers/net/ethernet/rdc/Kconfig"

drivers/net/ethernet/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ obj-$(CONFIG_ETHOC) += ethoc.o 
obj-$(CONFIG_NET_PACKET_ENGINE) += packetengines/

obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/

obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/

obj-$(CONFIG_NET_VENDOR_QUALCOMM) += qualcomm/

obj-$(CONFIG_NET_VENDOR_REALTEK) += realtek/

obj-$(CONFIG_SH_ETH) += renesas/

obj-$(CONFIG_NET_VENDOR_RDC) += rdc/

drivers/net/ethernet/qualcomm/Kconfig

0 → 100644
+30 −0
Original line number Diff line number Diff line 
#

# Qualcomm network device configuration

#



config NET_VENDOR_QUALCOMM

	bool "Qualcomm devices"

	default y

	depends on SPI_MASTER && OF_GPIO

	---help---

	  If you have a network (Ethernet) card belonging to this class, say Y

	  and read the Ethernet-HOWTO, available from

	  <http://www.tldp.org/docs.html#howto>.



	  Note that the answer to this question doesn't directly affect the

	  kernel: saying N will just cause the configurator to skip all

	  the questions about Qualcomm cards. If you say Y, you will be asked

	  for your specific card in the following questions.



if NET_VENDOR_QUALCOMM



config QCA7000

	tristate "Qualcomm Atheros QCA7000 support"

	depends on SPI_MASTER && OF_GPIO

	---help---

	  This SPI protocol driver supports the Qualcomm Atheros QCA7000.



	  To compile this driver as a module, choose M here. The module

	  will be called qcaspi.



endif # NET_VENDOR_QUALCOMM

drivers/net/ethernet/qualcomm/Makefile

0 → 100644
+6 −0
Original line number Diff line number Diff line 
#

# Makefile for the Qualcomm network device drivers.

#



obj-$(CONFIG_QCA7000) += qcaspi.o

qcaspi-objs := qca_spi.o qca_framing.o qca_7k.o qca_debug.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE