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

Merge branch 'microchip-ksz88x3' 



Oleksij Rempel says:

====================
microchip: add support for ksz88x3 driver family

changes v8:
- add Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
- fix build issue on "net: dsa: microchip: ksz8795: move register
  offsets and shifts to separate struct"

changes v7:
- Reverse christmas tree fixes
- remove IS_88X3 and use chip_id instead
- drop own tag and use DSA_TAG_PROTO_KSZ9893 instead

changes v6:
- take over this patch set
- rebase against latest netdev-next and fix regressions
- disable VLAN support for KSZ8863. KSZ8863's VLAN is not compatible to the
  KSZ8795's. So disable it for now and mainline it separately.

This series adds support for the ksz88x3 driver family to the dsa based
ksz drivers. The driver is making use of the already available ksz8795
driver and moves it to an generic driver for the ksz8 based chips which
have similar functions but an totaly different register layout.

The mainlining discussion history of this branch:
v1: https://lore.kernel.org/netdev/20191107110030.25199-1-m.grzeschik@pengutronix.de/
v2: https://lore.kernel.org/netdev/20191218200831.13796-1-m.grzeschik@pengutronix.de/
v3: https://lore.kernel.org/netdev/20200508154343.6074-1-m.grzeschik@pengutronix.de/
v4: https://lore.kernel.org/netdev/20200803054442.20089-1-m.grzeschik@pengutronix.de/
v5: https://lore.kernel.org/netdev/20201207125627.30843-1-m.grzeschik@pengutronix.de/


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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents aae0fdac 61b40598

Documentation/devicetree/bindings/net/dsa/microchip,ksz.yaml

+2 −0
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ properties: 
      - microchip,ksz8765

      - microchip,ksz8794

      - microchip,ksz8795

      - microchip,ksz8863

      - microchip,ksz8873

      - microchip,ksz9477

      - microchip,ksz9897

      - microchip,ksz9896

Documentation/devicetree/bindings/net/mdio-gpio.txt

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ MDIO on GPIOs 


Currently defined compatibles:

- virtual,gpio-mdio

- microchip,mdio-smi0



MDC and MDIO lines connected to GPIO controllers are listed in the

gpios property as described in section VIII.1 in the following order:

drivers/net/dsa/microchip/Kconfig

+9 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ menuconfig NET_DSA_MICROCHIP_KSZ8795 
	depends on NET_DSA

	select NET_DSA_MICROCHIP_KSZ_COMMON

	help

	  This driver adds support for Microchip KSZ8795 switch chips.

	  This driver adds support for Microchip KSZ8795/KSZ88X3 switch chips.



config NET_DSA_MICROCHIP_KSZ8795_SPI

	tristate "KSZ8795 series SPI connected switch driver"
@@ -40,3 +40,11 @@ config NET_DSA_MICROCHIP_KSZ8795_SPI 


	  It is required to use the KSZ8795 switch driver as the only access

	  is through SPI.



config NET_DSA_MICROCHIP_KSZ8863_SMI

	tristate "KSZ series SMI connected switch driver"

	depends on NET_DSA_MICROCHIP_KSZ8795

	select MDIO_BITBANG

	help

	  Select to enable support for registering switches configured through

	  Microchip SMI. It supports the KSZ8863 and KSZ8873 switch.

drivers/net/dsa/microchip/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -5,3 +5,4 @@ obj-$(CONFIG_NET_DSA_MICROCHIP_KSZ9477_I2C) += ksz9477_i2c.o 
obj-$(CONFIG_NET_DSA_MICROCHIP_KSZ9477_SPI)	+= ksz9477_spi.o

obj-$(CONFIG_NET_DSA_MICROCHIP_KSZ8795)		+= ksz8795.o

obj-$(CONFIG_NET_DSA_MICROCHIP_KSZ8795_SPI)	+= ksz8795_spi.o

obj-$(CONFIG_NET_DSA_MICROCHIP_KSZ8863_SMI)	+= ksz8863_smi.o

drivers/net/dsa/microchip/ksz8.h

0 → 100644
+69 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 * Microchip KSZ8XXX series register access

 *

 * Copyright (C) 2020 Pengutronix, Michael Grzeschik <kernel@pengutronix.de>

 */



#ifndef __KSZ8XXX_H

#define __KSZ8XXX_H

#include <linux/kernel.h>



enum ksz_regs {

	REG_IND_CTRL_0,

	REG_IND_DATA_8,

	REG_IND_DATA_CHECK,

	REG_IND_DATA_HI,

	REG_IND_DATA_LO,

	REG_IND_MIB_CHECK,

	P_FORCE_CTRL,

	P_LINK_STATUS,

	P_LOCAL_CTRL,

	P_NEG_RESTART_CTRL,

	P_REMOTE_STATUS,

	P_SPEED_STATUS,

	S_TAIL_TAG_CTRL,

};



enum ksz_masks {

	PORT_802_1P_REMAPPING,

	SW_TAIL_TAG_ENABLE,

	MIB_COUNTER_OVERFLOW,

	MIB_COUNTER_VALID,

	VLAN_TABLE_FID,

	VLAN_TABLE_MEMBERSHIP,

	VLAN_TABLE_VALID,

	STATIC_MAC_TABLE_VALID,

	STATIC_MAC_TABLE_USE_FID,

	STATIC_MAC_TABLE_FID,

	STATIC_MAC_TABLE_OVERRIDE,

	STATIC_MAC_TABLE_FWD_PORTS,

	DYNAMIC_MAC_TABLE_ENTRIES_H,

	DYNAMIC_MAC_TABLE_MAC_EMPTY,

	DYNAMIC_MAC_TABLE_NOT_READY,

	DYNAMIC_MAC_TABLE_ENTRIES,

	DYNAMIC_MAC_TABLE_FID,

	DYNAMIC_MAC_TABLE_SRC_PORT,

	DYNAMIC_MAC_TABLE_TIMESTAMP,

};



enum ksz_shifts {

	VLAN_TABLE_MEMBERSHIP_S,

	VLAN_TABLE,

	STATIC_MAC_FWD_PORTS,

	STATIC_MAC_FID,

	DYNAMIC_MAC_ENTRIES_H,

	DYNAMIC_MAC_ENTRIES,

	DYNAMIC_MAC_FID,

	DYNAMIC_MAC_TIMESTAMP,

	DYNAMIC_MAC_SRC_PORT,

};



struct ksz8 {

	const u8 *regs;

	const u32 *masks;

	const u8 *shifts;

	void *priv;

};



#endif