| Message ID | 1471536240-25082-6-git-send-email-laurent.pinchart+renesas@ideasonboard.com (mailing list archive) |
|---|---|
| State | Rejected |
| Delegated to: | Simon Horman |
| Headers | show |
Hi Laurent, On Thu, Aug 18, 2016 at 6:03 PM, Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> wrote: > In order to test VSP+DU integration for Gen3 on Gen2, link the VSPD > instances to the DU and modify their features to match the Gen3 VSPD. Why do you modify the feature properties? AFAIK the driver doesn't look at them anyway. > Remove the IOMMU properties for the DU as memory is now accessed through > the VSPD. > > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> > --- > arch/arm/boot/dts/r8a7790.dtsi | 14 +++++--------- > 1 file changed, 5 insertions(+), 9 deletions(-) > > diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi > index 637cb8be363f..0ff45867e711 100644 > --- a/arch/arm/boot/dts/r8a7790.dtsi > +++ b/arch/arm/boot/dts/r8a7790.dtsi > @@ -969,7 +969,7 @@ > renesas,#wpf = <4>; > }; > > - vsp1@fe930000 { > + vsp1d0: vsp1@fe930000 { > compatible = "renesas,vsp1"; > reg = <0 0xfe930000 0 0x8000>; > interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>; > @@ -979,13 +979,11 @@ > iommus = <&ipmmu_mx 5 &ipmmu_mx 13>; > > renesas,has-lif; > - renesas,has-lut; > renesas,#rpf = <4>; > - renesas,#uds = <1>; > - renesas,#wpf = <4>; > + renesas,#wpf = <1>; > }; Gr{oetje,eeting}s, Geert -- Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Hi Geert, On Friday 19 Aug 2016 09:06:57 Geert Uytterhoeven wrote: > On Thu, Aug 18, 2016 at 6:03 PM, Laurent Pinchart wrote: > > In order to test VSP+DU integration for Gen3 on Gen2, link the VSPD > > instances to the DU and modify their features to match the Gen3 VSPD. > > Why do you modify the feature properties? AFAIK the driver doesn't > look at them anyway. It was a leftover, that's not needed indeed. It will go away when I'll rebase the series on top of your patch that removes those properties from r8a7790.dtsi. > > Remove the IOMMU properties for the DU as memory is now accessed through > > the VSPD. > > > > Signed-off-by: Laurent Pinchart > > <laurent.pinchart+renesas@ideasonboard.com> > > --- > > > > arch/arm/boot/dts/r8a7790.dtsi | 14 +++++--------- > > 1 file changed, 5 insertions(+), 9 deletions(-) > > > > diff --git a/arch/arm/boot/dts/r8a7790.dtsi > > b/arch/arm/boot/dts/r8a7790.dtsi index 637cb8be363f..0ff45867e711 100644 > > --- a/arch/arm/boot/dts/r8a7790.dtsi > > +++ b/arch/arm/boot/dts/r8a7790.dtsi > > @@ -969,7 +969,7 @@ > > renesas,#wpf = <4>; > > }; > > > > - vsp1@fe930000 { > > + vsp1d0: vsp1@fe930000 { > > compatible = "renesas,vsp1"; > > reg = <0 0xfe930000 0 0x8000>; > > interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>; > > @@ -979,13 +979,11 @@ > > iommus = <&ipmmu_mx 5 &ipmmu_mx 13>; > > > > renesas,has-lif; > > - renesas,has-lut; > > renesas,#rpf = <4>; > > - renesas,#uds = <1>; > > - renesas,#wpf = <4>; > > + renesas,#wpf = <1>; > > };
diff --git a/arch/arm/boot/dts/r8a7790.dtsi b/arch/arm/boot/dts/r8a7790.dtsi index 637cb8be363f..0ff45867e711 100644 --- a/arch/arm/boot/dts/r8a7790.dtsi +++ b/arch/arm/boot/dts/r8a7790.dtsi @@ -969,7 +969,7 @@ renesas,#wpf = <4>; }; - vsp1@fe930000 { + vsp1d0: vsp1@fe930000 { compatible = "renesas,vsp1"; reg = <0 0xfe930000 0 0x8000>; interrupts = <GIC_SPI 246 IRQ_TYPE_LEVEL_HIGH>; @@ -979,13 +979,11 @@ iommus = <&ipmmu_mx 5 &ipmmu_mx 13>; renesas,has-lif; - renesas,has-lut; renesas,#rpf = <4>; - renesas,#uds = <1>; - renesas,#wpf = <4>; + renesas,#wpf = <1>; }; - vsp1@fe938000 { + vsp1d1: vsp1@fe938000 { compatible = "renesas,vsp1"; reg = <0 0xfe938000 0 0x8000>; interrupts = <GIC_SPI 247 IRQ_TYPE_LEVEL_HIGH>; @@ -995,10 +993,8 @@ iommus = <&ipmmu_mx 5 &ipmmu_mx 14>; renesas,has-lif; - renesas,has-lut; renesas,#rpf = <4>; - renesas,#uds = <1>; - renesas,#wpf = <4>; + renesas,#wpf = <1>; }; du: display@feb00000 { @@ -1018,7 +1014,7 @@ clock-names = "du.0", "du.1", "du.2", "lvds.0", "lvds.1"; status = "disabled"; - iommus = <&ipmmu_mx 15 &ipmmu_mx 16>; + vsps = <&vsp1d0 &vsp1d1>; ports { #address-cells = <1>;
In order to test VSP+DU integration for Gen3 on Gen2, link the VSPD instances to the DU and modify their features to match the Gen3 VSPD. Remove the IOMMU properties for the DU as memory is now accessed through the VSPD. Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> --- arch/arm/boot/dts/r8a7790.dtsi | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-)