2016-11-29 13:58 GMT+01:00 Leif Lindholm leif.lindholm@linaro.org:
On Tue, Nov 29, 2016 at 01:44:33PM +0100, Marcin Wojtas wrote:
Hi Leif,
2016-11-29 13:39 GMT+01:00 Leif Lindholm leif.lindholm@linaro.org:
On Tue, Nov 29, 2016 at 01:09:21PM +0100, Marcin Wojtas wrote:
Hi Leif,
In fact this patch can be squashed with: "Platforms/Marvell: Add PciEmulation driver" commit from previous patchset. I can do it, I'll consult with you technical details beforehand.
OK, I would prefer the following bit of surgery: Keep 2-6 of this set and send out a v4 (addressing comments). This set can go in first, and without the bits enabling them for the platform.
Squash 1 [SdMmc] into 1 [PciEmulation] and turn 7 [SdMmc] into 7/6 [PciEmulation]. I'm happy to take 1 and 7 only for this.
Does that sound reasonable to you?
Yes, but how about some more mixing? Here's what I propose: HEAD Platforms/Marvell: Enable SD/MMC for Armada70x0 board Platforms/Marvell: Enable SD/MMC stack for Armada70x0 platforms Platforms/Marvell: MppLib: Configure SD/MMC PHY Platforms/Marvell: Enable SATA port for Armada70x0 board Platforms/Marvell: Enable SATA stack for Armada70x0 platform Platforms/Marvell: Enable two xHCI ports for Armada70x0 board Platforms/Marvell: Enable USB stack for Armada70x0 platform Platforms/Marvell: Enable PciEmulation driver for Armada70x0 platform Platforms/Marvell: Add PciEmulation driver (+ squashed Platforms/Marvell/PciEmulation: Add second SD/MMC device of Armada70x0) Drivers/SdMmc: Adjust stack to fulfill Xenon controller demands Drivers/SdMmc: Replace deprecated debug level macros Drivers/SdMmc: Import SdMmcPciHcDxe driver
If we're juggling properly, how about:
Platforms/Marvell: Enable PciEmulation driver for Armada70x0 platform Platforms/Marvell: Enable SD/MMC for Armada70x0 board Platforms/Marvell: Enable SD/MMC stack for Armada70x0 platforms Platforms/Marvell: Enable SATA port for Armada70x0 board Platforms/Marvell: Enable SATA stack for Armada70x0 platform Platforms/Marvell: Enable two xHCI ports for Armada70x0 board Platforms/Marvell: Enable USB stack for Armada70x0 platform Platforms/Marvell: Add PciEmulation driver (+ squashed Platforms/Marvell/PciEmulation: Add second SD/MMC device of Armada70x0) Platforms/Marvell: MppLib: Configure SD/MMC PHY Drivers/SdMmc: Adjust stack to fulfill Xenon controller demands Drivers/SdMmc: Replace deprecated debug level macros Drivers/SdMmc: Import SdMmcPciHcDxe driver
?
What do you think? I could send it in a single patchset, could be easier to apply.
This is fine, with one exception - "Platforms/Marvell: MppLib: Configure SD/MMC PHY" uses PCD, that is added in "Platforms/Marvell: Add PciEmulation driver", so I'll swap them on above list.
Especially with a branch, yes.
Work in progress.
Best regards, Marcin