mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2025-04-21 12:27:27 +03:00
lots of code cleanup for ifxmips
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@11570 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
@@ -1,6 +1,4 @@
|
||||
/*
|
||||
* Driver for IFXMIPS flashmap
|
||||
*
|
||||
* 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
|
||||
@@ -16,7 +14,7 @@
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
* Copyright (C) 2004 Liu Peng Infineon IFAP DC COM CPE
|
||||
* Copyright (C) 2007 John Crispin <blogic@openwrt.org>
|
||||
* Copyright (C) 2008 John Crispin <blogic@openwrt.org>
|
||||
*/
|
||||
|
||||
#include <linux/module.h>
|
||||
@@ -32,17 +30,16 @@
|
||||
#include <linux/magic.h>
|
||||
#include <linux/platform_device.h>
|
||||
|
||||
#define DRVNAME "ifxmips_mtd"
|
||||
|
||||
static struct map_info
|
||||
ifxmips_map = {
|
||||
.name = DRVNAME,
|
||||
.name = "ifxmips_mtd",
|
||||
.bankwidth = 2,
|
||||
.size = 0x400000,
|
||||
};
|
||||
|
||||
static map_word
|
||||
ifxmips_read16 (struct map_info * map, unsigned long adr)
|
||||
ifxmips_read16(struct map_info * map, unsigned long adr)
|
||||
{
|
||||
map_word temp;
|
||||
|
||||
@@ -53,34 +50,33 @@ ifxmips_read16 (struct map_info * map, unsigned long adr)
|
||||
}
|
||||
|
||||
static void
|
||||
ifxmips_write16 (struct map_info *map, map_word d, unsigned long adr)
|
||||
ifxmips_write16(struct map_info *map, map_word d, unsigned long adr)
|
||||
{
|
||||
adr ^= 2;
|
||||
*((__u16 *) (map->virt + adr)) = d.x[0];
|
||||
}
|
||||
|
||||
void
|
||||
ifxmips_copy_from (struct map_info *map, void *to, unsigned long from, ssize_t len)
|
||||
ifxmips_copy_from(struct map_info *map, void *to, unsigned long from, ssize_t len)
|
||||
{
|
||||
u8 *p;
|
||||
u8 *to_8;
|
||||
unsigned char *p;
|
||||
unsigned char *to_8;
|
||||
|
||||
from = (unsigned long) (from + map->virt);
|
||||
p = (u8 *) from;
|
||||
to_8 = (u8 *) to;
|
||||
while(len--){
|
||||
from = (unsigned long)(from + map->virt);
|
||||
p = (unsigned char*) from;
|
||||
to_8 = (unsigned char*) to;
|
||||
while(len--)
|
||||
*to_8++ = *p++;
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
ifxmips_copy_to (struct map_info *map, unsigned long to, const void *from, ssize_t len)
|
||||
ifxmips_copy_to(struct map_info *map, unsigned long to, const void *from, ssize_t len)
|
||||
{
|
||||
u8 *p = (u8*) from;
|
||||
u8 *to_8;
|
||||
unsigned char *p = (unsigned char*)from;
|
||||
unsigned char *to_8;
|
||||
|
||||
to += (unsigned long) map->virt;
|
||||
to_8 = (u8*)to;
|
||||
to_8 = (unsigned char*)to;
|
||||
while(len--){
|
||||
*p++ = *to_8++;
|
||||
}
|
||||
@@ -111,16 +107,16 @@ ifxmips_partitions[4] = {
|
||||
};
|
||||
|
||||
int
|
||||
find_uImage_size (unsigned long start_offset){
|
||||
find_uImage_size(unsigned long start_offset){
|
||||
unsigned long temp;
|
||||
|
||||
ifxmips_copy_from(&ifxmips_map, &temp, start_offset + 12, 4);
|
||||
printk(KERN_INFO DRVNAME ": kernel size is %ld \n", temp + 0x40);
|
||||
printk(KERN_INFO "ifxmips_mtd: kernel size is %ld \n", temp + 0x40);
|
||||
return temp + 0x40;
|
||||
}
|
||||
|
||||
int
|
||||
detect_squashfs_partition (unsigned long start_offset){
|
||||
detect_squashfs_partition(unsigned long start_offset){
|
||||
unsigned long temp;
|
||||
|
||||
ifxmips_copy_from(&ifxmips_map, &temp, start_offset, 4);
|
||||
@@ -129,7 +125,7 @@ detect_squashfs_partition (unsigned long start_offset){
|
||||
}
|
||||
|
||||
static int
|
||||
ifxmips_mtd_probe (struct platform_device *dev)
|
||||
ifxmips_mtd_probe(struct platform_device *dev)
|
||||
{
|
||||
struct mtd_info *ifxmips_mtd = NULL;
|
||||
struct mtd_partition *parts = NULL;
|
||||
@@ -145,15 +141,17 @@ ifxmips_mtd_probe (struct platform_device *dev)
|
||||
ifxmips_map.phys = IFXMIPS_FLASH_START;
|
||||
ifxmips_map.virt = ioremap_nocache(IFXMIPS_FLASH_START, IFXMIPS_FLASH_MAX);
|
||||
ifxmips_map.size = IFXMIPS_FLASH_MAX;
|
||||
if (!ifxmips_map.virt) {
|
||||
printk(KERN_WARNING DRVNAME ": failed to ioremap!\n");
|
||||
if(!ifxmips_map.virt)
|
||||
{
|
||||
printk(KERN_WARNING "ifxmips_mtd: failed to ioremap!\n");
|
||||
return -EIO;
|
||||
}
|
||||
|
||||
ifxmips_mtd = (struct mtd_info *) do_map_probe("cfi_probe", &ifxmips_map);
|
||||
if (!ifxmips_mtd) {
|
||||
if(!ifxmips_mtd)
|
||||
{
|
||||
iounmap(ifxmips_map.virt);
|
||||
printk(KERN_WARNING DRVNAME ": probing failed\n");
|
||||
printk(KERN_WARNING "ifxmips_mtd: probing failed\n");
|
||||
return -ENXIO;
|
||||
}
|
||||
|
||||
@@ -161,8 +159,9 @@ ifxmips_mtd_probe (struct platform_device *dev)
|
||||
|
||||
uimage_size = find_uImage_size(ifxmips_partitions[2].offset);
|
||||
|
||||
if(detect_squashfs_partition(ifxmips_partitions[2].offset + uimage_size)){
|
||||
printk(KERN_INFO DRVNAME ": found a squashfs following the uImage\n");
|
||||
if(detect_squashfs_partition(ifxmips_partitions[2].offset + uimage_size))
|
||||
{
|
||||
printk(KERN_INFO "ifxmips_mtd: found a squashfs following the uImage\n");
|
||||
} else {
|
||||
uimage_size &= ~0xffff;
|
||||
uimage_size += 0x10000;
|
||||
@@ -175,7 +174,7 @@ ifxmips_mtd_probe (struct platform_device *dev)
|
||||
parts = &ifxmips_partitions[0];
|
||||
add_mtd_partitions(ifxmips_mtd, parts, 4);
|
||||
|
||||
printk(KERN_INFO DRVNAME ": added ifxmips flash with %dMB\n", ifxmips_mtd->size >> 20);
|
||||
printk(KERN_INFO "ifxmips_mtd: added ifxmips flash with %dMB\n", ifxmips_mtd->size >> 20);
|
||||
return 0;
|
||||
}
|
||||
|
||||
@@ -183,31 +182,30 @@ static struct
|
||||
platform_driver ifxmips_mtd_driver = {
|
||||
.probe = ifxmips_mtd_probe,
|
||||
.driver = {
|
||||
.name = DRVNAME,
|
||||
.name = "ifxmips_mtd",
|
||||
.owner = THIS_MODULE,
|
||||
},
|
||||
};
|
||||
|
||||
int __init
|
||||
init_ifxmips_mtd (void)
|
||||
init_ifxmips_mtd(void)
|
||||
{
|
||||
int ret = platform_driver_register(&ifxmips_mtd_driver);
|
||||
if (ret)
|
||||
printk(KERN_INFO DRVNAME ": error registering platfom driver!");
|
||||
|
||||
if(ret)
|
||||
printk(KERN_INFO "ifxmips_mtd: error registering platfom driver!");
|
||||
return ret;
|
||||
}
|
||||
|
||||
static void
|
||||
__exit
|
||||
cleanup_ifxmips_mtd (void)
|
||||
cleanup_ifxmips_mtd(void)
|
||||
{
|
||||
platform_driver_unregister(&ifxmips_mtd_driver);
|
||||
}
|
||||
|
||||
module_init (init_ifxmips_mtd);
|
||||
module_exit (cleanup_ifxmips_mtd);
|
||||
module_init(init_ifxmips_mtd);
|
||||
module_exit(cleanup_ifxmips_mtd);
|
||||
|
||||
MODULE_LICENSE ("GPL");
|
||||
MODULE_AUTHOR ("John Crispin <blogic@openwrt.org>");
|
||||
MODULE_DESCRIPTION ("MTD map driver for IFXMIPS boards");
|
||||
MODULE_LICENSE("GPL");
|
||||
MODULE_AUTHOR("John Crispin <blogic@openwrt.org>");
|
||||
MODULE_DESCRIPTION("MTD map driver for IFXMIPS boards");
|
||||
|
||||
Reference in New Issue
Block a user