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

Commit 593fdd4f authored by Enrico Weigelt, metux IT consult's avatar Enrico Weigelt, metux IT consult Committed by Dmitry Torokhov
Browse files

Input: gpio_keys_polled - allow specifying name of input device 



Instead of hardcoding the input name to the driver name
('gpio-keys-polled'), allow specifying the name of the device via
"label" property. If the property is not present (nor name is set in
board-supplied platform data), we'll default to the old name.

Signed-off-by: default avatarEnrico Weigelt, metux IT consult <info@metux.net>
Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent 17b92927

drivers/input/keyboard/gpio_keys_polled.c

+3 −1
Original line number Diff line number Diff line
@@ -168,6 +168,8 @@ gpio_keys_polled_get_devtree_pdata(struct device *dev) 
	pdata->rep = device_property_present(dev, "autorepeat");

	device_property_read_u32(dev, "poll-interval", &pdata->poll_interval);



	device_property_read_string(dev, "label", &pdata->name);



	device_for_each_child_node(dev, child) {

		if (fwnode_property_read_u32(child, "linux,code",

					     &button->code)) {
@@ -270,7 +272,7 @@ static int gpio_keys_polled_probe(struct platform_device *pdev) 


	input = poll_dev->input;



	input->name = pdev->name;

	input->name = pdata->name ?: pdev->name;

	input->phys = DRV_NAME"/input0";



	input->id.bustype = BUS_HOST;