7bf7e370d5
* 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6: (9356 commits) [media] rc: update for bitop name changes fs: simplify iget & friends fs: pull inode->i_lock up out of writeback_single_inode fs: rename inode_lock to inode_hash_lock fs: move i_wb_list out from under inode_lock fs: move i_sb_list out from under inode_lock fs: remove inode_lock from iput_final and prune_icache fs: Lock the inode LRU list separately fs: factor inode disposal fs: protect inode->i_state with inode->i_lock lib, arch: add filter argument to show_mem and fix private implementations SLUB: Write to per cpu data when allocating it slub: Fix debugobjects with lockless fastpath autofs4: Do not potentially dereference NULL pointer returned by fget() in autofs_dev_ioctl_setpipefd() autofs4 - remove autofs4_lock autofs4 - fix d_manage() return on rcu-walk autofs4 - fix autofs4_expire_indirect() traversal autofs4 - fix dentry leak in autofs4_expire_direct() autofs4 - reinstate last used update on access vfs - check non-mountpoint dentry might block in __follow_mount_rcu() ... NOTE! This merge commit was created to fix compilation error. The block tree was merged upstream and removed the 'elv_queue_empty()' function which the new 'mtdswap' driver is using. So a simple merge of the mtd tree with upstream does not compile. And the mtd tree has already be published, so re-basing it is not an option. To fix this unfortunate situation, I had to merge upstream into the mtd-2.6.git tree without committing, put the fixup patch on top of this, and then commit this. The result is that we do not have commits which do not compile. In other words, this merge commit "merges" 3 things: the MTD tree, the upstream tree, and the fixup patch.
54 lines
1.2 KiB
C
54 lines
1.2 KiB
C
/*
|
|
* arch/arm/plat-omap/include/mach/onenand.h
|
|
*
|
|
* Copyright (C) 2006 Nokia Corporation
|
|
* Author: Juha Yrjola
|
|
*
|
|
* 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/mtd/mtd.h>
|
|
#include <linux/mtd/partitions.h>
|
|
|
|
#define ONENAND_SYNC_READ (1 << 0)
|
|
#define ONENAND_SYNC_READWRITE (1 << 1)
|
|
|
|
struct onenand_freq_info {
|
|
u16 maf_id;
|
|
u16 dev_id;
|
|
u16 ver_id;
|
|
};
|
|
|
|
struct omap_onenand_platform_data {
|
|
int cs;
|
|
int gpio_irq;
|
|
struct mtd_partition *parts;
|
|
int nr_parts;
|
|
int (*onenand_setup)(void __iomem *, int *freq_ptr);
|
|
int (*get_freq)(const struct onenand_freq_info *freq_info,
|
|
bool *clk_dep);
|
|
int dma_channel;
|
|
u8 flags;
|
|
u8 regulator_can_sleep;
|
|
u8 skip_initial_unlocking;
|
|
};
|
|
|
|
#define ONENAND_MAX_PARTITIONS 8
|
|
|
|
#if defined(CONFIG_MTD_ONENAND_OMAP2) || \
|
|
defined(CONFIG_MTD_ONENAND_OMAP2_MODULE)
|
|
|
|
extern void gpmc_onenand_init(struct omap_onenand_platform_data *d);
|
|
|
|
#else
|
|
|
|
#define board_onenand_data NULL
|
|
|
|
static inline void gpmc_onenand_init(struct omap_onenand_platform_data *d)
|
|
{
|
|
}
|
|
|
|
#endif
|