ARM: mmp: remove custom sram code

The MMP_SRAM code is no longer used by the tdma driver because
the Kconfig symbol is not selected, so remove it along with its
former callsite.

Acked-By: Vinod Koul <vkoul@kernel.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --git a/arch/arm/mach-mmp/Makefile b/arch/arm/mach-mmp/Makefile
index 65cc9b6..cd874c5 100644 (file)
--- a/arch/arm/mach-mmp/Makefile
+++ b/arch/arm/mach-mmp/Makefile
@@ -8,7 +8,6 @@ obj-y                           += common.o devices.o time.o
 obj-$(CONFIG_CPU_PXA168)       += pxa168.o
 obj-$(CONFIG_CPU_PXA910)       += pxa910.o
 obj-$(CONFIG_CPU_MMP2)         += mmp2.o
-obj-$(CONFIG_MMP_SRAM)         += sram.o
 
 ifeq ($(CONFIG_PM),y)
 obj-$(CONFIG_CPU_PXA910)       += pm-pxa910.o

diff --git a/arch/arm/mach-mmp/mmp2.h b/arch/arm/mach-mmp/mmp2.h
index 7f80b90..5c80836 100644 (file)
--- a/arch/arm/mach-mmp/mmp2.h
+++ b/arch/arm/mach-mmp/mmp2.h
@@ -10,7 +10,6 @@ extern void mmp2_clear_pmic_int(void);
 
 #include <linux/i2c.h>
 #include <linux/platform_data/i2c-pxa.h>
-#include <linux/platform_data/dma-mmp_tdma.h>
 #include <linux/irqchip/mmp.h>
 
 #include "devices.h"
@@ -29,8 +28,6 @@ extern struct mmp_device_desc mmp2_device_sdh0;
 extern struct mmp_device_desc mmp2_device_sdh1;
 extern struct mmp_device_desc mmp2_device_sdh2;
 extern struct mmp_device_desc mmp2_device_sdh3;
-extern struct mmp_device_desc mmp2_device_asram;
-extern struct mmp_device_desc mmp2_device_isram;
 
 extern struct platform_device mmp2_device_gpio;
 
@@ -90,15 +87,5 @@ static inline int mmp2_add_sdhost(int id, struct sdhci_pxa_platdata *data)
        return mmp_register_device(d, data, sizeof(*data));
 }
 
-static inline int mmp2_add_asram(struct sram_platdata *data)
-{
-       return mmp_register_device(&mmp2_device_asram, data, sizeof(*data));
-}
-
-static inline int mmp2_add_isram(struct sram_platdata *data)
-{
-       return mmp_register_device(&mmp2_device_isram, data, sizeof(*data));
-}
-
 #endif /* __ASM_MACH_MMP2_H */
 

