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

Commit 694e33a7 authored by Linus Walleij's avatar Linus Walleij
Browse files

ARM: plat-nomadik: move MTU, kill plat-nomadik 



This moves the MTU timer driver from arch/arm/plat-nomadik
to drivers/clocksource and moves the header file to the
platform_data directory.

As this moves the last file being compiled to an object out
of arch/arm/plat-nomadik, we have to "turn off the light"
and delete the plat-nomadik directory, because it is not
allowed to have an empty Makefile in a plat-* directory.
This is probably also a desired side effect of depopulating
the arch/arm directory of drivers. Luckily we have just
deleted all the <plat/*> include files prior to this so
by moving the last one we may delete the directory.

After this all the Ux500 and Nomadik device drivers live
outside of the arch/arm hierarchy.

Cc: Alessandro Rubini <rubini@unipv.it>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 865fab60

arch/arm/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -1065,7 +1065,6 @@ source "arch/arm/mach-mxs/Kconfig" 
source "arch/arm/mach-netx/Kconfig"



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

source "arch/arm/plat-nomadik/Kconfig"



source "arch/arm/plat-omap/Kconfig"

arch/arm/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -201,7 +201,6 @@ plat-$(CONFIG_ARCH_OMAP) += omap 
plat-$(CONFIG_ARCH_S3C64XX)	+= samsung

plat-$(CONFIG_ARCH_ZYNQ)	+= versatile

plat-$(CONFIG_PLAT_IOP)		+= iop

plat-$(CONFIG_PLAT_NOMADIK)	+= nomadik

plat-$(CONFIG_PLAT_ORION)	+= orion

plat-$(CONFIG_PLAT_PXA)		+= pxa

plat-$(CONFIG_PLAT_S3C24XX)	+= s3c24xx samsung

arch/arm/mach-nomadik/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ menu "Nomadik boards" 


config MACH_NOMADIK_8815NHK

	bool "ST 8815 Nomadik Hardware Kit (evaluation board)"

	select HAS_MTU

	select CLKSRC_NOMADIK_MTU

	select NOMADIK_8815



endmenu

arch/arm/mach-nomadik/board-nhk8815.c

+2 −4
Original line number Diff line number Diff line
@@ -25,16 +25,14 @@ 
#include <linux/io.h>

#include <linux/pinctrl/machine.h>

#include <linux/platform_data/pinctrl-nomadik.h>

#include <linux/platform_data/clocksource-nomadik-mtu.h>

#include <linux/platform_data/mtd-nomadik-nand.h>

#include <asm/hardware/vic.h>

#include <asm/sizes.h>

#include <asm/mach-types.h>

#include <asm/mach/arch.h>

#include <asm/mach/flash.h>

#include <asm/mach/time.h>



#include <plat/mtu.h>



#include <linux/platform_data/mtd-nomadik-nand.h>

#include <mach/fsmc.h>

#include <mach/irqs.h>

arch/arm/mach-ux500/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ config UX500_SOC_COMMON 
	select ARM_ERRATA_764369 if SMP

	select ARM_GIC

	select CACHE_L2X0

	select CLKSRC_NOMADIK_MTU

	select COMMON_CLK

	select HAS_MTU

	select PINCTRL

	select PINCTRL_NOMADIK

	select PL310_ERRATA_753970 if CACHE_PL310