Commit 68996085 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm 

* 'for-linus' of git://codeaurora.org/quic/kernel/davidb/linux-msm: (46 commits)
  msm: scm: Check for interruption immediately
  msm: scm: Fix improper register assignment
  msm: scm: Mark inline asm as volatile
  msm: iommu: Enable HTW L2 redirection on MSM8960
  msm: iommu: Don't read from write-only registers
  msm: iommu: Remove dependency on IDR
  msm: iommu: Use ASID tagging instead of VMID tagging
  msm: iommu: Rework clock logic and add IOMMU bus clock control
  msm: iommu: Clock control for the IOMMU driver
  msm: mdp: Set the correct pack pattern for XRGB/ARGB
  msm_fb: Fix framebuffer console
  msm: mdp: Add support for RGBX 8888 image format.
  video: msmfb: Put the partial update magic value into the fix_screen struct.
  msm: clock: Migrate to clkdev
  msm: clock: Remove references to clk_ops_pcom
  msm: headsmp.S: Fix section mismatch
  msm: Use explicit GPLv2 licenses
  msm: iommu: Enable IOMMU support for MSM8960
  msm: iommu: Generalize platform data for multiple targets
  msm: iommu: Create a Kconfig item for the IOMMU driver
  ...
parents 411f5c7a 92c260f7

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -626,6 +626,7 @@ config ARCH_MSM 
	select HAVE_CLK

	select GENERIC_CLOCKEVENTS

	select ARCH_REQUIRE_GPIOLIB

	select CLKDEV_LOOKUP

	help

	  Support for Qualcomm MSM/QSD based systems.  This runs on the

	  apps processor of the MSM/QSD and depends on a shared memory

arch/arm/mach-msm/Kconfig

+35 −2
Original line number Diff line number Diff line
@@ -45,7 +45,16 @@ config ARCH_MSM8X60 
	select CPU_V7

	select MSM_V2_TLMM

	select MSM_GPIOMUX

	select IOMMU_API

	select MSM_SCM if SMP



config ARCH_MSM8960

	bool "MSM8960"

	select ARCH_MSM_SCORPIONMP

	select MACH_MSM8960_SIM if (!MACH_MSM8960_RUMI3)

	select ARM_GIC

	select CPU_V7

	select MSM_V2_TLMM

	select MSM_GPIOMUX

	select MSM_SCM if SMP



endchoice
@@ -125,11 +134,35 @@ config MACH_MSM8X60_FFA 
	help

	  Support for the Qualcomm MSM8x60 FFA eval board.



config MACH_MSM8960_SIM

	depends on ARCH_MSM8960

	bool "MSM8960 Simulator"

	help

	  Support for the Qualcomm MSM8960 simulator.



config MACH_MSM8960_RUMI3

	depends on ARCH_MSM8960

	bool "MSM8960 RUMI3"

	help

	  Support for the Qualcomm MSM8960 RUMI3 emulator.



endmenu



config MSM_IOMMU

	bool "MSM IOMMU Support"

	depends on ARCH_MSM8X60 || ARCH_MSM8960

	select IOMMU_API

	default n

	help

	  Support for the IOMMUs found on certain Qualcomm SOCs.

	  These IOMMUs allow virtualization of the address space used by most

	  cores within the multimedia subsystem.



	  If unsure, say N here.



config IOMMU_PGTABLES_L2

	def_bool y

	depends on ARCH_MSM8X60 && MMU && SMP && CPU_DCACHE_DISABLE=n

	depends on MSM_IOMMU && MMU && SMP && CPU_DCACHE_DISABLE=n



config MSM_DEBUG_UART

	int

arch/arm/mach-msm/Makefile

+14 −15
Original line number Diff line number Diff line 
obj-y += io.o idle.o timer.o

ifndef CONFIG_ARCH_MSM8X60

obj-y += acpuclock-arm11.o

obj-y += dma.o

endif

obj-y += clock.o

obj-$(CONFIG_DEBUG_FS) += clock-debug.o



ifdef CONFIG_MSM_VIC

obj-y += irq-vic.o

else

ifndef CONFIG_ARCH_MSM8X60

obj-y += irq.o

endif

endif

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

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



obj-$(CONFIG_ARCH_MSM7X00A) += dma.o irq.o acpuclock-arm11.o

obj-$(CONFIG_ARCH_MSM7X30) += dma.o

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



obj-$(CONFIG_ARCH_MSM8X60) += clock-dummy.o iommu.o iommu_dev.o devices-msm8x60-iommu.o

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

obj-$(CONFIG_MSM_PROC_COMM) += clock.o

obj-$(CONFIG_ARCH_QSD8X50) += sirc.o



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

obj-$(CONFIG_MSM_SMD) += last_radio_log.o

obj-$(CONFIG_MSM_SCM) += scm.o scm-boot.o
@@ -29,12 +24,16 @@ obj-$(CONFIG_MACH_HALIBUT) += board-halibut.o devices-msm7x00.o 
obj-$(CONFIG_ARCH_MSM7X30) += board-msm7x30.o devices-msm7x30.o

obj-$(CONFIG_ARCH_QSD8X50) += board-qsd8x50.o devices-qsd8x50.o

obj-$(CONFIG_ARCH_MSM8X60) += board-msm8x60.o

obj-$(CONFIG_ARCH_MSM8960) += board-msm8960.o devices-msm8960.o



obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-7x30.o gpiomux-v1.o gpiomux.o

obj-$(CONFIG_ARCH_MSM7X30) += gpiomux-v1.o gpiomux.o

obj-$(CONFIG_ARCH_QSD8X50) += gpiomux-8x50.o gpiomux-v1.o gpiomux.o

obj-$(CONFIG_ARCH_MSM8X60) += gpiomux-8x60.o gpiomux-v2.o gpiomux.o

ifdef CONFIG_MSM_V2_TLMM

ifndef CONFIG_ARCH_MSM8960

# TODO: TLMM Mapping issues need to be resolved

obj-y	+= gpio-v2.o

endif

else

obj-y	+= gpio.o

endif

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

+0 −2
Original line number Diff line number Diff line
@@ -93,8 +93,6 @@ static void __init halibut_map_io(void) 
}



MACHINE_START(HALIBUT, "Halibut Board (QCT SURF7200A)")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params	= 0x10000100,

	.fixup		= halibut_fixup,

	.map_io		= halibut_map_io,

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

+0 −2
Original line number Diff line number Diff line
@@ -74,8 +74,6 @@ static void __init mahimahi_map_io(void) 
extern struct sys_timer msm_timer;



MACHINE_START(MAHIMAHI, "mahimahi")

#ifdef CONFIG_MSM_DEBUG_UART

#endif

	.boot_params	= 0x20000100,

	.fixup		= mahimahi_fixup,

	.map_io		= mahimahi_map_io,

CRA Git | Maintained and supported by SUSTech CRA and CCSE