mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-07 17:19:02 +00:00
7affca3537
* 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core: (73 commits) arm: fix up some samsung merge sysdev conversion problems firmware: Fix an oops on reading fw_priv->fw in sysfs loading file Drivers:hv: Fix a bug in vmbus_driver_unregister() driver core: remove __must_check from device_create_file debugfs: add missing #ifdef HAS_IOMEM arm: time.h: remove device.h #include driver-core: remove sysdev.h usage. clockevents: remove sysdev.h arm: convert sysdev_class to a regular subsystem arm: leds: convert sysdev_class to a regular subsystem kobject: remove kset_find_obj_hinted() m86k: gpio - convert sysdev_class to a regular subsystem mips: txx9_sram - convert sysdev_class to a regular subsystem mips: 7segled - convert sysdev_class to a regular subsystem sh: dma - convert sysdev_class to a regular subsystem sh: intc - convert sysdev_class to a regular subsystem power: suspend - convert sysdev_class to a regular subsystem power: qe_ic - convert sysdev_class to a regular subsystem power: cmm - convert sysdev_class to a regular subsystem s390: time - convert sysdev_class to a regular subsystem ... Fix up conflicts with 'struct sysdev' removal from various platform drivers that got changed: - arch/arm/mach-exynos/cpu.c - arch/arm/mach-exynos/irq-eint.c - arch/arm/mach-s3c64xx/common.c - arch/arm/mach-s3c64xx/cpu.c - arch/arm/mach-s5p64x0/cpu.c - arch/arm/mach-s5pv210/common.c - arch/arm/plat-samsung/include/plat/cpu.h - arch/powerpc/kernel/sysfs.c and fix up cpu_is_hotpluggable() as per Greg in include/linux/cpu.h
114 lines
2.9 KiB
C
114 lines
2.9 KiB
C
/*
|
|
* linux/arch/arm/mach-versatile/versatile_pb.c
|
|
*
|
|
* Copyright (C) 2004 ARM Limited
|
|
* Copyright (C) 2000 Deep Blue Solutions Ltd
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*/
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/device.h>
|
|
#include <linux/amba/bus.h>
|
|
#include <linux/amba/pl061.h>
|
|
#include <linux/amba/mmci.h>
|
|
#include <linux/io.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <asm/hardware/vic.h>
|
|
#include <asm/irq.h>
|
|
#include <asm/mach-types.h>
|
|
|
|
#include <asm/mach/arch.h>
|
|
|
|
#include "core.h"
|
|
|
|
#if 1
|
|
#define IRQ_MMCI1A IRQ_VICSOURCE23
|
|
#else
|
|
#define IRQ_MMCI1A IRQ_SIC_MMCI1A
|
|
#endif
|
|
|
|
static struct mmci_platform_data mmc1_plat_data = {
|
|
.ocr_mask = MMC_VDD_32_33|MMC_VDD_33_34,
|
|
.status = mmc_status,
|
|
.gpio_wp = -1,
|
|
.gpio_cd = -1,
|
|
};
|
|
|
|
static struct pl061_platform_data gpio2_plat_data = {
|
|
.gpio_base = 16,
|
|
.irq_base = IRQ_GPIO2_START,
|
|
};
|
|
|
|
static struct pl061_platform_data gpio3_plat_data = {
|
|
.gpio_base = 24,
|
|
.irq_base = IRQ_GPIO3_START,
|
|
};
|
|
|
|
#define UART3_IRQ { IRQ_SIC_UART3, NO_IRQ }
|
|
#define SCI1_IRQ { IRQ_SIC_SCI3, NO_IRQ }
|
|
#define MMCI1_IRQ { IRQ_MMCI1A, IRQ_SIC_MMCI1B }
|
|
|
|
/*
|
|
* These devices are connected via the core APB bridge
|
|
*/
|
|
#define GPIO2_IRQ { IRQ_GPIOINT2, NO_IRQ }
|
|
#define GPIO3_IRQ { IRQ_GPIOINT3, NO_IRQ }
|
|
|
|
/*
|
|
* These devices are connected via the DMA APB bridge
|
|
*/
|
|
|
|
/* FPGA Primecells */
|
|
AMBA_DEVICE(uart3, "fpga:09", UART3, NULL);
|
|
AMBA_DEVICE(sci1, "fpga:0a", SCI1, NULL);
|
|
AMBA_DEVICE(mmc1, "fpga:0b", MMCI1, &mmc1_plat_data);
|
|
|
|
/* DevChip Primecells */
|
|
AMBA_DEVICE(gpio2, "dev:e6", GPIO2, &gpio2_plat_data);
|
|
AMBA_DEVICE(gpio3, "dev:e7", GPIO3, &gpio3_plat_data);
|
|
|
|
static struct amba_device *amba_devs[] __initdata = {
|
|
&uart3_device,
|
|
&gpio2_device,
|
|
&gpio3_device,
|
|
&sci1_device,
|
|
&mmc1_device,
|
|
};
|
|
|
|
static void __init versatile_pb_init(void)
|
|
{
|
|
int i;
|
|
|
|
versatile_init();
|
|
|
|
for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
|
|
struct amba_device *d = amba_devs[i];
|
|
amba_device_register(d, &iomem_resource);
|
|
}
|
|
}
|
|
|
|
MACHINE_START(VERSATILE_PB, "ARM-Versatile PB")
|
|
/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
|
|
.atag_offset = 0x100,
|
|
.map_io = versatile_map_io,
|
|
.init_early = versatile_init_early,
|
|
.init_irq = versatile_init_irq,
|
|
.handle_irq = vic_handle_irq,
|
|
.timer = &versatile_timer,
|
|
.init_machine = versatile_pb_init,
|
|
.restart = versatile_restart,
|
|
MACHINE_END
|