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?
Regards,
Leif
Best regards, Marcin
2016-11-29 12:59 GMT+01:00 Leif Lindholm leif.lindholm@linaro.org:
On Sun, Nov 27, 2016 at 10:55:41PM +0100, Marcin Wojtas wrote:
Armada 70x0 SoC comprise two Sd/Mmc controllers. This commit adds platform information about the second one, which can be enabled using PciEmulation mechanism and appropriate PCD entries.
Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Marcin Wojtas mw@semihalf.com
Platforms/Marvell/PciEmulation/PciEmulation.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Platforms/Marvell/PciEmulation/PciEmulation.c b/Platforms/Marvell/PciEmulation/PciEmulation.c index f0203f8..491b886 100644 --- a/Platforms/Marvell/PciEmulation/PciEmulation.c +++ b/Platforms/Marvell/PciEmulation/PciEmulation.c @@ -70,10 +70,10 @@ STATIC PCIE_PLATFORM_DESC mA70x0PlatDescTemplate = { { 0xF2540000 }, { SIZE_8KB }, { NonDiscoverableDeviceDmaTypeCoherent },
- 1, // SDHCI
- { 0xF06E0000 },
- { SIZE_1KB },
- { NonDiscoverableDeviceDmaTypeCoherent }
- 2, // SDHCI
- { 0xF06E0000, 0xF2780000 },
- { SIZE_1KB, SIZE_1KB },
- { NonDiscoverableDeviceDmaTypeCoherent, NonDiscoverableDeviceDmaTypeCoherent }
So ... it looks somewhat counterintuitive to me to add this before the driver which provides support for it. (And yes, I should probably have tweaked on this as part of your non-discoverable set)). Is there a strong reason not to squash this single hunk into 7/7?
Regards,
Leif
};
//
1.8.3.1