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

Commit 1a7caca2 authored by Bjorn Andersson's avatar Bjorn Andersson Committed by Andy Gross
Browse files

soc: qcom: smd: Implement id_table driver matching 



Implement a id_table based driver maching mechanism for drivers that
binds to fixed channels and doesn't need any additional configuration,
e.g. IPCRTR and DIAG.

Signed-off-by: default avatarBjorn Andersson <bjorn.andersson@sonymobile.com>
Signed-off-by: default avatarAndy Gross <agross@codeaurora.org>
parent f1fed8c0

drivers/soc/qcom/smd.c

+18 −7
Original line number Original line Diff line number Diff line
@@ -727,6 +727,19 @@ static struct qcom_smd_driver *to_smd_driver(struct device *dev) 




static int qcom_smd_dev_match(struct device *dev, struct device_driver *drv)

static int qcom_smd_dev_match(struct device *dev, struct device_driver *drv)

{

{

	struct qcom_smd_device *qsdev = to_smd_device(dev);

	struct qcom_smd_driver *qsdrv = container_of(drv, struct qcom_smd_driver, driver);

	const struct qcom_smd_id *match = qsdrv->smd_match_table;

	const char *name = qsdev->channel->name;



	if (match) {

		while (match->name[0]) {

			if (!strcmp(match->name, name))

				return 1;

			match++;

		}

	}



	return of_driver_match_device(dev, drv);

	return of_driver_match_device(dev, drv);

}

}
@@ -880,19 +893,17 @@ static int qcom_smd_create_device(struct qcom_smd_channel *channel) 
	if (channel->qsdev)

	if (channel->qsdev)

		return -EEXIST;

		return -EEXIST;





	node = qcom_smd_match_channel(edge->of_node, channel->name);

	if (!node) {

		dev_dbg(smd->dev, "no match for '%s'\n", channel->name);

		return -ENXIO;

	}



	dev_dbg(smd->dev, "registering '%s'\n", channel->name);

	dev_dbg(smd->dev, "registering '%s'\n", channel->name);





	qsdev = kzalloc(sizeof(*qsdev), GFP_KERNEL);

	qsdev = kzalloc(sizeof(*qsdev), GFP_KERNEL);

	if (!qsdev)

	if (!qsdev)

		return -ENOMEM;

		return -ENOMEM;





	dev_set_name(&qsdev->dev, "%s.%s", edge->of_node->name, node->name);

	node = qcom_smd_match_channel(edge->of_node, channel->name);

	dev_set_name(&qsdev->dev, "%s.%s",

		     edge->of_node->name,

		     node ? node->name : channel->name);



	qsdev->dev.parent = smd->dev;

	qsdev->dev.parent = smd->dev;

	qsdev->dev.bus = &qcom_smd_bus;

	qsdev->dev.bus = &qcom_smd_bus;

	qsdev->dev.release = qcom_smd_release_device;

	qsdev->dev.release = qcom_smd_release_device;

include/linux/soc/qcom/smd.h

+11 −0
Original line number Original line Diff line number Diff line
@@ -8,6 +8,14 @@ struct qcom_smd; 
struct qcom_smd_channel;

struct qcom_smd_channel;

struct qcom_smd_lookup;

struct qcom_smd_lookup;





/**

 * struct qcom_smd_id - struct used for matching a smd device

 * @name:	name of the channel

 */

struct qcom_smd_id {

	char name[20];

};



/**

/**

 * struct qcom_smd_device - smd device struct

 * struct qcom_smd_device - smd device struct

 * @dev:	the device struct

 * @dev:	the device struct
@@ -21,6 +29,7 @@ struct qcom_smd_device { 
/**

/**

 * struct qcom_smd_driver - smd driver struct

 * struct qcom_smd_driver - smd driver struct

 * @driver:	underlying device driver

 * @driver:	underlying device driver

 * @smd_match_table: static channel match table

 * @probe:	invoked when the smd channel is found

 * @probe:	invoked when the smd channel is found

 * @remove:	invoked when the smd channel is closed

 * @remove:	invoked when the smd channel is closed

 * @callback:	invoked when an inbound message is received on the channel,

 * @callback:	invoked when an inbound message is received on the channel,
@@ -29,6 +38,8 @@ struct qcom_smd_device { 
 */

 */

struct qcom_smd_driver {

struct qcom_smd_driver {

	struct device_driver driver;

	struct device_driver driver;

	const struct qcom_smd_id *smd_match_table;



	int (*probe)(struct qcom_smd_device *dev);

	int (*probe)(struct qcom_smd_device *dev);

	void (*remove)(struct qcom_smd_device *dev);

	void (*remove)(struct qcom_smd_device *dev);

	int (*callback)(struct qcom_smd_device *, const void *, size_t);

	int (*callback)(struct qcom_smd_device *, const void *, size_t);