Commit ef912fe4 authored by Rakesh Sankaranarayanan's avatar Rakesh Sankaranarayanan Committed by David S. Miller
Browse files

net: dsa: microchip: add ksz9563 in ksz_switch_ops and select based on compatible string 



Add KSZ9563 inside ksz_switch_chips structure with
port_nirq as 3. KSZ9563 use KSZ9893 switch parameters
but port_nirq count is 3 for KSZ9563 whereas 2 for
KSZ9893. Add KSZ9563 inside ksz_switch_chips as a separate
member and from device tree map compatible string into
KSZ9563 inside ksz_spi.c and ksz9477_i2c.c.
Global Chip ID 1 and 2 registers read value 9893, select
sku based on  Global Chip ID 4 Register which read 0x1c
for KSZ9563.

Signed-off-by: default avatarRakesh Sankaranarayanan <rakesh.sankaranarayanan@microchip.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 380f9acd

drivers/net/dsa/microchip/ksz9477.c

+2 −1
Original line number Diff line number Diff line
@@ -195,7 +195,8 @@ int ksz9477_reset_switch(struct ksz_device *dev) 


	/* KSZ9893 compatible chips do not support refclk configuration */

	if (dev->chip_id == KSZ9893_CHIP_ID ||

	    dev->chip_id == KSZ8563_CHIP_ID)

	    dev->chip_id == KSZ8563_CHIP_ID ||

	    dev->chip_id == KSZ9563_CHIP_ID)

		return 0;



	data8 = SW_ENABLE_REFCLKO;

drivers/net/dsa/microchip/ksz9477_i2c.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static const struct of_device_id ksz9477_dt_ids[] = { 
	},

	{

		.compatible = "microchip,ksz9563",

		.data = &ksz_switch_chips[KSZ9893]

		.data = &ksz_switch_chips[KSZ9563]

	},

	{

		.compatible = "microchip,ksz8563",

drivers/net/dsa/microchip/ksz_common.c

+31 −2
Original line number Diff line number Diff line
@@ -1282,6 +1282,31 @@ const struct ksz_chip_data ksz_switch_chips[] = { 
		.gbit_capable = {true, true, true},

	},



	[KSZ9563] = {

		.chip_id = KSZ9563_CHIP_ID,

		.dev_name = "KSZ9563",

		.num_vlans = 4096,

		.num_alus = 4096,

		.num_statics = 16,

		.cpu_ports = 0x07,	/* can be configured as cpu port */

		.port_cnt = 3,		/* total port count */

		.port_nirqs = 3,

		.ops = &ksz9477_dev_ops,

		.mib_names = ksz9477_mib_names,

		.mib_cnt = ARRAY_SIZE(ksz9477_mib_names),

		.reg_mib_cnt = MIB_COUNTER_NUM,

		.regs = ksz9477_regs,

		.masks = ksz9477_masks,

		.shifts = ksz9477_shifts,

		.xmii_ctrl0 = ksz9477_xmii_ctrl0,

		.xmii_ctrl1 = ksz8795_xmii_ctrl1, /* Same as ksz8795 */

		.supports_mii = {false, false, true},

		.supports_rmii = {false, false, true},

		.supports_rgmii = {false, false, true},

		.internal_phy = {true, true, false},

		.gbit_capable = {true, true, true},

	},



	[KSZ9567] = {

		.chip_id = KSZ9567_CHIP_ID,

		.dev_name = "KSZ9567",
@@ -2389,7 +2414,8 @@ static enum dsa_tag_protocol ksz_get_tag_protocol(struct dsa_switch *ds, 


	if (dev->chip_id == KSZ8830_CHIP_ID ||

	    dev->chip_id == KSZ8563_CHIP_ID ||

	    dev->chip_id == KSZ9893_CHIP_ID)

	    dev->chip_id == KSZ9893_CHIP_ID ||

	    dev->chip_id == KSZ9563_CHIP_ID)

		proto = DSA_TAG_PROTO_KSZ9893;



	if (dev->chip_id == KSZ9477_CHIP_ID ||
@@ -2509,7 +2535,8 @@ static void ksz_set_xmii(struct ksz_device *dev, int port, 
		data8 |= bitval[P_RGMII_SEL];

		/* On KSZ9893, disable RGMII in-band status support */

		if (dev->chip_id == KSZ9893_CHIP_ID ||

		    dev->chip_id == KSZ8563_CHIP_ID)

		    dev->chip_id == KSZ8563_CHIP_ID ||

		    dev->chip_id == KSZ9563_CHIP_ID)

			data8 &= ~P_MII_MAC_MODE;

		break;

	default:
@@ -2782,6 +2809,8 @@ static int ksz_switch_detect(struct ksz_device *dev) 


			if (id4 == SKU_ID_KSZ8563)

				dev->chip_id = KSZ8563_CHIP_ID;

			else if (id4 == SKU_ID_KSZ9563)

				dev->chip_id = KSZ9563_CHIP_ID;

			else

				dev->chip_id = KSZ9893_CHIP_ID;

drivers/net/dsa/microchip/ksz_common.h

+3 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ enum ksz_model { 
	KSZ9896,

	KSZ9897,

	KSZ9893,

	KSZ9563,

	KSZ9567,

	LAN9370,

	LAN9371,
@@ -172,6 +173,7 @@ enum ksz_chip_id { 
	KSZ9896_CHIP_ID = 0x00989600,

	KSZ9897_CHIP_ID = 0x00989700,

	KSZ9893_CHIP_ID = 0x00989300,

	KSZ9563_CHIP_ID = 0x00956300,

	KSZ9567_CHIP_ID = 0x00956700,

	LAN9370_CHIP_ID = 0x00937000,

	LAN9371_CHIP_ID = 0x00937100,
@@ -551,6 +553,7 @@ static inline int is_lan937x(struct ksz_device *dev) 
/* KSZ9893, KSZ9563, KSZ8563 specific register  */

#define REG_CHIP_ID4			0x0f

#define SKU_ID_KSZ8563			0x3c

#define SKU_ID_KSZ9563			0x1c



/* Driver set switch broadcast storm protection at 10% rate. */

#define BROADCAST_STORM_PROT_RATE	10

drivers/net/dsa/microchip/ksz_spi.c

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ static const struct of_device_id ksz_dt_ids[] = { 
	},

	{

		.compatible = "microchip,ksz9563",

		.data = &ksz_switch_chips[KSZ9893]

		.data = &ksz_switch_chips[KSZ9563]

	},

	{

		.compatible = "microchip,ksz8563",