OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remoteproc: Move qcom_mdt_loader into drivers/soc/qcom 

With the remoteproc parts cleaned out of the MDT loader we can move it
to drivers/soc/qcom.

Acked-by: Andy Gross <andy.gross@linaro.org>
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
This commit is contained in:
Bjorn Andersson 2017-01-27 03:12:57 -08:00
parent 7f0dd07a9b
commit 2aad40d911
9 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/remoteproc/Kconfig
View File

@ -87,9 +87,6 @@ config QCOM_ADSP_PIL
config QCOM_RPROC_COMMON config QCOM_RPROC_COMMON
tristate tristate
config QCOM_MDT_LOADER
tristate
config QCOM_Q6V5_PIL config QCOM_Q6V5_PIL
tristate "Qualcomm Hexagon V5 Peripherial Image Loader" tristate "Qualcomm Hexagon V5 Peripherial Image Loader"
depends on OF && ARCH_QCOM depends on OF && ARCH_QCOM

1
drivers/remoteproc/Makefile
View File

@ -12,7 +12,6 @@ obj-$(CONFIG_OMAP_REMOTEPROC) += omap_remoteproc.o
obj-$(CONFIG_WKUP_M3_RPROC) += wkup_m3_rproc.o obj-$(CONFIG_WKUP_M3_RPROC) += wkup_m3_rproc.o
obj-$(CONFIG_DA8XX_REMOTEPROC) += da8xx_remoteproc.o obj-$(CONFIG_DA8XX_REMOTEPROC) += da8xx_remoteproc.o
obj-$(CONFIG_QCOM_ADSP_PIL) += qcom_adsp_pil.o obj-$(CONFIG_QCOM_ADSP_PIL) += qcom_adsp_pil.o
obj-$(CONFIG_QCOM_MDT_LOADER) += qcom_mdt_loader.o
obj-$(CONFIG_QCOM_RPROC_COMMON) += qcom_common.o obj-$(CONFIG_QCOM_RPROC_COMMON) += qcom_common.o
obj-$(CONFIG_QCOM_Q6V5_PIL) += qcom_q6v5_pil.o obj-$(CONFIG_QCOM_Q6V5_PIL) += qcom_q6v5_pil.o
obj-$(CONFIG_QCOM_WCNSS_PIL) += qcom_wcnss_pil.o obj-$(CONFIG_QCOM_WCNSS_PIL) += qcom_wcnss_pil.o

2
drivers/remoteproc/qcom_adsp_pil.c
View File

