Merge tag 'staging-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging
Pull staging driver updates from Greg KH: "Here's the big pull request for the staging driver tree for 3.17-rc1. Lots of things in here, over 2000 patches, but the best part is this: 1480 files changed, 39070 insertions(+), 254659 deletions(-) Thanks to the great work of Kristina Martšenko, 14 different staging drivers have been removed from the tree as they were obsolete and no one was willing to work on cleaning them up. Other than the driver removals, loads of cleanups are in here (comedi, lustre, etc.) as well as the usual IIO driver updates and additions. All of this has been in the linux-next tree for a while" * tag 'staging-3.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging: (2199 commits) staging: comedi: addi_apci_1564: remove diagnostic interrupt support code staging: comedi: addi_apci_1564: add subdevice to check diagnostic status staging: wlan-ng: coding style problem fix staging: wlan-ng: fixing coding style problems staging: comedi: ii_pci20kc: request and ioremap memory staging: lustre: bitwise vs logical typo staging: dgnc: Remove unneeded dgnc_trace.c and dgnc_trace.h staging: dgnc: rephrase comment staging: comedi: ni_tio: remove some dead code staging: rtl8723au: Fix static symbol sparse warning staging: rtl8723au: usb_dvobj_init(): Remove unused variable 'pdev_desc' staging: rtl8723au: Do not duplicate kernel provided USB macros staging: rtl8723au: Remove never set struct pwrctrl_priv.bHWPowerdown staging: rtl8723au: Remove two never set variables staging: rtl8723au: RSSI_test is never set staging:r8190: coding style: Fixed checkpatch reported Error staging:r8180: coding style: Fixed too long lines staging:r8180: coding style: Fixed commenting style staging: lustre: ptlrpc: lproc_ptlrpc.c - fix dereferenceing user space buffer staging: lustre: ldlm: ldlm_resource.c - fix dereferenceing user space buffer ...
This commit is contained in:
Linus Torvalds
@@ -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
|
||||
|
||||
|
||||
@@ -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();
|
||||
}
|
||||
|
||||
@@ -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");
|
||||
Reference in New Issue
Block a user