Commit bee22087 authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge branch 'msm/cleanup' into next/cleanup 



From David Brown <davidb@codeaurora.org>:
* msm/cleanup:
  ARM: msm: Only compile io.c on platforms that use it
  iommu/msm: Move mach includes to iommu directory
  ARM: msm: Remove devices-iommu.c
  ARM: msm: Move mach/board.h contents to common.h
  ARM: msm: Migrate msm_timer to CLOCKSOURCE_OF_DECLARE
  ARM: msm: Remove TMR and TMR0 static mappings
  ARM: msm: Move debug-macro.S to include/debug
  ARM: msm: Don't compile __msm_ioremap_caller() unless used
  ARM: msm: Remove unused and unmapped MSM_TLMM_BASE for 8x60

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents 311b79bb 3294a7e7

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -630,6 +630,7 @@ config ARCH_MSM 
	bool "Qualcomm MSM"

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	select CLKSRC_OF if OF

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	help

arch/arm/Kconfig.debug

+7 −2
Original line number Diff line number Diff line
@@ -777,6 +777,11 @@ config DEBUG_LL_INCLUDE 
				 DEBUG_IMX6SL_UART

	default "debug/keystone.S" if DEBUG_KEYSTONE_UART0 || \

				      DEBUG_KEYSTONE_UART1

	default "debug/msm.S" if DEBUG_MSM_UART1 || \

				 DEBUG_MSM_UART2 || \

				 DEBUG_MSM_UART3 || \

				 DEBUG_MSM8660_UART || \

				 DEBUG_MSM8960_UART

	default "debug/mvebu.S" if DEBUG_MVEBU_UART || \

				   DEBUG_MVEBU_UART_ALTERNATE

	default "debug/mxs.S" if DEBUG_IMX23_UART || DEBUG_IMX28_UART
@@ -804,13 +809,13 @@ config DEBUG_LL_INCLUDE 


config DEBUG_UNCOMPRESS

	bool

	default y if ARCH_MULTIPLATFORM && DEBUG_LL && \

	default y if (ARCH_MULTIPLATFORM || ARCH_MSM) && DEBUG_LL && \

		     !DEBUG_OMAP2PLUS_UART && \

		     !DEBUG_TEGRA_UART



config UNCOMPRESS_INCLUDE

	string

	default "debug/uncompress.h" if ARCH_MULTIPLATFORM

	default "debug/uncompress.h" if ARCH_MULTIPLATFORM || ARCH_MSM

	default "mach/uncompress.h"



config EARLY_PRINTK

arch/arm/mach-msm/include/mach/debug-macro.S→arch/arm/include/debug/msm.S

+30 −2
Original line number Diff line number Diff line
@@ -15,8 +15,36 @@ 
 *

 */



#include <mach/hardware.h>

#include <mach/msm_iomap.h>

#if defined(CONFIG_ARCH_MSM7X00A) || defined(CONFIG_ARCH_QSD8X50)

#define MSM_UART1_PHYS        0xA9A00000

#define MSM_UART2_PHYS        0xA9B00000

#define MSM_UART3_PHYS        0xA9C00000

#elif defined(CONFIG_ARCH_MSM7X30)

#define MSM_UART1_PHYS        0xACA00000

#define MSM_UART2_PHYS        0xACB00000

#define MSM_UART3_PHYS        0xACC00000

#endif



#if defined(CONFIG_DEBUG_MSM_UART1)

#define MSM_DEBUG_UART_BASE	0xE1000000

#define MSM_DEBUG_UART_PHYS	MSM_UART1_PHYS

#elif defined(CONFIG_DEBUG_MSM_UART2)

#define MSM_DEBUG_UART_BASE	0xE1000000

#define MSM_DEBUG_UART_PHYS	MSM_UART2_PHYS

#elif defined(CONFIG_DEBUG_MSM_UART3)

#define MSM_DEBUG_UART_BASE	0xE1000000

#define MSM_DEBUG_UART_PHYS	MSM_UART3_PHYS

#endif



#ifdef CONFIG_DEBUG_MSM8660_UART

#define MSM_DEBUG_UART_BASE	0xF0040000

#define MSM_DEBUG_UART_PHYS	0x19C40000

#endif



#ifdef CONFIG_DEBUG_MSM8960_UART

#define MSM_DEBUG_UART_BASE	0xF0040000

#define MSM_DEBUG_UART_PHYS	0x16440000

#endif



	.macro	addruart, rp, rv, tmp

#ifdef MSM_DEBUG_UART_PHYS

arch/arm/mach-msm/Makefile

+4 −5
Original line number Diff line number Diff line 
obj-y += io.o timer.o

obj-y += timer.o

obj-y += clock.o



obj-$(CONFIG_MSM_VIC) += irq-vic.o

obj-$(CONFIG_MSM_IOMMU) += devices-iommu.o



obj-$(CONFIG_ARCH_MSM7X00A) += irq.o

obj-$(CONFIG_ARCH_QSD8X50) += sirc.o



obj-$(CONFIG_MSM_PROC_COMM) += proc_comm.o clock-pcom.o vreg.o



obj-$(CONFIG_ARCH_MSM7X00A) += dma.o

obj-$(CONFIG_ARCH_MSM7X30) += dma.o

obj-$(CONFIG_ARCH_QSD8X50) += dma.o

obj-$(CONFIG_ARCH_MSM7X00A) += dma.o io.o

obj-$(CONFIG_ARCH_MSM7X30) += dma.o io.o

obj-$(CONFIG_ARCH_QSD8X50) += dma.o io.o



obj-$(CONFIG_MSM_SMD) += smd.o smd_debug.o

obj-$(CONFIG_MSM_SMD) += last_radio_log.o

arch/arm/mach-msm/board-dt-8660.c

+1 −3
Original line number Diff line number Diff line
@@ -15,8 +15,8 @@ 
#include <linux/of_platform.h>



#include <asm/mach/arch.h>

#include <asm/mach/map.h>



#include <mach/board.h>

#include "common.h"



static void __init msm8x60_init_late(void)
@@ -42,9 +42,7 @@ static const char *msm8x60_fluid_match[] __initdata = { 


DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")

	.smp = smp_ops(msm_smp_ops),

	.map_io = msm_map_msm8x60_io,

	.init_machine = msm8x60_dt_init,

	.init_late = msm8x60_init_late,

	.init_time	= msm_dt_timer_init,

	.dt_compat = msm8x60_fluid_match,

MACHINE_END

CRA Git | Maintained and supported by SUSTech CRA and CCSE