* [PATCH v3 1/2] ARM: shmobile: r8a7790: add USB-DMAC device nodes
2015-05-08 7:13 [PATCH v3 0/2] ARM: shmobile: r8a7790: add for USB-DMAC Yoshihiro Shimoda
@ 2015-05-08 7:13 ` Yoshihiro Shimoda
2015-05-08 7:13 ` [PATCH v3 2/2] ARM: shmobile: r8a7790: Enable DMA for HSUSB Yoshihiro Shimoda
2015-05-11 23:56 ` [PATCH v3 0/2] ARM: shmobile: r8a7790: add for USB-DMAC Simon Horman
2 siblings, 0 replies; 4+ messages in thread
From: Yoshihiro Shimoda @ 2015-05-08 7:13 UTC (permalink / raw)
To: horms, magnus.damm, robh+dt, pawel.moll, mark.rutland,
ijc+devicetree, galak, linux
Cc: devicetree, linux-arm-kernel, linux-sh, Yoshihiro Shimoda
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Acked-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
arch/arm/boot/dts/r8a7790.dtsi | 22 ++++++++++++++++++++++
1 file changed, 22 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index c9055e3..c03a915 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -371,6 +371,28 @@
dma-channels = <13>;
};
+ usb_dmac0: dma-controller@e65a0000 {
+ compatible = "renesas,usb-dmac";
+ reg = <0 0xe65a0000 0 0x100>;
+ interrupts = <0 109 IRQ_TYPE_LEVEL_HIGH
+ 0 109 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "ch0", "ch1";
+ clocks = <&mstp3_clks R8A7790_CLK_USBDMAC0>;
+ #dma-cells = <1>;
+ dma-channels = <2>;
+ };
+
+ usb_dmac1: dma-controller@e65b0000 {
+ compatible = "renesas,usb-dmac";
+ reg = <0 0xe65b0000 0 0x100>;
+ interrupts = <0 110 IRQ_TYPE_LEVEL_HIGH
+ 0 110 IRQ_TYPE_LEVEL_HIGH>;
+ interrupt-names = "ch0", "ch1";
+ clocks = <&mstp3_clks R8A7790_CLK_USBDMAC1>;
+ #dma-cells = <1>;
+ dma-channels = <2>;
+ };
+
i2c0: i2c@e6508000 {
#address-cells = <1>;
#size-cells = <0>;
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v3 2/2] ARM: shmobile: r8a7790: Enable DMA for HSUSB
2015-05-08 7:13 [PATCH v3 0/2] ARM: shmobile: r8a7790: add for USB-DMAC Yoshihiro Shimoda
2015-05-08 7:13 ` [PATCH v3 1/2] ARM: shmobile: r8a7790: add USB-DMAC device nodes Yoshihiro Shimoda
@ 2015-05-08 7:13 ` Yoshihiro Shimoda
2015-05-11 23:56 ` [PATCH v3 0/2] ARM: shmobile: r8a7790: add for USB-DMAC Simon Horman
2 siblings, 0 replies; 4+ messages in thread
From: Yoshihiro Shimoda @ 2015-05-08 7:13 UTC (permalink / raw)
To: horms, magnus.damm, robh+dt, pawel.moll, mark.rutland,
ijc+devicetree, galak, linux
Cc: devicetree, linux-arm-kernel, linux-sh, Yoshihiro Shimoda
This patch adds DMA properties to the HSUSB node.
Signed-off-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
---
arch/arm/boot/dts/r8a7790.dtsi | 3 +++
1 file changed, 3 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index c03a915..62a9086 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -673,6 +673,9 @@
renesas,buswait = <4>;
phys = <&usb0 1>;
phy-names = "usb";
+ dmas = <&usb_dmac0 0>, <&usb_dmac0 1>,
+ <&usb_dmac1 0>, <&usb_dmac1 1>;
+ dma-names = "ch0", "ch1", "ch2", "ch3";
status = "disabled";
};
--
1.9.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v3 0/2] ARM: shmobile: r8a7790: add for USB-DMAC
2015-05-08 7:13 [PATCH v3 0/2] ARM: shmobile: r8a7790: add for USB-DMAC Yoshihiro Shimoda
2015-05-08 7:13 ` [PATCH v3 1/2] ARM: shmobile: r8a7790: add USB-DMAC device nodes Yoshihiro Shimoda
2015-05-08 7:13 ` [PATCH v3 2/2] ARM: shmobile: r8a7790: Enable DMA for HSUSB Yoshihiro Shimoda
@ 2015-05-11 23:56 ` Simon Horman
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2015-05-11 23:56 UTC (permalink / raw)
To: Yoshihiro Shimoda
Cc: magnus.damm, robh+dt, pawel.moll, mark.rutland, ijc+devicetree,
galak, linux, devicetree, linux-arm-kernel, linux-sh
On Fri, May 08, 2015 at 04:13:05PM +0900, Yoshihiro Shimoda wrote:
> This patch set is based on renesas.git / renesas-devel-20150507-v4.1-rc1
> tag. (commit id = c3059b3fff4ed6568783fdabdee1d62a55aa469c)
>
> This patch set is related to the usb-dmac driver and renesas_usbhs driver.
> Almost all patches for the drivers have been merged in Linus tree.
> And a fixed patch for renesas_usbhs driver have beed merged in the subsystem:
>
> [ linux repository ]
> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/dma/sh/usb-dmac.c?id=0c1c8ff32fa29e425b4938934c21afdb81104431
> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/dma/sh/usb-dmac.c?id=d7d8e892aa6fe280a2e2974d9fd1ec9253ee1a05
> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/usb/renesas_usbhs?id=7a96b78464bd8ba72c1c3095c543c1402db59e35
> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/usb/renesas_usbhs?id=9b53d9af7aac09cf249d72bfbf15f08e47c4f7fe
> https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/drivers/usb/renesas_usbhs?id=ab330cf3888d8e0779fa05a243d53ba9f53a7ba9
>
> [ usb repository ]
> https://git.kernel.org/cgit/linux/kernel/git/balbi/usb.git/commit/?h=testing/next&id=5a294e5469891d0701183049c4a9678887fa7091
Thanks, I have queued these up for v4.2.
^ permalink raw reply [flat|nested] 4+ messages in thread