On 02/25/2016 02:17 PM, Archit Taneja wrote:
On 02/25/2016 02:09 PM, Arnd Bergmann wrote:
On Thursday 25 February 2016 11:22:35 Archit Taneja wrote:
HDMI on MSM8996 has a TX block that is compatible with the older
versions apart from some minor changes. The HDMI PHY and PLL on MSM8996
are new.
The series refactors the code such that there is a separate HDMI PHY
driver, similar to what we already have for DSI. This makes it easier
to integrate new PHYs like the one in msm8996.
I sent a patch to rename all of the hdmi symbols to start with
msm_hdmi_*. I think your series now conflicts with Rob's tree
and needs to be rebased on top of that.
Didn't realize it got pulled. I'll rebase my set over this.
I checked Rob's branch again. The hdmi symbols rename patch you sent
was based over the previous version of this patch set. It would be
much easier for Rob to rebase your patch over this new version. I
tried it and I just get a small conflict that can be easily fixed.
We just need to replace the wildcards from the SoC numbers.
Thanks,
Archit
diff --cc drivers/gpu/drm/msm/hdmi/hdmi_phy.c
index 4bfeb0e,5530631..0000000
--- a/drivers/gpu/drm/msm/hdmi/hdmi_phy.c
+++ b/drivers/gpu/drm/msm/hdmi/hdmi_phy.c
@@@ -196,17 -196,15 +196,27 @@@ static int msm_hdmi_phy_remove(struct p
return 0;
}
++<<<<<<< HEAD
+static const struct of_device_id hdmi_phy_dt_match[] = {
+ { .compatible = "qcom,hdmi-phy-8660",
+ .data = &hdmi_phy_8x60_cfg },
+ { .compatible = "qcom,hdmi-phy-8960",
+ .data = &hdmi_phy_8960_cfg },
+ { .compatible = "qcom,hdmi-phy-8974",
+ .data = &hdmi_phy_8x74_cfg },
+ { .compatible = "qcom,hdmi-phy-8084",
+ .data = &hdmi_phy_8x74_cfg },
++=======
+ static const struct of_device_id msm_hdmi_phy_dt_match[] = {
+ { .compatible = "qcom,hdmi-phy-8x60",
+ .data = &msm_hdmi_phy_8x60_cfg },
+ { .compatible = "qcom,hdmi-phy-8960",
+ .data = &msm_hdmi_phy_8960_cfg },
+ { .compatible = "qcom,hdmi-phy-8x74",
+ .data = &msm_hdmi_phy_8x74_cfg },
++>>>>>>> 3932f00... drm/msm: rename hdmi symbols
{ .compatible = "qcom,hdmi-phy-8996",
- .data = &hdmi_phy_8996_cfg },
+ .data = &msm_hdmi_phy_8996_cfg },
{}
};
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora
Forum, hosted by The Linux Foundation
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
