Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fc773668 authored by Russell King's avatar Russell King
Browse files

Merge branch 'master' into devel

parents bc7ecbcb 9074e144

arch/arm/Kconfig

+1 −4
Original line number Diff line number Diff line
@@ -603,6 +603,7 @@ config ARCH_SA1100 
	select ARCH_SPARSEMEM_ENABLE

	select ARCH_MTD_XIP

	select ARCH_HAS_CPUFREQ

	select CPU_FREQ

	select GENERIC_GPIO

	select GENERIC_TIME

	select GENERIC_CLOCKEVENTS
@@ -1359,13 +1360,9 @@ source "drivers/cpufreq/Kconfig" 


config CPU_FREQ_SA1100

	bool

	depends on CPU_FREQ && (SA1100_H3100 || SA1100_H3600 || SA1100_LART || SA1100_PLEB || SA1100_BADGE4 || SA1100_HACKKIT)

	default y



config CPU_FREQ_SA1110

	bool

	depends on CPU_FREQ && (SA1100_ASSABET || SA1100_CERF || SA1100_PT_SYSTEM3)

	default y



config CPU_FREQ_INTEGRATOR

	tristate "CPUfreq driver for ARM Integrator CPUs"

arch/arm/mach-clps711x/include/mach/memory.h

+2 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 


#define __virt_to_bus(x)	((x) - PAGE_OFFSET)

#define __bus_to_virt(x)	((x) + PAGE_OFFSET)

#define __pfn_to_bus(x)		(__pfn_to_phys(x) - PHYS_OFFSET)

#define __bus_to_pfn(x)		__phys_to_pfn((x) + PHYS_OFFSET)



#endif

arch/arm/mach-footbridge/common.c

+19 −3
Original line number Diff line number Diff line
@@ -201,6 +201,11 @@ void __init footbridge_map_io(void) 


#ifdef CONFIG_FOOTBRIDGE_ADDIN



static inline unsigned long fb_bus_sdram_offset(void)

{

	return *CSR_PCISDRAMBASE & 0xfffffff0;

}



/*

 * These two functions convert virtual addresses to PCI addresses and PCI

 * addresses to virtual addresses.  Note that it is only legal to use these
@@ -210,14 +215,13 @@ unsigned long __virt_to_bus(unsigned long res) 
{

	WARN_ON(res < PAGE_OFFSET || res >= (unsigned long)high_memory);



	return (res - PAGE_OFFSET) + (*CSR_PCISDRAMBASE & 0xfffffff0);

	return res + (fb_bus_sdram_offset() - PAGE_OFFSET);

}

EXPORT_SYMBOL(__virt_to_bus);



unsigned long __bus_to_virt(unsigned long res)

{

	res -= (*CSR_PCISDRAMBASE & 0xfffffff0);

	res += PAGE_OFFSET;

	res = res - (fb_bus_sdram_offset() - PAGE_OFFSET);



	WARN_ON(res < PAGE_OFFSET || res >= (unsigned long)high_memory);
@@ -225,4 +229,16 @@ unsigned long __bus_to_virt(unsigned long res) 
}

EXPORT_SYMBOL(__bus_to_virt);



unsigned long __pfn_to_bus(unsigned long pfn)

{

	return __pfn_to_phys(pfn) + (fb_bus_sdram_offset() - PHYS_OFFSET));

}

EXPORT_SYMBOL(__pfn_to_bus);



unsigned long __bus_to_pfn(unsigned long bus)

{

	return __phys_to_pfn(bus - (fb_bus_sdram_offset() - PHYS_OFFSET));

}

EXPORT_SYMBOL(__bus_to_pfn);



#endif

arch/arm/mach-footbridge/include/mach/memory.h

+9 −6
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ 
#ifndef __ASSEMBLY__

extern unsigned long __virt_to_bus(unsigned long);

extern unsigned long __bus_to_virt(unsigned long);

extern unsigned long __pfn_to_bus(unsigned long);

extern unsigned long __bus_to_pfn(unsigned long);

#endif

#define __virt_to_bus	__virt_to_bus

#define __bus_to_virt	__bus_to_virt
@@ -36,14 +38,15 @@ extern unsigned long __bus_to_virt(unsigned long); 
#elif defined(CONFIG_FOOTBRIDGE_HOST)



/*

 * The footbridge is programmed to expose the system RAM at the corresponding

 * address.  So, if PAGE_OFFSET is 0xc0000000, RAM appears at 0xe0000000.

 * If 0x80000000, then its exposed at 0xa0000000 on the bus. etc.

 * The only requirement is that the RAM isn't placed at bus address 0 which

 * The footbridge is programmed to expose the system RAM at 0xe0000000.

 * The requirement is that the RAM isn't placed at bus address 0, which

 * would clash with VGA cards.

 */

#define __virt_to_bus(x)	((x) - 0xe0000000)

#define __bus_to_virt(x)	((x) + 0xe0000000)

#define BUS_OFFSET		0xe0000000

#define __virt_to_bus(x)	((x) + (BUS_OFFSET - PAGE_OFFSET))

#define __bus_to_virt(x)	((x) - (BUS_OFFSET - PAGE_OFFSET))

#define __pfn_to_bus(x)		(__pfn_to_phys(x) + (BUS_OFFSET - PHYS_OFFSET))

#define __bus_to_pfn(x)		__phys_to_pfn((x) - (BUS_OFFSET - PHYS_OFFSET))



#else

arch/arm/mach-integrator/include/mach/memory.h

+2 −1
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ 
#define BUS_OFFSET	UL(0x80000000)

#define __virt_to_bus(x)	((x) - PAGE_OFFSET + BUS_OFFSET)

#define __bus_to_virt(x)	((x) - BUS_OFFSET + PAGE_OFFSET)

#define __pfn_to_bus(x)		(((x) << PAGE_SHIFT) + BUS_OFFSET)

#define __pfn_to_bus(x)		(__pfn_to_phys(x) + (BUS_OFFSET - PHYS_OFFSET))

#define __bus_to_pfn(x)		__phys_to_pfn((x) - (BUS_OFFSET - PHYS_OFFSET))



#endif