diff options
author | Miodrag Dinic <miodrag.dinic@imgtec.com> | 2016-02-26 14:00:44 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-07 19:11:14 -0500 |
commit | 9b883eea26ccf043b608e398cf6a26231d44f5fb (patch) | |
tree | cc966458f88e68fa646124e4c75b3a7fe02ac05d | |
parent | 106020ccee79c7fcf3875c47000525d957c9bcf1 (diff) |
drivers: tty: goldfish: Add device tree bindings
Enable support for registering this device using the device tree.
Device tree node example for registering Goldfish TTY device :
goldfish_tty@1f004000 {
interrupts = <0xc>;
reg = <0x1f004000 0x1000>;
compatible = "google,goldfish-tty";
};
Signed-off-by: Miodrag Dinic <miodrag.dinic@imgtec.com>
Signed-off-by: Jin Qian <jinqian@android.com>
Signed-off-by: Alan <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | Documentation/devicetree/bindings/goldfish/tty.txt | 17 | ||||
-rw-r--r-- | drivers/tty/goldfish.c | 10 |
2 files changed, 26 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/goldfish/tty.txt b/Documentation/devicetree/bindings/goldfish/tty.txt new file mode 100644 index 000000000000..82648278da77 --- /dev/null +++ b/Documentation/devicetree/bindings/goldfish/tty.txt | |||
@@ -0,0 +1,17 @@ | |||
1 | Android Goldfish TTY | ||
2 | |||
3 | Android goldfish tty device generated by android emulator. | ||
4 | |||
5 | Required properties: | ||
6 | |||
7 | - compatible : should contain "google,goldfish-tty" to match emulator | ||
8 | - reg : <registers mapping> | ||
9 | - interrupts : <interrupt mapping> | ||
10 | |||
11 | Example: | ||
12 | |||
13 | goldfish_tty@1f004000 { | ||
14 | compatible = "google,goldfish-tty"; | ||
15 | reg = <0x1f004000 0x1000>; | ||
16 | interrupts = <0xc>; | ||
17 | }; | ||
diff --git a/drivers/tty/goldfish.c b/drivers/tty/goldfish.c index 752232c77503..1b3142cdb27d 100644 --- a/drivers/tty/goldfish.c +++ b/drivers/tty/goldfish.c | |||
@@ -324,11 +324,19 @@ static int goldfish_tty_remove(struct platform_device *pdev) | |||
324 | return 0; | 324 | return 0; |
325 | } | 325 | } |
326 | 326 | ||
327 | static const struct of_device_id goldfish_tty_of_match[] = { | ||
328 | { .compatible = "google,goldfish-tty", }, | ||
329 | {}, | ||
330 | }; | ||
331 | |||
332 | MODULE_DEVICE_TABLE(of, goldfish_tty_of_match); | ||
333 | |||
327 | static struct platform_driver goldfish_tty_platform_driver = { | 334 | static struct platform_driver goldfish_tty_platform_driver = { |
328 | .probe = goldfish_tty_probe, | 335 | .probe = goldfish_tty_probe, |
329 | .remove = goldfish_tty_remove, | 336 | .remove = goldfish_tty_remove, |
330 | .driver = { | 337 | .driver = { |
331 | .name = "goldfish_tty" | 338 | .name = "goldfish_tty", |
339 | .of_match_table = goldfish_tty_of_match, | ||
332 | } | 340 | } |
333 | }; | 341 | }; |
334 | 342 | ||