From: Olof Johansson <olof@lixom.net>
Date: Mon, 17 Sep 2012 00:53:34 +0000 (-0700)
Subject: Merge branches 'msm/fixes-non-critical' and 'msm/cleanup' into next/dt
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=bada1c5b49e4a66014f919b4bd95fca9dd3d04bd;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

Merge branches 'msm/fixes-non-critical' and 'msm/cleanup' into next/dt

Merging in fixes and cleanup as prereqs to simplify merge conflicts.

* msm/fixes-non-critical:
  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

* msm/cleanup:
  ARM: msm: Remove uncompiled board-msm7x27
  ARM: msm: Remove unused acpuclock-arm11
  ARM: msm: dma: use list_move_tail instead of list_del/list_add_tail
  ARM: msm: Fix sparse warnings due to incorrect type
  ARM: msm: Remove unused idle.c
  ARM: msm: clock-pcom: Mark functions static
  ARM: msm: Remove msm_hw_reset_hook

Signed-off-by: Olof Johansson <olof@lixom.net>
---

bada1c5b49e4a66014f919b4bd95fca9dd3d04bd
diff --cc arch/arm/mach-msm/io.c
index a1e7b1168850,af43f6acd7fc,97042331cfc7..3cb4f4c35710
--- a/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@@@ -33,26 -33,27 -33,25 +33,26 @@@@
   		.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)
++ #if defined(CONFIG_ARCH_MSM7X00A)
   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,