redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

mtd: autcpu12-nvram: Convert driver to platform_device

Browse source 
Because we can have a single kernel to support multiple machines, we
need to make loading specific drivers for the target platform only.
For this, driver is converted to the platform driver.

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
This commit is contained in:
Alexander Shiyan 2012-08-15 20:28:06 +04:00 committed by David Woodhouse
parent d1f55c680e
commit ce55754c4f
3 changed files with 100 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
arch/arm/mach-clps711x/autcpu12.c
View file

@ -23,6 +23,8 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/ioport.h>
#include <linux/platform_device.h>
#include <mach/hardware.h> #include <mach/hardware.h>
#include <asm/sizes.h> #include <asm/sizes.h>
@ -62,9 +64,26 @@ void __init autcpu12_map_io(void)
iotable_init(autcpu12_io_desc, ARRAY_SIZE(autcpu12_io_desc)); iotable_init(autcpu12_io_desc, ARRAY_SIZE(autcpu12_io_desc));
} }
static struct resource autcpu12_nvram_resource[] __initdata = {
DEFINE_RES_MEM_NAMED(AUTCPU12_PHYS_NVRAM, SZ_128K, "SRAM"),
};
static struct platform_device autcpu12_nvram_pdev __initdata = {
.name = "autcpu12_nvram",
.id = -1,
.resource = autcpu12_nvram_resource,
.num_resources = ARRAY_SIZE(autcpu12_nvram_resource),
};
static void __init autcpu12_init(void)
{
platform_device_register(&autcpu12_nvram_pdev);
}
MACHINE_START(AUTCPU12, "autronix autcpu12") MACHINE_START(AUTCPU12, "autronix autcpu12")
/* Maintainer: Thomas Gleixner */ /* Maintainer: Thomas Gleixner */
.atag_offset = 0x20000, .atag_offset = 0x20000,
.init_machine = autcpu12_init,
.map_io = autcpu12_map_io, .map_io = autcpu12_map_io,
.init_irq = clps711x_init_irq, .init_irq = clps711x_init_irq,
.timer = &clps711x_timer, .timer = &clps711x_timer,

2
drivers/mtd/maps/Kconfig
View file

@ -373,7 +373,7 @@ config MTD_FORTUNET
have such a board, say 'Y'. have such a board, say 'Y'.
config MTD_AUTCPU12 config MTD_AUTCPU12
tristate "NV-RAM mapping AUTCPU12 board" bool "NV-RAM mapping AUTCPU12 board"
depends on ARCH_AUTCPU12 depends on ARCH_AUTCPU12
help help
This enables access to the NV-RAM on autronix autcpu12 board. This enables access to the NV-RAM on autronix autcpu12 board.

148
drivers/mtd/maps/autcpu12-nvram.c
View file

