From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-out.m-online.net ([212.18.0.10]:58632 "EHLO mail-out.m-online.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751495Ab3JKLzv (ORCPT ); Fri, 11 Oct 2013 07:55:51 -0400 From: Marek Vasut To: Jingoo Han Subject: Re: [PATCH 2/2] PCI: imx6: Fix the clock for PCIe Date: Fri, 11 Oct 2013 13:55:04 +0200 Cc: linux-pci@vger.kernel.org, linux-arm-kernel@lists.infradead.org, "'Bjorn Helgaas'" , "'Frank Li'" , "'Richard Zhu'" , "'Sascha Hauer'" , "'Sean Cross'" , "'Shawn Guo'" , "'Tim Harvey'" , "'Yinghai Lu'" References: <1381457552-6575-2-git-send-email-marex@denx.de> <000c01cec652$55adbb30$01093190$%han@samsung.com> In-Reply-To: <000c01cec652$55adbb30$01093190$%han@samsung.com> MIME-Version: 1.0 Content-Type: Text/Plain; charset="us-ascii" Message-Id: <201310111355.04746.marex@denx.de> Sender: linux-pci-owner@vger.kernel.org List-ID: 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 > > Cc: Bjorn Helgaas > > Cc: Frank Li > > Cc: Richard Zhu > > Cc: Sascha Hauer > > Cc: Sean Cross > > Cc: Shawn Guo > > Cc: Tim Harvey > > Cc: Yinghai Lu > > --- > > > > 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: marex@denx.de (Marek Vasut) Date: Fri, 11 Oct 2013 13:55:04 +0200 Subject: [PATCH 2/2] PCI: imx6: Fix the clock for PCIe In-Reply-To: <000c01cec652$55adbb30$01093190$%han@samsung.com> References: <1381457552-6575-2-git-send-email-marex@denx.de> <000c01cec652$55adbb30$01093190$%han@samsung.com> Message-ID: <201310111355.04746.marex@denx.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 > > Cc: Bjorn Helgaas > > Cc: Frank Li > > Cc: Richard Zhu > > Cc: Sascha Hauer > > Cc: Sean Cross > > Cc: Shawn Guo > > Cc: Tim Harvey > > Cc: Yinghai Lu > > --- > > > > 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