Commit a445c7f0 authored by Olof Johansson's avatar Olof Johansson Committed by Dmitry Torokhov

Input: tegra-kbc - add device tree bindings

This adds a simple device tree binding to the tegra keyboard controller.

Also, mark the default keymap as __devinitdata since it is not referenced
after boot.
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
Signed-off-by: default avatarDmitry Torokhov <dtor@mail.ru>
parent 5245db49
* Tegra keyboard controller
Required properties:
- compatible: "nvidia,tegra20-kbc"
Optional properties:
- debounce-delay: delay in milliseconds per row scan for debouncing
- repeat-delay: delay in milliseconds before repeat starts
- ghost-filter: enable ghost filtering for this device
- wakeup-source: configure keyboard as a wakeup source for suspend/resume
Example:
keyboard: keyboard {
compatible = "nvidia,tegra20-kbc";
reg = <0x7000e200 0x100>;
ghost-filter;
};
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/of.h>
#include <linux/clk.h> #include <linux/clk.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <mach/clk.h> #include <mach/clk.h>
...@@ -82,7 +83,7 @@ struct tegra_kbc { ...@@ -82,7 +83,7 @@ struct tegra_kbc {
struct clk *clk; struct clk *clk;
}; };
static const u32 tegra_kbc_default_keymap[] = { static const u32 tegra_kbc_default_keymap[] __devinitdata = {
KEY(0, 2, KEY_W), KEY(0, 2, KEY_W),
KEY(0, 3, KEY_S), KEY(0, 3, KEY_S),
KEY(0, 4, KEY_A), KEY(0, 4, KEY_A),
...@@ -217,7 +218,8 @@ static const u32 tegra_kbc_default_keymap[] = { ...@@ -217,7 +218,8 @@ static const u32 tegra_kbc_default_keymap[] = {
KEY(31, 4, KEY_HELP), KEY(31, 4, KEY_HELP),
}; };
static const struct matrix_keymap_data tegra_kbc_default_keymap_data = { static const
struct matrix_keymap_data tegra_kbc_default_keymap_data __devinitdata = {
.keymap = tegra_kbc_default_keymap, .keymap = tegra_kbc_default_keymap,
.keymap_size = ARRAY_SIZE(tegra_kbc_default_keymap), .keymap_size = ARRAY_SIZE(tegra_kbc_default_keymap),
}; };
...@@ -576,6 +578,56 @@ tegra_kbc_check_pin_cfg(const struct tegra_kbc_platform_data *pdata, ...@@ -576,6 +578,56 @@ tegra_kbc_check_pin_cfg(const struct tegra_kbc_platform_data *pdata,
return true; return true;
} }
#ifdef CONFIG_OF
static struct tegra_kbc_platform_data * __devinit
tegra_kbc_dt_parse_pdata(struct platform_device *pdev)
{
struct tegra_kbc_platform_data *pdata;
struct device_node *np = pdev->dev.of_node;
if (!np)
return NULL;
pdata = kzalloc(sizeof(*pdata), GFP_KERNEL);
if (!pdata)
return NULL;
if (!of_property_read_u32(np, "debounce-delay", &prop))
pdata->debounce_cnt = prop;
if (!of_property_read_u32(np, "repeat-delay", &prop))
pdata->repeat_cnt = prop;
if (of_find_property(np, "needs-ghost-filter", NULL))
pdata->use_ghost_filter = true;
if (of_find_property(np, "wakeup-source", NULL))
pdata->wakeup = true;
/*
* All currently known keymaps with device tree support use the same
* pin_cfg, so set it up here.
*/
for (i = 0; i < KBC_MAX_ROW; i++) {
pdata->pin_cfg[i].num = i;
pdata->pin_cfg[i].is_row = true;
}
for (i = 0; i < KBC_MAX_COL; i++) {
pdata->pin_cfg[KBC_MAX_ROW + i].num = i;
pdata->pin_cfg[KBC_MAX_ROW + i].is_row = false;
}
return pdata;
}
#else
static inline struct tegra_kbc_platform_data *tegra_kbc_dt_parse_pdata(
struct platform_device *pdev)
{
return NULL;
}
#endif
static int __devinit tegra_kbc_probe(struct platform_device *pdev) static int __devinit tegra_kbc_probe(struct platform_device *pdev)
{ {
const struct tegra_kbc_platform_data *pdata = pdev->dev.platform_data; const struct tegra_kbc_platform_data *pdata = pdev->dev.platform_data;
...@@ -590,21 +642,28 @@ static int __devinit tegra_kbc_probe(struct platform_device *pdev) ...@@ -590,21 +642,28 @@ static int __devinit tegra_kbc_probe(struct platform_device *pdev)
unsigned int scan_time_rows; unsigned int scan_time_rows;
if (!pdata) if (!pdata)
return -EINVAL; pdata = tegra_kbc_dt_parse_pdata(pdev);
if (!tegra_kbc_check_pin_cfg(pdata, &pdev->dev, &num_rows)) if (!pdata)
return -EINVAL; return -EINVAL;
if (!tegra_kbc_check_pin_cfg(pdata, &pdev->dev, &num_rows)) {
err = -EINVAL;
goto err_free_pdata;
}
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
if (!res) { if (!res) {
dev_err(&pdev->dev, "failed to get I/O memory\n"); dev_err(&pdev->dev, "failed to get I/O memory\n");
return -ENXIO; err = -ENXIO;
goto err_free_pdata;
} }
irq = platform_get_irq(pdev, 0); irq = platform_get_irq(pdev, 0);
if (irq < 0) { if (irq < 0) {
dev_err(&pdev->dev, "failed to get keyboard IRQ\n"); dev_err(&pdev->dev, "failed to get keyboard IRQ\n");
return -ENXIO; err = -ENXIO;
goto err_free_pdata;
} }
kbc = kzalloc(sizeof(*kbc), GFP_KERNEL); kbc = kzalloc(sizeof(*kbc), GFP_KERNEL);
...@@ -706,6 +765,9 @@ static int __devinit tegra_kbc_probe(struct platform_device *pdev) ...@@ -706,6 +765,9 @@ static int __devinit tegra_kbc_probe(struct platform_device *pdev)
err_free_mem: err_free_mem:
input_free_device(input_dev); input_free_device(input_dev);
kfree(kbc); kfree(kbc);
err_free_pdata:
if (!pdev->dev.platform_data)
kfree(pdata);
return err; return err;
} }
...@@ -715,6 +777,8 @@ static int __devexit tegra_kbc_remove(struct platform_device *pdev) ...@@ -715,6 +777,8 @@ static int __devexit tegra_kbc_remove(struct platform_device *pdev)
struct tegra_kbc *kbc = platform_get_drvdata(pdev); struct tegra_kbc *kbc = platform_get_drvdata(pdev);
struct resource *res; struct resource *res;
platform_set_drvdata(pdev, NULL);
free_irq(kbc->irq, pdev); free_irq(kbc->irq, pdev);
clk_put(kbc->clk); clk_put(kbc->clk);
...@@ -723,9 +787,14 @@ static int __devexit tegra_kbc_remove(struct platform_device *pdev) ...@@ -723,9 +787,14 @@ static int __devexit tegra_kbc_remove(struct platform_device *pdev)
res = platform_get_resource(pdev, IORESOURCE_MEM, 0); res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
release_mem_region(res->start, resource_size(res)); release_mem_region(res->start, resource_size(res));
kfree(kbc); /*
* If we do not have platform data attached to the device we
* allocated it ourselves and thus need to free it.
*/
if (!pdev->dev.platform_data)
kfree(kbc->pdata);
platform_set_drvdata(pdev, NULL); kfree(kbc);
return 0; return 0;
} }
...@@ -793,6 +862,12 @@ static int tegra_kbc_resume(struct device *dev) ...@@ -793,6 +862,12 @@ static int tegra_kbc_resume(struct device *dev)
static SIMPLE_DEV_PM_OPS(tegra_kbc_pm_ops, tegra_kbc_suspend, tegra_kbc_resume); static SIMPLE_DEV_PM_OPS(tegra_kbc_pm_ops, tegra_kbc_suspend, tegra_kbc_resume);
static const struct of_device_id tegra_kbc_of_match[] = {
{ .compatible = "nvidia,tegra20-kbc", },
{ },
};
MODULE_DEVICE_TABLE(of, tegra_kbc_of_match);
static struct platform_driver tegra_kbc_driver = { static struct platform_driver tegra_kbc_driver = {
.probe = tegra_kbc_probe, .probe = tegra_kbc_probe,
.remove = __devexit_p(tegra_kbc_remove), .remove = __devexit_p(tegra_kbc_remove),
...@@ -800,6 +875,7 @@ static struct platform_driver tegra_kbc_driver = { ...@@ -800,6 +875,7 @@ static struct platform_driver tegra_kbc_driver = {
.name = "tegra-kbc", .name = "tegra-kbc",
.owner = THIS_MODULE, .owner = THIS_MODULE,
.pm = &tegra_kbc_pm_ops, .pm = &tegra_kbc_pm_ops,
.of_match_table = tegra_kbc_of_match,
}, },
}; };
module_platform_driver(tegra_kbc_driver); module_platform_driver(tegra_kbc_driver);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment