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

Commit ca43af52 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'msm-fix-noncrit-for-3.7' of... 

Merge tag 'msm-fix-noncrit-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/fixes-non-critical

From David Brown:

Some non-critical fixes for msm platforms.  The missing FPGA init call
fix is necessary to compile the 8660 target.  The iomapping calls are
needed to prevent duplicate mappings with differing attributes.  And,
the debug UART change keeps the debug UART working on targets with
more than 512MB of memory.

* tag 'msm-fix-noncrit-for-3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm:
  ARM: msm: Fix early debug uart mapping on some memory configs
  ARM: msm: io: Change the default static iomappings to be shared
  ARM: msm: io: Remove 7x30 iomap region from 7x00
  ARM: msm: Remove call to missing FPGA init on 8660
parents 03e588e9 10717e04

arch/arm/mach-msm/board-msm8x60.c

+0 −5
Original line number Diff line number Diff line
@@ -93,11 +93,6 @@ static struct of_dev_auxdata msm_auxdata_lookup[] __initdata = { 


static void __init msm8x60_dt_init(void)

{

	if (of_machine_is_compatible("qcom,msm8660-surf")) {

		printk(KERN_INFO "Init surf UART registers\n");

		msm8x60_init_uart12dm();

	}



	of_platform_populate(NULL, of_default_bus_match_table,

			msm_auxdata_lookup, NULL);

}

arch/arm/mach-msm/include/mach/msm_iomap-8960.h

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ 
#define MSM8960_TMR0_SIZE	SZ_4K



#ifdef CONFIG_DEBUG_MSM8960_UART

#define MSM_DEBUG_UART_BASE	0xE1040000

#define MSM_DEBUG_UART_BASE	0xF0040000

#define MSM_DEBUG_UART_PHYS	0x16440000

#endif

arch/arm/mach-msm/include/mach/msm_iomap-8x60.h

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ 
#define MSM8X60_TMR0_SIZE	SZ_4K



#ifdef CONFIG_DEBUG_MSM8660_UART

#define MSM_DEBUG_UART_BASE	0xE1040000

#define MSM_DEBUG_UART_BASE	0xF0040000

#define MSM_DEBUG_UART_PHYS	0x19C40000

#endif

arch/arm/mach-msm/io.c

+13 −12
Original line number Diff line number Diff line
@@ -29,30 +29,31 @@ 


#include <mach/board.h>



#define MSM_CHIP_DEVICE(name, chip) {			      \

#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 = MT_DEVICE_NONSHARED, \

		.type = mem_type, \

	 }



#define MSM_DEVICE_TYPE(name, mem_type) \

		MSM_CHIP_DEVICE_TYPE(name, MSM, mem_type)

#define MSM_CHIP_DEVICE(name, chip) \

		MSM_CHIP_DEVICE_TYPE(name, chip, MT_DEVICE)

#define MSM_DEVICE(name) MSM_CHIP_DEVICE(name, MSM)



#if defined(CONFIG_ARCH_MSM7X00A) || defined(CONFIG_ARCH_MSM7X27) \

	|| defined(CONFIG_ARCH_MSM7X25)

static struct map_desc msm_io_desc[] __initdata = {

	MSM_DEVICE(VIC),

	MSM_CHIP_DEVICE(CSR, MSM7X00),

	MSM_DEVICE(DMOV),

	MSM_CHIP_DEVICE(GPIO1, MSM7X00),

	MSM_CHIP_DEVICE(GPIO2, MSM7X00),

	MSM_DEVICE(CLK_CTL),

	MSM_DEVICE_TYPE(VIC, MT_DEVICE_NONSHARED),

	MSM_CHIP_DEVICE_TYPE(CSR, MSM7X00, MT_DEVICE_NONSHARED),

	MSM_DEVICE_TYPE(DMOV, MT_DEVICE_NONSHARED),

	MSM_CHIP_DEVICE_TYPE(GPIO1, MSM7X00, MT_DEVICE_NONSHARED),

	MSM_CHIP_DEVICE_TYPE(GPIO2, MSM7X00, MT_DEVICE_NONSHARED),

	MSM_DEVICE_TYPE(CLK_CTL, MT_DEVICE_NONSHARED),

#if defined(CONFIG_DEBUG_MSM_UART1) || defined(CONFIG_DEBUG_MSM_UART2) || \

	defined(CONFIG_DEBUG_MSM_UART3)

	MSM_DEVICE(DEBUG_UART),

#endif

#ifdef CONFIG_ARCH_MSM7X30

	MSM_DEVICE(GCC),

	MSM_DEVICE_TYPE(DEBUG_UART, MT_DEVICE_NONSHARED),

#endif

	{

		.virtual =  (unsigned long) MSM_SHARED_RAM_BASE,