From: Olof Johansson <olof@lixom.net>
Date: Fri, 5 Oct 2012 03:17:25 +0000 (-0700)
Subject: Merge branch 'late/kirkwood' into late/soc
X-Git-Tag: v3.7-rc1~99^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=54d69df5849ec2e660aa12ac75562618c10fb499;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'late/kirkwood' into late/soc

Merge in the late Kirkwood branch with the OMAP late branch for upstream
submission.

Final contents described in shared tag.

Fixup remove/change conflicts in arch/arm/mach-omap2/devices.c and
drivers/spi/spi-omap2-mcspi.c.

Signed-off-by: Olof Johansson <olof@lixom.net>
---

54d69df5849ec2e660aa12ac75562618c10fb499
diff --cc arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
index 016429d,94b38af..2857772
--- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
@@@ -20,16 -20,15 +20,16 @@@
  #include <plat/omap_hwmod.h>
  #include <plat/dma.h>
  #include <plat/serial.h>
- #include <plat/l3_3xxx.h>
- #include <plat/l4_3xxx.h>
+ #include "l3_3xxx.h"
+ #include "l4_3xxx.h"
  #include <plat/i2c.h>
  #include <plat/mmc.h>
- #include <plat/mcbsp.h>
- #include <plat/mcspi.h>
+ #include <linux/platform_data/asoc-ti-mcbsp.h>
+ #include <linux/platform_data/spi-omap2-mcspi.h>
  #include <plat/dmtimer.h>
 +#include <plat/iommu.h>
  
- #include <mach/am35xx.h>
+ #include "am35xx.h"
  
  #include "soc.h"
  #include "omap_hwmod_common_data.h"
diff --cc drivers/spi/spi-omap2-mcspi.c
index b5d6994,b9b7ad0..d3d62f1
--- a/drivers/spi/spi-omap2-mcspi.c
+++ b/drivers/spi/spi-omap2-mcspi.c
@@@ -41,7 -41,8 +41,7 @@@
  
  #include <linux/spi/spi.h>
  
- #include <plat/mcspi.h>
 -#include <plat/clock.h>
+ #include <linux/platform_data/spi-omap2-mcspi.h>
  
  #define OMAP2_MCSPI_MAX_FREQ		48000000
  #define SPI_AUTOSUSPEND_TIMEOUT		2000