* [PATCH v5 00/14] DU DT support for Marzen, Lager and Koelsch
@ 2014-10-26 14:11 Laurent Pinchart
2014-10-27 0:36 ` Simon Horman
0 siblings, 1 reply; 2+ messages in thread
From: Laurent Pinchart @ 2014-10-26 14:11 UTC (permalink / raw)
To: linux-sh
Hello,
This patch series enable the DU device in DT for the Marzen, Lager and Koelsch
boards (in their multiplatform implementation only).
Compared to v4,
- the shmobile_clk_workaround() function has been removed
- the Koelsch board files have been removed
- the Marzen LVDS encoder DT node has been renamed to lvds-encoder and its
port subnodes now have reg properties.
Compared to v3,
- the series has been rebased on top of v3.18-rc1
Compared to v2,
- the Marzen and Lager adv7123 DT nodes have been renamed to vga-encoder
- the Marzen and Lager adv7123 DT nodes now correctly set the "reg" property
in their port subnodes.
Compared to v1,
- support for the external LVDS panel commonly used with the three boards has
been moved to a separate file (r8a77xx-aa104xd12-panel.dtsi) that can be
included at the end of the Marzen, Lager or Koelsch DTS
- the DU DT nodes have been renamed to "display"
- the s/remote/remove/ typo has been fixed in commit messages.
The first three patches add the DU nodes to the SoC .dtsi files. Patch 04 adds
the panel .dtsi. Patches 05 enables the DU device in DT for the Marzen board,
and patches 06 to 09 perform the same operation for the Lager and Koelsch
boards, removing the C code DU platform device in the process. The following
patches are removals, with 10 and 11 removing shmobile_clk_workaround() and 12
to 14 removing the Koelsch board files.
Simon, I expect Dave to need a stable branch with patches 06 and 08 in order
to merge the RCar DU HDMI support in v3.19. Is that something you can provide
without too much trouble ? You can include the whole series in the branch if
easier but that's not strictly mandatory.
The alternative would be to merge the RCar DU patches through your tree, but
the risk of conflicts might be a bit too high.
The patches are based on top of v3.18-rc1. I've pushed a test branch that
includes all patches to
git://linuxtv.org/pinchartl/fbdev.git drm/du/dt
Cc: Simon Horman <horms+renesas@verge.net.au>
Laurent Pinchart (14):
ARM: shmobile: r8a7779: Add DU node to device tree
ARM: shmobile: r8a7790: Add DU node to device tree
ARM: shmobile: r8a7791: Add DU node to device tree
ARM: shmobile: dts: Add common file for AA104XD12 panel
ARM: shmobile: marzen: Enable DU device in DT
ARM: shmobile: lager-reference: Remove DU platform device
ARM: shmobile: lager: Enable DU device in DT
ARM: shmobile: koelsch-reference: Remove DU platform device
ARM: shmobile: koelsch: Enable DU device in DT
ARM: shmobile: marzen-reference: Don't include legacy clock.h
ARM: shmobile: Remove shmobile_clk_workaround() implementation
ARM: shmobile: koelsch: Remove legacy C board code
ARM: shmobile: r8a7791: Remove legacy code
ARM: shmobile: koelsch: Remove reference board code
arch/arm/boot/dts/r8a7779-marzen.dts | 83 ++++
arch/arm/boot/dts/r8a7779.dtsi | 24 ++
arch/arm/boot/dts/r8a7790-lager.dts | 53 ++-
arch/arm/boot/dts/r8a7790.dtsi | 39 ++
arch/arm/boot/dts/r8a7791-koelsch.dts | 16 +-
arch/arm/boot/dts/r8a7791.dtsi | 30 ++
arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi | 41 ++
arch/arm/configs/koelsch_defconfig | 113 -----
arch/arm/configs/shmobile_defconfig | 1 -
arch/arm/mach-shmobile/Kconfig | 19 -
arch/arm/mach-shmobile/Makefile | 5 +-
arch/arm/mach-shmobile/Makefile.boot | 1 -
arch/arm/mach-shmobile/board-koelsch-reference.c | 117 -----
arch/arm/mach-shmobile/board-koelsch.c | 527 -----------------------
arch/arm/mach-shmobile/board-lager-reference.c | 80 ----
arch/arm/mach-shmobile/board-marzen-reference.c | 1 -
arch/arm/mach-shmobile/clock-r8a7791.c | 342 ---------------
arch/arm/mach-shmobile/clock.c | 32 +-
arch/arm/mach-shmobile/clock.h | 14 -
arch/arm/mach-shmobile/r8a7791.h | 3 -
arch/arm/mach-shmobile/setup-r8a7791.c | 181 +-------
21 files changed, 285 insertions(+), 1437 deletions(-)
create mode 100644 arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi
delete mode 100644 arch/arm/configs/koelsch_defconfig
delete mode 100644 arch/arm/mach-shmobile/board-koelsch-reference.c
delete mode 100644 arch/arm/mach-shmobile/board-koelsch.c
delete mode 100644 arch/arm/mach-shmobile/clock-r8a7791.c
--
Regards,
Laurent Pinchart
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH v5 00/14] DU DT support for Marzen, Lager and Koelsch
2014-10-26 14:11 [PATCH v5 00/14] DU DT support for Marzen, Lager and Koelsch Laurent Pinchart
@ 2014-10-27 0:36 ` Simon Horman
0 siblings, 0 replies; 2+ messages in thread
From: Simon Horman @ 2014-10-27 0:36 UTC (permalink / raw)
To: linux-sh
On Sun, Oct 26, 2014 at 04:11:05PM +0200, Laurent Pinchart wrote:
> Hello,
>
> This patch series enable the DU device in DT for the Marzen, Lager and Koelsch
> boards (in their multiplatform implementation only).
Thanks, I have queued this up.
> Compared to v4,
>
> - the shmobile_clk_workaround() function has been removed
>
> - the Koelsch board files have been removed
>
> - the Marzen LVDS encoder DT node has been renamed to lvds-encoder and its
> port subnodes now have reg properties.
>
> Compared to v3,
>
> - the series has been rebased on top of v3.18-rc1
>
> Compared to v2,
>
> - the Marzen and Lager adv7123 DT nodes have been renamed to vga-encoder
>
> - the Marzen and Lager adv7123 DT nodes now correctly set the "reg" property
> in their port subnodes.
>
> Compared to v1,
>
> - support for the external LVDS panel commonly used with the three boards has
> been moved to a separate file (r8a77xx-aa104xd12-panel.dtsi) that can be
> included at the end of the Marzen, Lager or Koelsch DTS
>
> - the DU DT nodes have been renamed to "display"
>
> - the s/remote/remove/ typo has been fixed in commit messages.
>
> The first three patches add the DU nodes to the SoC .dtsi files. Patch 04 adds
> the panel .dtsi. Patches 05 enables the DU device in DT for the Marzen board,
> and patches 06 to 09 perform the same operation for the Lager and Koelsch
> boards, removing the C code DU platform device in the process. The following
> patches are removals, with 10 and 11 removing shmobile_clk_workaround() and 12
> to 14 removing the Koelsch board files.
>
> Simon, I expect Dave to need a stable branch with patches 06 and 08 in order
> to merge the RCar DU HDMI support in v3.19. Is that something you can provide
> without too much trouble ? You can include the whole series in the branch if
> easier but that's not strictly mandatory.
I think that is easier and I have put it the new du-dt-for-v3.19 branch.
I plan to push this a little latter today assuming my build and boot
tests don't produce any red flags.
I would appreciate it if I could have a little more time before
declaring that branch stable, say until the end of the week. I do
not intend to change it but there are lot of dt changes in flight
for shmobile at the moment and I would like to leave my options open
for slightly longer.
If all goes well my intention is to tag the du-dt-for-v3.19 branch and send
a pull request for it later this week. At that point it should be stable.
But the arm-soc maintainers like to reserve the right to ask for changes.
And that can take a while to happen (or not).
> The alternative would be to merge the RCar DU patches through your tree, but
> the risk of conflicts might be a bit too high.
From my point of view the most important thing is to avoid
conflicts that bubble up to Linus. So I'm happy with whatever strategy
you suggest that reduces that risk the most.
I do note that with the plan you propose there seems to be a risk
of a conflict in r8a7791-koelsch.dts. Please take care with that.
>
> The patches are based on top of v3.18-rc1. I've pushed a test branch that
> includes all patches to
>
> git://linuxtv.org/pinchartl/fbdev.git drm/du/dt
>
> Cc: Simon Horman <horms+renesas@verge.net.au>
>
> Laurent Pinchart (14):
> ARM: shmobile: r8a7779: Add DU node to device tree
> ARM: shmobile: r8a7790: Add DU node to device tree
> ARM: shmobile: r8a7791: Add DU node to device tree
> ARM: shmobile: dts: Add common file for AA104XD12 panel
> ARM: shmobile: marzen: Enable DU device in DT
> ARM: shmobile: lager-reference: Remove DU platform device
> ARM: shmobile: lager: Enable DU device in DT
> ARM: shmobile: koelsch-reference: Remove DU platform device
> ARM: shmobile: koelsch: Enable DU device in DT
> ARM: shmobile: marzen-reference: Don't include legacy clock.h
> ARM: shmobile: Remove shmobile_clk_workaround() implementation
> ARM: shmobile: koelsch: Remove legacy C board code
> ARM: shmobile: r8a7791: Remove legacy code
> ARM: shmobile: koelsch: Remove reference board code
>
> arch/arm/boot/dts/r8a7779-marzen.dts | 83 ++++
> arch/arm/boot/dts/r8a7779.dtsi | 24 ++
> arch/arm/boot/dts/r8a7790-lager.dts | 53 ++-
> arch/arm/boot/dts/r8a7790.dtsi | 39 ++
> arch/arm/boot/dts/r8a7791-koelsch.dts | 16 +-
> arch/arm/boot/dts/r8a7791.dtsi | 30 ++
> arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi | 41 ++
> arch/arm/configs/koelsch_defconfig | 113 -----
> arch/arm/configs/shmobile_defconfig | 1 -
> arch/arm/mach-shmobile/Kconfig | 19 -
> arch/arm/mach-shmobile/Makefile | 5 +-
> arch/arm/mach-shmobile/Makefile.boot | 1 -
> arch/arm/mach-shmobile/board-koelsch-reference.c | 117 -----
> arch/arm/mach-shmobile/board-koelsch.c | 527 -----------------------
> arch/arm/mach-shmobile/board-lager-reference.c | 80 ----
> arch/arm/mach-shmobile/board-marzen-reference.c | 1 -
> arch/arm/mach-shmobile/clock-r8a7791.c | 342 ---------------
> arch/arm/mach-shmobile/clock.c | 32 +-
> arch/arm/mach-shmobile/clock.h | 14 -
> arch/arm/mach-shmobile/r8a7791.h | 3 -
> arch/arm/mach-shmobile/setup-r8a7791.c | 181 +-------
> 21 files changed, 285 insertions(+), 1437 deletions(-)
> create mode 100644 arch/arm/boot/dts/r8a77xx-aa104xd12-panel.dtsi
> delete mode 100644 arch/arm/configs/koelsch_defconfig
> delete mode 100644 arch/arm/mach-shmobile/board-koelsch-reference.c
> delete mode 100644 arch/arm/mach-shmobile/board-koelsch.c
> delete mode 100644 arch/arm/mach-shmobile/clock-r8a7791.c
>
> --
> Regards,
>
> Laurent Pinchart
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-10-27 0:36 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-10-26 14:11 [PATCH v5 00/14] DU DT support for Marzen, Lager and Koelsch Laurent Pinchart
2014-10-27 0:36 ` Simon Horman
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.