* [PATCH 2/3] arm: shmobile: r8a7790: Add PCI USB host clock support
@ 2013-12-20 14:13 Valentine Barshak
2014-01-08 4:22 ` Simon Horman
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Valentine Barshak @ 2013-12-20 14:13 UTC (permalink / raw)
To: linux-sh
This adds internal PCI USB host clock support.
Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
---
arch/arm/mach-shmobile/clock-r8a7790.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index c5c60ec..3e27200 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -190,7 +190,7 @@ enum {
MSTP813,
MSTP726, MSTP725, MSTP724, MSTP723, MSTP722, MSTP721, MSTP720,
MSTP717, MSTP716,
- MSTP704,
+ MSTP704, MSTP703,
MSTP522,
MSTP315, MSTP314, MSTP313, MSTP312, MSTP311, MSTP305, MSTP304,
MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202,
@@ -226,6 +226,7 @@ static struct clk mstp_clks[MSTP_NR] = {
[MSTP717] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 17, 0), /* HSCIF0 */
[MSTP716] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 16, 0), /* HSCIF1 */
[MSTP704] = SH_CLK_MSTP32(&mp_clk, SMSTPCR7, 4, 0), /* HSUSB */
+ [MSTP703] = SH_CLK_MSTP32(&mp_clk, SMSTPCR7, 3, 0), /* EHCI */
[MSTP522] = SH_CLK_MSTP32(&extal_clk, SMSTPCR5, 22, 0), /* Thermal */
[MSTP315] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC0], SMSTPCR3, 15, 0), /* MMC0 */
[MSTP314] = SH_CLK_MSTP32(&div4_clks[DIV4_SD0], SMSTPCR3, 14, 0), /* SDHI0 */
@@ -317,6 +318,9 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("sh_cmt.0", &mstp_clks[MSTP124]),
CLKDEV_DEV_ID("qspi.0", &mstp_clks[MSTP917]),
CLKDEV_DEV_ID("renesas_usbhs", &mstp_clks[MSTP704]),
+ CLKDEV_DEV_ID("pci-rcar-gen2.0", &mstp_clks[MSTP703]),
+ CLKDEV_DEV_ID("pci-rcar-gen2.1", &mstp_clks[MSTP703]),
+ CLKDEV_DEV_ID("pci-rcar-gen2.2", &mstp_clks[MSTP703]),
/* ICK */
CLKDEV_ICK_ID("usbhs", "usb_phy_rcar_gen2", &mstp_clks[MSTP704]),
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/3] arm: shmobile: r8a7790: Add PCI USB host clock support
2013-12-20 14:13 [PATCH 2/3] arm: shmobile: r8a7790: Add PCI USB host clock support Valentine Barshak
@ 2014-01-08 4:22 ` Simon Horman
2014-01-08 16:31 ` [PATCH 2/3] ARM: " Valentine Barshak
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2014-01-08 4:22 UTC (permalink / raw)
To: linux-sh
On Fri, Dec 20, 2013 at 06:13:23PM +0400, Valentine Barshak wrote:
> This adds internal PCI USB host clock support.
>
> Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
> ---
> arch/arm/mach-shmobile/clock-r8a7790.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
> index c5c60ec..3e27200 100644
> --- a/arch/arm/mach-shmobile/clock-r8a7790.c
> +++ b/arch/arm/mach-shmobile/clock-r8a7790.c
> @@ -190,7 +190,7 @@ enum {
> MSTP813,
> MSTP726, MSTP725, MSTP724, MSTP723, MSTP722, MSTP721, MSTP720,
> MSTP717, MSTP716,
> - MSTP704,
> + MSTP704, MSTP703,
> MSTP522,
> MSTP315, MSTP314, MSTP313, MSTP312, MSTP311, MSTP305, MSTP304,
> MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202,
> @@ -226,6 +226,7 @@ static struct clk mstp_clks[MSTP_NR] = {
> [MSTP717] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 17, 0), /* HSCIF0 */
> [MSTP716] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 16, 0), /* HSCIF1 */
> [MSTP704] = SH_CLK_MSTP32(&mp_clk, SMSTPCR7, 4, 0), /* HSUSB */
> + [MSTP703] = SH_CLK_MSTP32(&mp_clk, SMSTPCR7, 3, 0), /* EHCI */
> [MSTP522] = SH_CLK_MSTP32(&extal_clk, SMSTPCR5, 22, 0), /* Thermal */
> [MSTP315] = SH_CLK_MSTP32(&div6_clks[DIV6_MMC0], SMSTPCR3, 15, 0), /* MMC0 */
> [MSTP314] = SH_CLK_MSTP32(&div4_clks[DIV4_SD0], SMSTPCR3, 14, 0), /* SDHI0 */
> @@ -317,6 +318,9 @@ static struct clk_lookup lookups[] = {
> CLKDEV_DEV_ID("sh_cmt.0", &mstp_clks[MSTP124]),
> CLKDEV_DEV_ID("qspi.0", &mstp_clks[MSTP917]),
> CLKDEV_DEV_ID("renesas_usbhs", &mstp_clks[MSTP704]),
> + CLKDEV_DEV_ID("pci-rcar-gen2.0", &mstp_clks[MSTP703]),
> + CLKDEV_DEV_ID("pci-rcar-gen2.1", &mstp_clks[MSTP703]),
> + CLKDEV_DEV_ID("pci-rcar-gen2.2", &mstp_clks[MSTP703]),
>
> /* ICK */
> CLKDEV_ICK_ID("usbhs", "usb_phy_rcar_gen2", &mstp_clks[MSTP704]),
Unfortunately this patch conflicts with "ARM: shmobile: r8a7790: Wait for
status on all MSTP clocks" which I have queued up as a fix for v3.14.
As this patch will be submitted for inclusion on v3.15 it will be in a
branch based on v3.14-rc1 which I expect to include (""ARM: shmobile:
r8a7790: Wait for status on all MSTP clocks").
Could you please rebase it on top of the latest devel tag of the renesas
tree, currently renesas-devel-v3.13-rc7-20140108.
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/3] ARM: shmobile: r8a7790: Add PCI USB host clock support
2013-12-20 14:13 [PATCH 2/3] arm: shmobile: r8a7790: Add PCI USB host clock support Valentine Barshak
2014-01-08 4:22 ` Simon Horman
@ 2014-01-08 16:31 ` Valentine Barshak
2014-01-09 8:17 ` Simon Horman
2014-06-10 2:33 ` [PATCH 2/3] ARM: shmobile: r8a7790: add R-Car sound support on DTSI Kuninori Morimoto
3 siblings, 0 replies; 5+ messages in thread
From: Valentine Barshak @ 2014-01-08 16:31 UTC (permalink / raw)
To: linux-sh
This adds internal PCI USB host clock support.
Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
---
arch/arm/mach-shmobile/clock-r8a7790.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index 31c5ffa..d1b1b8f 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -200,7 +200,7 @@ enum {
MSTP811, MSTP810, MSTP809, MSTP808,
MSTP726, MSTP725, MSTP724, MSTP723, MSTP722, MSTP721, MSTP720,
MSTP717, MSTP716,
- MSTP704,
+ MSTP704, MSTP703,
MSTP522,
MSTP315, MSTP314, MSTP313, MSTP312, MSTP311, MSTP305, MSTP304,
MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202,
@@ -240,6 +240,7 @@ static struct clk mstp_clks[MSTP_NR] = {
[MSTP717] = SH_CLK_MSTP32_STS(&zs_clk, SMSTPCR7, 17, MSTPSR7, 0), /* HSCIF0 */
[MSTP716] = SH_CLK_MSTP32_STS(&zs_clk, SMSTPCR7, 16, MSTPSR7, 0), /* HSCIF1 */
[MSTP704] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR7, 4, MSTPSR7, 0), /* HSUSB */
+ [MSTP703] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR7, 3, MSTPSR7, 0), /* EHCI */
[MSTP522] = SH_CLK_MSTP32_STS(&extal_clk, SMSTPCR5, 22, MSTPSR5, 0), /* Thermal */
[MSTP315] = SH_CLK_MSTP32_STS(&div6_clks[DIV6_MMC0], SMSTPCR3, 15, MSTPSR3, 0), /* MMC0 */
[MSTP314] = SH_CLK_MSTP32_STS(&div4_clks[DIV4_SD0], SMSTPCR3, 14, MSTPSR3, 0), /* SDHI0 */
@@ -335,6 +336,9 @@ static struct clk_lookup lookups[] = {
CLKDEV_DEV_ID("sh_cmt.0", &mstp_clks[MSTP124]),
CLKDEV_DEV_ID("qspi.0", &mstp_clks[MSTP917]),
CLKDEV_DEV_ID("renesas_usbhs", &mstp_clks[MSTP704]),
+ CLKDEV_DEV_ID("pci-rcar-gen2.0", &mstp_clks[MSTP703]),
+ CLKDEV_DEV_ID("pci-rcar-gen2.1", &mstp_clks[MSTP703]),
+ CLKDEV_DEV_ID("pci-rcar-gen2.2", &mstp_clks[MSTP703]),
/* ICK */
CLKDEV_ICK_ID("usbhs", "usb_phy_rcar_gen2", &mstp_clks[MSTP704]),
--
1.8.3.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/3] ARM: shmobile: r8a7790: Add PCI USB host clock support
2013-12-20 14:13 [PATCH 2/3] arm: shmobile: r8a7790: Add PCI USB host clock support Valentine Barshak
2014-01-08 4:22 ` Simon Horman
2014-01-08 16:31 ` [PATCH 2/3] ARM: " Valentine Barshak
@ 2014-01-09 8:17 ` Simon Horman
2014-06-10 2:33 ` [PATCH 2/3] ARM: shmobile: r8a7790: add R-Car sound support on DTSI Kuninori Morimoto
3 siblings, 0 replies; 5+ messages in thread
From: Simon Horman @ 2014-01-09 8:17 UTC (permalink / raw)
To: linux-sh
On Wed, Jan 08, 2014 at 08:31:24PM +0400, Valentine Barshak wrote:
> This adds internal PCI USB host clock support.
>
> Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
> ---
> arch/arm/mach-shmobile/clock-r8a7790.c | 6 +++++-
> 1 file changed, 5 insertions(+), 1 deletion(-)
I am holding off on this patch until reviewed the rest of
the USB patches is complete.
>
> diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
> index 31c5ffa..d1b1b8f 100644
> --- a/arch/arm/mach-shmobile/clock-r8a7790.c
> +++ b/arch/arm/mach-shmobile/clock-r8a7790.c
> @@ -200,7 +200,7 @@ enum {
> MSTP811, MSTP810, MSTP809, MSTP808,
> MSTP726, MSTP725, MSTP724, MSTP723, MSTP722, MSTP721, MSTP720,
> MSTP717, MSTP716,
> - MSTP704,
> + MSTP704, MSTP703,
> MSTP522,
> MSTP315, MSTP314, MSTP313, MSTP312, MSTP311, MSTP305, MSTP304,
> MSTP216, MSTP207, MSTP206, MSTP204, MSTP203, MSTP202,
> @@ -240,6 +240,7 @@ static struct clk mstp_clks[MSTP_NR] = {
> [MSTP717] = SH_CLK_MSTP32_STS(&zs_clk, SMSTPCR7, 17, MSTPSR7, 0), /* HSCIF0 */
> [MSTP716] = SH_CLK_MSTP32_STS(&zs_clk, SMSTPCR7, 16, MSTPSR7, 0), /* HSCIF1 */
> [MSTP704] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR7, 4, MSTPSR7, 0), /* HSUSB */
> + [MSTP703] = SH_CLK_MSTP32_STS(&mp_clk, SMSTPCR7, 3, MSTPSR7, 0), /* EHCI */
> [MSTP522] = SH_CLK_MSTP32_STS(&extal_clk, SMSTPCR5, 22, MSTPSR5, 0), /* Thermal */
> [MSTP315] = SH_CLK_MSTP32_STS(&div6_clks[DIV6_MMC0], SMSTPCR3, 15, MSTPSR3, 0), /* MMC0 */
> [MSTP314] = SH_CLK_MSTP32_STS(&div4_clks[DIV4_SD0], SMSTPCR3, 14, MSTPSR3, 0), /* SDHI0 */
> @@ -335,6 +336,9 @@ static struct clk_lookup lookups[] = {
> CLKDEV_DEV_ID("sh_cmt.0", &mstp_clks[MSTP124]),
> CLKDEV_DEV_ID("qspi.0", &mstp_clks[MSTP917]),
> CLKDEV_DEV_ID("renesas_usbhs", &mstp_clks[MSTP704]),
> + CLKDEV_DEV_ID("pci-rcar-gen2.0", &mstp_clks[MSTP703]),
> + CLKDEV_DEV_ID("pci-rcar-gen2.1", &mstp_clks[MSTP703]),
> + CLKDEV_DEV_ID("pci-rcar-gen2.2", &mstp_clks[MSTP703]),
>
> /* ICK */
> CLKDEV_ICK_ID("usbhs", "usb_phy_rcar_gen2", &mstp_clks[MSTP704]),
> --
> 1.8.3.1
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 2/3] ARM: shmobile: r8a7790: add R-Car sound support on DTSI
2013-12-20 14:13 [PATCH 2/3] arm: shmobile: r8a7790: Add PCI USB host clock support Valentine Barshak
` (2 preceding siblings ...)
2014-01-09 8:17 ` Simon Horman
@ 2014-06-10 2:33 ` Kuninori Morimoto
3 siblings, 0 replies; 5+ messages in thread
From: Kuninori Morimoto @ 2014-06-10 2:33 UTC (permalink / raw)
To: linux-sh
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
This patch support PIO transfer only at this point
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
arch/arm/boot/dts/r8a7790.dtsi | 56 ++++++++++++++++++++++++++++++++++++++++
1 file changed, 56 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index cb8a68d..d28b5e8 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -919,4 +919,60 @@
#size-cells = <0>;
status = "disabled";
};
+
+ rcar_sound: rcar_sound@0xec500000 {
+ #sound-dai-cells = <1>;
+ compatible = "renesas,rcar_sound-r8a7790", "renesas,rcar_sound-gen2", "renesas,rcar_sound";
+ interrupt-parent = <&gic>;
+ reg = <0 0xec500000 0 0x1000>, /* SCU */
+ <0 0xec5a0000 0 0x100>, /* ADG */
+ <0 0xec540000 0 0x1000>, /* SSIU */
+ <0 0xec541000 0 0x1280>; /* SSI */
+ clocks = <&mstp10_clks R8A7790_CLK_SSI>,
+ <&mstp10_clks R8A7790_CLK_SSI9>, <&mstp10_clks R8A7790_CLK_SSI8>,
+ <&mstp10_clks R8A7790_CLK_SSI7>, <&mstp10_clks R8A7790_CLK_SSI6>,
+ <&mstp10_clks R8A7790_CLK_SSI5>, <&mstp10_clks R8A7790_CLK_SSI4>,
+ <&mstp10_clks R8A7790_CLK_SSI3>, <&mstp10_clks R8A7790_CLK_SSI2>,
+ <&mstp10_clks R8A7790_CLK_SSI1>, <&mstp10_clks R8A7790_CLK_SSI0>,
+ <&mstp10_clks R8A7790_CLK_SRC9>, <&mstp10_clks R8A7790_CLK_SRC8>,
+ <&mstp10_clks R8A7790_CLK_SRC7>, <&mstp10_clks R8A7790_CLK_SRC6>,
+ <&mstp10_clks R8A7790_CLK_SRC5>, <&mstp10_clks R8A7790_CLK_SRC4>,
+ <&mstp10_clks R8A7790_CLK_SRC3>, <&mstp10_clks R8A7790_CLK_SRC2>,
+ <&mstp10_clks R8A7790_CLK_SRC1>, <&mstp10_clks R8A7790_CLK_SRC0>,
+ <&audio_clk_a>, <&audio_clk_b>, <&audio_clk_c>, <&m2_clk>;
+ clock-names = "ssi",
+ "ssi.9", "ssi.8", "ssi.7", "ssi.6", "ssi.5",
+ "ssi.4", "ssi.3", "ssi.2", "ssi.1", "ssi.0",
+ "src.9", "src.8", "src.7", "src.6", "src.5",
+ "src.4", "src.3", "src.2", "src.1", "src.0",
+ "clk_a", "clk_b", "clk_c", "clk_i";
+
+ status = "disabled";
+
+ rcar_sound,src {
+ src0: src@0 { };
+ src1: src@1 { };
+ src2: src@2 { };
+ src3: src@3 { };
+ src4: src@4 { };
+ src5: src@5 { };
+ src6: src@6 { };
+ src7: src@7 { };
+ src8: src@8 { };
+ src9: src@9 { };
+ };
+
+ rcar_sound,ssi {
+ ssi0: ssi@0 { interrupts = <0 370 IRQ_TYPE_LEVEL_HIGH>; };
+ ssi1: ssi@1 { interrupts = <0 371 IRQ_TYPE_LEVEL_HIGH>; };
+ ssi2: ssi@2 { interrupts = <0 372 IRQ_TYPE_LEVEL_HIGH>; };
+ ssi3: ssi@3 { interrupts = <0 373 IRQ_TYPE_LEVEL_HIGH>; };
+ ssi4: ssi@4 { interrupts = <0 374 IRQ_TYPE_LEVEL_HIGH>; };
+ ssi5: ssi@5 { interrupts = <0 375 IRQ_TYPE_LEVEL_HIGH>; };
+ ssi6: ssi@6 { interrupts = <0 376 IRQ_TYPE_LEVEL_HIGH>; };
+ ssi7: ssi@7 { interrupts = <0 377 IRQ_TYPE_LEVEL_HIGH>; };
+ ssi8: ssi@8 { interrupts = <0 378 IRQ_TYPE_LEVEL_HIGH>; };
+ ssi9: ssi@9 { interrupts = <0 379 IRQ_TYPE_LEVEL_HIGH>; };
+ };
+ };
};
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-06-10 2:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-12-20 14:13 [PATCH 2/3] arm: shmobile: r8a7790: Add PCI USB host clock support Valentine Barshak
2014-01-08 4:22 ` Simon Horman
2014-01-08 16:31 ` [PATCH 2/3] ARM: " Valentine Barshak
2014-01-09 8:17 ` Simon Horman
2014-06-10 2:33 ` [PATCH 2/3] ARM: shmobile: r8a7790: add R-Car sound support on DTSI Kuninori Morimoto
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).