@@ -82,8 +82,4 @@ config IMX_HAVE_IOMUX_V1
config ARCH_MXC_IOMUX_V3
bool
-config IRAM_ALLOC
- bool
- select GENERIC_ALLOCATOR
-
endif
@@ -10,7 +10,6 @@ obj-$(CONFIG_MXC_AVIC) += avic.o
obj-$(CONFIG_IMX_HAVE_IOMUX_V1) += iomux-v1.o
obj-$(CONFIG_ARCH_MXC_IOMUX_V3) += iomux-v3.o
-obj-$(CONFIG_IRAM_ALLOC) += iram_alloc.o
obj-$(CONFIG_MXC_ULPI) += ulpi.o
obj-$(CONFIG_MXC_USE_EPIT) += epit.o
obj-$(CONFIG_MXC_DEBUG_BOARD) += 3ds_debugboard.o
deleted file mode 100644
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * 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 (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-#include <linux/errno.h>
-
-#ifdef CONFIG_IRAM_ALLOC
-
-void __iomem *iram_alloc(unsigned int size, unsigned long *dma_addr);
-void iram_free(unsigned long dma_addr, unsigned int size);
-
-#else
-
-static inline void __iomem *iram_alloc(unsigned int size, unsigned long *dma_addr)
-{
- return NULL;
-}
-
-static inline void iram_free(unsigned long base, unsigned long size) {}
-
-#endif
deleted file mode 100644
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2010 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * 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 (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#include <linux/kernel.h>
-#include <linux/io.h>
-#include <linux/module.h>
-#include <linux/spinlock.h>
-#include <linux/genalloc.h>
-#include <linux/of.h>
-#include <linux/platform_device.h>
-#include <mach/iram.h>
-
-static struct gen_pool *iram_pool;
-
-void __iomem *iram_alloc(unsigned int size, unsigned long *dma_addr)
-{
- unsigned long virt;
-
- if (!iram_pool)
- return NULL;
-
- virt = gen_pool_alloc(iram_pool, size);
- pr_debug("iram alloc - %dB@0x%lX\n", size, *dma_addr);
- if (!virt)
- return NULL;
-
- *dma_addr = gen_pool_virt_to_phys(iram_pool, virt);
- return (void __iomem *)virt;
-}
-EXPORT_SYMBOL(iram_alloc);
-
-void iram_free(unsigned long addr, unsigned int size)
-{
- if (!iram_pool)
- return;
-
- gen_pool_free(iram_pool, addr, size);
-}
-EXPORT_SYMBOL(iram_free);
-
-static int __devinit iram_probe(struct platform_device *pdev)
-{
- void __iomem *virt_base;
- struct resource *res;
- unsigned long size;
- int ret;
-
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
- if (!res)
- return -EINVAL;
-
- if (iram_pool)
- return -EBUSY;
-
- size = resource_size(res);
-
- virt_base = devm_ioremap(&pdev->dev, res->start, size);
- if (!virt_base)
- return -ENOMEM;
-
- iram_pool = gen_pool_create(PAGE_SHIFT, -1);
- if (!iram_pool)
- return -ENOMEM;
-
- ret = gen_pool_add_virt(iram_pool, (unsigned long)virt_base,
- res->start, size, -1);
- if (ret < 0) {
- gen_pool_destroy(iram_pool);
- iram_pool = NULL;
- return ret;
- }
-
- pr_debug("i.MX IRAM pool: %ld KB@0x%p\n", size / 1024, virt_base);
- return 0;
-}
-
-static int __devexit iram_remove(struct platform_device *pdev)
-{
- gen_pool_destroy(iram_pool);
- iram_pool = NULL;
- return 0;
-}
-
-#ifdef CONFIG_OF
-static struct of_device_id iram_dt_ids[] = {
- { .compatible = "fsl,imx-iram" },
- { /* sentinel */ }
-};
-#endif
-
-static struct platform_driver iram_driver = {
- .driver = {
- .name = "imx-iram",
- .of_match_table = of_match_ptr(iram_dt_ids),
- },
- .probe = iram_probe,
- .remove = __devexit_p(iram_remove),
-};
-
-module_platform_driver(iram_driver);
A generic on-chip SRAM allocator driver can be used instead. Users of the iram_alloc/free API should convert to the genalloc API: - virt = iram_alloc(SIZE, &phys); + gen_pool_alloc(iram_pool, SIZE); + phys = gen_pool_virt_to_phys(iram_pool, virt); /* ... */ - iram_free(virt, SIZE); + gen_pool_free(iram_pool, virt, SIZE); Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de> --- arch/arm/plat-mxc/Kconfig | 4 -- arch/arm/plat-mxc/Makefile | 1 - arch/arm/plat-mxc/include/mach/iram.h | 35 ---------- arch/arm/plat-mxc/iram_alloc.c | 116 --------------------------------- 4 files changed, 156 deletions(-) delete mode 100644 arch/arm/plat-mxc/include/mach/iram.h delete mode 100644 arch/arm/plat-mxc/iram_alloc.c