On Thu, Jun 10, 2010 at 8:26 AM, Grant Likely <grant.lik...@secretlab.ca> wrote: > On Thu, Jun 10, 2010 at 12:43 AM, Benjamin Herrenschmidt > <b...@kernel.crashing.org> wrote: >> On Tue, 2010-06-08 at 08:10 -0600, Grant Likely wrote: >>> Microblaze and PowerPC share a large chunk of code for translating >>> OF device tree data into usable addresses. There aren't many differences >> ^^^^ >> Care to comment on these differences ? > > Purely cosmetic IIRC, but I will go back and double check. Things > like printk vs. pr_info and some style differences. I looked at them > side-by-side and fixed each difference individually until they were > identical. > >>> between the two, so merge the codebase wholesale rather than trying to >>> work out the independent bits. >> >> Well, I don't see ifdef's in the resulting code (but I'm a bit blind), >> so what did you do with the differences ? >> >> This is complex and fragile code, so any change to it must be very >> carefully scrutinized.
Hi Ben, I've double checked side-by-side. The changes are all cosmetic expect for the addition of dma-ranges support on the powerpc version that hadn't been applied to microblaze. This patch takes the powerpc code plus the cosmetic changes (spaces, pr_debug vs DBG, etc) from the microblaze side. There should be no functional changes to either platform since microblaze doesn't currently use dma-ranges anyway. Here's the new commit text: ---- of/address: Merge all of the bus translation code Microblaze and PowerPC share a large chunk of code for translating OF device tree data into usable addresses. Differences between the two consist of cosmetic differences, and the addition of dma-ranges support to powerpc but not microblaze. This patch moves the powerpc version into common code and applies many of the cosmetic (non-functional) changes from the microblaze version. ---- I've only changed the commit text. The patch remains unchanged. Are you okay with this patch? Cheers, g. >> >> Cheers, >> Ben. >> >>> Signed-off-by: Grant Likely <grant.lik...@secretlab.ca> >>> CC: Michal Simek <mon...@monstr.eu> >>> CC: Wolfram Sang <w.s...@pengutronix.de> >>> CC: Stephen Rothwell <s...@canb.auug.org.au> >>> CC: Benjamin Herrenschmidt <b...@kernel.crashing.org> >>> CC: microblaze-ucli...@itee.uq.edu.au >>> CC: linuxppc-...@ozlabs.org _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@lists.ozlabs.org https://lists.ozlabs.org/listinfo/linuxppc-dev