Commit b00ced38 authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: ixp4xx: Delete Avila boardfiles 



This board is replaced with the corresponding device tree.
There is also the "loft" board which is just a Kconfi entry
and which reuses the same boardfile.

If there is interest in the Loft variant and someone is willing
to test I can create a special DT superset for this board,
which only differs in PCI set-up.

Cc: Michael-Luke Jones <mlj28@cam.ac.uk>
Cc: Deepak Saxena <dsaxena@plexity.net>
Cc: Tom Billman <kernel@giantshoulderinc.com>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 5be86f68

arch/arm/mach-ixp4xx/Kconfig

+0 −16
Original line number Diff line number Diff line
@@ -17,22 +17,6 @@ config MACH_IXP4XX_OF 
	help

	  Say 'Y' here to support Device Tree-based IXP4xx platforms.



config MACH_AVILA

	bool "Avila"

	depends on IXP4XX_PCI_LEGACY

	help

	  Say 'Y' here if you want your kernel to support the Gateworks

	  Avila Network Platform. For more information on this platform,

	  see <file:Documentation/arm/ixp4xx.rst>.



config MACH_LOFT

    bool "Loft"

    depends on MACH_AVILA

    help

	  Say 'Y' here if you want your kernel to support the Giant

	  Shoulder Inc Loft board (a minor variation on the standard

	  Gateworks Avila Network Platform).



config ARCH_ADI_COYOTE

	bool "Coyote"

	depends on IXP4XX_PCI_LEGACY

arch/arm/mach-ixp4xx/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ obj-pci-n := 
obj-pci-$(CONFIG_MACH_IXP4XX_OF)	+= ixp4xx-of.o



obj-pci-$(CONFIG_ARCH_IXDP4XX)		+= ixdp425-pci.o

obj-pci-$(CONFIG_MACH_AVILA)		+= avila-pci.o

obj-pci-$(CONFIG_MACH_IXDPG425)		+= ixdpg425-pci.o

obj-pci-$(CONFIG_ARCH_ADI_COYOTE)	+= coyote-pci.o

obj-pci-$(CONFIG_MACH_GTWX5715)		+= gtwx5715-pci.o
@@ -20,7 +19,6 @@ obj-pci-$(CONFIG_MACH_FSG) += fsg-pci.o 
obj-y	+= common.o



obj-$(CONFIG_ARCH_IXDP4XX)	+= ixdp425-setup.o

obj-$(CONFIG_MACH_AVILA)	+= avila-setup.o

obj-$(CONFIG_MACH_IXDPG425)	+= coyote-setup.o

obj-$(CONFIG_ARCH_ADI_COYOTE)	+= coyote-setup.o

obj-$(CONFIG_MACH_GTWX5715)	+= gtwx5715-setup.o

arch/arm/mach-ixp4xx/avila-pci.c

deleted100644 → 0
+0 −79
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * arch/arm/mach-ixp4xx/avila-pci.c

 *

 * Gateworks Avila board-level PCI initialization

 *

 * Author: Michael-Luke Jones <mlj28@cam.ac.uk>

 *

 * Based on ixdp-pci.c

 * Copyright (C) 2002 Intel Corporation.

 * Copyright (C) 2003-2004 MontaVista Software, Inc.

 *

 * Maintainer: Deepak Saxena <dsaxena@plexity.net>

 */



#include <linux/kernel.h>

#include <linux/pci.h>

#include <linux/init.h>

#include <linux/irq.h>

#include <linux/delay.h>

#include <asm/mach/pci.h>

#include <asm/irq.h>

#include <mach/hardware.h>

#include <asm/mach-types.h>



#include "irqs.h"



#define AVILA_MAX_DEV	4

#define LOFT_MAX_DEV	6

#define IRQ_LINES	4



/* PCI controller GPIO to IRQ pin mappings */

#define INTA		11

#define INTB		10

#define INTC		9

#define INTD		8



void __init avila_pci_preinit(void)

{

	irq_set_irq_type(IXP4XX_GPIO_IRQ(INTA), IRQ_TYPE_LEVEL_LOW);

	irq_set_irq_type(IXP4XX_GPIO_IRQ(INTB), IRQ_TYPE_LEVEL_LOW);

	irq_set_irq_type(IXP4XX_GPIO_IRQ(INTC), IRQ_TYPE_LEVEL_LOW);

	irq_set_irq_type(IXP4XX_GPIO_IRQ(INTD), IRQ_TYPE_LEVEL_LOW);

	ixp4xx_pci_preinit();

}



