From: Marek Vasut <marex@denx.de>
To: Jingoo Han <jg1.han@samsung.com>
Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
"'Bjorn Helgaas'" <bhelgaas@google.com>,
"'Frank Li'" <lznuaa@gmail.com>,
"'Richard Zhu'" <r65037@freescale.com>,
"'Sascha Hauer'" <s.hauer@pengutronix.de>,
"'Sean Cross'" <xobs@kosagi.com>,
"'Shawn Guo'" <shawn.guo@linaro.org>,
"'Tim Harvey'" <tharvey@gateworks.com>,
"'Yinghai Lu'" <yinghai@kernel.org>
Subject: Re: [PATCH 2/2] PCI: imx6: Fix the clock for PCIe
Date: Fri, 11 Oct 2013 13:55:04 +0200 [thread overview]
Message-ID: <201310111355.04746.marex@denx.de> (raw)
In-Reply-To: <000c01cec652$55adbb30$01093190$%han@samsung.com>
Dear Jingoo Han,
> On Friday, October 11, 2013 11:13 AM, Marek Vasut wrote:
> > The clk #205 are lvds_sel, not lvds_gate , so fix this. Moreover,
> > the PCIe needs lvds_gate for successful operation, so make the PCIe
> > driver enable (set as output) the lvds_gate .
> >
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > Cc: Bjorn Helgaas <bhelgaas@google.com>
> > Cc: Frank Li <lznuaa@gmail.com>
> > Cc: Richard Zhu <r65037@freescale.com>
> > Cc: Sascha Hauer <s.hauer@pengutronix.de>
> > Cc: Sean Cross <xobs@kosagi.com>
> > Cc: Shawn Guo <shawn.guo@linaro.org>
> > Cc: Tim Harvey <tharvey@gateworks.com>
> > Cc: Yinghai Lu <yinghai@kernel.org>
> > ---
> >
> > arch/arm/boot/dts/imx6qdl.dtsi | 6 +++---
> > drivers/pci/host/pci-imx6.c | 19 ++++++++++++++++++-
> > 2 files changed, 21 insertions(+), 4 deletions(-)
>
> Hi Marek Vasut,
>
> How about splitting this patch into two patches such as
> arch part and driver part?
>
> It is because driver part was merged into PCI tree by Bjorn Helgaas,[1]
> and arch part was merged into i.MX tree by Shawn Guo.[2]
> Thus, your patch can make the conflict issue.
>
> For example,
> [PATCH 1/2] ARM: dts: imx6qdl: Fix the clock for PCIe
> [PATCH 2/2] PCI: imx6: Fix the clock for PCIe
>
> Then, 1st patch can be merged to i.MX tree, and 2nd patch can be merged
> to PCI tree.
>
> If I am wrong, please let me know kindly. :-)
By all means, you're right. Is the patch addressing the issue correctly (if we
ignore that it's not split)? Shawn?
Best regards,
Marek Vasut
WARNING: multiple messages have this Message-ID (diff)
From: marex@denx.de (Marek Vasut)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] PCI: imx6: Fix the clock for PCIe
Date: Fri, 11 Oct 2013 13:55:04 +0200 [thread overview]
Message-ID: <201310111355.04746.marex@denx.de> (raw)
In-Reply-To: <000c01cec652$55adbb30$01093190$%han@samsung.com>
Dear Jingoo Han,
> On Friday, October 11, 2013 11:13 AM, Marek Vasut wrote:
> > The clk #205 are lvds_sel, not lvds_gate , so fix this. Moreover,
> > the PCIe needs lvds_gate for successful operation, so make the PCIe
> > driver enable (set as output) the lvds_gate .
> >
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > Cc: Bjorn Helgaas <bhelgaas@google.com>
> > Cc: Frank Li <lznuaa@gmail.com>
> > Cc: Richard Zhu <r65037@freescale.com>
> > Cc: Sascha Hauer <s.hauer@pengutronix.de>
> > Cc: Sean Cross <xobs@kosagi.com>
> > Cc: Shawn Guo <shawn.guo@linaro.org>
> > Cc: Tim Harvey <tharvey@gateworks.com>
> > Cc: Yinghai Lu <yinghai@kernel.org>
> > ---
> >
> > arch/arm/boot/dts/imx6qdl.dtsi | 6 +++---
> > drivers/pci/host/pci-imx6.c | 19 ++++++++++++++++++-
> > 2 files changed, 21 insertions(+), 4 deletions(-)
>
> Hi Marek Vasut,
>
> How about splitting this patch into two patches such as
> arch part and driver part?
>
> It is because driver part was merged into PCI tree by Bjorn Helgaas,[1]
> and arch part was merged into i.MX tree by Shawn Guo.[2]
> Thus, your patch can make the conflict issue.
>
> For example,
> [PATCH 1/2] ARM: dts: imx6qdl: Fix the clock for PCIe
> [PATCH 2/2] PCI: imx6: Fix the clock for PCIe
>
> Then, 1st patch can be merged to i.MX tree, and 2nd patch can be merged
> to PCI tree.
>
> If I am wrong, please let me know kindly. :-)
By all means, you're right. Is the patch addressing the issue correctly (if we
ignore that it's not split)? Shawn?
Best regards,
Marek Vasut
next prev parent reply other threads:[~2013-10-11 11:55 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-26 3:24 [PATCH v7 0/2] Add PCIe support for i.MX6q Shawn Guo
2013-09-26 3:24 ` Shawn Guo
2013-09-26 3:24 ` [PATCH v7 1/2] ARM: imx6q: Add PCIe bits to GPR syscon definition Shawn Guo
2013-09-26 3:24 ` Shawn Guo
2013-09-26 3:24 ` [PATCH v7 2/2] PCI: imx6: Add support for i.MX6 PCIe controller Shawn Guo
2013-09-26 3:24 ` Shawn Guo
2013-09-27 19:24 ` [PATCH v7 0/2] Add PCIe support for i.MX6q Bjorn Helgaas
2013-09-27 19:24 ` Bjorn Helgaas
2013-09-28 6:56 ` Shawn Guo
2013-09-28 6:56 ` Shawn Guo
2013-10-08 20:56 ` Marek Vasut
2013-10-08 20:56 ` Marek Vasut
2013-10-09 5:23 ` Zhu Richard-R65037
2013-10-09 5:23 ` Zhu Richard-R65037
2013-10-10 10:25 ` Marek Vasut
2013-10-10 10:25 ` Marek Vasut
2013-10-10 10:40 ` Zhu Richard-R65037
2013-10-10 10:40 ` Zhu Richard-R65037
2013-10-10 12:59 ` Marek Vasut
2013-10-10 12:59 ` Marek Vasut
2013-10-10 20:33 ` Tim Harvey
2013-10-10 20:33 ` Tim Harvey
2013-10-10 20:40 ` Marek Vasut
2013-10-10 20:40 ` Marek Vasut
2013-10-10 13:27 ` Bjorn Helgaas
2013-10-10 13:27 ` Bjorn Helgaas
2013-10-10 13:43 ` Marek Vasut
2013-10-10 13:43 ` Marek Vasut
2013-10-10 15:58 ` Marek Vasut
2013-10-10 15:58 ` Marek Vasut
2013-10-10 17:17 ` Bjorn Helgaas
2013-10-10 17:17 ` Bjorn Helgaas
2013-10-10 17:39 ` Marek Vasut
2013-10-10 17:39 ` Marek Vasut
2013-10-10 17:56 ` Bjorn Helgaas
2013-10-10 17:56 ` Bjorn Helgaas
2013-10-11 2:12 ` [PATCH 1/2] PCI: imx6: Make reset-gpio optional Marek Vasut
2013-10-11 2:12 ` Marek Vasut
2013-10-11 2:12 ` [PATCH 2/2] PCI: imx6: Fix the clock for PCIe Marek Vasut
2013-10-11 2:12 ` Marek Vasut
2013-10-11 7:20 ` Jingoo Han
2013-10-11 7:20 ` Jingoo Han
2013-10-11 11:55 ` Marek Vasut [this message]
2013-10-11 11:55 ` Marek Vasut
2013-10-12 7:13 ` Shawn Guo
2013-10-12 7:13 ` Shawn Guo
2013-10-11 7:09 ` [PATCH 1/2] PCI: imx6: Make reset-gpio optional Jingoo Han
2013-10-11 7:09 ` Jingoo Han
2013-10-12 7:20 ` Shawn Guo
2013-10-12 7:20 ` Shawn Guo
2013-10-12 9:28 ` Marek Vasut
2013-10-12 9:28 ` Marek Vasut
2013-10-14 0:02 ` Jingoo Han
2013-10-14 0:02 ` Jingoo Han
2013-10-14 0:44 ` Marek Vasut
2013-10-14 0:44 ` Marek Vasut
2013-10-14 1:17 ` Marek Vasut
2013-10-14 1:17 ` Marek Vasut
2013-10-14 2:33 ` Jingoo Han
2013-10-14 2:33 ` Jingoo Han
2013-10-14 3:23 ` Marek Vasut
2013-10-14 3:23 ` Marek Vasut
2013-10-11 2:13 ` [PATCH v7 0/2] Add PCIe support for i.MX6q Marek Vasut
2013-10-11 2:13 ` Marek Vasut
2013-10-11 2:18 ` Marek Vasut
2013-10-11 2:18 ` Marek Vasut
2013-10-11 2:29 ` Zhu Richard-R65037
2013-10-11 2:29 ` Zhu Richard-R65037
2013-10-11 4:44 ` Yinghai Lu
2013-10-11 4:44 ` Yinghai Lu
2013-10-11 14:44 ` Marek Vasut
2013-10-11 14:44 ` Marek Vasut
2013-10-11 15:24 ` Tim Harvey
2013-10-11 15:24 ` Tim Harvey
2013-10-11 20:13 ` Marek Vasut
2013-10-11 20:13 ` Marek Vasut
2013-10-12 2:16 ` Zhu Richard-R65037
2013-10-12 2:16 ` Zhu Richard-R65037
2013-10-12 2:30 ` Marek Vasut
2013-10-12 2:30 ` Marek Vasut
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=201310111355.04746.marex@denx.de \
--to=marex@denx.de \
--cc=bhelgaas@google.com \
--cc=jg1.han@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-pci@vger.kernel.org \
--cc=lznuaa@gmail.com \
--cc=r65037@freescale.com \
--cc=s.hauer@pengutronix.de \
--cc=shawn.guo@linaro.org \
--cc=tharvey@gateworks.com \
--cc=xobs@kosagi.com \
--cc=yinghai@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 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.