diff mbox series

[v3] Input: imx_keypad - convert to a DT-only driver

Message ID 20210327194307.541248-1-festevam@gmail.com (mailing list archive)
State Accepted
Commit 73e7f1732e800a88cafab31d75548c6fcfdd8c47
Headers show
Series [v3] Input: imx_keypad - convert to a DT-only driver | expand

Commit Message

Fabio Estevam March 27, 2021, 7:43 p.m. UTC 
i.MX has been converted to a DT-only platform, so make the
adjustments to the driver to convert it to a DT-only driver.

Signed-off-by: Fabio Estevam <festevam@gmail.com>
---
Changes since v2:
- Remove the OF dependency in Kconfig. (Dmitry)

 drivers/input/keyboard/imx_keypad.c | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

Comments

Dmitry Torokhov March 28, 2021, 4:41 a.m. UTC | #1 
On Sat, Mar 27, 2021 at 04:43:07PM -0300, Fabio Estevam wrote:
> i.MX has been converted to a DT-only platform, so make the
> adjustments to the driver to convert it to a DT-only driver.
> 
> Signed-off-by: Fabio Estevam <festevam@gmail.com>

Applied, thank you.
diff mbox series

Patch

diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c
index 1f5c9ea5e9e5..ae9303848571 100644
--- a/drivers/input/keyboard/imx_keypad.c
+++ b/drivers/input/keyboard/imx_keypad.c
@@ -408,27 +408,18 @@  static int imx_keypad_open(struct input_dev *dev)
 	return -EIO;
 }
 
-#ifdef CONFIG_OF
 static const struct of_device_id imx_keypad_of_match[] = {
 	{ .compatible = "fsl,imx21-kpp", },
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, imx_keypad_of_match);
-#endif
 
 static int imx_keypad_probe(struct platform_device *pdev)
 {
-	const struct matrix_keymap_data *keymap_data =
-			dev_get_platdata(&pdev->dev);
 	struct imx_keypad *keypad;
 	struct input_dev *input_dev;
 	int irq, error, i, row, col;
 
-	if (!keymap_data && !pdev->dev.of_node) {
-		dev_err(&pdev->dev, "no keymap defined\n");
-		return -EINVAL;
-	}
-
 	irq = platform_get_irq(pdev, 0);
 	if (irq < 0)
 		return irq;
@@ -469,7 +460,7 @@  static int imx_keypad_probe(struct platform_device *pdev)
 	input_dev->open = imx_keypad_open;
 	input_dev->close = imx_keypad_close;
 
-	error = matrix_keypad_build_keymap(keymap_data, NULL,
+	error = matrix_keypad_build_keymap(NULL, NULL,
 					   MAX_MATRIX_KEY_ROWS,
 					   MAX_MATRIX_KEY_COLS,
 					   keypad->keycodes, input_dev);
@@ -582,7 +573,7 @@  static struct platform_driver imx_keypad_driver = {
 	.driver		= {
 		.name	= "imx-keypad",
 		.pm	= &imx_kbd_pm_ops,
-		.of_match_table = of_match_ptr(imx_keypad_of_match),
+		.of_match_table = imx_keypad_of_match,
 	},
 	.probe		= imx_keypad_probe,
 };