mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
![Russell King](/assets/img/avatar_default.png)
Commitb70661c708
("net: smc91x: use run-time configuration on all ARM machines") broke some ARM platforms through several mistakes. Firstly, the access size must correspond to the following rule: (a) at least one of 16-bit or 8-bit access size must be supported (b) 32-bit accesses are optional, and may be enabled in addition to the above. Secondly, it provides no emulation of 16-bit accesses, instead blindly making 16-bit accesses even when the platform specifies that only 8-bit is supported. Reorganise smc91x.h so we can make use of the existing 16-bit access emulation already provided - if 16-bit accesses are supported, use 16-bit accesses directly, otherwise if 8-bit accesses are supported, use the provided 16-bit access emulation. If neither, BUG(). This exactly reflects the driver behaviour prior to the commit being fixed. Since the conversion incorrectly cut down the available access sizes on several platforms, we also need to go through every platform and fix up the overly-restrictive access size: Arnd assumed that if a platform can perform 32-bit, 16-bit and 8-bit accesses, then only a 32-bit access size needed to be specified - not so, all available access sizes must be specified. This likely fixes some performance regressions in doing this: if a platform does not support 8-bit accesses, 8-bit accesses have been emulated by performing a 16-bit read-modify-write access. Tested on the Intel Assabet/Neponset platform, which supports only 8-bit accesses, which was broken by the original commit. Fixes:b70661c708
("net: smc91x: use run-time configuration on all ARM machines") Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: David S. Miller <davem@davemloft.net>
192 lines
4.6 KiB
C
192 lines
4.6 KiB
C
/* linux/arch/arm/mach-pxa/xcep.c
|
|
*
|
|
* Support for the Iskratel Electronics XCEP platform as used in
|
|
* the Libera instruments from Instrumentation Technologies.
|
|
*
|
|
* Author: Ales Bardorfer <ales@i-tech.si>
|
|
* Contributions by: Abbott, MG (Michael) <michael.abbott@diamond.ac.uk>
|
|
* Contributions by: Matej Kenda <matej.kenda@i-tech.si>
|
|
* Created: June 2006
|
|
* Copyright: (C) 2006-2009 Instrumentation Technologies
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*/
|
|
|
|
#include <linux/platform_device.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/i2c/pxa-i2c.h>
|
|
#include <linux/smc91x.h>
|
|
#include <linux/mtd/mtd.h>
|
|
#include <linux/mtd/partitions.h>
|
|
#include <linux/mtd/physmap.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/irq.h>
|
|
#include <asm/mach/map.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include "pxa25x.h"
|
|
#include <mach/smemc.h>
|
|
|
|
#include "generic.h"
|
|
|
|
#define XCEP_ETH_PHYS (PXA_CS3_PHYS + 0x00000300)
|
|
#define XCEP_ETH_PHYS_END (PXA_CS3_PHYS + 0x000fffff)
|
|
#define XCEP_ETH_ATTR (PXA_CS3_PHYS + 0x02000000)
|
|
#define XCEP_ETH_ATTR_END (PXA_CS3_PHYS + 0x020fffff)
|
|
#define XCEP_ETH_IRQ IRQ_GPIO0
|
|
|
|
/* XCEP CPLD base */
|
|
#define XCEP_CPLD_BASE 0xf0000000
|
|
|
|
|
|
/* Flash partitions. */
|
|
|
|
static struct mtd_partition xcep_partitions[] = {
|
|
{
|
|
.name = "Bootloader",
|
|
.size = 0x00040000,
|
|
.offset = 0,
|
|
.mask_flags = MTD_WRITEABLE
|
|
}, {
|
|
.name = "Bootloader ENV",
|
|
.size = 0x00040000,
|
|
.offset = 0x00040000,
|
|
.mask_flags = MTD_WRITEABLE
|
|
}, {
|
|
.name = "Kernel",
|
|
.size = 0x00100000,
|
|
.offset = 0x00080000,
|
|
}, {
|
|
.name = "Rescue fs",
|
|
.size = 0x00280000,
|
|
.offset = 0x00180000,
|
|
}, {
|
|
.name = "Filesystem",
|
|
.size = MTDPART_SIZ_FULL,
|
|
.offset = 0x00400000
|
|
}
|
|
};
|
|
|
|
static struct physmap_flash_data xcep_flash_data[] = {
|
|
{
|
|
.width = 4, /* bankwidth in bytes */
|
|
.parts = xcep_partitions,
|
|
.nr_parts = ARRAY_SIZE(xcep_partitions)
|
|
}
|
|
};
|
|
|
|
static struct resource flash_resource = {
|
|
.start = PXA_CS0_PHYS,
|
|
.end = PXA_CS0_PHYS + SZ_32M - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
};
|
|
|
|
static struct platform_device flash_device = {
|
|
.name = "physmap-flash",
|
|
.id = 0,
|
|
.dev = {
|
|
.platform_data = xcep_flash_data,
|
|
},
|
|
.resource = &flash_resource,
|
|
.num_resources = 1,
|
|
};
|
|
|
|
|
|
|
|
/* SMC LAN91C111 network controller. */
|
|
|
|
static struct resource smc91x_resources[] = {
|
|
[0] = {
|
|
.name = "smc91x-regs",
|
|
.start = XCEP_ETH_PHYS,
|
|
.end = XCEP_ETH_PHYS_END,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
[1] = {
|
|
.start = XCEP_ETH_IRQ,
|
|
.end = XCEP_ETH_IRQ,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
[2] = {
|
|
.name = "smc91x-attrib",
|
|
.start = XCEP_ETH_ATTR,
|
|
.end = XCEP_ETH_ATTR_END,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
};
|
|
|
|
static struct smc91x_platdata xcep_smc91x_info = {
|
|
.flags = SMC91X_USE_8BIT | SMC91X_USE_16BIT | SMC91X_USE_32BIT |
|
|
SMC91X_NOWAIT | SMC91X_USE_DMA,
|
|
};
|
|
|
|
static struct platform_device smc91x_device = {
|
|
.name = "smc91x",
|
|
.id = -1,
|
|
.num_resources = ARRAY_SIZE(smc91x_resources),
|
|
.resource = smc91x_resources,
|
|
.dev = {
|
|
.platform_data = &xcep_smc91x_info,
|
|
},
|
|
};
|
|
|
|
|
|
static struct platform_device *devices[] __initdata = {
|
|
&flash_device,
|
|
&smc91x_device,
|
|
};
|
|
|
|
|
|
/* We have to state that there are HWMON devices on the I2C bus on XCEP.
|
|
* Drivers for HWMON verify capabilities of the adapter when loading and
|
|
* refuse to attach if the adapter doesn't support HWMON class of devices. */
|
|
static struct i2c_pxa_platform_data xcep_i2c_platform_data = {
|
|
.class = I2C_CLASS_HWMON
|
|
};
|
|
|
|
|
|
static mfp_cfg_t xcep_pin_config[] __initdata = {
|
|
GPIO79_nCS_3, /* SMC 91C111 chip select. */
|
|
GPIO80_nCS_4, /* CPLD chip select. */
|
|
/* SSP communication to MSP430 */
|
|
GPIO23_SSP1_SCLK,
|
|
GPIO24_SSP1_SFRM,
|
|
GPIO25_SSP1_TXD,
|
|
GPIO26_SSP1_RXD,
|
|
GPIO27_SSP1_EXTCLK
|
|
};
|
|
|
|
static void __init xcep_init(void)
|
|
{
|
|
pxa2xx_mfp_config(ARRAY_AND_SIZE(xcep_pin_config));
|
|
|
|
pxa_set_ffuart_info(NULL);
|
|
pxa_set_btuart_info(NULL);
|
|
pxa_set_stuart_info(NULL);
|
|
pxa_set_hwuart_info(NULL);
|
|
|
|
/* See Intel XScale Developer's Guide for details */
|
|
/* Set RDF and RDN to appropriate values (chip select 3 (smc91x)) */
|
|
__raw_writel((__raw_readl(MSC1) & 0xffff) | 0xD5540000, MSC1);
|
|
/* Set RDF and RDN to appropriate values (chip select 5 (fpga)) */
|
|
__raw_writel((__raw_readl(MSC2) & 0xffff) | 0x72A00000, MSC2);
|
|
|
|
platform_add_devices(ARRAY_AND_SIZE(devices));
|
|
pxa_set_i2c_info(&xcep_i2c_platform_data);
|
|
}
|
|
|
|
MACHINE_START(XCEP, "Iskratel XCEP")
|
|
.atag_offset = 0x100,
|
|
.init_machine = xcep_init,
|
|
.map_io = pxa25x_map_io,
|
|
.nr_irqs = PXA_NR_IRQS,
|
|
.init_irq = pxa25x_init_irq,
|
|
.handle_irq = pxa25x_handle_irq,
|
|
.init_time = pxa_timer_init,
|
|
.restart = pxa_restart,
|
|
MACHINE_END
|
|
|