mirror of
https://github.com/torvalds/linux.git
synced 2024-12-13 14:43:03 +00:00
f8060f5446
This creates irqchip initialization infrastructure from Thomas Petazzoni. The VIC and GIC irqchip code is moved to drivers/irqchips and adapted to use the new infrastructure. All DT enabled platforms using GIC and VIC are converted over to use the new irqchip_init. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAABAgAGBQJQ8ZobAAoJEMhvYp4jgsXiihIH/2VvxmSHZb0e3jN6AR0B42b7 9EwX0IE0B23t91hNTwdzzmTJQYA7pMmWkgHNfd3vIeqSepJAmrVv/gp4iM9CtPwE KNh+kDWOK2ZsOH4Vb0lYRJHN8WQOIQHuCUr9+MdYLNOgf/pPL6G/Y9kv9A1e7fTC W+tFRjC5N1ilZMGyowX12L1wnwDk6kHzed6YV6bskC17cZ9/pg8PhSVbM4A/3kAv NXYKqbXJb+eCsWGXg/knZXOL6V9gBwvVYoe4O9X3nQ0226AWB9caad8l8tchAjRB fmrYF1tbkpOWPnLxhvQy5b5MJichJgTMJHh7RgiEcc/3f63kOljjlx4QKiqHvT0= =q7gm -----END PGP SIGNATURE----- Merge tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into next/cleanup From Rob Herring: Initial irqchip init infrastructure and GIC and VIC clean-ups This creates irqchip initialization infrastructure from Thomas Petazzoni. The VIC and GIC irqchip code is moved to drivers/irqchips and adapted to use the new infrastructure. All DT enabled platforms using GIC and VIC are converted over to use the new irqchip_init. * tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux: irqchip: Move ARM vic.h to include/linux/irqchip/arm-vic.h ARM: picoxcell: use common irqchip_init function ARM: spear: use common irqchip_init function irqchip: Move ARM VIC to drivers/irqchip ARM: samsung: remove unused tick.h ARM: remove unneeded vic.h includes ARM: remove mach .handle_irq for VIC users ARM: VIC: set handle_arch_irq in VIC initialization ARM: VIC: shrink down vic.h irqchip: Move ARM gic.h to include/linux/irqchip/arm-gic.h ARM: use common irqchip_init for GIC init irqchip: Move ARM GIC to drivers/irqchip ARM: remove mach .handle_irq for GIC users ARM: GIC: set handle_arch_irq in GIC initialization ARM: GIC: remove direct use of gic_raise_softirq ARM: GIC: remove assembly ifdefs from gic.h ARM: mach-ux500: use SGI0 to wake up the other core arm: add set_handle_irq() to register the parent IRQ controller handler function irqchip: add basic infrastructure irqchip: add to the directories part of the IRQ subsystem in MAINTAINERS Fixed up massive merge conflicts with the timer cleanup due to adjacent changes: Signed-off-by: Olof Johansson <olof@lixom.net> Conflicts: arch/arm/mach-bcm/board_bcm.c arch/arm/mach-cns3xxx/cns3420vb.c arch/arm/mach-ep93xx/adssphere.c arch/arm/mach-ep93xx/edb93xx.c arch/arm/mach-ep93xx/gesbc9312.c arch/arm/mach-ep93xx/micro9.c arch/arm/mach-ep93xx/simone.c arch/arm/mach-ep93xx/snappercl15.c arch/arm/mach-ep93xx/ts72xx.c arch/arm/mach-ep93xx/vision_ep9307.c arch/arm/mach-highbank/highbank.c arch/arm/mach-imx/mach-imx6q.c arch/arm/mach-msm/board-dt-8960.c arch/arm/mach-netx/nxdb500.c arch/arm/mach-netx/nxdkn.c arch/arm/mach-netx/nxeb500hmi.c arch/arm/mach-nomadik/board-nhk8815.c arch/arm/mach-picoxcell/common.c arch/arm/mach-realview/realview_eb.c arch/arm/mach-realview/realview_pb1176.c arch/arm/mach-realview/realview_pb11mp.c arch/arm/mach-realview/realview_pba8.c arch/arm/mach-realview/realview_pbx.c arch/arm/mach-socfpga/socfpga.c arch/arm/mach-spear13xx/spear1310.c arch/arm/mach-spear13xx/spear1340.c arch/arm/mach-spear13xx/spear13xx.c arch/arm/mach-spear3xx/spear300.c arch/arm/mach-spear3xx/spear310.c arch/arm/mach-spear3xx/spear320.c arch/arm/mach-spear3xx/spear3xx.c arch/arm/mach-spear6xx/spear6xx.c arch/arm/mach-tegra/board-dt-tegra20.c arch/arm/mach-tegra/board-dt-tegra30.c arch/arm/mach-u300/core.c arch/arm/mach-ux500/board-mop500.c arch/arm/mach-ux500/cpu-db8500.c arch/arm/mach-versatile/versatile_ab.c arch/arm/mach-versatile/versatile_dt.c arch/arm/mach-versatile/versatile_pb.c arch/arm/mach-vexpress/v2m.c include/asm-generic/vmlinux.lds.h
183 lines
4.6 KiB
C
183 lines
4.6 KiB
C
/*
|
|
* arch/arm/mach-ep93xx/snappercl15.c
|
|
* Bluewater Systems Snapper CL15 system module
|
|
*
|
|
* Copyright (C) 2009 Bluewater Systems Ltd
|
|
* Author: Ryan Mallon
|
|
*
|
|
* NAND code adapted from driver by:
|
|
* Andre Renaud <andre@bluewatersys.com>
|
|
* James R. McKaskill
|
|
*
|
|
* 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.
|
|
*
|
|
*/
|
|
|
|
#include <linux/platform_device.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/init.h>
|
|
#include <linux/io.h>
|
|
#include <linux/i2c.h>
|
|
#include <linux/i2c-gpio.h>
|
|
#include <linux/fb.h>
|
|
|
|
#include <linux/mtd/partitions.h>
|
|
#include <linux/mtd/nand.h>
|
|
|
|
#include <mach/hardware.h>
|
|
#include <linux/platform_data/video-ep93xx.h>
|
|
#include <mach/gpio-ep93xx.h>
|
|
|
|
#include <asm/mach-types.h>
|
|
#include <asm/mach/arch.h>
|
|
|
|
#include "soc.h"
|
|
|
|
#define SNAPPERCL15_NAND_BASE (EP93XX_CS7_PHYS_BASE + SZ_16M)
|
|
|
|
#define SNAPPERCL15_NAND_WPN (1 << 8) /* Write protect (active low) */
|
|
#define SNAPPERCL15_NAND_ALE (1 << 9) /* Address latch */
|
|
#define SNAPPERCL15_NAND_CLE (1 << 10) /* Command latch */
|
|
#define SNAPPERCL15_NAND_CEN (1 << 11) /* Chip enable (active low) */
|
|
#define SNAPPERCL15_NAND_RDY (1 << 14) /* Device ready */
|
|
|
|
#define NAND_CTRL_ADDR(chip) (chip->IO_ADDR_W + 0x40)
|
|
|
|
static void snappercl15_nand_cmd_ctrl(struct mtd_info *mtd, int cmd,
|
|
unsigned int ctrl)
|
|
{
|
|
struct nand_chip *chip = mtd->priv;
|
|
static u16 nand_state = SNAPPERCL15_NAND_WPN;
|
|
u16 set;
|
|
|
|
if (ctrl & NAND_CTRL_CHANGE) {
|
|
set = SNAPPERCL15_NAND_CEN | SNAPPERCL15_NAND_WPN;
|
|
|
|
if (ctrl & NAND_NCE)
|
|
set &= ~SNAPPERCL15_NAND_CEN;
|
|
if (ctrl & NAND_CLE)
|
|
set |= SNAPPERCL15_NAND_CLE;
|
|
if (ctrl & NAND_ALE)
|
|
set |= SNAPPERCL15_NAND_ALE;
|
|
|
|
nand_state &= ~(SNAPPERCL15_NAND_CEN |
|
|
SNAPPERCL15_NAND_CLE |
|
|
SNAPPERCL15_NAND_ALE);
|
|
nand_state |= set;
|
|
__raw_writew(nand_state, NAND_CTRL_ADDR(chip));
|
|
}
|
|
|
|
if (cmd != NAND_CMD_NONE)
|
|
__raw_writew((cmd & 0xff) | nand_state, chip->IO_ADDR_W);
|
|
}
|
|
|
|
static int snappercl15_nand_dev_ready(struct mtd_info *mtd)
|
|
{
|
|
struct nand_chip *chip = mtd->priv;
|
|
|
|
return !!(__raw_readw(NAND_CTRL_ADDR(chip)) & SNAPPERCL15_NAND_RDY);
|
|
}
|
|
|
|
static struct mtd_partition snappercl15_nand_parts[] = {
|
|
{
|
|
.name = "Kernel",
|
|
.offset = 0,
|
|
.size = SZ_2M,
|
|
},
|
|
{
|
|
.name = "Filesystem",
|
|
.offset = MTDPART_OFS_APPEND,
|
|
.size = MTDPART_SIZ_FULL,
|
|
},
|
|
};
|
|
|
|
static struct platform_nand_data snappercl15_nand_data = {
|
|
.chip = {
|
|
.nr_chips = 1,
|
|
.partitions = snappercl15_nand_parts,
|
|
.nr_partitions = ARRAY_SIZE(snappercl15_nand_parts),
|
|
.chip_delay = 25,
|
|
},
|
|
.ctrl = {
|
|
.dev_ready = snappercl15_nand_dev_ready,
|
|
.cmd_ctrl = snappercl15_nand_cmd_ctrl,
|
|
},
|
|
};
|
|
|
|
static struct resource snappercl15_nand_resource[] = {
|
|
{
|
|
.start = SNAPPERCL15_NAND_BASE,
|
|
.end = SNAPPERCL15_NAND_BASE + SZ_4K - 1,
|
|
.flags = IORESOURCE_MEM,
|
|
},
|
|
};
|
|
|
|
static struct platform_device snappercl15_nand_device = {
|
|
.name = "gen_nand",
|
|
.id = -1,
|
|
.dev.platform_data = &snappercl15_nand_data,
|
|
.resource = snappercl15_nand_resource,
|
|
.num_resources = ARRAY_SIZE(snappercl15_nand_resource),
|
|
};
|
|
|
|
static struct ep93xx_eth_data __initdata snappercl15_eth_data = {
|
|
.phy_id = 1,
|
|
};
|
|
|
|
static struct i2c_gpio_platform_data __initdata snappercl15_i2c_gpio_data = {
|
|
.sda_pin = EP93XX_GPIO_LINE_EEDAT,
|
|
.sda_is_open_drain = 0,
|
|
.scl_pin = EP93XX_GPIO_LINE_EECLK,
|
|
.scl_is_open_drain = 0,
|
|
.udelay = 0,
|
|
.timeout = 0,
|
|
};
|
|
|
|
static struct i2c_board_info __initdata snappercl15_i2c_data[] = {
|
|
{
|
|
/* Audio codec */
|
|
I2C_BOARD_INFO("tlv320aic23", 0x1a),
|
|
},
|
|
};
|
|
|
|
static struct ep93xxfb_mach_info __initdata snappercl15_fb_info = {
|
|
.num_modes = EP93XXFB_USE_MODEDB,
|
|
.bpp = 16,
|
|
};
|
|
|
|
static struct platform_device snappercl15_audio_device = {
|
|
.name = "snappercl15-audio",
|
|
.id = -1,
|
|
};
|
|
|
|
static void __init snappercl15_register_audio(void)
|
|
{
|
|
ep93xx_register_i2s();
|
|
platform_device_register(&snappercl15_audio_device);
|
|
}
|
|
|
|
static void __init snappercl15_init_machine(void)
|
|
{
|
|
ep93xx_init_devices();
|
|
ep93xx_register_eth(&snappercl15_eth_data, 1);
|
|
ep93xx_register_i2c(&snappercl15_i2c_gpio_data, snappercl15_i2c_data,
|
|
ARRAY_SIZE(snappercl15_i2c_data));
|
|
ep93xx_register_fb(&snappercl15_fb_info);
|
|
snappercl15_register_audio();
|
|
platform_device_register(&snappercl15_nand_device);
|
|
}
|
|
|
|
MACHINE_START(SNAPPER_CL15, "Bluewater Systems Snapper CL15")
|
|
/* Maintainer: Ryan Mallon */
|
|
.atag_offset = 0x100,
|
|
.map_io = ep93xx_map_io,
|
|
.init_irq = ep93xx_init_irq,
|
|
.init_time = ep93xx_timer_init,
|
|
.init_machine = snappercl15_init_machine,
|
|
.init_late = ep93xx_init_late,
|
|
.restart = ep93xx_restart,
|
|
MACHINE_END
|