EljakimHerrewijnen/Openwrt
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Convert the nand driver to a platform_device, should only allow routerboards to use it

Browse Source 
SVN-Revision: 8045
This commit is contained in:
Florian Fainelli 2007-07-18 17:16:36 +00:00
parent f59b6f6089
commit b3fae87009
4 changed files with 162 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
target/linux/adm5120-2.6/files/arch/mips/adm5120/boards/mikrotik.c
View File

@ -47,6 +47,7 @@ static struct mtd_partition rb1xx_partitions[] = {
static struct platform_device *rb1xx_devices[] __initdata = {
&adm5120_flash0_device,
&adm5120_nand_device,
};
static void __init rb1xx_setup(void)

19
target/linux/adm5120-2.6/files/arch/mips/adm5120/platform.c
View File

@ -109,3 +109,22 @@ struct platform_device adm5120_flash1_device = {
.id = 1,
.dev.platform_data = &adm5120_flash1_data,
};
/* NAND flash */
struct resource adm5120_nand_resource[] = {
[0] = {
.start = ADM5120_SRAM1_BASE,
.end = ADM5120_SRAM1_BASE+0x1000-1,
.flags = IORESOURCE_MEM,
},
};
struct adm5120_nand_platform_data adm5120_nand_data;
struct platform_device adm5120_nand_device = {
.name = "adm5120-nand",
.id = -1,
.dev.platform_data = &adm5120_nand_data,
.num_resources = ARRAY_SIZE(adm5120_nand_resource),
.resource = adm5120_nand_resource,
};

190
target/linux/adm5120-2.6/files/drivers/mtd/nand/rbmipsnand.c
View File

@ -8,7 +8,9 @@
/* Copyright(C) 2007 david.goodenough@linkchoose.co.uk (for rewriten code) */
/*==============================================================================*/
#include <linux/init.h>
#include <linux/io.h>
#include <linux/module.h>
#include <linux/platform_device.h>
#include <linux/mtd/nand.h>
#include <linux/mtd/mtd.h>
#include <linux/mtd/partitions.h>
@ -36,93 +38,169 @@
#define NAND_STS_REG 0xB //Status register
#define MEM32(x) *((volatile unsigned *) (x))
static void __iomem *p_nand;
static int rb100_dev_ready(struct mtd_info *mtd) {
return SMEM1(NAND_STS_REG) & 0x80;
}
static void rbmips_hwcontrol100(struct mtd_info *mtd, int cmd, unsigned int ctrl) {
struct nand_chip *chip = mtd->priv;
if (ctrl & NAND_CTRL_CHANGE) {
SMEM1((( ctrl & NAND_CLE) ? NAND_SET_CLE : NAND_CLR_CLE)) = 0x01;
SMEM1((( ctrl & NAND_ALE) ? NAND_SET_ALE : NAND_CLR_ALE)) = 0x01;
SMEM1((( ctrl & NAND_NCE) ? NAND_SET_CEn : NAND_CLR_CEn)) = 0x01;
}
if( cmd != NAND_CMD_NONE)
writeb( cmd, chip->IO_ADDR_W);
}
static struct mtd_partition partition_info[] = {
{
name: "RouterBoard NAND Boot",
offset: 0,
size: 4 * 1024 * 1024
size: 4 * 1024 * 1024
},
{
name: "rootfs",
offset: MTDPART_OFS_NXTBLK,
size: MTDPART_SIZ_FULL
offset: MTDPART_OFS_NXTBLK,
size: MTDPART_SIZ_FULL
}
};
static struct mtd_info rmtd;
static struct nand_chip rnand;
static struct nand_ecclayout rb_ecclayout = {
.eccbytes = 6,
.eccpos = { 8, 9, 10, 13, 14, 15 },
.oobavail = 9,
.oobfree = { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1} }
};
struct adm5120_nand_info {
struct nand_chip chip;
struct mtd_info mtd;
void __iomem *io_base;
#ifdef CONFIG_MTD_PARTITIONS
int nr_parts;
struct mtd_partition *parts;
#endif
};
static int rb100_dev_ready(struct mtd_info *mtd)
{
return SMEM1(NAND_STS_REG) & 0x80;
}
static void rbmips_hwcontrol100(struct mtd_info *mtd, int cmd, unsigned int ctrl)
{
struct nand_chip *chip = mtd->priv;
if (ctrl & NAND_CTRL_CHANGE)
{
SMEM1((( ctrl & NAND_CLE) ? NAND_SET_CLE : NAND_CLR_CLE)) = 0x01;
SMEM1((( ctrl & NAND_ALE) ? NAND_SET_ALE : NAND_CLR_ALE)) = 0x01;
SMEM1((( ctrl & NAND_NCE) ? NAND_SET_CEn : NAND_CLR_CEn)) = 0x01;
}
if (cmd != NAND_CMD_NONE)
writeb( cmd, chip->IO_ADDR_W);
}
/*========================================================================*/
/* We need to use the OLD Yaffs-1 OOB layout, otherwise the RB bootloader */
/* will not be able to find the kernel that we load. So set the oobinfo */
/* when creating the partitions. */
/*========================================================================*/
static struct nand_ecclayout rb_ecclayout = {
.eccbytes = 6,
.eccpos = { 8, 9, 10, 13, 14, 15 },
.oobavail = 9,
.oobfree = { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1} }
};
static unsigned init_ok = 0;
unsigned get_rbnand_block_size(void) {
return init_ok ? rmtd.writesize : 0;
unsigned get_rbnand_block_size(struct adm5120_nand_info *data)
{
return init_ok ? data->mtd.writesize : 0;
}
EXPORT_SYMBOL(get_rbnand_block_size);
int __init rbmips_init(void) {
static int rbmips_probe(struct platform_device *pdev)
{
struct adm5120_nand_info *data;
int res = 0;
if (!adm5120_nand_boot)
return -ENODEV;
/* Allocate memory for the nand_chip structure */
data = kzalloc(sizeof(*data), GFP_KERNEL);
if (!data) {
dev_err(&pdev->dev, "Failed to allocate device structure\n");
return -ENOMEM;
}
data->io_base = ioremap(pdev->resource[0].start, 0x1000);
if (data->io_base == NULL) {
dev_err(&pdev->dev, "ioremap failed\n");
kfree(data);
return -EIO;
}
memset(&rmtd, 0, sizeof(rmtd));
memset(&rnand, 0, sizeof(rnand));
printk(KERN_INFO "RB1xx nand\n");
MEM32(0xB2000064) = 0x100;
MEM32(0xB2000008) = 0x1;
SMEM1(NAND_SET_SPn) = 0x01;
SMEM1(NAND_CLR_WPn) = 0x01;
rnand.IO_ADDR_R = (unsigned char *)KSEG1ADDR(ADM5120_SRAM1_BASE);
rnand.IO_ADDR_W = rnand.IO_ADDR_R;
rnand.cmd_ctrl = rbmips_hwcontrol100;
rnand.dev_ready = rb100_dev_ready;
p_nand = (void __iomem *)ioremap(( unsigned long)ADM5120_SRAM1_BASE, 0x1000);
if (!p_nand) {
printk(KERN_WARNING "RB1xx nand Unable ioremap buffer\n");
return -ENXIO;
}
rnand.ecc.mode = NAND_ECC_SOFT;
rnand.ecc.layout = &rb_ecclayout;
rnand.chip_delay = 25;
rnand.options |= NAND_NO_AUTOINCR;
rmtd.priv = &rnand;
if (nand_scan(&rmtd, 1) && nand_scan(&rmtd, 1)
&& nand_scan(&rmtd, 1) && nand_scan(&rmtd, 1)) {
data->chip.priv = &data;
data->mtd.priv = &data->chip;
data->mtd.owner = THIS_MODULE;
data->chip.IO_ADDR_R = (unsigned char *)KSEG1ADDR(ADM5120_SRAM1_BASE);
data->chip.IO_ADDR_W = data->chip.IO_ADDR_R;
data->chip.cmd_ctrl = rbmips_hwcontrol100;
data->chip.dev_ready = rb100_dev_ready;
data->chip.ecc.mode = NAND_ECC_SOFT;
data->chip.ecc.layout = &rb_ecclayout;
data->chip.chip_delay = 25;
data->chip.options |= NAND_NO_AUTOINCR;
platform_set_drvdata(pdev, data);
/* Why do we need to scan 4 times ? */
if (nand_scan(&data->mtd, 1) && nand_scan(&data->mtd, 1) && nand_scan(&data->mtd, 1) && nand_scan(&data->mtd, 1)) {
printk(KERN_INFO "RB1xxx nand device not found\n");
iounmap ((void *)p_nand);
return -ENXIO;
res = -ENXIO;
goto out;
}
add_mtd_partitions(&rmtd, partition_info, 2);
add_mtd_partitions(&data->mtd, partition_info, 2);
init_ok = 1;
res = add_mtd_device(&data->mtd);
if (!res)
return res;
nand_release(&data->mtd);
out:
platform_set_drvdata(pdev, NULL);
iounmap(data->io_base);
kfree(data);
return res;
}
static int __devexit rbmips_remove(struct platform_device *pdev)
{
struct adm5120_nand_info *data = platform_get_drvdata(pdev);
nand_release(&data->mtd);
iounmap(data->io_base);
kfree(data);
return 0;
}
module_init(rbmips_init);
static struct platform_driver adm5120_nand_driver = {
.probe = rbmips_probe,
.remove = rbmips_remove,
.driver = {
.name = "adm5120-nand",
.owner = THIS_MODULE,
},
};
static int __init adm5120_nand_init(void)
{
int err;
err = platform_driver_register(&adm5120_nand_driver);
return err;
}
static void __exit adm5120_nand_exit(void)
{
platform_driver_unregister(&adm5120_nand_driver);
}
module_init(adm5120_nand_init);
module_exit(adm5120_nand_exit);
MODULE_LICENSE("GPL");
MODULE_AUTHOR("David Goodenough, Florian Fainelli");
MODULE_DESCRIPTION("RouterBOARD 100 NAND driver");

8
target/linux/adm5120-2.6/files/include/asm-mips/mach-adm5120/adm5120_platform.h
View File

@ -32,8 +32,14 @@
struct adm5120_flash_platform_data {
void (*set_vpp)(struct map_info *, int);
void (*switch_bank)(unsigned);
#ifdef CONFIG_MTD_PARTITIONS
unsigned int nr_parts;
struct mtd_partition *parts;
#endif
};
struct adm5120_nand_platform_data {
/* TODO : not yet implemented */
};
struct adm5120_switch_platform_data {
@ -54,11 +60,13 @@ struct adm5120_pci_platform_data {
extern struct adm5120_flash_platform_data adm5120_flash0_data;
extern struct adm5120_flash_platform_data adm5120_flash1_data;
extern struct adm5120_nand_platform_data adm5120_nand_data;
extern struct adm5120_pci_platform_data adm5120_pci_data;
extern struct adm5120_switch_platform_data adm5120_switch_data;
extern struct platform_device adm5120_flash0_device;
extern struct platform_device adm5120_flash1_device;
extern struct platform_device adm5120_nand_device;
extern struct platform_device adm5120_usbc_device;
extern struct platform_device adm5120_pci_device;
extern struct platform_device adm5120_switch_device;