From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sat, 6 Oct 2012 01:32:05 +0000 (-0300)
Subject: Merge branch 'samsung_platform_data' into staging/for_v3.7
X-Git-Tag: v3.7-rc1~38^2^2~60
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eabe7b01c249c9d8166a1a10bb6effce2b3de665;p=pandora-kernel.git

Merge branch 'samsung_platform_data' into staging/for_v3.7

* samsung_platform_data:
  ARM: samsung: move platform_data definitions
  ARM: orion: move platform_data definitions
  ARM: nomadik: move platform_data definitions
  ARM: w90x900: move platform_data definitions
  ARM: vt8500: move platform_data definitions
  ARM: tegra: move sdhci platform_data definition
  ARM: sa1100: move platform_data definitions
  ARM: pxa: move platform_data definitions
  ARM: netx: move platform_data definitions
  ARM: msm: move platform_data definitions
  ARM: imx: move platform_data definitions
  ARM: ep93xx: move platform_data definitions
  ARM: davinci: move platform_data definitions
  ARM: at91: move platform_data definitions
---

eabe7b01c249c9d8166a1a10bb6effce2b3de665
diff --cc arch/arm/mach-davinci/board-da850-evm.c
index bc6b8c7b86c3,1295e616ceee..32ee3f895967
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@@ -40,14 -40,11 +40,14 @@@
  
  #include <mach/cp_intc.h>
  #include <mach/da8xx.h>
- #include <mach/nand.h>
+ #include <linux/platform_data/mtd-davinci.h>
  #include <mach/mux.h>
- #include <mach/aemif.h>
- #include <mach/spi.h>
+ #include <linux/platform_data/mtd-davinci-aemif.h>
+ #include <linux/platform_data/spi-davinci.h>
  
 +#include <media/tvp514x.h>
 +#include <media/adv7343.h>
 +
  #define DA850_EVM_PHY_ID		"davinci_mdio-0:00"
  #define DA850_LCD_PWR_PIN		GPIO_TO_PIN(2, 8)
  #define DA850_LCD_BL_PIN		GPIO_TO_PIN(2, 15)
diff --cc arch/arm/mach-davinci/include/mach/da8xx.h
index 8eecbce7febc,33e78ae2a254..13d229575757
--- a/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@@ -20,15 -19,13 +20,15 @@@
  
  #include <mach/serial.h>
  #include <mach/edma.h>
- #include <mach/i2c.h>
  #include <mach/asp.h>
- #include <mach/mmc.h>
- #include <mach/usb.h>
  #include <mach/pm.h>
- #include <mach/spi.h>
+ #include <linux/platform_data/i2c-davinci.h>
+ #include <linux/platform_data/mmc-davinci.h>
+ #include <linux/platform_data/usb-davinci.h>
+ #include <linux/platform_data/spi-davinci.h>
  
 +#include <media/davinci/vpif_types.h>
 +
  extern void __iomem *da8xx_syscfg0_base;
  extern void __iomem *da8xx_syscfg1_base;
  
diff --cc arch/arm/mach-exynos/mach-origen.c
index a54ce4ef7057,4a531dccd0c6..0b8d24e27e74
--- a/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@@ -42,9 -42,8 +42,9 @@@
  #include <plat/backlight.h>
  #include <plat/fb.h>
  #include <plat/mfc.h>
 +#include <plat/hdmi.h>
  
- #include <mach/ohci.h>
+ #include <linux/platform_data/usb-exynos.h>
  #include <mach/map.h>
  
  #include <drm/exynos_drm.h>
diff --cc arch/arm/mach-exynos/mach-smdkv310.c
index 73f2bce097e1,fa2ada6c9ca7..1b864ee387cd
--- a/arch/arm/mach-exynos/mach-smdkv310.c
+++ b/arch/arm/mach-exynos/mach-smdkv310.c
@@@ -38,12 -38,11 +38,12 @@@
  #include <plat/gpio-cfg.h>
  #include <plat/backlight.h>
  #include <plat/mfc.h>
- #include <plat/ehci.h>
+ #include <linux/platform_data/usb-ehci-s5p.h>
  #include <plat/clock.h>
 +#include <plat/hdmi.h>
  
  #include <mach/map.h>
- #include <mach/ohci.h>
+ #include <linux/platform_data/usb-exynos.h>
  
  #include <drm/exynos_drm.h>
  #include "common.h"