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@xxxxxxx> > Cc: Bjorn Helgaas <bhelgaas@xxxxxxxxxx> > Cc: Frank Li <lznuaa@xxxxxxxxx> > Cc: Richard Zhu <r65037@xxxxxxxxxxxxx> > Cc: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> > Cc: Sean Cross <xobs@xxxxxxxxxx> > Cc: Shawn Guo <shawn.guo@xxxxxxxxxx> > Cc: Tim Harvey <tharvey@xxxxxxxxxxxxx> > Cc: Yinghai Lu <yinghai@xxxxxxxxxx> > --- > 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. :-) [1] http://git.kernel.org/cgit/linux/kernel/git/helgaas/pci.git/commit/?h=next&id=bb38919ec56e0758c3ae56dfc091dcde1391353e [2] https://git.linaro.org/gitweb?p=people/shawnguo/linux-2.6.git;a=commit;h=3a57291fa4ca7f7647d826f5b47082ef306d839f Best regards, Jingoo Han -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
