* [PATCH v3 3/8] ARM: shmobile: r8a7790: Add DU and LVDS clocks
@ 2013-08-08 12:03 Laurent Pinchart
2013-08-22 6:25 ` Simon Horman
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Laurent Pinchart @ 2013-08-08 12:03 UTC (permalink / raw)
To: linux-sh
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
arch/arm/mach-shmobile/clock-r8a7790.c | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-shmobile/clock-r8a7790.c b/arch/arm/mach-shmobile/clock-r8a7790.c
index fc36d3d..d99b87b 100644
--- a/arch/arm/mach-shmobile/clock-r8a7790.c
+++ b/arch/arm/mach-shmobile/clock-r8a7790.c
@@ -182,7 +182,7 @@ static struct clk div6_clks[DIV6_NR] = {
/* MSTP */
enum {
MSTP813,
- MSTP721, MSTP720,
+ MSTP726, MSTP725, MSTP724, MSTP723, MSTP722, MSTP721, MSTP720,
MSTP717, MSTP716,
MSTP522,
MSTP315, MSTP314, MSTP313, MSTP312, MSTP311, MSTP305, MSTP304,
@@ -193,6 +193,11 @@ enum {
static struct clk mstp_clks[MSTP_NR] = {
[MSTP813] = SH_CLK_MSTP32(&p_clk, SMSTPCR8, 13, 0), /* Ether */
+ [MSTP726] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 26, 0), /* LVDS0 */
+ [MSTP725] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 25, 0), /* LVDS1 */
+ [MSTP724] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 24, 0), /* DU0 */
+ [MSTP723] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 23, 0), /* DU1 */
+ [MSTP722] = SH_CLK_MSTP32(&zx_clk, SMSTPCR7, 22, 0), /* DU2 */
[MSTP721] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 21, 0), /* SCIF0 */
[MSTP720] = SH_CLK_MSTP32(&p_clk, SMSTPCR7, 20, 0), /* SCIF1 */
[MSTP717] = SH_CLK_MSTP32(&zs_clk, SMSTPCR7, 17, 0), /* HSCIF0 */
@@ -251,6 +256,11 @@ static struct clk_lookup lookups[] = {
CLKDEV_CON_ID("ssprs", &div6_clks[DIV6_SSPRS]),
/* MSTP */
+ CLKDEV_ICK_ID("lvds.0", "rcar-du-r8a7790", &mstp_clks[MSTP726]),
+ CLKDEV_ICK_ID("lvds.1", "rcar-du-r8a7790", &mstp_clks[MSTP725]),
+ CLKDEV_ICK_ID("du.0", "rcar-du-r8a7790", &mstp_clks[MSTP724]),
+ CLKDEV_ICK_ID("du.1", "rcar-du-r8a7790", &mstp_clks[MSTP723]),
+ CLKDEV_ICK_ID("du.2", "rcar-du-r8a7790", &mstp_clks[MSTP722]),
CLKDEV_DEV_ID("sh-sci.0", &mstp_clks[MSTP204]),
CLKDEV_DEV_ID("sh-sci.1", &mstp_clks[MSTP203]),
CLKDEV_DEV_ID("sh-sci.2", &mstp_clks[MSTP206]),
--
1.8.1.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v3 3/8] ARM: shmobile: r8a7790: Add DU and LVDS clocks
2013-08-08 12:03 [PATCH v3 3/8] ARM: shmobile: r8a7790: Add DU and LVDS clocks Laurent Pinchart
@ 2013-08-22 6:25 ` Simon Horman
2013-08-22 6:26 ` Simon Horman
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2013-08-22 6:25 UTC (permalink / raw)
To: linux-sh
On Thu, Aug 08, 2013 at 02:03:29PM +0200, Laurent Pinchart wrote:
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Thanks, I have queued this up in the soc3 branch.
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v3 3/8] ARM: shmobile: r8a7790: Add DU and LVDS clocks
2013-08-08 12:03 [PATCH v3 3/8] ARM: shmobile: r8a7790: Add DU and LVDS clocks Laurent Pinchart
2013-08-22 6:25 ` Simon Horman
@ 2013-08-22 6:26 ` Simon Horman
2014-06-13 9:37 ` [PATCH v3 3/8] ARM: shmobile: r8a7790: Add PCIe Controller device node Phil Edworthy
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2013-08-22 6:26 UTC (permalink / raw)
To: linux-sh
On Thu, Aug 08, 2013 at 02:03:29PM +0200, Laurent Pinchart wrote:
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Thanks, I have merged this into the boards3 branch which
includes a merge of git://people.freedesktop.Org/~airlied/linux drm-rcar-for-v3.12.
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH v3 3/8] ARM: shmobile: r8a7790: Add PCIe Controller device node
2013-08-08 12:03 [PATCH v3 3/8] ARM: shmobile: r8a7790: Add DU and LVDS clocks Laurent Pinchart
2013-08-22 6:25 ` Simon Horman
2013-08-22 6:26 ` Simon Horman
@ 2014-06-13 9:37 ` Phil Edworthy
2014-06-16 0:54 ` Simon Horman
2014-06-16 7:41 ` Phil Edworthy
4 siblings, 0 replies; 6+ messages in thread
From: Phil Edworthy @ 2014-06-13 9:37 UTC (permalink / raw)
To: linux-sh
Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
---
v3:
- No change
v2:
- Changed PCIe controller names,etc from pcie to pciec
arch/arm/boot/dts/r8a7790.dtsi | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index d0520f1..2f5bd9e 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -896,4 +896,29 @@
#size-cells = <0>;
status = "disabled";
};
+
+ pciec: pcie@fe000000 {
+ compatible = "renesas,pcie-r8a7790";
+ reg = <0 0xfe000000 0 0x80000>;
+ #address-cells = <3>;
+ #size-cells = <2>;
+ bus-range = <0x00 0xff>;
+ device_type = "pci";
+ ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000
+ 0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000
+ 0x02000000 0 0x30000000 0 0x30000000 0 0x08000000
+ 0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
+ /* Map all possible DDR as inbound ranges */
+ dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000
+ 0x43000000 1 0x80000000 1 0x80000000 0 0x80000000>;
+ interrupts = <0 116 IRQ_TYPE_LEVEL_HIGH>,
+ <0 117 IRQ_TYPE_LEVEL_HIGH>,
+ <0 118 IRQ_TYPE_LEVEL_HIGH>;
+ #interrupt-cells = <1>;
+ interrupt-map-mask = <0 0 0 0>;
+ interrupt-map = <0 0 0 0 &gic 0 116 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp3_clks R8A7790_CLK_PCIEC>, <&pcie_bus_clk>;
+ clock-names = "pcie", "pcie_bus";
+ status = "disabled";
+ };
};
--
2.0.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH v3 3/8] ARM: shmobile: r8a7790: Add PCIe Controller device node
2013-08-08 12:03 [PATCH v3 3/8] ARM: shmobile: r8a7790: Add DU and LVDS clocks Laurent Pinchart
` (2 preceding siblings ...)
2014-06-13 9:37 ` [PATCH v3 3/8] ARM: shmobile: r8a7790: Add PCIe Controller device node Phil Edworthy
@ 2014-06-16 0:54 ` Simon Horman
2014-06-16 7:41 ` Phil Edworthy
4 siblings, 0 replies; 6+ messages in thread
From: Simon Horman @ 2014-06-16 0:54 UTC (permalink / raw)
To: linux-sh
On Fri, Jun 13, 2014 at 10:37:17AM +0100, Phil Edworthy wrote:
> Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
> ---
> v3:
> - No change
>
> v2:
> - Changed PCIe controller names,etc from pcie to pciec
>
> arch/arm/boot/dts/r8a7790.dtsi | 25 +++++++++++++++++++++++++
> 1 file changed, 25 insertions(+)
Hi Phil,
I encountered a minor conflict when applying this patch.
The version that I have queued-up is below, please check that it is correct.
From: Phil Edworthy <phil.edworthy@renesas.com>
ARM: shmobile: r8a7790: Add PCIe Controller device node
Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
[horms+renesas@verge.net.au: resolved conflict]
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
---
arch/arm/boot/dts/r8a7790.dtsi | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi
index 2c55c4b..994330e 100644
--- a/arch/arm/boot/dts/r8a7790.dtsi
+++ b/arch/arm/boot/dts/r8a7790.dtsi
@@ -930,6 +930,31 @@
status = "disabled";
};
+ pciec: pcie@fe000000 {
+ compatible = "renesas,pcie-r8a7790";
+ reg = <0 0xfe000000 0 0x80000>;
+ #address-cells = <3>;
+ #size-cells = <2>;
+ bus-range = <0x00 0xff>;
+ device_type = "pci";
+ ranges = <0x01000000 0 0x00000000 0 0xfe100000 0 0x00100000
+ 0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000
+ 0x02000000 0 0x30000000 0 0x30000000 0 0x08000000
+ 0x42000000 0 0x38000000 0 0x38000000 0 0x08000000>;
+ /* Map all possible DDR as inbound ranges */
+ dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0 0x80000000
+ 0x43000000 1 0x80000000 1 0x80000000 0 0x80000000>;
+ interrupts = <0 116 IRQ_TYPE_LEVEL_HIGH>,
+ <0 117 IRQ_TYPE_LEVEL_HIGH>,
+ <0 118 IRQ_TYPE_LEVEL_HIGH>;
+ #interrupt-cells = <1>;
+ interrupt-map-mask = <0 0 0 0>;
+ interrupt-map = <0 0 0 0 &gic 0 116 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&mstp3_clks R8A7790_CLK_PCIEC>, <&pcie_bus_clk>;
+ clock-names = "pcie", "pcie_bus";
+ status = "disabled";
+ };
+
rcar_sound: rcar_sound@0xec500000 {
#sound-dai-cells = <1>;
compatible = "renesas,rcar_sound-r8a7790", "renesas,rcar_sound-gen2", "renesas,rcar_sound";
--
2.0.0.rc2
^ permalink raw reply related [flat|nested] 6+ messages in thread* RE: [PATCH v3 3/8] ARM: shmobile: r8a7790: Add PCIe Controller device node
2013-08-08 12:03 [PATCH v3 3/8] ARM: shmobile: r8a7790: Add DU and LVDS clocks Laurent Pinchart
` (3 preceding siblings ...)
2014-06-16 0:54 ` Simon Horman
@ 2014-06-16 7:41 ` Phil Edworthy
4 siblings, 0 replies; 6+ messages in thread
From: Phil Edworthy @ 2014-06-16 7:41 UTC (permalink / raw)
To: linux-sh
Hi Simon,
On 16 June 2014 01:55, Simon wrote:
> On Fri, Jun 13, 2014 at 10:37:17AM +0100, Phil Edworthy wrote:
> > Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
> > ---
> > v3:
> > - No change
> >
> > v2:
> > - Changed PCIe controller names,etc from pcie to pciec
> >
> > arch/arm/boot/dts/r8a7790.dtsi | 25 +++++++++++++++++++++++++
> > 1 file changed, 25 insertions(+)
>
> Hi Phil,
>
> I encountered a minor conflict when applying this patch.
> The version that I have queued-up is below, please check that it is correct.
Looks good.
Thanks
Phil
> From: Phil Edworthy <phil.edworthy@renesas.com>
>
> ARM: shmobile: r8a7790: Add PCIe Controller device node
>
> Signed-off-by: Phil Edworthy <phil.edworthy@renesas.com>
> [horms+renesas@verge.net.au: resolved conflict]
> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
> ---
> arch/arm/boot/dts/r8a7790.dtsi | 25 +++++++++++++++++++++++++
> 1 file changed, 25 insertions(+)
>
> diff --git a/arch/arm/boot/dts/r8a7790.dtsi
> b/arch/arm/boot/dts/r8a7790.dtsi
> index 2c55c4b..994330e 100644
> --- a/arch/arm/boot/dts/r8a7790.dtsi
> +++ b/arch/arm/boot/dts/r8a7790.dtsi
> @@ -930,6 +930,31 @@
> status = "disabled";
> };
>
> + pciec: pcie@fe000000 {
> + compatible = "renesas,pcie-r8a7790";
> + reg = <0 0xfe000000 0 0x80000>;
> + #address-cells = <3>;
> + #size-cells = <2>;
> + bus-range = <0x00 0xff>;
> + device_type = "pci";
> + ranges = <0x01000000 0 0x00000000 0 0xfe100000 0
> 0x00100000
> + 0x02000000 0 0xfe200000 0 0xfe200000 0 0x00200000
> + 0x02000000 0 0x30000000 0 0x30000000 0 0x08000000
> + 0x42000000 0 0x38000000 0 0x38000000 0
> 0x08000000>;
> + /* Map all possible DDR as inbound ranges */
> + dma-ranges = <0x42000000 0 0x40000000 0 0x40000000 0
> 0x80000000
> + 0x43000000 1 0x80000000 1 0x80000000 0
> 0x80000000>;
> + interrupts = <0 116 IRQ_TYPE_LEVEL_HIGH>,
> + <0 117 IRQ_TYPE_LEVEL_HIGH>,
> + <0 118 IRQ_TYPE_LEVEL_HIGH>;
> + #interrupt-cells = <1>;
> + interrupt-map-mask = <0 0 0 0>;
> + interrupt-map = <0 0 0 0 &gic 0 116 IRQ_TYPE_LEVEL_HIGH>;
> + clocks = <&mstp3_clks R8A7790_CLK_PCIEC>,
> <&pcie_bus_clk>;
> + clock-names = "pcie", "pcie_bus";
> + status = "disabled";
> + };
> +
> rcar_sound: rcar_sound@0xec500000 {
> #sound-dai-cells = <1>;
> compatible = "renesas,rcar_sound-r8a7790",
> "renesas,rcar_sound-gen2", "renesas,rcar_sound";
> --
> 2.0.0.rc2
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2014-06-16 7:41 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-08-08 12:03 [PATCH v3 3/8] ARM: shmobile: r8a7790: Add DU and LVDS clocks Laurent Pinchart
2013-08-22 6:25 ` Simon Horman
2013-08-22 6:26 ` Simon Horman
2014-06-13 9:37 ` [PATCH v3 3/8] ARM: shmobile: r8a7790: Add PCIe Controller device node Phil Edworthy
2014-06-16 0:54 ` Simon Horman
2014-06-16 7:41 ` Phil Edworthy
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.