linux-arm-msm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Archit Taneja <architt@codeaurora.org>
To: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH v3 00/10] drm/msm/hdmi: HDMI support on MSM8996
Date: Thu, 25 Feb 2016 14:33:02 +0530	[thread overview]
Message-ID: <56CEC346.3050605@codeaurora.org> (raw)
In-Reply-To: <56CEBF86.8010400@codeaurora.org>



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@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

      reply	other threads:[~2016-02-25  9:03 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-25  5:52 [PATCH v3 00/10] drm/msm/hdmi: HDMI support on MSM8996 Archit Taneja
2016-02-25  5:52 ` [PATCH v3 01/10] drm/msm/hdmi: Clean up connector gpio usage Archit Taneja
2016-02-25  5:52 ` [PATCH v3 02/10] drm/msm/hdmi: Fix connector detect when there is no HPD gpio Archit Taneja
2016-02-25  5:52 ` [PATCH v3 03/10] drm/msm/hdmi: Create a separate HDMI PHY driver Archit Taneja
2016-02-25  5:52 ` [PATCH v3 04/10] drm/msm/hdmi: Manage HDMI PLL through " Archit Taneja
2016-02-25  5:52 ` [PATCH v3 05/10] drm/msm/hdmi: Make HDMI core get its PHY Archit Taneja
2016-02-25  5:52 ` [PATCH v3 06/10] drm/msm/hdmi: Convert PHY files according to new design Archit Taneja
2016-02-25  5:52 ` [PATCH v3 07/10] drm/msm/hdmi: Update generated headers to split PHY/PLL offsets Archit Taneja
2016-02-25  5:52 ` [PATCH v3 08/10] drm/msm/hdmi: Update generated headers for HDMI 8996 PHY Archit Taneja
2016-02-25  5:52 ` [PATCH v3 09/10] drm/msm/hdmi: HDMI 8996 PHY/PLL support Archit Taneja
2016-02-25  5:52 ` [PATCH v3 10/10] dt-bindings: msm/hdmi: Add HDMI PHY bindings Archit Taneja
2016-03-02 17:41   ` Rob Herring
2016-02-25  8:39 ` [PATCH v3 00/10] drm/msm/hdmi: HDMI support on MSM8996 Arnd Bergmann
2016-02-25  8:47   ` Archit Taneja
2016-02-25  9:03     ` Archit Taneja [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=56CEC346.3050605@codeaurora.org \
    --to=architt@codeaurora.org \
    --cc=arnd@arndb.de \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-arm-msm@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).