From: Olof Johansson <olof@lixom.net>
Date: Mon, 17 Sep 2012 02:28:42 +0000 (-0700)
Subject: Merge tag 'cleanup-omap-tags-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=e640ca0fcb8b616c92a660605fddd1cc9e4bde1d;p=linux-beck.git

Merge tag 'cleanup-omap-tags-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup

From Tony Lindgren:

Remove the ancient omap specific atags that are no longer needed.

At some point we were planning to pass the bootloader information
with custom atags that did not work out too well.

There's no need for these any longer as the kernel has been booting
fine without them for quite some time. And Now we have device tree
support that can be used instead.

* tag 'cleanup-omap-tags-for-v3.7' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP: remove plat/board.h file
  ARM: OMAP: move debug_card_init() function
  ARM: OMAP1: move lcd pdata out of arch/arm/*
  ARM: OMAP1: move omap1_bl pdata out of arch/arm/*
  ARM: OMAP: remove the omap custom tags
  ARM: OMAP1: remove the crystal type tag parsing
  ARM: OMAP: remove the sti console workaround
  ARM: OMAP: omap3evm: cleanup revision bits
  ARM: OMAP: cleanup struct omap_board_config_kernel
  + sync to 3.6-rc5
---

e640ca0fcb8b616c92a660605fddd1cc9e4bde1d
diff --cc arch/arm/mach-omap2/devices.c
index 02b9478b786f,56dfa2df6e78..2deec1749e0c
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -23,9 -23,9 +23,8 @@@
  #include <mach/irqs.h>
  #include <asm/mach-types.h>
  #include <asm/mach/map.h>
 -#include <asm/pmu.h>
  
  #include "iomap.h"
- #include <plat/board.h>
  #include <plat/dma.h>
  #include <plat/omap_hwmod.h>
  #include <plat/omap_device.h>
diff --cc arch/arm/mach-omap2/gpmc-nand.c
index 045596a3e899,513ed9e2db5a..96fcc641aab7
--- a/arch/arm/mach-omap2/gpmc-nand.c
+++ b/arch/arm/mach-omap2/gpmc-nand.c
@@@ -18,19 -18,10 +18,18 @@@
  
  #include <plat/cpu.h>
  #include <plat/nand.h>
- #include <plat/board.h>
  #include <plat/gpmc.h>
  
 -static struct resource gpmc_nand_resource = {
 -	.flags		= IORESOURCE_MEM,
 +static struct resource gpmc_nand_resource[] = {
 +	{
 +		.flags		= IORESOURCE_MEM,
 +	},
 +	{
 +		.flags		= IORESOURCE_IRQ,
 +	},
 +	{
 +		.flags		= IORESOURCE_IRQ,
 +	},
  };
  
  static struct platform_device gpmc_nand_device = {
diff --cc arch/arm/mach-omap2/gpmc-onenand.c
index 71d7c07dd350,c5f005e088a5..b12a39e223fc
--- a/arch/arm/mach-omap2/gpmc-onenand.c
+++ b/arch/arm/mach-omap2/gpmc-onenand.c
@@@ -20,17 -20,10 +20,16 @@@
  
  #include <plat/cpu.h>
  #include <plat/onenand.h>
- #include <plat/board.h>
  #include <plat/gpmc.h>
  
 +#define	ONENAND_IO_SIZE	SZ_128K
 +
  static struct omap_onenand_platform_data *gpmc_onenand_data;
  
 +static struct resource gpmc_onenand_resource = {
 +	.flags		= IORESOURCE_MEM,
 +};
 +
  static struct platform_device gpmc_onenand_device = {
  	.name		= "omap2-onenand",
  	.id		= -1,
diff --cc drivers/mtd/onenand/omap2.c
index 3ff893d4e6ce,10ed992aaab2..108ab1ab6606
--- a/drivers/mtd/onenand/omap2.c
+++ b/drivers/mtd/onenand/omap2.c
@@@ -44,10 -44,9 +44,8 @@@
  
  #include <plat/dma.h>
  
- #include <plat/board.h>
- 
  #define DRIVER_NAME "omap2-onenand"
  
 -#define ONENAND_IO_SIZE		SZ_128K
  #define ONENAND_BUFRAM_SIZE	(1024 * 5)
  
  struct omap2_onenand {