On Wed, Nov 25, 2015 at 11:59:37AM -0800, Jin Qian wrote:
> From: Greg Hackmann <ghackmann@xxxxxxxxxx>
Please summarize the discussion here. Like why we should merge this.
> Signed-off-by: Greg Hackmann <ghackmann@xxxxxxxxxx>
> (cherry picked from commit 3c56d07eb796066530e93a40e74dea3bc59bf4cf)
This line should be removed.
> Signed-off-by: Jin Qian <jinqian@xxxxxxxxxxx>
> ---
> Documentation/devicetree/bindings/goldfish/pipe.txt | 17 +++++++++++++++++
> drivers/platform/goldfish/goldfish_pipe.c | 10 +++++++++-
> 2 files changed, 26 insertions(+), 1 deletion(-)
> create mode 100644 Documentation/devicetree/bindings/goldfish/pipe.txt
>
> diff --git a/Documentation/devicetree/bindings/goldfish/pipe.txt b/Documentation/devicetree/bindings/goldfish/pipe.txt
> new file mode 100644
> index 0000000..6d3801e
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/goldfish/pipe.txt
> @@ -0,0 +1,17 @@
> +Android Goldfish QEMU Pipe
> +
> +Andorid pipe virtual device generated by android emulator.
> +
> +Required properties:
> +
> +- compatible : should contain "generic,android-pipe" to match emulator
generic is not a vendor prefix. How about linux,android-pipe or
google,android-pipe.
> +- reg : <registers mapping>
> +- interrupts : <interrupt mapping>
> +
> +Example:
> +
> + android_pipe@a010000 {
> + compatible = "generic,android-pipe";
> + reg = <ff018000 0x2000>;
> + interrupts = <0x12>;
> + };
> diff --git a/drivers/platform/goldfish/goldfish_pipe.c b/drivers/platform/goldfish/goldfish_pipe.c
> index 20a9337..86cc57f 100644
> --- a/drivers/platform/goldfish/goldfish_pipe.c
> +++ b/drivers/platform/goldfish/goldfish_pipe.c
> @@ -624,11 +624,19 @@ static int goldfish_pipe_remove(struct platform_device *pdev)
> return 0;
> }
>
> +static const struct of_device_id goldfish_pipe_of_match[] = {
> + { .compatible = "generic,android-pipe", },
> + {},
> +};
> +MODULE_DEVICE_TABLE(of, goldfish_pipe_of_match);
> +
> static struct platform_driver goldfish_pipe = {
> .probe = goldfish_pipe_probe,
> .remove = goldfish_pipe_remove,
> .driver = {
> - .name = "goldfish_pipe"
> + .name = "goldfish_pipe",
> + .owner = THIS_MODULE,
You don't need to set owner.
> + .of_match_table = goldfish_pipe_of_match,
> }
> };
>
> --
> 2.6.0.rc2.230.g3dd15c0
>
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
