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

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

Merge tag 'ux500-cleanup-bundle' of... 

Merge tag 'ux500-cleanup-bundle' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson into next/drivers

Merge "Ux500 cleanups from Arnd" from Linus Walleij:

This is a set of cleanups for the Ux500 that reduce the number
of machine-local files and boardfile-type data for regulators
and ASoC.

* tag 'ux500-cleanup-bundle' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-stericsson:
  ARM: ux500: consolidate base platform files
  ARM: ux500: move soc_id driver to drivers/soc
  ARM: ux500: call ux500_setup_id later
  ARM: ux500: consolidate soc_device code in id.c
  ARM: ux500: remove cpu_is_u* helpers
  ARM: ux500: use CLK_OF_DECLARE()
  ARM: ux500: move l2x0 init to .init_irq
  mfd: db8500 stop passing around platform data
  ASoC: ab8500-codec: remove platform data based probe
  ARM: ux500: move ab8500_regulator_plat_data into driver
  ARM: ux500: remove unused regulator data
parents cf1d9dd4 a16729ea

MAINTAINERS

+0 −1
Original line number Original line Diff line number Diff line
@@ -1822,7 +1822,6 @@ L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers) 
T:	git git://git.linaro.org/people/ulfh/clk.git

T:	git git://git.linaro.org/people/ulfh/clk.git

S:	Maintained

S:	Maintained

F:	drivers/clk/ux500/

F:	drivers/clk/ux500/

F:	include/linux/platform_data/clk-ux500.h





ARM/VERSATILE EXPRESS PLATFORM

ARM/VERSATILE EXPRESS PLATFORM

M:	Liviu Dudau <liviu.dudau@arm.com>

M:	Liviu Dudau <liviu.dudau@arm.com>

arch/arm/mach-ux500/Makefile

+2 −4
Original line number Original line Diff line number Diff line
@@ -2,11 +2,9 @@ 
# Makefile for the linux kernel, U8500 machine.

# Makefile for the linux kernel, U8500 machine.

#

#





obj-y				:= cpu.o id.o pm.o

obj-y				:= pm.o

obj-$(CONFIG_CACHE_L2X0)	+= cache-l2x0.o

obj-$(CONFIG_UX500_SOC_DB8500)	+= cpu-db8500.o

obj-$(CONFIG_UX500_SOC_DB8500)	+= cpu-db8500.o

obj-$(CONFIG_MACH_MOP500)	+= board-mop500-regulators.o \

obj-$(CONFIG_MACH_MOP500)	+= board-mop500-audio.o

				board-mop500-audio.o

obj-$(CONFIG_SMP)		+= platsmp.o

obj-$(CONFIG_SMP)		+= platsmp.o

obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o

obj-$(CONFIG_HOTPLUG_CPU)	+= hotplug.o

obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o

obj-$(CONFIG_PM_GENERIC_DOMAINS) += pm_domains.o