[PATCH v3 4/8] platform: goldfish: pipe: add devicetree bindings

[PATCH v3 4/8] platform: goldfish: pipe: add devicetree bindings

[Jin Qian]

From: Greg Hackmann <ghackmann@google.com>

Add bindings so we don't need to rely on goldfish virtual bus for
probing any more, which means we don't need ARM and MIPS goldfish
board code for instantiating the bus.

In the long term we would like to move towards replacing the Android
pipe with virtio-vsock that is currently under development.

Signed-off-by: Greg Hackmann <ghackmann@google.com>
Signed-off-by: Jin Qian <jinqian@android.com>
---
 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..e417a31
--- /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 "google,android-pipe" to match emulator
+- reg        : <registers mapping>
+- interrupts : <interrupt mapping>
+
+Example:
+
+	android_pipe@a010000 {
+		compatible = "google,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..0b187ff 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 = "google,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,
+		.of_match_table = goldfish_pipe_of_match,
 	}
 };
 
-- 
2.6.0.rc2.230.g3dd15c0

Re: [PATCH v3 4/8] platform: goldfish: pipe: add devicetree bindings

[Rob Herring]

On Wed, Dec 02, 2015 at 11:35:59AM -0800, Jin Qian wrote:
> From: Greg Hackmann <ghackmann@google.com>
> 
> Add bindings so we don't need to rely on goldfish virtual bus for
> probing any more, which means we don't need ARM and MIPS goldfish
> board code for instantiating the bus.
> 
> In the long term we would like to move towards replacing the Android
> pipe with virtio-vsock that is currently under development.
> 
> Signed-off-by: Greg Hackmann <ghackmann@google.com>
> Signed-off-by: Jin Qian <jinqian@android.com>

Acked-by: Rob Herring <robh@kernel.org>

> ---
>  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..e417a31
> --- /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 "google,android-pipe" to match emulator
> +- reg        : <registers mapping>
> +- interrupts : <interrupt mapping>
> +
> +Example:
> +
> +	android_pipe@a010000 {
> +		compatible = "google,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..0b187ff 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 = "google,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,
> +		.of_match_table = goldfish_pipe_of_match,
>  	}
>  };
>  
> -- 
> 2.6.0.rc2.230.g3dd15c0
>