Hi, On Fri, Aug 10, 2012 at 2:18 PM, Rohit Vaswani <[email protected]> wrote: > With 3.4 kernel the static iomappings can be shared with the ioremap > mappings. If ioremap is called with an address for which a static > mapping already exists, then that mapping should be used instead > of creating a new one. > However, the MT_DEVICE_NONSHARED flag prevents this. Hence, get rid > of this flag. Some targets (7X00) that require the static iomappings > to be NONSHARED use the MSM_DEVICE_TYPE and MSM_CHIP_DEVICE_TYPE macros. > > Signed-off-by: Rohit Vaswani <[email protected]> > --- > arch/arm/mach-msm/io.c | 25 +++++++++++++++++-------- > 1 files changed, 17 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/mach-msm/io.c b/arch/arm/mach-msm/io.c > index 2409c0b..5fc2e48 100644 > --- a/arch/arm/mach-msm/io.c > +++ b/arch/arm/mach-msm/io.c > @@ -33,23 +33,32 @@ > .virtual = (unsigned long) MSM_##name##_BASE, \ > .pfn = __phys_to_pfn(chip##_##name##_PHYS), \ > .length = chip##_##name##_SIZE, \ > - .type = MT_DEVICE_NONSHARED, \ > + .type = MT_DEVICE, \ > + } > + > +#define MSM_CHIP_DEVICE_TYPE(name, chip, mem_type) { > \ > + .virtual = (unsigned long) MSM_##name##_BASE, \ > + .pfn = __phys_to_pfn(chip##_##name##_PHYS), \ > + .length = chip##_##name##_SIZE, \ > + .type = mem_type, \ > }
The above is partially hidden by lack of context in the diff, but now you have two defines that do nearly the same thing. It's better to move to a #define MSM_CHIP_DEVICE(name, chip) MSM_CHIP_DEVICE_TYPE(name, chip, MT_DEVICE) for the exising one, instead of duplicating the open coded macros. -Olof -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
