Commit 751bfe3e authored by Kevin Hilman's avatar Kevin Hilman
Browse files

Merge tag 'msm-cleanup-for-3.13' of... 

Merge tag 'msm-cleanup-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm into next/cleanup

From David Brown:
General cleanups for MSM for 3.13

Some small cleanups for MSM.  Removes extraneous irq definitions that
aren't used on DT targets, moves the single existing board file to
board-dt.c in antipication of additional targets, and renames the
existing DT files to have a common 'qcom' prefix.

* tag 'msm-cleanup-for-3.13' of git://git.kernel.org/pub/scm/linux/kernel/git/davidb/linux-msm

:
  ARM: msm: Rename msm devicetrees to have standard 'qcom' prefix
  ARM: msm: Create a common board-dt and config ARCH_MSM_DT
  ARM: msm: Remove irqs-*.h files for DT based targets

Signed-off-by: default avatarKevin Hilman <khilman@linaro.org>
parents 94850992 81cf1e06

arch/arm/boot/dts/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -101,8 +101,8 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-cloudbox.dtb \ 
	kirkwood-ts219-6282.dtb \

	kirkwood-openblocks_a6.dtb

dtb-$(CONFIG_ARCH_MARCO) += marco-evb.dtb

dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.dtb \

	msm8960-cdp.dtb

dtb-$(CONFIG_ARCH_MSM) += qcom-msm8660-surf.dtb \

	qcom-msm8960-cdp.dtb

dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \

	armada-370-mirabox.dtb \

	armada-370-netgear-rn102.dtb \

arch/arm/mach-msm/Kconfig

+10 −3
Original line number Diff line number Diff line 
if ARCH_MSM



comment "Qualcomm MSM SoC Type"

	depends on (ARCH_MSM8X60 || ARCH_MSM8960)

	depends on ARCH_MSM_DT



choice

	prompt "Qualcomm MSM SoC Type"

	default ARCH_MSM7X00A

	depends on !(ARCH_MSM8X60 || ARCH_MSM8960)

	depends on !ARCH_MSM_DT



config ARCH_MSM7X00A

	bool "MSM7x00A / MSM7x01A"
@@ -49,7 +49,6 @@ config ARCH_MSM8X60 
	select GPIO_MSM_V2

	select HAVE_SMP

	select MSM_SCM if SMP

	select USE_OF



config ARCH_MSM8960

	bool "MSM8960"
@@ -58,6 +57,11 @@ config ARCH_MSM8960 
	select HAVE_SMP

	select GPIO_MSM_V2

	select MSM_SCM if SMP



config ARCH_MSM_DT

	def_bool y

	depends on (ARCH_MSM8X60 || ARCH_MSM8960)

	select SPARSE_IRQ

	select USE_OF



config MSM_HAS_DEBUG_UART_HS
@@ -68,6 +72,7 @@ config MSM_SOC_REV_A 


config  ARCH_MSM_ARM11

	bool



config  ARCH_MSM_SCORPION

	bool
@@ -75,6 +80,7 @@ config MSM_VIC 
	bool



menu "Qualcomm MSM Board Type"

	depends on !ARCH_MSM_DT



config MACH_HALIBUT

	depends on ARCH_MSM
@@ -122,6 +128,7 @@ config MSM_SMD 


config MSM_GPIOMUX

	bool

	depends on !ARCH_MSM_DT

	help

	  Support for MSM V1 TLMM GPIOMUX architecture.

arch/arm/mach-msm/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ obj-$(CONFIG_MACH_TROUT) += board-trout.o board-trout-gpio.o board-trout-mmc.o b 
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-dt-8660.o

obj-$(CONFIG_ARCH_MSM8960) += board-dt-8960.o

obj-$(CONFIG_ARCH_MSM_DT) += board-dt.o

obj-$(CONFIG_MSM_GPIOMUX) += gpiomux.o

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE