Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 54c39b42 authored Mar 16, 2010 by Haojian Zhuang Committed by Eric Miao May 11, 2010

[ARM] pxa: move ssp into common plat-pxa



Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>

parent be1194cc

arch/arm/mach-pxa/Kconfig

+0 −5

Original line number	Diff line number	Diff line
		@@ -648,11 +648,6 @@ config PXA_SHARP_Cxx00
		help
		Enable common support for Sharp Cxx00 models

		config PXA_SSP
		tristate
		help
		Enable support for PXA2xx SSP ports

		config TOSA_BT
		tristate "Control the state of built-in bluetooth chip on Sharp SL-6000"
		depends on MACH_TOSA

arch/arm/mach-pxa/Makefile

+0 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,6 @@ obj-$(CONFIG_PXA3xx) += cpufreq-pxa3xx.o
		endif

		# Generic drivers that other drivers may depend upon
		obj-$(CONFIG_PXA_SSP) += ssp.o

		# SoC-specific code
		obj-$(CONFIG_PXA25x) += mfp-pxa2xx.o pxa2xx.o pxa25x.o

arch/arm/mach-pxa/poodle.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -40,12 +40,12 @@
		#include <mach/pxa25x.h>
		#include <mach/mmc.h>
		#include <mach/udc.h>
		#include <plat/i2c.h>
		#include <mach/irda.h>
		#include <mach/poodle.h>
		#include <mach/pxafb.h>
		#include <mach/sharpsl.h>
		#include <mach/pxa2xx_spi.h>
		#include <plat/i2c.h>

		#include <asm/hardware/scoop.h>
		#include <asm/hardware/locomo.h>

arch/arm/plat-pxa/Kconfig

+5 −0

Original line number	Diff line number	Diff line
		if PLAT_PXA

		config PXA_SSP
		tristate
		help
		Enable support for PXA2xx SSP ports

		endif

arch/arm/plat-pxa/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -9,3 +9,4 @@ obj-$(CONFIG_PXA3xx) += mfp.o
		obj-$(CONFIG_ARCH_MMP) += mfp.o

		obj-$(CONFIG_HAVE_PWM) += pwm.o
		obj-$(CONFIG_PXA_SSP) += ssp.o