2016년 01월 14일 16:01에 Andrzej Hajda 이(가) 쓴 글:
On 01/14/2016 07:25 AM, Inki Dae wrote:
Hi Andrzej,
This patch series incurred merge conflicts at severial patches so I had to merge them manually. It looks good to me but it seems to need more tests so I merged them to exynos-drm-next-todo. After that, I will move them to exynos-drm-next. Sorry for late reivew again.
I guess it is because exynos-drm-next does not contains patch 'dt-bindings: remove deprecated compatible string from exynos-hdmi'. It is already in next, it entered via samsung-dt tree. With this patch this patchset applies cleanly to exynos-drm-next.
Including dt-bindings patch, other patches also incurred merge conflicts. I think your patch set are conflicted with the configurable plane support already merged.
Thanks, Inki Dae
Regards Andrzej
Thanks, Inki Dae
2016년 01월 14일 13:54에 Inki Dae 이(가) 쓴 글:
Hi Andrzej,
Really sorry for missing this. I will merge them soon.
Thanks, Inki Dae
2016년 01월 13일 23:01에 Andrzej Hajda 이(가) 쓴 글:
Hi Inki,
Ping.
Regards Andrzej
On 11/02/2015 02:16 PM, Andrzej Hajda wrote:
Hi Inki, Krzysztof,
This patchset adds support for Exynos 5433 HDMI. There are also few preparation/cleanup patches. All patches except one touch only exynos-drm. Sixth patch adds binding properties for Exynos5433 HDMI, Krzysztof could you look at it.
The patchset is based on exynos-drm-next.
Regards Andrzej
Andrzej Hajda (7): drm/exynos/hdmi: clock code re-factoring drm/exynos/hdmi: constify global variables drm/exynos/hdmi: use array specifier for HDMI-PHY configurations drm/exynos/hdmi: code cleanup drm/exynos/hdmi: stop programming registers with default values dt-bindings: exynos_hdmi: add bindings for Exynos5433 variant drm/exynos/hdmi: add Exynos5433 support
.../devicetree/bindings/video/exynos_hdmi.txt | 27 +- drivers/gpu/drm/exynos/exynos_hdmi.c | 454 +++++++++++++++------ drivers/gpu/drm/exynos/regs-hdmi.h | 9 +- 3 files changed, 352 insertions(+), 138 deletions(-)
-- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
-- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
-- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html