static int __init avila_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)

{

	static int pci_irq_table[IRQ_LINES] = {

		IXP4XX_GPIO_IRQ(INTA),

		IXP4XX_GPIO_IRQ(INTB),

		IXP4XX_GPIO_IRQ(INTC),

		IXP4XX_GPIO_IRQ(INTD)

	};



	if (slot >= 1 &&

	    slot <= (machine_is_loft() ? LOFT_MAX_DEV : AVILA_MAX_DEV) &&

	    pin >= 1 && pin <= IRQ_LINES)

		return pci_irq_table[(slot + pin - 2) % 4];



	return -1;

}



struct hw_pci avila_pci __initdata = {

	.nr_controllers = 1,

	.ops		= &ixp4xx_ops,

	.preinit	= avila_pci_preinit,

	.setup		= ixp4xx_setup,

	.map_irq	= avila_map_irq,

};



int __init avila_pci_init(void)

{

	if (machine_is_avila() || machine_is_loft())

		pci_common_init(&avila_pci);

	return 0;

}



subsys_initcall(avila_pci_init);

arch/arm/mach-ixp4xx/avila-setup.c

deleted100644 → 0
+0 −210
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * arch/arm/mach-ixp4xx/avila-setup.c

 *

 * Gateworks Avila board-setup

 *

 * Author: Michael-Luke Jones <mlj28@cam.ac.uk>

 *

 * Based on ixdp-setup.c

 * Copyright (C) 2003-2005 MontaVista Software, Inc.

 *

 * Author: Deepak Saxena <dsaxena@plexity.net>

 */



#include <linux/kernel.h>

#include <linux/init.h>

#include <linux/device.h>

#include <linux/serial.h>

#include <linux/tty.h>

#include <linux/serial_8250.h>

#include <linux/gpio/machine.h>

#include <linux/platform_data/pata_ixp4xx_cf.h>

#include <asm/types.h>

#include <asm/setup.h>

#include <asm/memory.h>

#include <mach/hardware.h>

#include <asm/mach-types.h>

#include <asm/irq.h>

#include <asm/mach/arch.h>

#include <asm/mach/flash.h>



#include "irqs.h"



#define AVILA_SDA_PIN	7

#define AVILA_SCL_PIN	6



static struct flash_platform_data avila_flash_data = {

	.map_name	= "cfi_probe",

	.width		= 2,

};



static struct resource avila_flash_resource = {

	.flags		= IORESOURCE_MEM,

};



static struct platform_device avila_flash = {

	.name		= "IXP4XX-Flash",

	.id		= 0,

	.dev		= {

		.platform_data = &avila_flash_data,

	},

	.num_resources	= 1,

	.resource	= &avila_flash_resource,

};



static struct gpiod_lookup_table avila_i2c_gpiod_table = {

	.dev_id		= "i2c-gpio.0",

	.table		= {

		GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", AVILA_SDA_PIN,

				NULL, 0, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

		GPIO_LOOKUP_IDX("IXP4XX_GPIO_CHIP", AVILA_SCL_PIN,

				NULL, 1, GPIO_ACTIVE_HIGH | GPIO_OPEN_DRAIN),

	},

};



static struct platform_device avila_i2c_gpio = {

	.name		= "i2c-gpio",

	.id		= 0,

	.dev	 = {

		.platform_data	= NULL,

	},

};



static struct resource avila_uart_resources[] = {

	{

		.start		= IXP4XX_UART1_BASE_PHYS,

		.end		= IXP4XX_UART1_BASE_PHYS + 0x0fff,

		.flags		= IORESOURCE_MEM

	},

	{

		.start		= IXP4XX_UART2_BASE_PHYS,

		.end		= IXP4XX_UART2_BASE_PHYS + 0x0fff,

		.flags		= IORESOURCE_MEM

	}

};



static struct plat_serial8250_port avila_uart_data[] = {

	{

		.mapbase	= IXP4XX_UART1_BASE_PHYS,

		.membase	= (char *)IXP4XX_UART1_BASE_VIRT + REG_OFFSET,

