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

Commit 20bd48c7 authored by Katish Paran's avatar Katish Paran
Browse files

msm: ssm: Update the header structures 



The long variable under 64-bit migration needs to be changed to
uint32_t. Also as the smd channel is fixed for communication,
SSM driver doesn't need to depend on device tree to read the
details.

Change-Id: I43cafef1260f53660c18298f4e7314c753cf3944
Signed-off-by: default avatarKatish Paran <kparan@codeaurora.org>
parent d5fc7ff6

drivers/platform/msm/ssm.c

+1 −8
Original line number Diff line number Diff line
@@ -249,7 +249,6 @@ static int ssm_load_app(struct ssm_driver *ssm) 
static struct ssm_platform_data *populate_ssm_pdata(struct device *dev)

{

	struct ssm_platform_data *pdata;

	int rc;



	pdata = devm_kzalloc(dev, sizeof(struct ssm_platform_data),

								GFP_KERNEL);
@@ -259,12 +258,6 @@ static struct ssm_platform_data *populate_ssm_pdata(struct device *dev) 
	pdata->need_key_exchg =

		of_property_read_bool(dev->of_node, "qcom,need-keyexhg");



	rc = of_property_read_string(dev->of_node, "qcom,channel-name",

							&pdata->channel_name);

	if (rc && rc != -EINVAL) {

		dev_err(dev, "Error reading channel_name property %d\n", rc);

		return NULL;

	} else if (rc == -EINVAL)

	pdata->channel_name = CHANNEL_NAME;



	return pdata;

drivers/platform/msm/ssm.h

+3 −3
Original line number Diff line number Diff line 
/* Copyright (c) 2013, The Linux Foundation. All rights reserved.

/* Copyright (c) 2013-2014, 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
@@ -64,7 +64,7 @@ __packed struct tzapp_mode_enc_rsp { 
	uint32_t tzapp_ssm_cmd;

	uint8_t enc_mode_info[ENC_MODE_MAX_SIZE];

	uint32_t enc_mode_len;

	long status;

	uint32_t status;

};



/* tzapp get mode request.*/
@@ -77,7 +77,7 @@ __packed struct tzapp_get_mode_info_rsp { 
	uint32_t tzapp_ssm_cmd;

	uint8_t  enc_mode_info[ENC_MODE_MAX_SIZE];

	uint32_t enc_mode_len;

	long status;

	uint32_t status;

};



/* Modem/SSM packet format.*/