Hi, It's common case, one topic but two different tree. So I suggest merge it at samsung sub-soc tree and drm parts will be merged after arm-soc tree is merged. since arm-soc tree collect arm soc-soc and merged early at merge window. then drm tree will be merged later. Until that time, drm patches are hold only at local git. How do you think? Thank you, Kyungmin Park On 10/16/12, Rahul Sharma <r.sh.open@xxxxxxxxx> wrote: > Hi Mr. Park, Mr. Kim, > > I had a suggestion here from Tomasz about dividing this patch-set into > 2 portions: > > 1) DT related (patches 1-4) for samsung-dt branch. > 2) Clocks, Arch data related to Exynos5. (patches 5,6) for > exynos-drm-fixes branch. > > Rationale behind this is kgene tree with all 6 patches applied will > have broken drm > exynos4 and incomplete drm exynos5. > > I want to know your opinion on this. > > regards, > Rahul Sharma > > On Tue, Oct 16, 2012 at 3:01 PM, Tomasz Figa <t.figa@xxxxxxxxxxx> wrote: >> Hi Rahul, >> >> >> >> On Tuesday 16 of October 2012 05:00:28 Rahul Sharma wrote: >> >>> This patch set adds the DT based support for Samsung's Exynos5250. It >> >>> adds device tree nodes for hdmi, mixer, hdmiphy and hdmiddc. The name >> >>> of these devices are changed to the one matching with drivers. >> >>> Exynos-drm and exynos hdmi-drm-commmon devices are removed from machine >> >>> init code. >> >>> >> >>> Exynos-drm and exynos hdmi-drm-commmon devices are removed from machine >> >>> init code. Patch set which adds this code is posted to dri-devel list at >> >>> http://comments.gmane.org/gmane.comp.video.dri.devel/75121. >> >>> >> >>> This patchset is based on linux v3.6-rc6, branch v3.7-next/dt-samsung at >> >>> git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung.git >> >>> >> >>> v1: >> >>> - dropped patch for hpd gpio initialisation from machine init. >> >>> - dropped patch for platform device registration. >> >>> - removed platform device registration from non-dt platforms. >> >>> >> >>> v2: >> >>> - removed version information from hdmi, mixer dt nodes. >> >>> - added DT binding documentation for hdmi, mixer, hdmiphy and hdmiddc. >> >>> >> >>> v3: >> >>> - corrected indentations. >> >>> - changed dt node names to name@address format. >> >>> >> >>> Rahul Sharma (6): >> >>> dts: exynos: add device tree support for exynos5 hdmi >> >>> dts: exynos: add device tree support for exynos5 mixer >> >>> dts: exynos: add device tree support for exynos5 hdmiphy >> >>> dts: exynos: add device tree support for exynos5 hdmiddc >> >>> arm: exynos: add clocks for exynos5 hdmi >> >>> arm: exynos: removing exynos-drm device registration from non-dt >> >>> platforms >> >>> >> >>> .../devicetree/bindings/drm/exynos/hdmi.txt | 22 >> >>> +++++++++++++++ .../devicetree/bindings/drm/exynos/hdmiddc.txt | >> >>> 12 ++++++++ .../devicetree/bindings/drm/exynos/hdmiphy.txt | 12 >> >>> ++++++++ .../devicetree/bindings/drm/exynos/mixer.txt | 15 >> >>> ++++++++++ arch/arm/boot/dts/exynos5250-smdk5250.dts | 24 >> >>> +++++++++++++++- arch/arm/boot/dts/exynos5250.dtsi | >> >>> 20 +++++++++++++ arch/arm/mach-exynos/Makefile | >> >>> 1 - >> >>> arch/arm/mach-exynos/clock-exynos5.c | 14 ++++++++- >> >>> arch/arm/mach-exynos/dev-drm.c | 29 >> >>> -------------------- arch/arm/mach-exynos/include/mach/map.h >> >>> | 2 + >> >>> arch/arm/mach-exynos/mach-exynos5-dt.c | 8 +++++ >> >>> arch/arm/mach-exynos/mach-nuri.c | 3 -- >> >>> arch/arm/mach-exynos/mach-origen.c | 3 -- >> >>> arch/arm/mach-exynos/mach-smdk4x12.c | 3 -- >> >>> arch/arm/mach-exynos/mach-smdkv310.c | 3 -- >> >>> arch/arm/mach-exynos/mach-universal_c210.c | 3 -- >> >>> arch/arm/plat-samsung/include/plat/devs.h | 2 - >> >>> 17 files changed, 126 insertions(+), 50 deletions(-) >> >>> create mode 100644 >> >>> Documentation/devicetree/bindings/drm/exynos/hdmi.txt create mode >> >>> 100644 Documentation/devicetree/bindings/drm/exynos/hdmiddc.txt create >> >>> mode 100644 Documentation/devicetree/bindings/drm/exynos/hdmiphy.txt >> >>> create mode 100644 >> >>> Documentation/devicetree/bindings/drm/exynos/mixer.txt delete mode >> >>> 100644 arch/arm/mach-exynos/dev-drm.c >> >> >> >> The patches look fine, but Kukjin's tree doesn't contain all the >> >> dependencies for them to be usable. >> >> >> >> Shouldn't they be based on exynos-drm-next branch of Kyungmin's tree at >> >> infradead instead: >> >> >> >> http://git.infradead.org/users/kmpark/linux-samsung/shortlog/refs/heads/exynos-drm-next >> >> >> >> Best regards, >> >> -- >> >> Tomasz Figa >> >> Samsung Poland R&D Center >> >> > -- > To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" > in > the body of a message to majordomo@xxxxxxxxxxxxxxx > 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@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
 |