Merge branch 'devel' of... (9a38e989) · Commits · e / devices / android_kernel_oneplus_sm7250

MAINTAINERS

+16 −0

Original line number	Diff line number	Diff line
		@@ -3543,6 +3543,22 @@ M: linux@arm.linux.org.uk
		L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
		S: Maintained

		PXA168 SUPPORT
		P: Eric Miao
		M: eric.miao@marvell.com
		P: Jason Chagas
		M: jason.chagas@marvell.com
		L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
		T: git kernel.org:/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
		S: Supported

		PXA910 SUPPORT
		P: Eric Miao
		M: eric.miao@marvell.com
		L: linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
		T: git kernel.org:/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6.git
		S: Supported

		PXA MMCI DRIVER
		S: Orphan

+25 −2

Original line number	Diff line number	Diff line
		@@ -478,12 +478,29 @@ config ARCH_PXA
		select HAVE_CLK
		select COMMON_CLKDEV
		select ARCH_REQUIRE_GPIOLIB
		select HAVE_CLK
		select COMMON_CLKDEV
		select GENERIC_TIME
		select GENERIC_CLOCKEVENTS
		select TICK_ONESHOT
		select PLAT_PXA
		help
		Support for Intel/Marvell's PXA2xx/PXA3xx processor line.

		config ARCH_MMP
		bool "Marvell PXA168/910"
		depends on MMU
		select GENERIC_GPIO
		select ARCH_REQUIRE_GPIOLIB
		select HAVE_CLK
		select COMMON_CLKDEV
		select GENERIC_TIME
		select GENERIC_CLOCKEVENTS
		select TICK_ONESHOT
		select PLAT_PXA
		help
		Support for Marvell's PXA168/910 processor line.

		config ARCH_RPC
		bool "RiscPC"
		select ARCH_ACORN
		@@ -618,6 +635,9 @@ source "arch/arm/mach-loki/Kconfig"
		source "arch/arm/mach-mv78xx0/Kconfig"

		source "arch/arm/mach-pxa/Kconfig"
		source "arch/arm/plat-pxa/Kconfig"

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

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

		@@ -687,12 +707,15 @@ config PLAT_IOP
		config PLAT_ORION
		bool

		config PLAT_PXA
		bool

		source arch/arm/mm/Kconfig

		config IWMMXT
		bool "Enable iWMMXt support"
		depends on CPU_XSCALE \|\| CPU_XSC3
		default y if PXA27x \|\| PXA3xx
		depends on CPU_XSCALE \|\| CPU_XSC3 \|\| CPU_MOHAWK
		default y if PXA27x \|\| PXA3xx \|\| ARCH_MMP
		help
		Enable support for iWMMXt context switching at run time if
		running on a CPU that supports it.

+2 −0

Original line number	Diff line number	Diff line
		@@ -109,6 +109,8 @@ ifeq ($(CONFIG_ARCH_SA1100),y)
		textofs-$(CONFIG_SA1111) := 0x00208000
		endif
		machine-$(CONFIG_ARCH_PXA) := pxa
		machine-$(CONFIG_ARCH_MMP) := mmp
		plat-$(CONFIG_PLAT_PXA) := pxa
		machine-$(CONFIG_ARCH_L7200) := l7200
		machine-$(CONFIG_ARCH_INTEGRATOR) := integrator
		textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000

+12 −0