Commit c9910484 authored by Colin Foster's avatar Colin Foster Committed by Jakub Kicinski
Browse files

net: dsa: ocelot: remove unnecessary pci_bar variables 



The pci_bar variables for the switch and imdio don't make sense for the
generic felix driver. Moving them to felix_vsc9959 to limit scope and
simplify the felix_info struct.

Signed-off-by: default avatarColin Foster <colin.foster@in-advantage.com>
Reviewed-by: default avatarVladimir Oltean <vladimir.oltean@nxp.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 3c5290a2

drivers/net/dsa/ocelot/felix.h

+0 −2
Original line number Diff line number Diff line
@@ -25,8 +25,6 @@ struct felix_info { 
	u16				vcap_pol_max;

	u16				vcap_pol_base2;

	u16				vcap_pol_max2;

	int				switch_pci_bar;

	int				imdio_pci_bar;

	const struct ptp_clock_info	*ptp_caps;



	/* Some Ocelot switches are integrated into the SoC without the

drivers/net/dsa/ocelot/felix_vsc9959.c

+4 −6
Original line number Diff line number Diff line
@@ -21,6 +21,8 @@ 
#define VSC9959_TAS_GCL_ENTRY_MAX	63

#define VSC9959_VCAP_POLICER_BASE	63

#define VSC9959_VCAP_POLICER_MAX	383

#define VSC9959_SWITCH_PCI_BAR		4

#define VSC9959_IMDIO_PCI_BAR		0



static const u32 vsc9959_ana_regmap[] = {

	REG(ANA_ADVLEARN,			0x0089a0),
@@ -2230,8 +2232,6 @@ static const struct felix_info felix_info_vsc9959 = { 
	.num_mact_rows		= 2048,

	.num_ports		= 6,

	.num_tx_queues		= OCELOT_NUM_TC,

	.switch_pci_bar		= 4,

	.imdio_pci_bar		= 0,

	.quirk_no_xtr_irq	= true,

	.ptp_caps		= &vsc9959_ptp_caps,

	.mdio_bus_alloc		= vsc9959_mdio_bus_alloc,
@@ -2290,10 +2290,8 @@ static int felix_pci_probe(struct pci_dev *pdev, 
	ocelot->dev = &pdev->dev;

	ocelot->num_flooding_pgids = OCELOT_NUM_TC;

	felix->info = &felix_info_vsc9959;

	felix->switch_base = pci_resource_start(pdev,

						felix->info->switch_pci_bar);

	felix->imdio_base = pci_resource_start(pdev,

					       felix->info->imdio_pci_bar);

	felix->switch_base = pci_resource_start(pdev, VSC9959_SWITCH_PCI_BAR);

	felix->imdio_base = pci_resource_start(pdev, VSC9959_IMDIO_PCI_BAR);



	pci_set_master(pdev);