@ -26,11 +26,11 @@
#include <linux/qcom_scm.h> #include <linux/qcom_scm.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/remoteproc.h> #include <linux/remoteproc.h>
#include <linux/soc/qcom/mdt_loader.h>
#include <linux/soc/qcom/smem.h> #include <linux/soc/qcom/smem.h>
#include <linux/soc/qcom/smem_state.h> #include <linux/soc/qcom/smem_state.h>
#include "qcom_common.h" #include "qcom_common.h"
#include "qcom_mdt_loader.h"
#include "remoteproc_internal.h" #include "remoteproc_internal.h"
struct adsp_data { struct adsp_data {

2
drivers/remoteproc/qcom_q6v5_pil.c
View File

@ -29,12 +29,12 @@
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/remoteproc.h> #include <linux/remoteproc.h>
#include <linux/reset.h> #include <linux/reset.h>
#include <linux/soc/qcom/mdt_loader.h>
#include <linux/soc/qcom/smem.h> #include <linux/soc/qcom/smem.h>
#include <linux/soc/qcom/smem_state.h> #include <linux/soc/qcom/smem_state.h>
#include "remoteproc_internal.h" #include "remoteproc_internal.h"
#include "qcom_common.h" #include "qcom_common.h"
#include "qcom_mdt_loader.h"
#include <linux/qcom_scm.h> #include <linux/qcom_scm.h>

2
drivers/remoteproc/qcom_wcnss.c
View File

@ -28,12 +28,12 @@
#include <linux/qcom_scm.h> #include <linux/qcom_scm.h>
#include <linux/regulator/consumer.h> #include <linux/regulator/consumer.h>
#include <linux/remoteproc.h> #include <linux/remoteproc.h>
#include <linux/soc/qcom/mdt_loader.h>
#include <linux/soc/qcom/smem.h> #include <linux/soc/qcom/smem.h>
#include <linux/soc/qcom/smem_state.h> #include <linux/soc/qcom/smem_state.h>
#include <linux/rpmsg/qcom_smd.h> #include <linux/rpmsg/qcom_smd.h>
#include "qcom_common.h" #include "qcom_common.h"
#include "qcom_mdt_loader.h"
#include "remoteproc_internal.h" #include "remoteproc_internal.h"
#include "qcom_wcnss.h" #include "qcom_wcnss.h"

4
drivers/soc/qcom/Kconfig
View File

@ -10,6 +10,10 @@ config QCOM_GSBI
functions for connecting the underlying serial UART, SPI, and I2C functions for connecting the underlying serial UART, SPI, and I2C
devices to the output pins. devices to the output pins.
config QCOM_MDT_LOADER
tristate
select QCOM_SCM
config QCOM_PM config QCOM_PM
bool "Qualcomm Power Management" bool "Qualcomm Power Management"
depends on ARCH_QCOM && !ARM64 depends on ARCH_QCOM && !ARM64

1
drivers/soc/qcom/Makefile
View File

@ -1,4 +1,5 @@
obj-$(CONFIG_QCOM_GSBI) += qcom_gsbi.o obj-$(CONFIG_QCOM_GSBI) += qcom_gsbi.o
obj-$(CONFIG_QCOM_MDT_LOADER) += mdt_loader.o
obj-$(CONFIG_QCOM_PM) += spm.o obj-$(CONFIG_QCOM_PM) += spm.o
obj-$(CONFIG_QCOM_SMD) += smd.o obj-$(CONFIG_QCOM_SMD) += smd.o
obj-$(CONFIG_QCOM_SMD_RPM) += smd-rpm.o obj-$(CONFIG_QCOM_SMD_RPM) += smd-rpm.o

3
drivers/remoteproc/qcom_mdt_loader.c → drivers/soc/qcom/mdt_loader.c
View File

@ -23,8 +23,7 @@
#include <linux/qcom_scm.h> #include <linux/qcom_scm.h>
#include <linux/sizes.h> #include <linux/sizes.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/soc/qcom/mdt_loader.h>
#include "qcom_mdt_loader.h"
static bool mdt_phdr_valid(const struct elf32_phdr *phdr) static bool mdt_phdr_valid(const struct elf32_phdr *phdr)
{ {

5
drivers/remoteproc/qcom_mdt_loader.h → include/linux/soc/qcom/mdt_loader.h
View File

@ -1,10 +1,15 @@
#ifndef __QCOM_MDT_LOADER_H__ #ifndef __QCOM_MDT_LOADER_H__
#define __QCOM_MDT_LOADER_H__ #define __QCOM_MDT_LOADER_H__
#include <linux/types.h>
#define QCOM_MDT_TYPE_MASK (7 << 24) #define QCOM_MDT_TYPE_MASK (7 << 24)
#define QCOM_MDT_TYPE_HASH (2 << 24) #define QCOM_MDT_TYPE_HASH (2 << 24)
#define QCOM_MDT_RELOCATABLE BIT(27) #define QCOM_MDT_RELOCATABLE BIT(27)
struct device;
struct firmware;
ssize_t qcom_mdt_get_size(const struct firmware *fw); ssize_t qcom_mdt_get_size(const struct firmware *fw);
int qcom_mdt_load(struct device *dev, const struct firmware *fw, int qcom_mdt_load(struct device *dev, const struct firmware *fw,
const char *fw_name, int pas_id, void *mem_region, const char *fw_name, int pas_id, void *mem_region,