From 9f10a3c5325be21cc99dd92981669655ad182c86 Mon Sep 17 00:00:00 2001 From: Sudeep Holla Date: Wed, 6 Nov 2019 17:58:03 +0000 Subject: [PATCH] UPSTREAM: reset: reset-scmi: Match scmi device by both name and protocol id The scmi bus now has support to match the driver with devices not only based on their protocol id but also based on their device name if one is available. This was added to cater the need to support multiple devices and drivers for the same protocol. Let us add the name "reset" to scmi_device_id table in the driver so that in matches only with device with the same name and protocol id SCMI_PROTOCOL_RESET. Change-Id: Iccebdc2ed032db23d5b4e86462ce33534a23924c Acked-by: Philipp Zabel Signed-off-by: Sudeep Holla Signed-off-by: Elaine Zhang (cherry picked from commit 34ce3c5e691206d388fcc61f3da2ce8fe8a1907a) --- drivers/reset/reset-scmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/reset/reset-scmi.c b/drivers/reset/reset-scmi.c index b46df80ec6c3..8d3a858e3b19 100644 --- a/drivers/reset/reset-scmi.c +++ b/drivers/reset/reset-scmi.c @@ -108,7 +108,7 @@ static int scmi_reset_probe(struct scmi_device *sdev) } static const struct scmi_device_id scmi_id_table[] = { - { SCMI_PROTOCOL_RESET }, + { SCMI_PROTOCOL_RESET, "reset" }, { }, }; MODULE_DEVICE_TABLE(scmi, scmi_id_table);