litmus-rt.git - The LITMUS^RT kernel.

The LITMUS^RT kernel.

Bjoern Brandenburg

about summary refs log tree commit diff stats

diff options

author	H. Peter Anvin <hpa@zytor.com>	2009-11-23 18:12:07 -0500
committer	H. Peter Anvin <hpa@zytor.com>	2009-11-23 20:09:59 -0500
commit	55a6ca25472ee01574bfc24d23b7f5fa09cc38cf (patch)
tree	8d63f57f636981c6029a45ea10a04a65e407e3d8 /net/tipc/node.c
parent	fd12a0d69aee6d90fa9b9890db24368a897f8423 (diff)

x86, mm: Call is_untracked_pat_range() rather than is_ISA_range()

Checkin fd12a0d69aee6d90fa9b9890db24368a897f8423 made the PAT untracked range a platform configurable, but missed on occurrence of is_ISA_range() which still refers to PAT-untracked memory, and therefore should be using the configurable. Signed-off-by: H. Peter Anvin <hpa@zytor.com> Cc: Jack Steiner <steiner@sgi.com> Cc: Suresh Siddha <suresh.b.siddha@intel.com> LKML-Reference: <20091119202341.GA4420@sgi.com>

Diffstat (limited to 'net/tipc/node.c')

0 files changed, 0 insertions, 0 deletions

hl ppc"> #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 const char *snappercl15_nand_part_probes[] = {"cmdlinepart", NULL}; 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, .part_probe_types = snappercl15_nand_part_probes, .partitions = snappercl15_nand_parts, .nr_partitions = ARRAY_SIZE(snappercl15_nand_parts), .options = NAND_NO_AUTOINCR, .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, .handle_irq = vic_handle_irq, .timer = &ep93xx_timer, .init_machine = snappercl15_init_machine, .restart = ep93xx_restart, MACHINE_END


context:
space:
mode: