ARM: OMAP2+: remove DSP platform device

It was added to support DSP Bridge. Since DSP Bridge was removed, and
nothing else is using the platform device, remove it too.

Signed-off-by: Kristina Martšenko <kristina.martsenko@gmail.com>
Cc: Omar Ramirez Luna <omar.ramirez@copitl.com>
Cc: Suman Anna <s-anna@ti.com>
Cc: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 8ca99e9321e35de580eb83b94aeb64967532c808..fa780001575309e0c3ca38b2cb970c03e478a72f 100644 (file)
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -232,10 +232,6 @@ obj-$(CONFIG_HW_PERF_EVENTS)               += pmu.o
 iommu-$(CONFIG_OMAP_IOMMU)             := omap-iommu.o
 obj-y                                  += $(iommu-m) $(iommu-y)
 
-ifneq ($(CONFIG_TIDSPBRIDGE),)
-obj-y                                  += dsp.o
-endif
-
 # OMAP2420 MSDI controller integration support ("MMC")
 obj-$(CONFIG_SOC_OMAP2420)             += msdi.o
 

diff --git a/arch/arm/mach-omap2/common.c b/arch/arm/mach-omap2/common.c
index 2dabb9ecb986adc2abcbc851f54ecd5c4875adf9..484cdadfb18785ade051c29bab4d5e608dd56218 100644 (file)
--- a/arch/arm/mach-omap2/common.c
+++ b/arch/arm/mach-omap2/common.c
@@ -14,7 +14,6 @@
  */
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/platform_data/dsp-omap.h>
 
 #include "common.h"
 #include "omap-secure.h"
@@ -30,7 +29,6 @@ int __weak omap_secure_ram_reserve_memblock(void)
 
 void __init omap_reserve(void)
 {
-       omap_dsp_reserve_sdram_memblock();
        omap_secure_ram_reserve_memblock();
        omap_barrier_reserve_memblock();
 }

diff --git a/arch/arm/mach-omap2/dsp.c b/arch/arm/mach-omap2/dsp.c
deleted file mode 100644 (file)
index f7492df..0000000
--- a/arch/arm/mach-omap2/dsp.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * TI's OMAP DSP platform device registration
- *
- * Copyright (C) 2005-2006 Texas Instruments, Inc.
- * Copyright (C) 2009 Nokia Corporation
- *
- * Written by Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-/*
- * XXX The function pointers to the PRM/CM functions are incorrect and
- * should be removed.  No device driver should be changing PRM/CM bits
- * directly; that's a layering violation -- those bits are the responsibility
- * of the OMAP PM core code.
- */
-
-#include <linux/module.h>
-#include <linux/platform_device.h>
-
-#include <asm/memblock.h>
-
-#include "control.h"
-#include "cm2xxx_3xxx.h"
-#include "prm2xxx_3xxx.h"
-#ifdef CONFIG_TIDSPBRIDGE_DVFS
-#include "omap-pm.h"
-#endif
-#include "soc.h"
-
-#include <linux/platform_data/dsp-omap.h>
-
-static struct platform_device *omap_dsp_pdev;
-
-static struct omap_dsp_platform_data omap_dsp_pdata __initdata = {
-#ifdef CONFIG_TIDSPBRIDGE_DVFS
-       .dsp_set_min_opp = omap_pm_dsp_set_min_opp,
-       .dsp_get_opp = omap_pm_dsp_get_opp,
-       .cpu_set_freq = omap_pm_cpu_set_freq,
-       .cpu_get_freq = omap_pm_cpu_get_freq,
-#endif
-       .dsp_prm_read = omap2_prm_read_mod_reg,
-       .dsp_prm_write = omap2_prm_write_mod_reg,
-       .dsp_prm_rmw_bits = omap2_prm_rmw_mod_reg_bits,
-       .dsp_cm_read = omap2_cm_read_mod_reg,
-       .dsp_cm_write = omap2_cm_write_mod_reg,
-       .dsp_cm_rmw_bits = omap2_cm_rmw_mod_reg_bits,
-
-       .set_bootaddr = omap_ctrl_write_dsp_boot_addr,
-       .set_bootmode = omap_ctrl_write_dsp_boot_mode,
-};
-
-static phys_addr_t omap_dsp_phys_mempool_base;
-
-void __init omap_dsp_reserve_sdram_memblock(void)
-{
-       phys_addr_t size = CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE;
-       phys_addr_t paddr;
-
-       if (!cpu_is_omap34xx())
-               return;
-
-       if (!size)
-               return;
-
-       paddr = arm_memblock_steal(size, SZ_1M);
-       if (!paddr) {
-               pr_err("%s: failed to reserve %llx bytes\n",
-                               __func__, (unsigned long long)size);
-               return;
-       }
-
-       omap_dsp_phys_mempool_base = paddr;
-}
-
-static phys_addr_t omap_dsp_get_mempool_base(void)
-{
-       return omap_dsp_phys_mempool_base;
-}
-
-static int __init omap_dsp_init(void)
-{
-       struct platform_device *pdev;
-       int err = -ENOMEM;
-       struct omap_dsp_platform_data *pdata = &omap_dsp_pdata;
-
-       if (!cpu_is_omap34xx())
-               return 0;
-
-       pdata->phys_mempool_base = omap_dsp_get_mempool_base();
-
-       if (pdata->phys_mempool_base) {
-               pdata->phys_mempool_size = CONFIG_TIDSPBRIDGE_MEMPOOL_SIZE;
-               pr_info("%s: %llx bytes @ %llx\n", __func__,
-                       (unsigned long long)pdata->phys_mempool_size,
-                       (unsigned long long)pdata->phys_mempool_base);
-       }
-
-       pdev = platform_device_alloc("omap-dsp", -1);
-       if (!pdev)
-               goto err_out;
-
-       err = platform_device_add_data(pdev, pdata, sizeof(*pdata));
-       if (err)
-               goto err_out;
-
-       err = platform_device_add(pdev);
-       if (err)
-               goto err_out;
-
-       omap_dsp_pdev = pdev;
-       return 0;
-
-err_out:
-       platform_device_put(pdev);
-       return err;
-}
-module_init(omap_dsp_init);
-
-static void __exit omap_dsp_exit(void)
-{
-       if (!cpu_is_omap34xx())
-               return;
-
-       platform_device_unregister(omap_dsp_pdev);
-}
-module_exit(omap_dsp_exit);
-
-MODULE_AUTHOR("Hiroshi DOYU");
-MODULE_DESCRIPTION("TI's OMAP DSP platform device registration");
-MODULE_LICENSE("GPL");

diff --git a/include/linux/platform_data/dsp-omap.h b/include/linux/platform_data/dsp-omap.h
deleted file mode 100644 (file)
index 5927709..0000000
--- a/include/linux/platform_data/dsp-omap.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef __OMAP_DSP_H__
-#define __OMAP_DSP_H__
-
-#include <linux/types.h>
-
-struct omap_dsp_platform_data {
-       void (*dsp_set_min_opp) (u8 opp_id);
-       u8 (*dsp_get_opp) (void);
-       void (*cpu_set_freq) (unsigned long f);
-       unsigned long (*cpu_get_freq) (void);
-       unsigned long mpu_speed[6];
-
-       /* functions to write and read PRCM registers */
-       void (*dsp_prm_write)(u32, s16 , u16);
-       u32 (*dsp_prm_read)(s16 , u16);
-       u32 (*dsp_prm_rmw_bits)(u32, u32, s16, s16);
-       void (*dsp_cm_write)(u32, s16 , u16);
-       u32 (*dsp_cm_read)(s16 , u16);
-       u32 (*dsp_cm_rmw_bits)(u32, u32, s16, s16);
-
-       void (*set_bootaddr)(u32);
-       void (*set_bootmode)(u8);
-
-       phys_addr_t phys_mempool_base;
-       phys_addr_t phys_mempool_size;
-};
-
-#if defined(CONFIG_TIDSPBRIDGE) || defined(CONFIG_TIDSPBRIDGE_MODULE)
-extern void omap_dsp_reserve_sdram_memblock(void);
-#else
-static inline void omap_dsp_reserve_sdram_memblock(void) { }
-#endif
-
-#endif