forked from Minki/linux
1bf25e78af
These are cleanups and smaller changes that either depend on earlier feature branches or came in late during the development cycle. We normally try to get all cleanups early, so these are the exceptions: - A follow-up on the clocksource reworks, hopefully the last time we need to merge clocksource subsystem changes through arm-soc. A first set of patches was part of the original 3.10 arm-soc cleanup series because of interdependencies with timer drivers now moved out of arch/arm. - Migrating the SPEAr13xx platform away from using auxdata for DMA channel descriptions towards using information in device tree, based on the earlier SPEAr multiplatform series - A few follow-ups on the Atmel SAMA5 support and other changes for Atmel at91 based on the larger at91 reworks. - Moving the armada irqchip implementation to drivers/irqchip - Several OMAP cleanups following up on the larger series already merged in 3.10. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.12 (GNU/Linux) iQIVAwUAUYj5U2CrR//JCVInAQLNIRAAvsCtYOmXTxkRBxdtNEUUbkEjx71Se7q0 h9PR8vqlkbYwONkJ8a6j8pKq/WJDmLpHQWg/moBsvlGc6uEVBPBFhCWHs1+yGUzX GhnJOaIKh3+651hIoXccS+/YZ16e1EAzdCM7+1QegPTldsRGkTOiwXgmR51kmPrz 6cZ8P5MFqMrWIy4XqWhOBbMDCY/An05IHMpniGIamUg2/uB921Z0wNFvDrnsg97u DsVEwimyCJ0j7aO4TH+fkvsjoGWnIhxPtpaIm8iff6TPRI49deRb3zYpnIONm+oG /cQrRf3BNW+aiTuRCTEjdBNGtcrYgN6CLWWjzgMhv1itSlX8swBcOhuNJRCGNQRI v3wL4aEBxUpPGGL8erc2GIW7pe29YC2UEYI2z1X/5MEzYO589zkkG2k+/3HQVUwp dnYpQxhjRMvh4mcodBJFRjzH1Z7agKUwtoKalAHRRH7r5gJDkpL3zLoMhYPTG5IZ OwU+aYf+dDxh2kKW0zs8a/qL97UTHjlTRUC9LPoumvJ7LlKeDfzEn7DHUm2gggiu dO9ye/NF/xEXoDXTl0Qp2wJ6/sbPSLyCYCIMdP/gJjWUiDDqqZ0VRaKL7vE/JWrd NJ7k5yunX8/kRgfqgRFLDdFnPj1JeYHlmexsq4l9TPbPstoIcbw8u1v9sr8aZF+Z agh9u4e7QU8= =HWfp -----END PGP SIGNATURE----- Merge tag 'cleanup-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc Pull ARM SoC late cleanups from Arnd Bergmann: "These are cleanups and smaller changes that either depend on earlier feature branches or came in late during the development cycle. We normally try to get all cleanups early, so these are the exceptions: - A follow-up on the clocksource reworks, hopefully the last time we need to merge clocksource subsystem changes through arm-soc. A first set of patches was part of the original 3.10 arm-soc cleanup series because of interdependencies with timer drivers now moved out of arch/arm. - Migrating the SPEAr13xx platform away from using auxdata for DMA channel descriptions towards using information in device tree, based on the earlier SPEAr multiplatform series - A few follow-ups on the Atmel SAMA5 support and other changes for Atmel at91 based on the larger at91 reworks. - Moving the armada irqchip implementation to drivers/irqchip - Several OMAP cleanups following up on the larger series already merged in 3.10." * tag 'cleanup-for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (50 commits) ARM: OMAP4: change the device names in usb_bind_phy ARM: OMAP2+: Fix mismerge for timer.c betweenff931c82
andda4a686a
ARM: SPEAr: conditionalize SMP code ARM: arch_timer: Silence debug preempt warnings ARM: OMAP: remove unused variable serial: amba-pl011: fix !CONFIG_DMA_ENGINE case ata: arasan: remove the need for platform_data ARM: at91/sama5d34ek.dts: remove not needed compatibility string ARM: at91: dts: add MCI DMA support ARM: at91: dts: add i2c dma support ARM: at91: dts: set #dma-cells to the correct value ARM: at91: suspend both memory controllers on at91sam9263 irqchip: armada-370-xp: slightly cleanup irq controller driver irqchip: armada-370-xp: move IRQ handler to avoid forward declaration irqchip: move IRQ driver for Armada 370/XP ARM: mvebu: move L2 cache initialization in init_early() devtree: add binding documentation for sp804 ARM: integrator-cp: convert use CLKSRC_OF for timer init ARM: versatile: use OF init for sp804 timer ARM: versatile: add versatile dtbs to dtbs target ...
466 lines
11 KiB
C
466 lines
11 KiB
C
/*
|
|
* Versatile Express V2M Motherboard Support
|
|
*/
|
|
#include <linux/clocksource.h>
|
|
#include <linux/device.h>
|
|
#include <linux/amba/bus.h>
|
|
#include <linux/amba/mmci.h>
|
|
#include <linux/io.h>
|
|
#include <linux/clocksource.h>
|
|
#include <linux/smp.h>
|
|
#include <linux/init.h>
|
|
#include <linux/irqchip.h>
|
|
#include <linux/of_address.h>
|
|
#include <linux/of_fdt.h>
|
|
#include <linux/of_irq.h>
|
|
#include <linux/of_platform.h>
|
|
#include <linux/platform_device.h>
|
|
#include <linux/ata_platform.h>
|
|
#include <linux/smsc911x.h>
|
|
#include <linux/spinlock.h>
|
|
#include <linux/usb/isp1760.h>
|
|
#include <linux/mtd/physmap.h>
|
|
#include <linux/regulator/fixed.h>
|
|
#include <linux/regulator/machine.h>
|
|
#include <linux/vexpress.h>
|
|
#include <linux/clk-provider.h>
|
|
#include <linux/clkdev.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <asm/sizes.h>
|
|
#include <asm/mach/arch.h>
|
|
#include <asm/mach/map.h>
|
|
#include <asm/mach/time.h>
|
|
#include <asm/hardware/arm_timer.h>
|
|
#include <asm/hardware/cache-l2x0.h>
|
|
#include <asm/hardware/timer-sp.h>
|
|
|
|
#include <mach/ct-ca9x4.h>
|
|
#include <mach/motherboard.h>
|
|
|
|
#include <plat/sched_clock.h>
|
|
#include <plat/platsmp.h>
|
|
|
|
#include "core.h"
|
|
|
|
#define V2M_PA_CS0 0x40000000
|
|
#define V2M_PA_CS1 0x44000000
|
|
#define V2M_PA_CS2 0x48000000
|
|
#define V2M_PA_CS3 0x4c000000
|
|
#define V2M_PA_CS7 0x10000000
|
|
|
|
static struct map_desc v2m_io_desc[] __initdata = {
|
|
{
|
|
.virtual = V2M_PERIPH,
|
|
.pfn = __phys_to_pfn(V2M_PA_CS7),
|
|
.length = SZ_128K,
|
|
.type = MT_DEVICE,
|
|
},
|
|
};
|
|
|
|
static void __init v2m_sp804_init(void __iomem *base, unsigned int irq)
|
|
{
|
|
if (WARN_ON(!base || irq == NO_IRQ))
|
|
return;
|
|
|
|
sp804_clocksource_init(base + TIMER_2_BASE, "v2m-timer1");
|
|
sp804_clockevents_init(base + TIMER_1_BASE, irq, "v2m-timer0");
|
|
}
|
|
|
|
|
|
static struct resource v2m_pcie_i2c_resource = {
|
|
.start = V2M_SERIAL_BUS_PCI,
|
|
.end = V2M_SERIAL_BUS_PCI + SZ_4K - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
};
|
|
|
|
static struct platform_device v2m_pcie_i2c_device = {
|
|
.name = "versatile-i2c",
|
|
.id = 0,
|
|
.num_resources = 1,
|
|
.resource = &v2m_pcie_i2c_resource,
|
|
};
|
|
|
|
static struct resource v2m_ddc_i2c_resource = {
|
|
.start = V2M_SERIAL_BUS_DVI,
|
|
.end = V2M_SERIAL_BUS_DVI + SZ_4K - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
};
|
|
|
|
static struct platform_device v2m_ddc_i2c_device = {
|
|
.name = "versatile-i2c",
|
|
.id = 1,
|
|
.num_resources = 1,
|
|
.resource = &v2m_ddc_i2c_resource,
|
|
};
|
|
|
|
static struct resource v2m_eth_resources[] = {
|
|
{
|
|
.start = V2M_LAN9118,
|
|
.end = V2M_LAN9118 + SZ_64K - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
}, {
|
|
.start = IRQ_V2M_LAN9118,
|
|
.end = IRQ_V2M_LAN9118,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static struct smsc911x_platform_config v2m_eth_config = {
|
|
.flags = SMSC911X_USE_32BIT,
|
|
.irq_polarity = SMSC911X_IRQ_POLARITY_ACTIVE_HIGH,
|
|
.irq_type = SMSC911X_IRQ_TYPE_PUSH_PULL,
|
|
.phy_interface = PHY_INTERFACE_MODE_MII,
|
|
};
|
|
|
|
static struct platform_device v2m_eth_device = {
|
|
.name = "smsc911x",
|
|
.id = -1,
|
|
.resource = v2m_eth_resources,
|
|
.num_resources = ARRAY_SIZE(v2m_eth_resources),
|
|
.dev.platform_data = &v2m_eth_config,
|
|
};
|
|
|
|
static struct regulator_consumer_supply v2m_eth_supplies[] = {
|
|
REGULATOR_SUPPLY("vddvario", "smsc911x"),
|
|
REGULATOR_SUPPLY("vdd33a", "smsc911x"),
|
|
};
|
|
|
|
static struct resource v2m_usb_resources[] = {
|
|
{
|
|
.start = V2M_ISP1761,
|
|
.end = V2M_ISP1761 + SZ_128K - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
}, {
|
|
.start = IRQ_V2M_ISP1761,
|
|
.end = IRQ_V2M_ISP1761,
|
|
.flags = IORESOURCE_IRQ,
|
|
},
|
|
};
|
|
|
|
static struct isp1760_platform_data v2m_usb_config = {
|
|
.is_isp1761 = true,
|
|
.bus_width_16 = false,
|
|
.port1_otg = true,
|
|
.analog_oc = false,
|
|
.dack_polarity_high = false,
|
|
.dreq_polarity_high = false,
|
|
};
|
|
|
|
static struct platform_device v2m_usb_device = {
|
|
.name = "isp1760",
|
|
.id = -1,
|
|
.resource = v2m_usb_resources,
|
|
.num_resources = ARRAY_SIZE(v2m_usb_resources),
|
|
.dev.platform_data = &v2m_usb_config,
|
|
};
|
|
|
|
static struct physmap_flash_data v2m_flash_data = {
|
|
.width = 4,
|
|
};
|
|
|
|
static struct resource v2m_flash_resources[] = {
|
|
{
|
|
.start = V2M_NOR0,
|
|
.end = V2M_NOR0 + SZ_64M - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
}, {
|
|
.start = V2M_NOR1,
|
|
.end = V2M_NOR1 + SZ_64M - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
};
|
|
|
|
static struct platform_device v2m_flash_device = {
|
|
.name = "physmap-flash",
|
|
.id = -1,
|
|
.resource = v2m_flash_resources,
|
|
.num_resources = ARRAY_SIZE(v2m_flash_resources),
|
|
.dev.platform_data = &v2m_flash_data,
|
|
};
|
|
|
|
static struct pata_platform_info v2m_pata_data = {
|
|
.ioport_shift = 2,
|
|
};
|
|
|
|
static struct resource v2m_pata_resources[] = {
|
|
{
|
|
.start = V2M_CF,
|
|
.end = V2M_CF + 0xff,
|
|
.flags = IORESOURCE_MEM,
|
|
}, {
|
|
.start = V2M_CF + 0x100,
|
|
.end = V2M_CF + SZ_4K - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
};
|
|
|
|
static struct platform_device v2m_cf_device = {
|
|
.name = "pata_platform",
|
|
.id = -1,
|
|
.resource = v2m_pata_resources,
|
|
.num_resources = ARRAY_SIZE(v2m_pata_resources),
|
|
.dev.platform_data = &v2m_pata_data,
|
|
};
|
|
|
|
static struct mmci_platform_data v2m_mmci_data = {
|
|
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
|
|
.gpio_wp = VEXPRESS_GPIO_MMC_WPROT,
|
|
.gpio_cd = VEXPRESS_GPIO_MMC_CARDIN,
|
|
};
|
|
|
|
static struct resource v2m_sysreg_resources[] = {
|
|
{
|
|
.start = V2M_SYSREGS,
|
|
.end = V2M_SYSREGS + 0xfff,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
};
|
|
|
|
static struct platform_device v2m_sysreg_device = {
|
|
.name = "vexpress-sysreg",
|
|
.id = -1,
|
|
.resource = v2m_sysreg_resources,
|
|
.num_resources = ARRAY_SIZE(v2m_sysreg_resources),
|
|
};
|
|
|
|
static struct platform_device v2m_muxfpga_device = {
|
|
.name = "vexpress-muxfpga",
|
|
.id = 0,
|
|
.num_resources = 1,
|
|
.resource = (struct resource []) {
|
|
VEXPRESS_RES_FUNC(0, 7),
|
|
}
|
|
};
|
|
|
|
static struct platform_device v2m_shutdown_device = {
|
|
.name = "vexpress-shutdown",
|
|
.id = 0,
|
|
.num_resources = 1,
|
|
.resource = (struct resource []) {
|
|
VEXPRESS_RES_FUNC(0, 8),
|
|
}
|
|
};
|
|
|
|
static struct platform_device v2m_reboot_device = {
|
|
.name = "vexpress-reboot",
|
|
.id = 0,
|
|
.num_resources = 1,
|
|
.resource = (struct resource []) {
|
|
VEXPRESS_RES_FUNC(0, 9),
|
|
}
|
|
};
|
|
|
|
static struct platform_device v2m_dvimode_device = {
|
|
.name = "vexpress-dvimode",
|
|
.id = 0,
|
|
.num_resources = 1,
|
|
.resource = (struct resource []) {
|
|
VEXPRESS_RES_FUNC(0, 11),
|
|
}
|
|
};
|
|
|
|
static AMBA_APB_DEVICE(aaci, "mb:aaci", 0, V2M_AACI, IRQ_V2M_AACI, NULL);
|
|
static AMBA_APB_DEVICE(mmci, "mb:mmci", 0, V2M_MMCI, IRQ_V2M_MMCI, &v2m_mmci_data);
|
|
static AMBA_APB_DEVICE(kmi0, "mb:kmi0", 0, V2M_KMI0, IRQ_V2M_KMI0, NULL);
|
|
static AMBA_APB_DEVICE(kmi1, "mb:kmi1", 0, V2M_KMI1, IRQ_V2M_KMI1, NULL);
|
|
static AMBA_APB_DEVICE(uart0, "mb:uart0", 0, V2M_UART0, IRQ_V2M_UART0, NULL);
|
|
static AMBA_APB_DEVICE(uart1, "mb:uart1", 0, V2M_UART1, IRQ_V2M_UART1, NULL);
|
|
static AMBA_APB_DEVICE(uart2, "mb:uart2", 0, V2M_UART2, IRQ_V2M_UART2, NULL);
|
|
static AMBA_APB_DEVICE(uart3, "mb:uart3", 0, V2M_UART3, IRQ_V2M_UART3, NULL);
|
|
static AMBA_APB_DEVICE(wdt, "mb:wdt", 0, V2M_WDT, IRQ_V2M_WDT, NULL);
|
|
static AMBA_APB_DEVICE(rtc, "mb:rtc", 0, V2M_RTC, IRQ_V2M_RTC, NULL);
|
|
|
|
static struct amba_device *v2m_amba_devs[] __initdata = {
|
|
&aaci_device,
|
|
&mmci_device,
|
|
&kmi0_device,
|
|
&kmi1_device,
|
|
&uart0_device,
|
|
&uart1_device,
|
|
&uart2_device,
|
|
&uart3_device,
|
|
&wdt_device,
|
|
&rtc_device,
|
|
};
|
|
|
|
static void __init v2m_timer_init(void)
|
|
{
|
|
vexpress_clk_init(ioremap(V2M_SYSCTL, SZ_4K));
|
|
v2m_sp804_init(ioremap(V2M_TIMER01, SZ_4K), IRQ_V2M_TIMER0);
|
|
}
|
|
|
|
static void __init v2m_init_early(void)
|
|
{
|
|
if (ct_desc->init_early)
|
|
ct_desc->init_early();
|
|
versatile_sched_clock_init(vexpress_get_24mhz_clock_base(), 24000000);
|
|
}
|
|
|
|
struct ct_desc *ct_desc;
|
|
|
|
static struct ct_desc *ct_descs[] __initdata = {
|
|
#ifdef CONFIG_ARCH_VEXPRESS_CA9X4
|
|
&ct_ca9x4_desc,
|
|
#endif
|
|
};
|
|
|
|
static void __init v2m_populate_ct_desc(void)
|
|
{
|
|
int i;
|
|
u32 current_tile_id;
|
|
|
|
ct_desc = NULL;
|
|
current_tile_id = vexpress_get_procid(VEXPRESS_SITE_MASTER)
|
|
& V2M_CT_ID_MASK;
|
|
|
|
for (i = 0; i < ARRAY_SIZE(ct_descs) && !ct_desc; ++i)
|
|
if (ct_descs[i]->id == current_tile_id)
|
|
ct_desc = ct_descs[i];
|
|
|
|
if (!ct_desc)
|
|
panic("vexpress: this kernel does not support core tile ID 0x%08x when booting via ATAGs.\n"
|
|
"You may need a device tree blob or a different kernel to boot on this board.\n",
|
|
current_tile_id);
|
|
}
|
|
|
|
static void __init v2m_map_io(void)
|
|
{
|
|
iotable_init(v2m_io_desc, ARRAY_SIZE(v2m_io_desc));
|
|
vexpress_sysreg_early_init(ioremap(V2M_SYSREGS, SZ_4K));
|
|
v2m_populate_ct_desc();
|
|
ct_desc->map_io();
|
|
}
|
|
|
|
static void __init v2m_init_irq(void)
|
|
{
|
|
ct_desc->init_irq();
|
|
}
|
|
|
|
static void __init v2m_init(void)
|
|
{
|
|
int i;
|
|
|
|
regulator_register_fixed(0, v2m_eth_supplies,
|
|
ARRAY_SIZE(v2m_eth_supplies));
|
|
|
|
platform_device_register(&v2m_muxfpga_device);
|
|
platform_device_register(&v2m_shutdown_device);
|
|
platform_device_register(&v2m_reboot_device);
|
|
platform_device_register(&v2m_dvimode_device);
|
|
|
|
platform_device_register(&v2m_sysreg_device);
|
|
platform_device_register(&v2m_pcie_i2c_device);
|
|
platform_device_register(&v2m_ddc_i2c_device);
|
|
platform_device_register(&v2m_flash_device);
|
|
platform_device_register(&v2m_cf_device);
|
|
platform_device_register(&v2m_eth_device);
|
|
platform_device_register(&v2m_usb_device);
|
|
|
|
for (i = 0; i < ARRAY_SIZE(v2m_amba_devs); i++)
|
|
amba_device_register(v2m_amba_devs[i], &iomem_resource);
|
|
|
|
ct_desc->init_tile();
|
|
}
|
|
|
|
MACHINE_START(VEXPRESS, "ARM-Versatile Express")
|
|
.atag_offset = 0x100,
|
|
.smp = smp_ops(vexpress_smp_ops),
|
|
.map_io = v2m_map_io,
|
|
.init_early = v2m_init_early,
|
|
.init_irq = v2m_init_irq,
|
|
.init_time = v2m_timer_init,
|
|
.init_machine = v2m_init,
|
|
MACHINE_END
|
|
|
|
static struct map_desc v2m_rs1_io_desc __initdata = {
|
|
.virtual = V2M_PERIPH,
|
|
.pfn = __phys_to_pfn(0x1c000000),
|
|
.length = SZ_2M,
|
|
.type = MT_DEVICE,
|
|
};
|
|
|
|
static int __init v2m_dt_scan_memory_map(unsigned long node, const char *uname,
|
|
int depth, void *data)
|
|
{
|
|
const char **map = data;
|
|
|
|
if (strcmp(uname, "motherboard") != 0)
|
|
return 0;
|
|
|
|
*map = of_get_flat_dt_prop(node, "arm,v2m-memory-map", NULL);
|
|
|
|
return 1;
|
|
}
|
|
|
|
void __init v2m_dt_map_io(void)
|
|
{
|
|
const char *map = NULL;
|
|
|
|
of_scan_flat_dt(v2m_dt_scan_memory_map, &map);
|
|
|
|
if (map && strcmp(map, "rs1") == 0)
|
|
iotable_init(&v2m_rs1_io_desc, 1);
|
|
else
|
|
iotable_init(v2m_io_desc, ARRAY_SIZE(v2m_io_desc));
|
|
|
|
#if defined(CONFIG_SMP)
|
|
vexpress_dt_smp_map_io();
|
|
#endif
|
|
}
|
|
|
|
void __init v2m_dt_init_early(void)
|
|
{
|
|
u32 dt_hbi;
|
|
|
|
vexpress_sysreg_of_early_init();
|
|
|
|
/* Confirm board type against DT property, if available */
|
|
if (of_property_read_u32(of_allnodes, "arm,hbi", &dt_hbi) == 0) {
|
|
u32 hbi = vexpress_get_hbi(VEXPRESS_SITE_MASTER);
|
|
|
|
if (WARN_ON(dt_hbi != hbi))
|
|
pr_warning("vexpress: DT HBI (%x) is not matching "
|
|
"hardware (%x)!\n", dt_hbi, hbi);
|
|
}
|
|
}
|
|
|
|
static void __init v2m_dt_timer_init(void)
|
|
{
|
|
of_clk_init(NULL);
|
|
|
|
clocksource_of_init();
|
|
|
|
versatile_sched_clock_init(vexpress_get_24mhz_clock_base(),
|
|
24000000);
|
|
}
|
|
|
|
static const struct of_device_id v2m_dt_bus_match[] __initconst = {
|
|
{ .compatible = "simple-bus", },
|
|
{ .compatible = "arm,amba-bus", },
|
|
{ .compatible = "arm,vexpress,config-bus", },
|
|
{}
|
|
};
|
|
|
|
static void __init v2m_dt_init(void)
|
|
{
|
|
l2x0_of_init(0x00400000, 0xfe0fffff);
|
|
of_platform_populate(NULL, v2m_dt_bus_match, NULL, NULL);
|
|
}
|
|
|
|
static const char * const v2m_dt_match[] __initconst = {
|
|
"arm,vexpress",
|
|
"xen,xenvm",
|
|
NULL,
|
|
};
|
|
|
|
DT_MACHINE_START(VEXPRESS_DT, "ARM-Versatile Express")
|
|
.dt_compat = v2m_dt_match,
|
|
.smp = smp_ops(vexpress_smp_ops),
|
|
.map_io = v2m_dt_map_io,
|
|
.init_early = v2m_dt_init_early,
|
|
.init_irq = irqchip_init,
|
|
.init_time = v2m_dt_timer_init,
|
|
.init_machine = v2m_dt_init,
|
|
MACHINE_END
|