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

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

Merge "esoc: Code cleanup for mdm9x45"

parents 7eaaf5c5 de765726

drivers/esoc/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ config ESOC_DEBUG 
	  allow logging of different esoc driver traces.



config ESOC_MDM_4x

	bool "Add support for external mdm9x25/mdm9x35/mdm9x45/mdm9x55"

	bool "Add support for external mdm9x25/mdm9x35/mdm9x55"

	help

	  In some Qualcomm Technologies, Inc. boards, an external modem such as

	  mdm9x25 or mdm9x35 is connected to a primary msm. The primary soc can
@@ -49,7 +49,7 @@ config ESOC_MDM_DRV 
	tristate "Command engine for 4x series external modems"

	help

	  Provides a command engine to control the behavior of an external modem

	  such as mdm9x25/mdm9x35/mdm9x45/mdm9x55/QSC. Allows the primary soc to put the

	  such as mdm9x25/mdm9x35/mdm9x55/QSC. Allows the primary soc to put the

	  external modem in a specific mode. Also listens for events on the

	  external modem.

drivers/esoc/esoc-mdm-pon.c

+0 −9
Original line number Diff line number Diff line
@@ -207,15 +207,6 @@ struct mdm_pon_ops mdm9x35_pon_ops = { 
	.setup = mdm4x_pon_setup,

};



struct mdm_pon_ops mdm9x45_pon_ops = {

	.pon = mdm4x_do_first_power_on,

	.soft_reset = mdm4x_toggle_soft_reset,

	.poff_force = mdm4x_power_down,

	.cold_reset = mdm4x_cold_reset,

	.dt_init = mdm4x_pon_dt_init,

	.setup = mdm4x_pon_setup,

};



struct mdm_pon_ops mdm9x55_pon_ops = {

	.pon = mdm4x_do_first_power_on,

	.soft_reset = mdm9x55_toggle_soft_reset,

drivers/esoc/esoc-mdm.h

+1 −4
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2015, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2015, 2017, 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
@@ -33,8 +33,6 @@ 
#define MDM9x35_PCIE			"PCIe"

#define MDM9x35_DUAL_LINK		"HSIC+PCIe"

#define MDM9x35_HSIC			"HSIC"

#define MDM9x45_LABEL			"MDM9x45"

#define MDM9x45_PCIE			"PCIe"

#define MDM9x55_LABEL			"MDM9x55"

#define MDM9x55_PCIE			"PCIe"

#define MDM2AP_STATUS_TIMEOUT_MS	120000L
@@ -151,6 +149,5 @@ static inline int mdm_pon_setup(struct mdm_ctrl *mdm) 


extern struct mdm_pon_ops mdm9x25_pon_ops;

extern struct mdm_pon_ops mdm9x35_pon_ops;

extern struct mdm_pon_ops mdm9x45_pon_ops;

extern struct mdm_pon_ops mdm9x55_pon_ops;

#endif