Re: [PATCH V10 0/4] PCIe support for Samsung Exynos5440 SoC
On Friday, June 21, 2013 11:15 PM, Arnd Bergmann wrote: On Friday 21 June 2013, Jason Cooper wrote: On Fri, Jun 21, 2013 at 10:30:47AM +0200, Arnd Bergmann wrote: On Friday 21 June 2013, Thomas Petazzoni wrote: I am by far not an expert on how to solve merge strategies and so on, but to avoid conflicts at Linus's level while merging the arm-soc and pci trees, it would be better if this Samsung PCIe driver could go through arm-soc (with Bjorn ACK, of course), so that Arnd/Olof can make sure the ordering is correct with regard to the of/pci changes and the mvebu/pci driver. Yes, right. That is the reason why I based on 'linu-next' tree, instead of 'PCI' -next branch. Bjorn Helgaas, Could you give your ACK? Thank you. Best regards, Jingoo Han Yes, good point. The alternative would be that Bjorn also takes the PCI branch dependencies that are already in arm-soc into his tree. Either way works, but I agree that what you suggest would be simpler. Yes, that is why we did it this way. It was my understanding based on previous comments by yourself and LinusW that you both had patches depending on (now called) mvebu/of_pci. So we got it into arm-soc early so those branches could depend on it. Right. I wasn't paying enough attention for the early merges that Olof did. Arnd ___ devicetree-discuss mailing list devicetree-discuss@lists.ozlabs.org https://lists.ozlabs.org/listinfo/devicetree-discuss
Re: [PATCH V10 0/4] PCIe support for Samsung Exynos5440 SoC
On Friday 21 June 2013, Jingoo Han wrote: Changes between v9 and v10: * Changed the file name from 'pci-designware.c' to 'pcie-designware.c' guided by Pratyush Anand, because synopsis pcie and pci controllers are different. * Fixed the typos of document, reported by Sachin Kamat. Changes between v8 and v9: * Changed the file name from 'exynos-pcie.txt' to 'designware-pcie.txt'. * Added 'snps,dw-pcie' string to compatible property. Changes between v7 and v8: * Changed the file name from 'pci-exynos.c' to 'pci-designware.c', and added a generic string for compatible property to exynos-pcie.txt * Moved pci_add_resource_offset() for I/O space to the 'if' clause * Added Arnd's Acked-by Changes between v6 and v7: * Split ARM DT patch to two patches * Fixed node naming * Added Arnd's Acked-by Ok, that takes care of all my comments. Bjorn, are you still considering to merge this for 3.11 or have you closed your tree for the merge window? I think it would be good to get it in. Arnd ___ devicetree-discuss mailing list devicetree-discuss@lists.ozlabs.org https://lists.ozlabs.org/listinfo/devicetree-discuss
Re: [PATCH V10 0/4] PCIe support for Samsung Exynos5440 SoC
Dear Arnd Bergmann, On Fri, 21 Jun 2013 09:31:58 +0200, Arnd Bergmann wrote: Bjorn, are you still considering to merge this for 3.11 or have you closed your tree for the merge window? I think it would be good to get it in. Note that the of/pci changes needed for this driver are merged through the arm-soc tree, with the of maintainers ACKs. They are already in arm-soc for-next, through Jason Cooper's tree. 4e23d3f505e8acfeac7cc33d4113fbb5a25c3090 of/pci: Add of_pci_parse_bus_range() function 45ab9702fb47d18dca116b3a0509efa19fbcb27a of/pci: Add of_pci_get_devfn() function 29b635c00f3ebcdaf7a52c4948f6d948ad3757d3 of/pci: Provide support for parsing PCI DT ranges property Also, it depends on the Marvell PCIe driver (but to a lesser extent), which is the one that creates the drivers/pci/host/Kconfig and drivers/pci/host/Makefile. 45361a4fe4464180815157654aabbd2afb4848ad pci: PCIe driver for Marvell Armada 370/XP systems I am by far not an expert on how to solve merge strategies and so on, but to avoid conflicts at Linus's level while merging the arm-soc and pci trees, it would be better if this Samsung PCIe driver could go through arm-soc (with Bjorn ACK, of course), so that Arnd/Olof can make sure the ordering is correct with regard to the of/pci changes and the mvebu/pci driver. I'll let you discuss that with Jason Cooper. Best regards, Thomas -- Thomas Petazzoni, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com ___ devicetree-discuss mailing list devicetree-discuss@lists.ozlabs.org https://lists.ozlabs.org/listinfo/devicetree-discuss
Re: [PATCH V10 0/4] PCIe support for Samsung Exynos5440 SoC
On Friday 21 June 2013, Thomas Petazzoni wrote: I am by far not an expert on how to solve merge strategies and so on, but to avoid conflicts at Linus's level while merging the arm-soc and pci trees, it would be better if this Samsung PCIe driver could go through arm-soc (with Bjorn ACK, of course), so that Arnd/Olof can make sure the ordering is correct with regard to the of/pci changes and the mvebu/pci driver. Yes, good point. The alternative would be that Bjorn also takes the PCI branch dependencies that are already in arm-soc into his tree. Either way works, but I agree that what you suggest would be simpler. Arnd ___ devicetree-discuss mailing list devicetree-discuss@lists.ozlabs.org https://lists.ozlabs.org/listinfo/devicetree-discuss
Re: [PATCH V10 0/4] PCIe support for Samsung Exynos5440 SoC
On Fri, Jun 21, 2013 at 10:30:47AM +0200, Arnd Bergmann wrote: On Friday 21 June 2013, Thomas Petazzoni wrote: I am by far not an expert on how to solve merge strategies and so on, but to avoid conflicts at Linus's level while merging the arm-soc and pci trees, it would be better if this Samsung PCIe driver could go through arm-soc (with Bjorn ACK, of course), so that Arnd/Olof can make sure the ordering is correct with regard to the of/pci changes and the mvebu/pci driver. Yes, good point. The alternative would be that Bjorn also takes the PCI branch dependencies that are already in arm-soc into his tree. Either way works, but I agree that what you suggest would be simpler. Yes, that is why we did it this way. It was my understanding based on previous comments by yourself and LinusW that you both had patches depending on (now called) mvebu/of_pci. So we got it into arm-soc early so those branches could depend on it. hth, Jason. ___ devicetree-discuss mailing list devicetree-discuss@lists.ozlabs.org https://lists.ozlabs.org/listinfo/devicetree-discuss
Re: [PATCH V10 0/4] PCIe support for Samsung Exynos5440 SoC
On Friday 21 June 2013, Jason Cooper wrote: On Fri, Jun 21, 2013 at 10:30:47AM +0200, Arnd Bergmann wrote: On Friday 21 June 2013, Thomas Petazzoni wrote: I am by far not an expert on how to solve merge strategies and so on, but to avoid conflicts at Linus's level while merging the arm-soc and pci trees, it would be better if this Samsung PCIe driver could go through arm-soc (with Bjorn ACK, of course), so that Arnd/Olof can make sure the ordering is correct with regard to the of/pci changes and the mvebu/pci driver. Yes, good point. The alternative would be that Bjorn also takes the PCI branch dependencies that are already in arm-soc into his tree. Either way works, but I agree that what you suggest would be simpler. Yes, that is why we did it this way. It was my understanding based on previous comments by yourself and LinusW that you both had patches depending on (now called) mvebu/of_pci. So we got it into arm-soc early so those branches could depend on it. Right. I wasn't paying enough attention for the early merges that Olof did. Arnd ___ devicetree-discuss mailing list devicetree-discuss@lists.ozlabs.org https://lists.ozlabs.org/listinfo/devicetree-discuss
