Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 368bec0d authored by David Daney's avatar David Daney Committed by Ralf Baechle
Browse files

netdev: octeon_mgmt: Convert to use device tree. 



The device tree will supply the register bank base addresses, make
register addressing relative to those.  PHY connection is now
described by the device tree.

The OCTEON_IRQ_MII{0,1} symbols are also removed as they are now
unused and interfere with the irq_domain used for device tree irq
mapping.

Signed-off-by: default avatarDavid Daney <david.daney@cavium.com>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Cc: linux-mips@linux-mips.org
Cc: devicetree-discuss@lists.ozlabs.org
Cc: Grant Likely <grant.likely@secretlab.ca>
Cc: Rob Herring <rob.herring@calxeda.com>
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/3941/


Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent 2fd46f47

arch/mips/cavium-octeon/octeon-irq.c

+0 −2
Original line number Diff line number Diff line
@@ -1197,7 +1197,6 @@ static void __init octeon_irq_init_ciu(void) 
		octeon_irq_set_ciu_mapping(i + OCTEON_IRQ_TIMER0, 0, i + 52, chip, handle_edge_irq);



	octeon_irq_set_ciu_mapping(OCTEON_IRQ_USB0, 0, 56, chip, handle_level_irq);

	octeon_irq_set_ciu_mapping(OCTEON_IRQ_MII0, 0, 62, chip, handle_level_irq);

	octeon_irq_set_ciu_mapping(OCTEON_IRQ_BOOTDMA, 0, 63, chip, handle_level_irq);



	/* CIU_1 */
@@ -1206,7 +1205,6 @@ static void __init octeon_irq_init_ciu(void) 


	octeon_irq_set_ciu_mapping(OCTEON_IRQ_UART2, 1, 16, chip, handle_level_irq);

	octeon_irq_set_ciu_mapping(OCTEON_IRQ_USB1, 1, 17, chip, handle_level_irq);

	octeon_irq_set_ciu_mapping(OCTEON_IRQ_MII1, 1, 18, chip, handle_level_irq);



	gpio_node = of_find_compatible_node(NULL, NULL, "cavium,octeon-3860-gpio");

	if (gpio_node) {

arch/mips/cavium-octeon/octeon-platform.c

+0 −62
Original line number Diff line number Diff line
@@ -168,68 +168,6 @@ static int __init octeon_rng_device_init(void) 
}

device_initcall(octeon_rng_device_init);



/* Octeon mgmt port Ethernet interface.  */

static int __init octeon_mgmt_device_init(void)

{

	struct platform_device *pd;

	int ret = 0;

	int port, num_ports;



	struct resource mgmt_port_resource = {

		.flags	= IORESOURCE_IRQ,

		.start	= -1,

		.end	= -1

	};



	if (!OCTEON_IS_MODEL(OCTEON_CN56XX) && !OCTEON_IS_MODEL(OCTEON_CN52XX))

		return 0;



	if (OCTEON_IS_MODEL(OCTEON_CN56XX))

		num_ports = 1;

	else

		num_ports = 2;



	for (port = 0; port < num_ports; port++) {

		pd = platform_device_alloc("octeon_mgmt", port);

		if (!pd) {

			ret = -ENOMEM;

			goto out;

		}

		/* No DMA restrictions */

		pd->dev.coherent_dma_mask = DMA_BIT_MASK(64);

		pd->dev.dma_mask = &pd->dev.coherent_dma_mask;



		switch (port) {

		case 0:

			mgmt_port_resource.start = OCTEON_IRQ_MII0;

			break;

		case 1:

			mgmt_port_resource.start = OCTEON_IRQ_MII1;

			break;

		default:

			BUG();

		}

		mgmt_port_resource.end = mgmt_port_resource.start;



		ret = platform_device_add_resources(pd, &mgmt_port_resource, 1);



		if (ret)

			goto fail;



		ret = platform_device_add(pd);

		if (ret)

			goto fail;

	}

	return ret;

fail:

	platform_device_put(pd);



out:

	return ret;



}

device_initcall(octeon_mgmt_device_init);



#ifdef CONFIG_USB



static int __init octeon_ehci_device_init(void)

drivers/net/ethernet/octeon/octeon_mgmt.c

+207 −105

File changed.

Preview size limit exceeded, changes collapsed.