Commit 42895642 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge branch 'qcom/cleanup' into next/dt 



This is a dependency for the qcom/dt branch.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents c58181eb cf1e8f0c

MAINTAINERS

+8 −0
Original line number Diff line number Diff line
@@ -1167,6 +1167,14 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
W:	http://www.arm.linux.org.uk/

S:	Maintained



ARM/QUALCOMM SUPPORT

M:	Kumar Gala <galak@codeaurora.org>

M:	David Brown <davidb@codeaurora.org>

L:	linux-arm-msm@vger.kernel.org

S:	Maintained

F:	arch/arm/mach-qcom/

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git



ARM/RADISYS ENP2611 MACHINE SUPPORT

M:	Lennert Buytenhek <kernel@wantstofly.org>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

arch/arm/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -657,9 +657,8 @@ config ARCH_PXA 
	help

	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.



config ARCH_MSM_NODT

	bool "Qualcomm MSM"

	select ARCH_MSM

config ARCH_MSM

	bool "Qualcomm MSM (non-multiplatform)"

	select ARCH_REQUIRE_GPIOLIB

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS
@@ -1005,6 +1004,8 @@ source "arch/arm/plat-pxa/Kconfig" 


source "arch/arm/mach-mmp/Kconfig"



source "arch/arm/mach-qcom/Kconfig"



source "arch/arm/mach-realview/Kconfig"



source "arch/arm/mach-rockchip/Kconfig"

arch/arm/Kconfig.debug

+1 −1
Original line number Diff line number Diff line
@@ -956,7 +956,7 @@ config DEBUG_STI_UART 


config DEBUG_MSM_UART

	bool

	depends on ARCH_MSM

	depends on ARCH_MSM || ARCH_QCOM



config DEBUG_LL_INCLUDE

	string

arch/arm/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -180,6 +180,7 @@ machine-$(CONFIG_ARCH_OMAP2PLUS) += omap2 
machine-$(CONFIG_ARCH_ORION5X)		+= orion5x

machine-$(CONFIG_ARCH_PICOXCELL)	+= picoxcell

machine-$(CONFIG_ARCH_PXA)		+= pxa

machine-$(CONFIG_ARCH_QCOM)		+= qcom

machine-$(CONFIG_ARCH_REALVIEW)		+= realview

machine-$(CONFIG_ARCH_ROCKCHIP)		+= rockchip

machine-$(CONFIG_ARCH_RPC)		+= rpc

arch/arm/boot/dts/Makefile

+3 −3
Original line number Diff line number Diff line
@@ -125,9 +125,6 @@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood-b3.dtb \ 
	kirkwood-ts419-6282.dtb

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

dtb-$(CONFIG_ARCH_MOXART) += moxart-uc7112lx.dtb

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

	qcom-msm8960-cdp.dtb \

	qcom-apq8074-dragonboard.dtb

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

	armada-370-mirabox.dtb \

	armada-370-netgear-rn102.dtb \
@@ -265,6 +262,9 @@ dtb-$(CONFIG_ARCH_OMAP2PLUS) += omap2420-h4.dtb \ 
	dra7-evm.dtb

dtb-$(CONFIG_ARCH_ORION5X) += orion5x-lacie-ethernet-disk-mini-v2.dtb

dtb-$(CONFIG_ARCH_PRIMA2) += prima2-evb.dtb

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

	qcom-msm8960-cdp.dtb \

	qcom-apq8074-dragonboard.dtb

dtb-$(CONFIG_ARCH_U8500) += ste-snowball.dtb \

	ste-hrefprev60-stuib.dtb \

	ste-hrefprev60-tvk.dtb \