		.irq		= IRQ_IXP4XX_UART1,

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,

		.iotype		= UPIO_MEM,

		.regshift	= 2,

		.uartclk	= IXP4XX_UART_XTAL,

	},

	{

		.mapbase	= IXP4XX_UART2_BASE_PHYS,

		.membase	= (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET,

		.irq		= IRQ_IXP4XX_UART2,

		.flags		= UPF_BOOT_AUTOCONF | UPF_SKIP_TEST,

		.iotype		= UPIO_MEM,

		.regshift	= 2,

		.uartclk	= IXP4XX_UART_XTAL,

	},

	{ },

};



static struct platform_device avila_uart = {

	.name			= "serial8250",

	.id			= PLAT8250_DEV_PLATFORM,

	.dev.platform_data	= avila_uart_data,

	.num_resources		= 2,

	.resource		= avila_uart_resources

};



static struct resource avila_pata_resources[] = {

	{

		.flags	= IORESOURCE_MEM

	},

	{

		.flags	= IORESOURCE_MEM,

	},

	{

		.name	= "intrq",

		.start	= IRQ_IXP4XX_GPIO12,

		.end	= IRQ_IXP4XX_GPIO12,

		.flags	= IORESOURCE_IRQ,

	},

};



static struct ixp4xx_pata_data avila_pata_data = {

	.cs0_bits	= 0xbfff0043,

	.cs1_bits	= 0xbfff0043,

};



static struct platform_device avila_pata = {

	.name			= "pata_ixp4xx_cf",

	.id			= 0,

	.dev.platform_data      = &avila_pata_data,

	.num_resources		= ARRAY_SIZE(avila_pata_resources),

	.resource		= avila_pata_resources,

};



static struct platform_device *avila_devices[] __initdata = {

	&avila_i2c_gpio,

	&avila_flash,

	&avila_uart

};



static void __init avila_init(void)

{

	ixp4xx_sys_init();



	avila_flash_resource.start = IXP4XX_EXP_BUS_BASE(0);

	avila_flash_resource.end =

		IXP4XX_EXP_BUS_BASE(0) + ixp4xx_exp_bus_size - 1;



	gpiod_add_lookup_table(&avila_i2c_gpiod_table);



	platform_add_devices(avila_devices, ARRAY_SIZE(avila_devices));



	avila_pata_resources[0].start = IXP4XX_EXP_BUS_BASE(1);

	avila_pata_resources[0].end = IXP4XX_EXP_BUS_END(1);



	avila_pata_resources[1].start = IXP4XX_EXP_BUS_BASE(2);

	avila_pata_resources[1].end = IXP4XX_EXP_BUS_END(2);



	avila_pata_data.cs0_cfg = IXP4XX_EXP_CS1;

	avila_pata_data.cs1_cfg = IXP4XX_EXP_CS2;



	platform_device_register(&avila_pata);



}



MACHINE_START(AVILA, "Gateworks Avila Network Platform")

	/* Maintainer: Deepak Saxena <dsaxena@plexity.net> */

	.map_io		= ixp4xx_map_io,

	.init_early	= ixp4xx_init_early,

	.init_irq	= ixp4xx_init_irq,

	.init_time	= ixp4xx_timer_init,

	.atag_offset	= 0x100,

	.init_machine	= avila_init,

#if defined(CONFIG_PCI)

	.dma_zone_size	= SZ_64M,

#endif

	.restart	= ixp4xx_restart,

MACHINE_END



 /*

  * Loft is functionally equivalent to Avila except that it has a

  * different number for the maximum PCI devices.  The MACHINE

  * structure below is identical to Avila except for the comment.

  */

#ifdef CONFIG_MACH_LOFT

MACHINE_START(LOFT, "Giant Shoulder Inc Loft board")

	/* Maintainer: Tom Billman <kernel@giantshoulderinc.com> */

	.map_io		= ixp4xx_map_io,

	.init_early	= ixp4xx_init_early,

	.init_irq	= ixp4xx_init_irq,

	.init_time	= ixp4xx_timer_init,

	.atag_offset	= 0x100,

	.init_machine	= avila_init,

#if defined(CONFIG_PCI)

	.dma_zone_size	= SZ_64M,

#endif

	.restart	= ixp4xx_restart,

MACHINE_END

#endif