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

Commit f75ed2d3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'kill-plat-sparse-irq' of... 

Merge tag 'kill-plat-sparse-irq' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl into next/multiplatform

From Linus Walleij:

This patchset will:
- Move all remaining headers out of arch/arm/plat-nomadik/include/plat
  out to e.g. include/linux/platform_data
- Delete arch/arm/plat-nomadik
- Convert Nomadik and Ux500 to SPARSE_IRQ

* tag 'kill-plat-sparse-irq' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl:
  ARM: plat-nomadik: convert platforms to SPARSE_IRQ
  mfd/db8500-prcmu: use the irq_domain_add_simple()
  mfd/ab8500-core: use irq_domain_add_simple()
  ARM: plat-nomadik: move MTU, kill plat-nomadik
  ARM: plat-nomadik: move DMA40 header to <linux/platform_data>
  ARM: plat-nomadik: use DIV_ROUND_CLOSEST()
  ARM: plat-nomadik: pass IRQ to timer driver
  clk/ux500: explicitly include register header
  pinctrl/nomadik: merge old pincfg header
  pinctrl/nomadik: move the platform data header
  ARM: plat-nomadik: move NMK_GPIO_PER_CHIP into gpio-nomadik.h
  ARM: plat-nomadik: Introduce new DB8540 GPIO registers
parents c2d8c259 c3b9d1db

arch/arm/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -885,6 +885,7 @@ config ARCH_U8500 
	select GENERIC_CLOCKEVENTS

	select HAVE_SMP

	select MIGHT_HAVE_CACHE_L2X0

	select SPARSE_IRQ

	help

	  Support for ST-Ericsson's Ux500 architecture
@@ -899,6 +900,7 @@ config ARCH_NOMADIK 
	select MIGHT_HAVE_CACHE_L2X0

	select PINCTRL

	select PINCTRL_STN8815

	select SPARSE_IRQ

	help

	  Support for the Nomadik platform by ST-Ericsson
@@ -1067,7 +1069,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

+5 −8
Original line number Diff line number Diff line
@@ -24,20 +24,17 @@ 
#include <linux/i2c.h>

#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/irq.h>

#include <asm/mach/flash.h>

#include <asm/mach/time.h>



#include <plat/gpio-nomadik.h>

#include <plat/mtu.h>

#include <plat/pincfg.h>



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

#include <mach/fsmc.h>

#include <mach/irqs.h>



#include "cpu-8815.h"
@@ -261,7 +258,7 @@ static void __init nomadik_timer_init(void) 
	src_cr |= SRC_CR_INIT_VAL;

	writel(src_cr, io_p2v(NOMADIK_SRC_BASE));



	nmdk_timer_init(io_p2v(NOMADIK_MTU0_BASE));

	nmdk_timer_init(io_p2v(NOMADIK_MTU0_BASE), IRQ_MTU0);

}



static struct sys_timer nomadik_timer = {

arch/arm/mach-nomadik/cpu-8815.c

+1 −1
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ 
#include <linux/irq.h>

#include <linux/dma-mapping.h>

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

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



#include <plat/gpio-nomadik.h>

#include <mach/hardware.h>

#include <mach/irqs.h>

#include <asm/mach/map.h>