@ -15,44 +15,57 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*
*/ */
#include <linux/sizes.h>
#include <linux/module.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/ioport.h>
#include <linux/init.h> #include <linux/init.h>
#include <asm/io.h> #include <linux/device.h>
#include <asm/sizes.h> #include <linux/module.h>
#include <mach/hardware.h> #include <linux/platform_device.h>
#include <mach/autcpu12.h>
#include <linux/mtd/mtd.h> #include <linux/mtd/mtd.h>
#include <linux/mtd/map.h> #include <linux/mtd/map.h>
#include <linux/mtd/partitions.h>
struct autcpu12_nvram_priv {
static struct mtd_info *sram_mtd; struct mtd_info *mtd;
struct map_info map;
struct map_info autcpu12_sram_map = {
.name = "SRAM",
.size = 32768,
.bankwidth = 4,
.phys = 0x12000000,
}; };
static int __init init_autcpu12_sram (void) static int __devinit autcpu12_nvram_probe(struct platform_device *pdev)
{ {
map_word tmp, save0, save1; map_word tmp, save0, save1;
struct resource *res;
struct autcpu12_nvram_priv *priv;
int err; int err;
autcpu12_sram_map.virt = ioremap(0x12000000, SZ_128K); priv = devm_kzalloc(&pdev->dev,
if (!autcpu12_sram_map.virt) { sizeof(struct autcpu12_nvram_priv), GFP_KERNEL);
printk("Failed to ioremap autcpu12 NV-RAM space\n"); if (!priv)
err = -EIO; return -ENOMEM;
platform_set_drvdata(pdev, priv);
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) {
dev_err(&pdev->dev, "failed to get memory resource\n");
err = -ENOENT;
goto out; goto out;
} }
simple_map_init(&autcpu12_sram_map);
priv->map.bankwidth = 4;
priv->map.phys = res->start;
priv->map.size = resource_size(res);
priv->map.virt = devm_request_and_ioremap(&pdev->dev, res);
strcpy((char *)priv->map.name, res->name);
if (!priv->map.virt) {
dev_err(&pdev->dev, "failed to remap mem resource\n");
err = -EBUSY;
goto out;
}
simple_map_init(&priv->map);
/* /*
* Check for 32K/128K * Check for 32K/128K
@ -62,67 +75,66 @@ static int __init init_autcpu12_sram (void)
* Read and check result on ofs 0x0 * Read and check result on ofs 0x0
* Restore contents * Restore contents
*/ */
save0 = map_read(&autcpu12_sram_map, 0); save0 = map_read(&priv->map, 0);
save1 = map_read(&autcpu12_sram_map, 0x10000); save1 = map_read(&priv->map, 0x10000);
tmp.x[0] = ~save0.x[0]; tmp.x[0] = ~save0.x[0];
map_write(&autcpu12_sram_map, tmp, 0x10000); map_write(&priv->map, tmp, 0x10000);
/* if we find this pattern on 0x0, we have 32K size tmp = map_read(&priv->map, 0);
* restore contents and exit /* if we find this pattern on 0x0, we have 32K size */
*/ if (!map_word_equal(&priv->map, tmp, save0)) {
tmp = map_read(&autcpu12_sram_map, 0); map_write(&priv->map, save0, 0x0);
if (!map_word_equal(&autcpu12_sram_map, tmp, save0)) { priv->map.size = SZ_32K;
map_write(&autcpu12_sram_map, save0, 0x0); } else
goto map; map_write(&priv->map, save1, 0x10000);
}
/* We have a 128K found, restore 0x10000 and set size
* to 128K
*/
map_write(&autcpu12_sram_map, save1, 0x10000);
autcpu12_sram_map.size = SZ_128K;
map: priv->mtd = do_map_probe("map_ram", &priv->map);
sram_mtd = do_map_probe("map_ram", &autcpu12_sram_map); if (!priv->mtd) {
if (!sram_mtd) { dev_err(&pdev->dev, "probing failed\n");
printk("NV-RAM probe failed\n");
err = -ENXIO; err = -ENXIO;
goto out_ioremap; goto out;
} }
sram_mtd->owner = THIS_MODULE; priv->mtd->owner = THIS_MODULE;
sram_mtd->erasesize = 16; priv->mtd->erasesize = 16;
priv->mtd->dev.parent = &pdev->dev;
if (mtd_device_register(sram_mtd, NULL, 0)) { if (!mtd_device_register(priv->mtd, NULL, 0)) {
printk("NV-RAM device addition failed\n"); dev_info(&pdev->dev,
err = -ENOMEM; "NV-RAM device size %ldKiB registered on AUTCPU12\n",
goto out_probe; priv->map.size / SZ_1K);
return 0;
} }
printk("NV-RAM device size %ldKiB registered on AUTCPU12\n",autcpu12_sram_map.size/SZ_1K); map_destroy(priv->mtd);
dev_err(&pdev->dev, "NV-RAM device addition failed\n");
err = -ENOMEM;
return 0;
out_probe:
map_destroy(sram_mtd);
sram_mtd = 0;
out_ioremap:
iounmap((void *)autcpu12_sram_map.virt);
out: out:
devm_kfree(&pdev->dev, priv);
return err; return err;
} }
static void __exit cleanup_autcpu12_maps(void) static int __devexit autcpu12_nvram_remove(struct platform_device *pdev)
{ {
if (sram_mtd) { struct autcpu12_nvram_priv *priv = platform_get_drvdata(pdev);
mtd_device_unregister(sram_mtd);
map_destroy(sram_mtd); mtd_device_unregister(priv->mtd);
iounmap((void *)autcpu12_sram_map.virt); map_destroy(priv->mtd);
} devm_kfree(&pdev->dev, priv);
return 0;
} }
module_init(init_autcpu12_sram); static struct platform_driver autcpu12_nvram_driver = {
module_exit(cleanup_autcpu12_maps); .driver = {
.name = "autcpu12_nvram",
.owner = THIS_MODULE,
},
.probe = autcpu12_nvram_probe,
.remove = __devexit_p(autcpu12_nvram_remove),
};
module_platform_driver(autcpu12_nvram_driver);
MODULE_AUTHOR("Thomas Gleixner"); MODULE_AUTHOR("Thomas Gleixner");
MODULE_DESCRIPTION("autcpu12 NV-RAM map driver"); MODULE_DESCRIPTION("autcpu12 NVRAM map driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");