Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ed028f3e authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "arm: msm: Remove unused external modem driver"

parents abbd037e 60d24b6c

arch/arm/configs/apq8084-perf_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ CONFIG_MSM_SMD=y 
CONFIG_MSM_PCIE=y

CONFIG_MSM_SMP2P=y

CONFIG_MSM_SMP2P_TEST=y

CONFIG_EXTERNAL_MDM=y

CONFIG_MSM_IPC_ROUTER=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_MSM_IPC_ROUTER_HSIC_XPRT=y

arch/arm/configs/apq8084_defconfig

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ CONFIG_MSM_SMD=y 
CONFIG_MSM_PCIE=y

CONFIG_MSM_SMP2P=y

CONFIG_MSM_SMP2P_TEST=y

CONFIG_EXTERNAL_MDM=y

CONFIG_MSM_IPC_ROUTER=y

CONFIG_MSM_IPC_ROUTER_SMD_XPRT=y

CONFIG_MSM_IPC_ROUTER_HSIC_XPRT=y

arch/arm/mach-msm/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -668,17 +668,6 @@ config MSM_SMP2P_TEST 
	  are used to verify the local and remote

	  implementations.



config EXTERNAL_MDM

	tristate "External modem driver"

	default n

	help

	  Enable communication with external modem.

	  Support power up and shut down external modem

	  by using gpios. Monitor external modem status

	  for crashes and perform ram dump collection

	  as well as a restart of the modem in the event

	  of a crash.



config MSM_SMD_LOGGING

	depends on MSM_SMD

	default y

arch/arm/mach-msm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -147,7 +147,6 @@ obj-$(CONFIG_MSM_RUN_QUEUE_STATS) += msm_rq_stats.o 
obj-$(CONFIG_MSM_SHOW_RESUME_IRQ) += msm_show_resume_irq.o

obj-$(CONFIG_MSM_NATIVE_RESTART) += restart.o



obj-$(CONFIG_EXTERNAL_MDM) += mdm2.o mdm_common.o

obj-$(CONFIG_MSM_CACHE_ERP) += cache_erp.o

obj-$(CONFIG_MSM_CACHE_DUMP) += msm_cache_dump.o

arch/arm/mach-msm/include/mach/mdm2.h

deleted100644 → 0
+0 −47
Original line number Diff line number Diff line 
/* Copyright (c) 2011-2013, The Linux Foundation. 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 version 2 and

 * only version 2 as published by the Free Software Foundation.

 *

 * 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.

 */



#ifndef _ARCH_ARM_MACH_MSM_MDM2_H

#define _ARCH_ARM_MACH_MSM_MDM2_H

#include "sysmon.h"



struct mdm_vddmin_resource {

	int rpm_id;

	int ap2mdm_vddmin_gpio;

	unsigned int modes;

	unsigned int drive_strength;

	int mdm2ap_vddmin_gpio;

};



struct mdm_platform_data {

	char *mdm_version;

	int ramdump_delay_ms;

	int ps_hold_delay_ms;

	int soft_reset_inverted;

	int early_power_on;

	int sfr_query;

	int no_powerdown_after_ramdumps;

	struct mdm_vddmin_resource *vddmin_resource;

	struct platform_device *peripheral_platform_device;

	unsigned int ramdump_timeout_ms;

	int image_upgrade_supported;

	struct gpiomux_setting *mdm2ap_status_gpio_run_cfg;

	int send_shdn;

	int cascading_ssr;

	int sysmon_subsys_id_valid;

	int sysmon_subsys_id;

	int no_a2m_errfatal_on_ssr;

	int no_reset_on_first_powerup;

	int kpd_not_inverted;

};

#endif