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

Commit c33aa7d3 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: msm_bus: Add support for S2D"

parents 699881fd 13186fe0

drivers/soc/qcom/msm_bus/msm_bus_fabric_adhoc.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -1163,6 +1163,12 @@ static int msm_bus_node_debug(struct device *bus_dev, void *data) 
	return ret;

	return ret;

}

}





static int msm_bus_pm_restore(struct device *dev)

{

	return bus_for_each_dev(&msm_bus_type, NULL, NULL,

			msm_bus_dev_init_qos);

}



static int msm_bus_free_dev(struct device *dev, void *data)

static int msm_bus_free_dev(struct device *dev, void *data)

{

{

	struct msm_bus_node_device_type *bus_node = NULL;

	struct msm_bus_node_device_type *bus_node = NULL;
@@ -1361,6 +1367,10 @@ static struct platform_driver msm_bus_rules_driver = { 
	},

	},

};

};





static const struct dev_pm_ops msm_bus_pm_ops = {

	.restore = msm_bus_pm_restore,

};



static const struct of_device_id fabric_match[] = {

static const struct of_device_id fabric_match[] = {

	{.compatible = "qcom,msm-bus-device"},

	{.compatible = "qcom,msm-bus-device"},

	{}

	{}
@@ -1373,6 +1383,7 @@ static struct platform_driver msm_bus_device_driver = { 
		.name = "msm_bus_device",

		.name = "msm_bus_device",

		.owner = THIS_MODULE,

		.owner = THIS_MODULE,

		.of_match_table = fabric_match,

		.of_match_table = fabric_match,

		.pm = &msm_bus_pm_ops,

	},

	},

};

};

drivers/soc/qcom/msm_bus/msm_bus_fabric_rpmh.c

+11 −0
Original line number Original line Diff line number Diff line
@@ -1790,6 +1790,12 @@ static int msm_bus_node_debug(struct device *bus_dev, void *data) 
	return ret;

	return ret;

}

}





static int msm_bus_pm_restore(struct device *dev)

{

	return bus_for_each_dev(&msm_bus_type, NULL, NULL,

			msm_bus_dev_init_qos);

}



static int msm_bus_free_dev(struct device *dev, void *data)

static int msm_bus_free_dev(struct device *dev, void *data)

{

{

	struct msm_bus_node_device_type *bus_node = NULL;

	struct msm_bus_node_device_type *bus_node = NULL;
@@ -1956,6 +1962,10 @@ static struct platform_driver msm_bus_rules_driver = { 
	},

	},

};

};





static const struct dev_pm_ops msm_bus_pm_ops = {

	.restore = msm_bus_pm_restore,

};



static const struct of_device_id fabric_match[] = {

static const struct of_device_id fabric_match[] = {

	{.compatible = "qcom,msm-bus-device"},

	{.compatible = "qcom,msm-bus-device"},

	{}

	{}
@@ -1968,6 +1978,7 @@ static struct platform_driver msm_bus_device_driver = { 
		.name = "msm_bus_device",

		.name = "msm_bus_device",

		.owner = THIS_MODULE,

		.owner = THIS_MODULE,

		.of_match_table = fabric_match,

		.of_match_table = fabric_match,

		.pm = &msm_bus_pm_ops,

	},

	},

};

};