forked from Minki/linux
b70661c708
The smc91x driver traditionally gets configured at compile-time for whichever hardware it runs on. This no longer works on ARM as we continue to move to building all-in-one kernels. Most ARM configurations with this driver already use run-time configuration through DT or through platform_data, but a few have not been converted yet. I've checked all ARM boards that use this driver in their legacy board files, and converted the ones that were using compile-time configuration in smc91x.h to behave like the other ones and provide the interrupt polarity along with the MMIO configuration (width, stride) at platform device creation time. In particular, these combinations were previously selectable in Kconfig but in fact broken: - sa1100 assabet plus pleb - msm combined with any other armv6/v7 platform - pxa-idp combined with any non-DMA pxa variant - LogicPD PXA270 combined with any other pxa - nomadik combined with any other armv4/v5 platform, e.g. versatile. None of these seem critical enough to warrant a backport to stable, but it would be nice to clean this up for good. Signed-off-by: Arnd Bergmann <arnd@arndb.de> ---- I would like the patch to get merged through netdev, after Robert and/or Linus have verified it on at least some hardware. There are a few other non-ARM platforms using this driver, I could do the same patch for those if we want to take it further. arch/arm/mach-msm/board-halibut.c | 8 ++++- arch/arm/mach-msm/board-qsd8x50.c | 8 ++++- arch/arm/mach-pxa/idp.c | 5 +++ arch/arm/mach-pxa/lpd270.c | 8 ++++- arch/arm/mach-realview/core.c | 7 ++++ arch/arm/mach-realview/realview_eb.c | 2 +- arch/arm/mach-sa1100/neponset.c | 6 ++++ arch/arm/mach-sa1100/pleb.c | 7 ++++ drivers/net/ethernet/smsc/smc91x.c | 9 +++-- drivers/net/ethernet/smsc/smc91x.h | 114 ++---------------------------------------------------------- 10 files changed, 57 insertions(+), 117 deletions(-) Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: David S. Miller <davem@davemloft.net>
148 lines
3.0 KiB
C
148 lines
3.0 KiB
C
/*
|
|
* linux/arch/arm/mach-sa1100/pleb.c
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/tty.h>
|
|
#include <linux/ioport.h>
|
|
#include <linux/platform_data/sa11x0-serial.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/irq.h>
|
|
#include <linux/io.h>
|
|
#include <linux/mtd/partitions.h>
|
|
#include <linux/smc91x.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <asm/setup.h>
|
|
#include <asm/mach-types.h>
|
|
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/mach/flash.h>
|
|
#include <mach/irqs.h>
|
|
|
|
#include "generic.h"
|
|
|
|
|
|
/*
|
|
* Ethernet IRQ mappings
|
|
*/
|
|
|
|
#define PLEB_ETH0_P (0x20000300) /* Ethernet 0 in PCMCIA0 IO */
|
|
#define PLEB_ETH0_V (0xf6000300)
|
|
|
|
#define GPIO_ETH0_IRQ GPIO_GPIO(21)
|
|
#define GPIO_ETH0_EN GPIO_GPIO(26)
|
|
|
|
#define IRQ_GPIO_ETH0_IRQ IRQ_GPIO21
|
|
|
|
static struct resource smc91x_resources[] = {
|
|
[0] = DEFINE_RES_MEM(PLEB_ETH0_P, 0x04000000),
|
|
#if 0 /* Autoprobe instead, to get rising/falling edge characteristic right */
|
|
[1] = DEFINE_RES_IRQ(IRQ_GPIO_ETH0_IRQ),
|
|
#endif
|
|
};
|
|
|
|
static struct smc91x_platdata smc91x_platdata = {
|
|
.flags = SMC91X_USE_16BIT | SMC91X_NOWAIT,
|
|
};
|
|
|
|
static struct platform_device smc91x_device = {
|
|
.name = "smc91x",
|
|
.id = 0,
|
|
.num_resources = ARRAY_SIZE(smc91x_resources),
|
|
.resource = smc91x_resources,
|
|
.dev = {
|
|
.platform_data = &smc91c_platdata,
|
|
},
|
|
};
|
|
|
|
static struct platform_device *devices[] __initdata = {
|
|
&smc91x_device,
|
|
};
|
|
|
|
|
|
/*
|
|
* Pleb's memory map
|
|
* has flash memory (typically 4 or 8 meg) selected by
|
|
* the two SA1100 lowest chip select outputs.
|
|
*/
|
|
static struct resource pleb_flash_resources[] = {
|
|
[0] = DEFINE_RES_MEM(SA1100_CS0_PHYS, SZ_8M),
|
|
[1] = DEFINE_RES_MEM(SA1100_CS1_PHYS, SZ_8M),
|
|
};
|
|
|
|
|
|
static struct mtd_partition pleb_partitions[] = {
|
|
{
|
|
.name = "blob",
|
|
.offset = 0,
|
|
.size = 0x00020000,
|
|
}, {
|
|
.name = "kernel",
|
|
.offset = MTDPART_OFS_APPEND,
|
|
.size = 0x000e0000,
|
|
}, {
|
|
.name = "rootfs",
|
|
.offset = MTDPART_OFS_APPEND,
|
|
.size = 0x00300000,
|
|
}
|
|
};
|
|
|
|
|
|
static struct flash_platform_data pleb_flash_data = {
|
|
.map_name = "cfi_probe",
|
|
.parts = pleb_partitions,
|
|
.nr_parts = ARRAY_SIZE(pleb_partitions),
|
|
};
|
|
|
|
|
|
static void __init pleb_init(void)
|
|
{
|
|
sa11x0_register_mtd(&pleb_flash_data, pleb_flash_resources,
|
|
ARRAY_SIZE(pleb_flash_resources));
|
|
|
|
|
|
platform_add_devices(devices, ARRAY_SIZE(devices));
|
|
}
|
|
|
|
|
|
static void __init pleb_map_io(void)
|
|
{
|
|
sa1100_map_io();
|
|
|
|
sa1100_register_uart(0, 3);
|
|
sa1100_register_uart(1, 1);
|
|
|
|
GAFR |= (GPIO_UART_TXD | GPIO_UART_RXD);
|
|
GPDR |= GPIO_UART_TXD;
|
|
GPDR &= ~GPIO_UART_RXD;
|
|
PPAR |= PPAR_UPR;
|
|
|
|
/*
|
|
* Fix expansion memory timing for network card
|
|
*/
|
|
MECR = ((2<<10) | (2<<5) | (2<<0));
|
|
|
|
/*
|
|
* Enable the SMC ethernet controller
|
|
*/
|
|
GPDR |= GPIO_ETH0_EN; /* set to output */
|
|
GPCR = GPIO_ETH0_EN; /* clear MCLK (enable smc) */
|
|
|
|
GPDR &= ~GPIO_ETH0_IRQ;
|
|
|
|
irq_set_irq_type(GPIO_ETH0_IRQ, IRQ_TYPE_EDGE_FALLING);
|
|
}
|
|
|
|
MACHINE_START(PLEB, "PLEB")
|
|
.map_io = pleb_map_io,
|
|
.nr_irqs = SA1100_NR_IRQS,
|
|
.init_irq = sa1100_init_irq,
|
|
.init_time = sa1100_timer_init,
|
|
.init_machine = pleb_init,
|
|
.init_late = sa11x0_init_late,
|
|
.restart = sa11x0_restart,
|
|
MACHINE_END
|