From: Olof Johansson <olof@lixom.net>
Date: Sat, 22 Sep 2012 07:22:33 +0000 (-0700)
Subject: Merge branch 'multiplatform/platform-data' into next/multiplatform
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=e3a66aa33a8f06924f67770e15c22a5c52df314e;p=linux.git
Merge branch 'multiplatform/platform-data' into next/multiplatform
* multiplatform/platform-data:
ARM: spear: move platform_data definitions
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
Conflicts due to removed files:
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/board-trimslice.c
Conflicts due to code removal:
arch/arm/mach-tegra/board-paz00.c
Context conflicts in:
drivers/mmc/host/sdhci-tegra.c
drivers/net/irda/pxaficp_ir.c
Signed-off-by: Olof Johansson <olof@lixom.net>
---
e3a66aa33a8f06924f67770e15c22a5c52df314e
diff --cc arch/arm/mach-exynos/mach-origen.c
index abd0e6059ab3a,4a531dccd0c6f..fc23f74ade817
--- 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 69b858ceefc55,fa2ada6c9ca7d..6e52cbd0b3e0a
--- 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"
diff --cc arch/arm/mach-msm/board-qsd8x50.c
index b16b71abf5f6d,b21bb4cfc642e..a344a373928b7
--- a/arch/arm/mach-msm/board-qsd8x50.c
+++ b/arch/arm/mach-msm/board-qsd8x50.c
@@@ -32,10 -32,11 +32,10 @@@
#include <mach/irqs.h>
#include <mach/sirc.h>
#include <mach/vreg.h>
- #include <mach/mmc.h>
+ #include <linux/platform_data/mmc-msm_sdcc.h>
#include "devices.h"
-
-extern struct sys_timer msm_timer;
+#include "common.h"
static const resource_size_t qsd8x50_surf_smc91x_base __initdata = 0x70000300;
static const unsigned qsd8x50_surf_smc91x_gpio __initdata = 156;
diff --cc arch/arm/mach-pxa/devices.c
index adf32e61f4512,e66bd1bf0163c..ddaa04de8e22e
--- a/arch/arm/mach-pxa/devices.c
+++ b/arch/arm/mach-pxa/devices.c
@@@ -6,18 -6,19 +6,18 @@@
#include <linux/spi/pxa2xx_spi.h>
#include <linux/i2c/pxa-i2c.h>
-#include <asm/pmu.h>
#include <mach/udc.h>
- #include <mach/pxa3xx-u2d.h>
- #include <mach/pxafb.h>
- #include <mach/mmc.h>
- #include <mach/irda.h>
+ #include <linux/platform_data/usb-pxa3xx-ulpi.h>
+ #include <linux/platform_data/video-pxafb.h>
+ #include <linux/platform_data/mmc-pxamci.h>
+ #include <linux/platform_data/irda-pxaficp.h>
#include <mach/irqs.h>
- #include <mach/ohci.h>
- #include <plat/pxa27x_keypad.h>
- #include <mach/camera.h>
+ #include <linux/platform_data/usb-ohci-pxa27x.h>
+ #include <linux/platform_data/keypad-pxa27x.h>
+ #include <linux/platform_data/camera-pxa.h>
#include <mach/audio.h>
#include <mach/hardware.h>
- #include <plat/pxa3xx_nand.h>
+ #include <linux/platform_data/mtd-nand-pxa3xx.h>
#include "devices.h"
#include "generic.h"
diff --cc arch/arm/mach-tegra/board-paz00.c
index 59305516fadb8,112bf683283bb..740e16f64728f
--- a/arch/arm/mach-tegra/board-paz00.c
+++ b/arch/arm/mach-tegra/board-paz00.c
@@@ -17,10 -17,72 +17,10 @@@
*
*/
-#include <linux/kernel.h>
-#include <linux/init.h>
#include <linux/platform_device.h>
-#include <linux/serial_8250.h>
-#include <linux/of_serial.h>
-#include <linux/clk.h>
-#include <linux/dma-mapping.h>
-#include <linux/gpio_keys.h>
-#include <linux/pda_power.h>
-#include <linux/io.h>
-#include <linux/input.h>
-#include <linux/i2c.h>
-#include <linux/gpio.h>
#include <linux/rfkill-gpio.h>
-#include <linux/platform_data/mmc-sdhci-tegra.h>
-
-#include <asm/hardware/gic.h>
-#include <asm/mach-types.h>
-#include <asm/mach/arch.h>
-#include <asm/mach/time.h>
-#include <asm/setup.h>
-
-#include <mach/iomap.h>
-#include <mach/irqs.h>
--
+ #include "board.h"
#include "board-paz00.h"
-#include "clock.h"
-#include "devices.h"
-#include "gpio-names.h"
-
-static struct plat_serial8250_port debug_uart_platform_data[] = {
- {
- /* serial port on JP1 */
- .membase = IO_ADDRESS(TEGRA_UARTA_BASE),
- .mapbase = TEGRA_UARTA_BASE,
- .irq = INT_UARTA,
- .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
- .type = PORT_TEGRA,
- .handle_break = tegra_serial_handle_break,
- .iotype = UPIO_MEM,
- .regshift = 2,
- .uartclk = 216000000,
- }, {
- /* serial port on mini-pcie */
- .membase = IO_ADDRESS(TEGRA_UARTC_BASE),
- .mapbase = TEGRA_UARTC_BASE,
- .irq = INT_UARTC,
- .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE,
- .type = PORT_TEGRA,
- .handle_break = tegra_serial_handle_break,
- .iotype = UPIO_MEM,
- .regshift = 2,
- .uartclk = 216000000,
- }, {
- .flags = 0
- }
-};
-
-static struct platform_device debug_uart = {
- .name = "serial8250",
- .id = PLAT8250_DEV_PLATFORM,
- .dev = {
- .platform_data = debug_uart_platform_data,
- },
-};
static struct rfkill_gpio_platform_data wifi_rfkill_platform_data = {
.name = "wifi_rfkill",
diff --cc drivers/mtd/nand/pxa3xx_nand.c
index d944d6ef7da89,c53502f3eb6c5..c45227173efd1
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@@ -22,11 -22,9 +22,11 @@@
#include <linux/io.h>
#include <linux/irq.h>
#include <linux/slab.h>
+#include <linux/of.h>
+#include <linux/of_device.h>
#include <mach/dma.h>
- #include <plat/pxa3xx_nand.h>
+ #include <linux/platform_data/mtd-nand-pxa3xx.h>
#define CHIP_DELAY_TIMEOUT (2 * HZ/10)
#define NAND_STOP_DELAY (2 * HZ/50)
diff --cc drivers/net/irda/pxaficp_ir.c
index cb0a5d3c0b641,aa4b9470f04e4..002a442bf73fa
--- a/drivers/net/irda/pxaficp_ir.c
+++ b/drivers/net/irda/pxaficp_ir.c
@@@ -28,9 -28,9 +28,9 @@@
#include <net/irda/irda_device.h>
#include <mach/dma.h>
- #include <mach/irda.h>
+ #include <linux/platform_data/irda-pxaficp.h>
-#include <mach/regs-uart.h>
#include <mach/regs-ost.h>
+#include <mach/regs-uart.h>
#define FICP __REG(0x40800000) /* Start of FICP area */
#define ICCR0 __REG(0x40800000) /* ICP Control Register 0 */
diff --cc include/linux/platform_data/camera-mx2.h
index 0000000000000,3c080a32dbf58..7ded6f1f74bc6
mode 000000,100644..100644
--- a/include/linux/platform_data/camera-mx2.h
+++ b/include/linux/platform_data/camera-mx2.h
@@@ -1,0 -1,46 +1,44 @@@
+ /*
+ * mx2-cam.h - i.MX27/i.MX25 camera driver header file
+ *
+ * Copyright (C) 2003, Intel Corporation
+ * Copyright (C) 2008, Sascha Hauer <s.hauer@pengutronix.de>
+ * Copyright (C) 2010, Baruch Siach <baruch@tkos.co.il>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ */
+
+ #ifndef __MACH_MX2_CAM_H_
+ #define __MACH_MX2_CAM_H_
+
-#define MX2_CAMERA_SWAP16 (1 << 0)
+ #define MX2_CAMERA_EXT_VSYNC (1 << 1)
+ #define MX2_CAMERA_CCIR (1 << 2)
+ #define MX2_CAMERA_CCIR_INTERLACE (1 << 3)
+ #define MX2_CAMERA_HSYNC_HIGH (1 << 4)
+ #define MX2_CAMERA_GATED_CLOCK (1 << 5)
+ #define MX2_CAMERA_INV_DATA (1 << 6)
+ #define MX2_CAMERA_PCLK_SAMPLE_RISING (1 << 7)
-#define MX2_CAMERA_PACK_DIR_MSB (1 << 8)
+
+ /**
+ * struct mx2_camera_platform_data - optional platform data for mx2_camera
+ * @flags: any combination of MX2_CAMERA_*
+ * @clk: clock rate of the csi block / 2
+ */
+ struct mx2_camera_platform_data {
+ unsigned long flags;
+ unsigned long clk;
+ };
+
+ #endif /* __MACH_MX2_CAM_H_ */