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

Commit 5bf6c6e3 authored by Dmitry Eremin-Solenikov's avatar Dmitry Eremin-Solenikov Committed by Russell King
Browse files

[ARM] 5033/1: Unbreak corgi_ssp by registering ssp drivers earlier. 



A lot of stuff in spitz/akita/etc. depends on corgi_ssp to be initialised
early. However corgi_ssp initialisation fails, because at that time pxa*-ssp
devices don't have drivers. Move ssp earlier in the makefile so they are
registered before corgi-ssp.

Also move sleep/suspend and cpu-freq to more logical places

Signed-off-by: default avatarDmitry Baryshkov <dbaryshkov@gmail.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent dc38e2ad

arch/arm/mach-pxa/Makefile

+7 −5
Original line number Diff line number Diff line
@@ -5,6 +5,13 @@ 
# Common support (must be linked before board specific support)

obj-y				+= clock.o devices.o generic.o irq.o dma.o \

				   time.o gpio.o

obj-$(CONFIG_PM)		+= pm.o sleep.o standby.o

obj-$(CONFIG_CPU_FREQ)		+= cpu-pxa.o



# Generic drivers that other drivers may depend upon

obj-$(CONFIG_PXA_SSP)		+= ssp.o



# SoC-specific code

obj-$(CONFIG_PXA25x)		+= mfp-pxa2xx.o pxa25x.o

obj-$(CONFIG_PXA27x)		+= mfp-pxa2xx.o pxa27x.o

obj-$(CONFIG_PXA3xx)		+= mfp-pxa3xx.o pxa3xx.o smemc.o
@@ -48,11 +55,6 @@ led-$(CONFIG_MACH_TRIZEPS4) += leds-trizeps4.o 


obj-$(CONFIG_LEDS)		+= $(led-y)



# Misc features

obj-$(CONFIG_PM)		+= pm.o sleep.o standby.o

obj-$(CONFIG_CPU_FREQ)		+= cpu-pxa.o

obj-$(CONFIG_PXA_SSP)		+= ssp.o



ifeq ($(CONFIG_PCI),y)

obj-$(CONFIG_MACH_ARMCORE) += cm-x270-pci.o

endif