diff --git a/arch/arm/mach-mmp/sram.c b/arch/arm/mach-mmp/sram.c
deleted file mode 100644 (file)
index ecc46c3..0000000
--- a/arch/arm/mach-mmp/sram.c
+++ /dev/null
@@ -1,167 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-only
-/*
- *  linux/arch/arm/mach-mmp/sram.c
- *
- *  based on mach-davinci/sram.c - DaVinci simple SRAM allocator
- *
- *  Copyright (c) 2011 Marvell Semiconductors Inc.
- *  All Rights Reserved
- *
- *  Add for mmp sram support - Leo Yan <leoy@marvell.com>
- */
-
-#include <linux/module.h>
-#include <linux/mod_devicetable.h>
-#include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/io.h>
-#include <linux/err.h>
-#include <linux/slab.h>
-#include <linux/genalloc.h>
-
-#include <linux/platform_data/dma-mmp_tdma.h>
-
-struct sram_bank_info {
-       char *pool_name;
-       struct gen_pool *gpool;
-       int granularity;
-
-       phys_addr_t sram_phys;
-       void __iomem *sram_virt;
-       u32 sram_size;
-
-       struct list_head node;
-};
-
-static DEFINE_MUTEX(sram_lock);
-static LIST_HEAD(sram_bank_list);
-
-struct gen_pool *sram_get_gpool(char *pool_name)
-{
-       struct sram_bank_info *info = NULL;
-
-       if (!pool_name)
-               return NULL;
-
-       mutex_lock(&sram_lock);
-
-       list_for_each_entry(info, &sram_bank_list, node)
-               if (!strcmp(pool_name, info->pool_name))
-                       break;
-
-       mutex_unlock(&sram_lock);
-
-       if (&info->node == &sram_bank_list)
-               return NULL;
-
-       return info->gpool;
-}
-EXPORT_SYMBOL(sram_get_gpool);
-
-static int sram_probe(struct platform_device *pdev)
-{
-       struct sram_platdata *pdata = pdev->dev.platform_data;
-       struct sram_bank_info *info;
-       struct resource *res;
-       int ret = 0;
-
-       if (!pdata || !pdata->pool_name)
-               return -ENODEV;
-
-       info = kzalloc(sizeof(*info), GFP_KERNEL);
-       if (!info)
-               return -ENOMEM;
-
-       platform_set_drvdata(pdev, info);
-
-       res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-       if (res == NULL) {
-               dev_err(&pdev->dev, "no memory resource defined\n");
-               ret = -ENODEV;
-               goto out;
-       }
-
-       if (!resource_size(res))
-               return 0;
-
-       info->sram_phys   = (phys_addr_t)res->start;
-       info->sram_size   = resource_size(res);
-       info->sram_virt   = ioremap(info->sram_phys, info->sram_size);
-       info->pool_name   = kstrdup(pdata->pool_name, GFP_KERNEL);
-       info->granularity = pdata->granularity;
-
-       info->gpool = gen_pool_create(ilog2(info->granularity), -1);
-       if (!info->gpool) {
-               dev_err(&pdev->dev, "create pool failed\n");
-               ret = -ENOMEM;
-               goto create_pool_err;
-       }
-
-       ret = gen_pool_add_virt(info->gpool, (unsigned long)info->sram_virt,
-                               info->sram_phys, info->sram_size, -1);
-       if (ret < 0) {
-               dev_err(&pdev->dev, "add new chunk failed\n");
-               ret = -ENOMEM;
-               goto add_chunk_err;
-       }
-
-       mutex_lock(&sram_lock);
-       list_add(&info->node, &sram_bank_list);
-       mutex_unlock(&sram_lock);
-
-       dev_info(&pdev->dev, "initialized\n");
-       return 0;
-
-add_chunk_err:
-       gen_pool_destroy(info->gpool);
-create_pool_err:
-       iounmap(info->sram_virt);
-       kfree(info->pool_name);
-out:
-       kfree(info);
-       return ret;
-}
-
-static int sram_remove(struct platform_device *pdev)
-{
-       struct sram_bank_info *info;
-
-       info = platform_get_drvdata(pdev);
-
-       if (info->sram_size) {
-               mutex_lock(&sram_lock);
-               list_del(&info->node);
-               mutex_unlock(&sram_lock);
-
-               gen_pool_destroy(info->gpool);
-               iounmap(info->sram_virt);
-               kfree(info->pool_name);
-       }
-
-       kfree(info);
-
-       return 0;
-}
-
-static const struct platform_device_id sram_id_table[] = {
-       { "asram", MMP_ASRAM },
-       { "isram", MMP_ISRAM },
-       { }
-};
-
-static struct platform_driver sram_driver = {
-       .probe          = sram_probe,
-       .remove         = sram_remove,
-       .driver         = {
-               .name   = "mmp-sram",
-       },
-       .id_table       = sram_id_table,
-};
-
-static int __init sram_init(void)
-{
-       return platform_driver_register(&sram_driver);
-}
-core_initcall(sram_init);
-
-MODULE_LICENSE("GPL");

diff --git a/drivers/dma/mmp_tdma.c b/drivers/dma/mmp_tdma.c
index a262e0e..d83e608 100644 (file)
--- a/drivers/dma/mmp_tdma.c
+++ b/drivers/dma/mmp_tdma.c
@@ -15,7 +15,7 @@
 #include <linux/dmaengine.h>
 #include <linux/platform_device.h>
 #include <linux/device.h>
-#include <linux/platform_data/dma-mmp_tdma.h>
+#include <linux/genalloc.h>
 #include <linux/of_device.h>
 #include <linux/of_dma.h>
 
@@ -670,10 +670,7 @@ static int mmp_tdma_probe(struct platform_device *pdev)
 
        INIT_LIST_HEAD(&tdev->device.channels);
 
-       if (pdev->dev.of_node)
-               pool = of_gen_pool_get(pdev->dev.of_node, "asram", 0);
-       else
-               pool = sram_get_gpool("asram");
+       pool = of_gen_pool_get(pdev->dev.of_node, "asram", 0);
        if (!pool) {
                dev_err(&pdev->dev, "asram pool not available\n");
                return -ENOMEM;

diff --git a/include/linux/platform_data/dma-mmp_tdma.h b/include/linux/platform_data/dma-mmp_tdma.h
deleted file mode 100644 (file)
index 8bec548..0000000
--- a/include/linux/platform_data/dma-mmp_tdma.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-only */
-/*
- *  SRAM Memory Management
- *
- *  Copyright (c) 2011 Marvell Semiconductors Inc.
- */
-
-#ifndef __DMA_MMP_TDMA_H
-#define __DMA_MMP_TDMA_H
-
-#include <linux/genalloc.h>
-
-/* ARBITRARY:  SRAM allocations are multiples of this 2^N size */
-#define SRAM_GRANULARITY       512
-
-enum sram_type {
-       MMP_SRAM_UNDEFINED = 0,
-       MMP_ASRAM,
-       MMP_ISRAM,
-};
-
-struct sram_platdata {
-       char *pool_name;
-       int granularity;
-};
-
-#ifdef CONFIG_MMP_SRAM
-extern struct gen_pool *sram_get_gpool(char *pool_name);
-#else
-static inline struct gen_pool *sram_get_gpool(char *pool_name)
-{
-       return NULL;
-}
-#endif
-
-#endif /* __DMA_MMP_TDMA_H */