Patched in Tegra support.

169 files changed, 20 insertions, 7813 deletions

diff --git a/include/linux/platform_data/ad5449.h b/include/linux/platform_data/ad5449.h
deleted file mode 100644
index bd712bd4b94..00000000000
--- a/include/linux/platform_data/ad5449.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * AD5415, AD5426, AD5429, AD5432, AD5439, AD5443, AD5449 Digital to Analog
- * Converter driver.
- *
- * Copyright 2012 Analog Devices Inc.
- *  Author: Lars-Peter Clausen <lars@metafoo.de>
- *
- * Licensed under the GPL-2.
- */
-
-#ifndef __LINUX_PLATFORM_DATA_AD5449_H__
-#define __LINUX_PLATFORM_DATA_AD5449_H__
-
-/**
- * enum ad5449_sdo_mode - AD5449 SDO pin configuration
- * @AD5449_SDO_DRIVE_FULL: Drive the SDO pin with full strength.
- * @AD5449_SDO_DRIVE_WEAK: Drive the SDO pin with not full strength.
- * @AD5449_SDO_OPEN_DRAIN: Operate the SDO pin in open-drain mode.
- * @AD5449_SDO_DISABLED: Disable the SDO pin, in this mode it is not possible to
- *                      read back from the device.
- */
-enum ad5449_sdo_mode {
-        AD5449_SDO_DRIVE_FULL = 0x0,
-        AD5449_SDO_DRIVE_WEAK = 0x1,
-        AD5449_SDO_OPEN_DRAIN = 0x2,
-        AD5449_SDO_DISABLED = 0x3,
-};
-
-/**
- * struct ad5449_platform_data - Platform data for the ad5449 DAC driver
- * @sdo_mode: SDO pin mode
- * @hardware_clear_to_midscale: Whether asserting the hardware CLR pin sets the
- *                      outputs to midscale (true) or to zero scale(false).
- */
-struct ad5449_platform_data {
-        enum ad5449_sdo_mode sdo_mode;
-        bool hardware_clear_to_midscale;
-};
-
-#endif
diff --git a/include/linux/platform_data/ad5755.h b/include/linux/platform_data/ad5755.h
deleted file mode 100644
index a5a1cb75187..00000000000
--- a/include/linux/platform_data/ad5755.h
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright 2012 Analog Devices Inc.
- *
- * Licensed under the GPL-2.
- */
-#ifndef __LINUX_PLATFORM_DATA_AD5755_H__
-#define __LINUX_PLATFORM_DATA_AD5755_H__
-
-enum ad5755_mode {
-        AD5755_MODE_VOLTAGE_0V_5V               = 0,
-        AD5755_MODE_VOLTAGE_0V_10V              = 1,
-        AD5755_MODE_VOLTAGE_PLUSMINUS_5V        = 2,
-        AD5755_MODE_VOLTAGE_PLUSMINUS_10V       = 3,
-        AD5755_MODE_CURRENT_4mA_20mA            = 4,
-        AD5755_MODE_CURRENT_0mA_20mA            = 5,
-        AD5755_MODE_CURRENT_0mA_24mA            = 6,
-};
-
-enum ad5755_dc_dc_phase {
-        AD5755_DC_DC_PHASE_ALL_SAME_EDGE                = 0,
-        AD5755_DC_DC_PHASE_A_B_SAME_EDGE_C_D_OPP_EDGE   = 1,
-        AD5755_DC_DC_PHASE_A_C_SAME_EDGE_B_D_OPP_EDGE   = 2,
-        AD5755_DC_DC_PHASE_90_DEGREE                    = 3,
-};
-
-enum ad5755_dc_dc_freq {
-        AD5755_DC_DC_FREQ_250kHZ = 0,
-        AD5755_DC_DC_FREQ_410kHZ = 1,
-        AD5755_DC_DC_FREQ_650kHZ = 2,
-};
-
-enum ad5755_dc_dc_maxv {
-        AD5755_DC_DC_MAXV_23V   = 0,
-        AD5755_DC_DC_MAXV_24V5  = 1,
-        AD5755_DC_DC_MAXV_27V   = 2,
-        AD5755_DC_DC_MAXV_29V5  = 3,
-};
-
-enum ad5755_slew_rate {
-        AD5755_SLEW_RATE_64k    = 0,
-        AD5755_SLEW_RATE_32k    = 1,
-        AD5755_SLEW_RATE_16k    = 2,
-        AD5755_SLEW_RATE_8k     = 3,
-        AD5755_SLEW_RATE_4k     = 4,
-        AD5755_SLEW_RATE_2k     = 5,
-        AD5755_SLEW_RATE_1k     = 6,
-        AD5755_SLEW_RATE_500    = 7,
-        AD5755_SLEW_RATE_250    = 8,
-        AD5755_SLEW_RATE_125    = 9,
-        AD5755_SLEW_RATE_64     = 10,
-        AD5755_SLEW_RATE_32     = 11,
-        AD5755_SLEW_RATE_16     = 12,
-        AD5755_SLEW_RATE_8      = 13,
-        AD5755_SLEW_RATE_4      = 14,
-        AD5755_SLEW_RATE_0_5    = 15,
-};
-
-enum ad5755_slew_step_size {
-        AD5755_SLEW_STEP_SIZE_1 = 0,
-        AD5755_SLEW_STEP_SIZE_2 = 1,
-        AD5755_SLEW_STEP_SIZE_4 = 2,
-        AD5755_SLEW_STEP_SIZE_8 = 3,
-        AD5755_SLEW_STEP_SIZE_16 = 4,
-        AD5755_SLEW_STEP_SIZE_32 = 5,
-        AD5755_SLEW_STEP_SIZE_64 = 6,
-        AD5755_SLEW_STEP_SIZE_128 = 7,
-        AD5755_SLEW_STEP_SIZE_256 = 8,
-};
-
-/**
- * struct ad5755_platform_data - AD5755 DAC driver platform data
- * @ext_dc_dc_compenstation_resistor: Whether an external DC-DC converter
- * compensation register is used.
- * @dc_dc_phase: DC-DC converter phase.
- * @dc_dc_freq: DC-DC converter frequency.
- * @dc_dc_maxv: DC-DC maximum allowed boost voltage.
- * @dac.mode: The mode to be used for the DAC output.
- * @dac.ext_current_sense_resistor: Whether an external current sense resistor
- * is used.
- * @dac.enable_voltage_overrange: Whether to enable 20% voltage output overrange.
- * @dac.slew.enable: Whether to enable digital slew.
- * @dac.slew.rate: Slew rate of the digital slew.
- * @dac.slew.step_size: Slew step size of the digital slew.
- **/
-struct ad5755_platform_data {
-        bool ext_dc_dc_compenstation_resistor;
-        enum ad5755_dc_dc_phase dc_dc_phase;
-        enum ad5755_dc_dc_freq dc_dc_freq;
-        enum ad5755_dc_dc_maxv dc_dc_maxv;
-
-        struct {
-                enum ad5755_mode mode;
-                bool ext_current_sense_resistor;
-                bool enable_voltage_overrange;
-                struct {
-                        bool enable;
-                        enum ad5755_slew_rate rate;
-                        enum ad5755_slew_step_size step_size;
-                } slew;
-        } dac[4];
-};
-
-#endif
diff --git a/include/linux/platform_data/ad7266.h b/include/linux/platform_data/ad7266.h
deleted file mode 100644
index eabfdcb2699..00000000000
--- a/include/linux/platform_data/ad7266.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * AD7266/65 SPI ADC driver
- *
- * Copyright 2012 Analog Devices Inc.
- *
- * Licensed under the GPL-2.
- */
-
-#ifndef __IIO_ADC_AD7266_H__
-#define __IIO_ADC_AD7266_H__
-
-/**
- * enum ad7266_range - AD7266 reference voltage range
- * @AD7266_RANGE_VREF: Device is configured for input range 0V - VREF
- *                      (RANGE pin set to low)
- * @AD7266_RANGE_2VREF: Device is configured for input range 0V - 2VREF
- *                      (RANGE pin set to high)
- */
-enum ad7266_range {
-        AD7266_RANGE_VREF,
-        AD7266_RANGE_2VREF,
-};
-
-/**
- * enum ad7266_mode - AD7266 sample mode
- * @AD7266_MODE_DIFF: Device is configured for full differential mode
- *                              (SGL/DIFF pin set to low, AD0 pin set to low)
- * @AD7266_MODE_PSEUDO_DIFF: Device is configured for pseudo differential mode
- *                              (SGL/DIFF pin set to low, AD0 pin set to high)
- * @AD7266_MODE_SINGLE_ENDED: Device is configured for single-ended mode
- *                              (SGL/DIFF pin set to high)
- */
-enum ad7266_mode {
-        AD7266_MODE_DIFF,
-        AD7266_MODE_PSEUDO_DIFF,
-        AD7266_MODE_SINGLE_ENDED,
-};
-
-/**
- * struct ad7266_platform_data - Platform data for the AD7266 driver
- * @range: Reference voltage range the device is configured for
- * @mode: Sample mode the device is configured for
- * @fixed_addr: Whether the address pins are hard-wired
- * @addr_gpios: GPIOs used for controlling the address pins, only used if
- *              fixed_addr is set to false.
- */
-struct ad7266_platform_data {
-        enum ad7266_range range;
-        enum ad7266_mode mode;
-        bool fixed_addr;
-        unsigned int addr_gpios[3];
-};
-
-#endif
diff --git a/include/linux/platform_data/ad7298.h b/include/linux/platform_data/ad7298.h
deleted file mode 100644
index fbf8adf1363..00000000000
--- a/include/linux/platform_data/ad7298.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * AD7298 SPI ADC driver
- *
- * Copyright 2011 Analog Devices Inc.
- *
- * Licensed under the GPL-2.
- */
-
-#ifndef __LINUX_PLATFORM_DATA_AD7298_H__
-#define __LINUX_PLATFORM_DATA_AD7298_H__
-
-/**
- * struct ad7298_platform_data - Platform data for the ad7298 ADC driver
- * @ext_ref: Whether to use an external reference voltage.
- **/
-struct ad7298_platform_data {
-        bool ext_ref;
-};
-
-#endif /* IIO_ADC_AD7298_H_ */
diff --git a/include/linux/platform_data/ad7791.h b/include/linux/platform_data/ad7791.h
deleted file mode 100644
index f9e4db1b82a..00000000000
--- a/include/linux/platform_data/ad7791.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef __LINUX_PLATFORM_DATA_AD7791__
-#define __LINUX_PLATFORM_DATA_AD7791__
-
-/**
- * struct ad7791_platform_data - AD7791 device platform data
- * @buffered: If set to true configure the device for buffered input mode.
- * @burnout_current: If set to true the 100mA burnout current is enabled.
- * @unipolar: If set to true sample in unipolar mode, if set to false sample in
- *              bipolar mode.
- */
-struct ad7791_platform_data {
-        bool buffered;
-        bool burnout_current;
-        bool unipolar;
-};
-
-#endif
diff --git a/include/linux/platform_data/ad7793.h b/include/linux/platform_data/ad7793.h
deleted file mode 100644
index 7ea6751aae6..00000000000
--- a/include/linux/platform_data/ad7793.h
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * AD7792/AD7793 SPI ADC driver
- *
- * Copyright 2011 Analog Devices Inc.
- *
- * Licensed under the GPL-2.
- */
-#ifndef __LINUX_PLATFORM_DATA_AD7793_H__
-#define __LINUX_PLATFORM_DATA_AD7793_H__
-
-/**
- * enum ad7793_clock_source - AD7793 clock source selection
- * @AD7793_CLK_SRC_INT: Internal 64 kHz clock, not available at the CLK pin.
- * @AD7793_CLK_SRC_INT_CO: Internal 64 kHz clock, available at the CLK pin.
- * @AD7793_CLK_SRC_EXT: Use external clock.
- * @AD7793_CLK_SRC_EXT_DIV2: Use external clock divided by 2.
- */
-enum ad7793_clock_source {
-        AD7793_CLK_SRC_INT,
-        AD7793_CLK_SRC_INT_CO,
-        AD7793_CLK_SRC_EXT,
-        AD7793_CLK_SRC_EXT_DIV2,
-};
-
-/**
- * enum ad7793_bias_voltage - AD7793 bias voltage selection
- * @AD7793_BIAS_VOLTAGE_DISABLED: Bias voltage generator disabled
- * @AD7793_BIAS_VOLTAGE_AIN1: Bias voltage connected to AIN1(-).
- * @AD7793_BIAS_VOLTAGE_AIN2: Bias voltage connected to AIN2(-).
- * @AD7793_BIAS_VOLTAGE_AIN3: Bias voltage connected to AIN3(-).
- *      Only valid for AD7795/AD7796.
- */
-enum ad7793_bias_voltage {
-        AD7793_BIAS_VOLTAGE_DISABLED,
-        AD7793_BIAS_VOLTAGE_AIN1,
-        AD7793_BIAS_VOLTAGE_AIN2,
-        AD7793_BIAS_VOLTAGE_AIN3,
-};
-
-/**
- * enum ad7793_refsel - AD7793 reference voltage selection
- * @AD7793_REFSEL_REFIN1: External reference applied between REFIN1(+)
- *      and REFIN1(-).
- * @AD7793_REFSEL_REFIN2: External reference applied between REFIN2(+) and
- *      and REFIN1(-). Only valid for AD7795/AD7796.
- * @AD7793_REFSEL_INTERNAL: Internal 1.17 V reference.
- */
-enum ad7793_refsel {
-        AD7793_REFSEL_REFIN1 = 0,
-        AD7793_REFSEL_REFIN2 = 1,
-        AD7793_REFSEL_INTERNAL = 2,
-};
-
-/**
- * enum ad7793_current_source_direction - AD7793 excitation current direction
- * @AD7793_IEXEC1_IOUT1_IEXEC2_IOUT2: Current source IEXC1 connected to pin
- *      IOUT1, current source IEXC2 connected to pin IOUT2.
- * @AD7793_IEXEC1_IOUT2_IEXEC2_IOUT1: Current source IEXC2 connected to pin
- *      IOUT1, current source IEXC1 connected to pin IOUT2.
- * @AD7793_IEXEC1_IEXEC2_IOUT1: Both current sources connected to pin IOUT1.
- *      Only valid when the current sources are set to 10 uA or 210 uA.
- * @AD7793_IEXEC1_IEXEC2_IOUT2: Both current sources connected to Pin IOUT2.
- *      Only valid when the current ources are set to 10 uA or 210 uA.
- */
-enum ad7793_current_source_direction {
-        AD7793_IEXEC1_IOUT1_IEXEC2_IOUT2 = 0,
-        AD7793_IEXEC1_IOUT2_IEXEC2_IOUT1 = 1,
-        AD7793_IEXEC1_IEXEC2_IOUT1 = 2,
-        AD7793_IEXEC1_IEXEC2_IOUT2 = 3,
-};
-
-/**
- * enum ad7793_excitation_current - AD7793 excitation current selection
- * @AD7793_IX_DISABLED: Excitation current Disabled.
- * @AD7793_IX_10uA: Enable 10 micro-ampere excitation current.
- * @AD7793_IX_210uA: Enable 210 micro-ampere excitation current.
- * @AD7793_IX_1mA: Enable 1 milli-Ampere excitation current.
- */
-enum ad7793_excitation_current {
-        AD7793_IX_DISABLED = 0,
-        AD7793_IX_10uA = 1,
-        AD7793_IX_210uA = 2,
-        AD7793_IX_1mA = 3,
-};
-
-/**
- * struct ad7793_platform_data - AD7793 platform data
- * @clock_src: Clock source selection
- * @burnout_current: If set to true the 100nA burnout current is enabled.
- * @boost_enable: Enable boost for the bias voltage generator.
- * @buffered: If set to true configure the device for buffered input mode.
- * @unipolar: If set to true sample in unipolar mode, if set to false sample in
- *              bipolar mode.
- * @refsel: Reference voltage selection
- * @bias_voltage: Bias voltage selection
- * @exitation_current: Excitation current selection
- * @current_source_direction: Excitation current direction selection
- */
-struct ad7793_platform_data {
-        enum ad7793_clock_source clock_src;
-        bool burnout_current;
-        bool boost_enable;
-        bool buffered;
-        bool unipolar;
-
-        enum ad7793_refsel refsel;
-        enum ad7793_bias_voltage bias_voltage;
-        enum ad7793_excitation_current exitation_current;
-        enum ad7793_current_source_direction current_source_direction;
-};
-
-#endif /* IIO_ADC_AD7793_H_ */
diff --git a/include/linux/platform_data/ad7887.h b/include/linux/platform_data/ad7887.h
deleted file mode 100644
index 1e06eac3174..00000000000
--- a/include/linux/platform_data/ad7887.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * AD7887 SPI ADC driver
- *
- * Copyright 2010 Analog Devices Inc.
- *
- * Licensed under the GPL-2 or later.
- */
-#ifndef IIO_ADC_AD7887_H_
-#define IIO_ADC_AD7887_H_
-
-/**
- * struct ad7887_platform_data - AD7887 ADC driver platform data
- * @en_dual: Whether to use dual channel mode. If set to true AIN1 becomes the
- *      second input channel, and Vref is internally connected to Vdd. If set to
- *      false the device is used in single channel mode and AIN1/Vref is used as
- *      VREF input.
- * @use_onchip_ref: Whether to use the onchip reference. If set to true the
- *      internal 2.5V reference is used. If set to false a external reference is
- *      used.
- */
-struct ad7887_platform_data {
-        bool en_dual;
-        bool use_onchip_ref;
-};
-
-#endif /* IIO_ADC_AD7887_H_ */
diff --git a/include/linux/platform_data/ads7828.h b/include/linux/platform_data/ads7828.h
deleted file mode 100644
index 3245f45f9d7..00000000000
--- a/include/linux/platform_data/ads7828.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * TI ADS7828 A/D Converter platform data definition
- *
- * Copyright (c) 2012 Savoir-faire Linux Inc.
- *          Vivien Didelot <vivien.didelot@savoirfairelinux.com>
- *
- * For further information, see the Documentation/hwmon/ads7828 file.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef _PDATA_ADS7828_H
-#define _PDATA_ADS7828_H
-
-/**
- * struct ads7828_platform_data - optional ADS7828 connectivity info
- * @diff_input:         Differential input mode.
- * @ext_vref:           Use an external voltage reference.
- * @vref_mv:            Voltage reference value, if external.
- */
-struct ads7828_platform_data {
-        bool diff_input;
-        bool ext_vref;
-        unsigned int vref_mv;
-};
-
-#endif /* _PDATA_ADS7828_H */
diff --git a/include/linux/platform_data/asoc-imx-ssi.h b/include/linux/platform_data/asoc-imx-ssi.h
deleted file mode 100644
index 92c7fd72f63..00000000000
--- a/include/linux/platform_data/asoc-imx-ssi.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef __MACH_SSI_H
-#define __MACH_SSI_H
-
-struct snd_ac97;
-
-extern unsigned char imx_ssi_fiq_start, imx_ssi_fiq_end;
-extern unsigned long imx_ssi_fiq_base, imx_ssi_fiq_tx_buffer, imx_ssi_fiq_rx_buffer;
-
-struct imx_ssi_platform_data {
-        unsigned int flags;
-#define IMX_SSI_DMA            (1 << 0)
-#define IMX_SSI_USE_AC97       (1 << 1)
-#define IMX_SSI_NET            (1 << 2)
-#define IMX_SSI_SYN            (1 << 3)
-#define IMX_SSI_USE_I2S_SLAVE  (1 << 4)
-        void (*ac97_reset) (struct snd_ac97 *ac97);
-        void (*ac97_warm_reset)(struct snd_ac97 *ac97);
-};
-
-extern int mxc_set_irq_fiq(unsigned int irq, unsigned int type);
-
-#endif /* __MACH_SSI_H */
-
diff --git a/include/linux/platform_data/asoc-kirkwood.h b/include/linux/platform_data/asoc-kirkwood.h
deleted file mode 100644
index d6a55bd2e57..00000000000
--- a/include/linux/platform_data/asoc-kirkwood.h
+++ /dev/null
@@ -1,7 +0,0 @@
-#ifndef __PLAT_AUDIO_H
-#define __PLAT_AUDIO_H
-
-struct kirkwood_asoc_platform_data {
-        int burst;
-};
-#endif
diff --git a/include/linux/platform_data/asoc-mx27vis.h b/include/linux/platform_data/asoc-mx27vis.h
deleted file mode 100644
index 409adcd04d0..00000000000
--- a/include/linux/platform_data/asoc-mx27vis.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __PLATFORM_DATA_ASOC_MX27VIS_H
-#define __PLATFORM_DATA_ASOC_MX27VIS_H
-
-struct snd_mx27vis_platform_data {
-        int amp_gain0_gpio;
-        int amp_gain1_gpio;
-        int amp_mutel_gpio;
-        int amp_muter_gpio;
-};
-
-#endif /* __PLATFORM_DATA_ASOC_MX27VIS_H */
diff --git a/include/linux/platform_data/asoc-palm27x.h b/include/linux/platform_data/asoc-palm27x.h
deleted file mode 100644
index 58afb30d529..00000000000
--- a/include/linux/platform_data/asoc-palm27x.h
+++ /dev/null
@@ -1,8 +0,0 @@
-#ifndef _INCLUDE_PALMASOC_H_
-#define _INCLUDE_PALMASOC_H_
-
-struct palm27x_asoc_info {
-        int     jack_gpio;
-};
-
-#endif
diff --git a/include/linux/platform_data/asoc-s3c.h b/include/linux/platform_data/asoc-s3c.h
deleted file mode 100644
index 88272591a89..00000000000
--- a/include/linux/platform_data/asoc-s3c.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* arch/arm/plat-samsung/include/plat/audio.h
- *
- * Copyright (c) 2009 Samsung Electronics Co. Ltd
- * Author: Jaswinder Singh <jassi.brar@samsung.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-/* The machine init code calls s3c*_ac97_setup_gpio with
- * one of these defines in order to select appropriate bank
- * of GPIO for AC97 pins
- */
-#define S3C64XX_AC97_GPD  0
-#define S3C64XX_AC97_GPE  1
-extern void s3c64xx_ac97_setup_gpio(int);
-
-/*
- * The machine init code calls s5p*_spdif_setup_gpio with
- * one of these defines in order to select appropriate bank
- * of GPIO for S/PDIF pins
- */
-#define S5PC100_SPDIF_GPD  0
-#define S5PC100_SPDIF_GPG3 1
-extern void s5pc100_spdif_setup_gpio(int);
-
-struct samsung_i2s {
-/* If the Primary DAI has 5.1 Channels */
-#define QUIRK_PRI_6CHAN         (1 << 0)
-/* If the I2S block has a Stereo Overlay Channel */
-#define QUIRK_SEC_DAI           (1 << 1)
-/*
- * If the I2S block has no internal prescalar or MUX (I2SMOD[10] bit)
- * The Machine driver must provide suitably set clock to the I2S block.
- */
-#define QUIRK_NO_MUXPSR         (1 << 2)
-#define QUIRK_NEED_RSTCLR       (1 << 3)
-        /* Quirks of the I2S controller */
-        u32 quirks;
-        dma_addr_t idma_addr;
-};
-
-/**
- * struct s3c_audio_pdata - common platform data for audio device drivers
- * @cfg_gpio: Callback function to setup mux'ed pins in I2S/PCM/AC97 mode
- */
-struct s3c_audio_pdata {
-        int (*cfg_gpio)(struct platform_device *);
-        union {
-                struct samsung_i2s i2s;
-        } type;
-};
diff --git a/include/linux/platform_data/asoc-s3c24xx_simtec.h b/include/linux/platform_data/asoc-s3c24xx_simtec.h
deleted file mode 100644
index 376af5286a3..00000000000
--- a/include/linux/platform_data/asoc-s3c24xx_simtec.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* arch/arm/plat-samsung/include/plat/audio-simtec.h
- *
- * Copyright 2008 Simtec Electronics
- *      http://armlinux.simtec.co.uk/
- *      Ben Dooks <ben@simtec.co.uk>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Simtec Audio support.
-*/
-
-/**
- * struct s3c24xx_audio_simtec_pdata - platform data for simtec audio
- * @use_mpllin: Select codec clock from MPLLin
- * @output_cdclk: Need to output CDCLK to the codec
- * @have_mic: Set if we have a MIC socket
- * @have_lout: Set if we have a LineOut socket
- * @amp_gpio: GPIO pin to enable the AMP
- * @amp_gain: Option GPIO to control AMP gain
- */
-struct s3c24xx_audio_simtec_pdata {
-        unsigned int    use_mpllin:1;
-        unsigned int    output_cdclk:1;
-
-        unsigned int    have_mic:1;
-        unsigned int    have_lout:1;
-
-        int             amp_gpio;
-        int             amp_gain[2];
-
-        void    (*startup)(void);
-};
diff --git a/include/linux/platform_data/asoc-ti-mcbsp.h b/include/linux/platform_data/asoc-ti-mcbsp.h
deleted file mode 100644
index c78d90b28b1..00000000000
--- a/include/linux/platform_data/asoc-ti-mcbsp.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * arch/arm/plat-omap/include/mach/mcbsp.h
- *
- * Defines for Multi-Channel Buffered Serial Port
- *
- * Copyright (C) 2002 RidgeRun, Inc.
- * Author: Steve Johnson
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-#ifndef __ASM_ARCH_OMAP_MCBSP_H
-#define __ASM_ARCH_OMAP_MCBSP_H
-
-#include <linux/spinlock.h>
-#include <linux/clk.h>
-
-#define MCBSP_CONFIG_TYPE2      0x2
-#define MCBSP_CONFIG_TYPE3      0x3
-#define MCBSP_CONFIG_TYPE4      0x4
-
-/* Platform specific configuration */
-struct omap_mcbsp_ops {
-        void (*request)(unsigned int);
-        void (*free)(unsigned int);
-};
-
-struct omap_mcbsp_platform_data {
-        struct omap_mcbsp_ops *ops;
-        u16 buffer_size;
-        u8 reg_size;
-        u8 reg_step;
-
-        /* McBSP platform and instance specific features */
-        bool has_wakeup; /* Wakeup capability */
-        bool has_ccr; /* Transceiver has configuration control registers */
-        int (*enable_st_clock)(unsigned int, bool);
-};
-
-/**
- * omap_mcbsp_dev_attr - OMAP McBSP device attributes for omap_hwmod
- * @sidetone: name of the sidetone device
- */
-struct omap_mcbsp_dev_attr {
-        const char *sidetone;
-};
-
-#endif
diff --git a/include/linux/platform_data/at91_adc.h b/include/linux/platform_data/at91_adc.h
deleted file mode 100644
index e15745b4f3a..00000000000
--- a/include/linux/platform_data/at91_adc.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright (C) 2011 Free Electrons
- *
- * Licensed under the GPLv2 or later.
- */
-
-#ifndef _AT91_ADC_H_
-#define _AT91_ADC_H_
-
-/**
- * struct at91_adc_reg_desc - Various informations relative to registers
- * @channel_base:       Base offset for the channel data registers
- * @drdy_mask:          Mask of the DRDY field in the relevant registers
-                        (Interruptions registers mostly)
- * @status_register:    Offset of the Interrupt Status Register
- * @trigger_register:   Offset of the Trigger setup register
- */
-struct at91_adc_reg_desc {
-        u8      channel_base;
-        u32     drdy_mask;
-        u8      status_register;
-        u8      trigger_register;
-};
-
-/**
- * struct at91_adc_trigger - description of triggers
- * @name:               name of the trigger advertised to the user
- * @value:              value to set in the ADC's trigger setup register
-                        to enable the trigger
- * @is_external:        Does the trigger rely on an external pin?
- */
-struct at91_adc_trigger {
-        const char      *name;
-        u8              value;
-        bool            is_external;
-};
-
-/**
- * struct at91_adc_data - platform data for ADC driver
- * @channels_used:              channels in use on the board as a bitmask
- * @num_channels:               global number of channels available on the board
- * @registers:                  Registers definition on the board
- * @startup_time:               startup time of the ADC in microseconds
- * @trigger_list:               Triggers available in the ADC
- * @trigger_number:             Number of triggers available in the ADC
- * @use_external_triggers:      does the board has external triggers availables
- * @vref:                       Reference voltage for the ADC in millivolts
- */
-struct at91_adc_data {
-        unsigned long                   channels_used;
-        u8                              num_channels;
-        struct at91_adc_reg_desc        *registers;
-        u8                              startup_time;
-        struct at91_adc_trigger         *trigger_list;
-        u8                              trigger_number;
-        bool                            use_external_triggers;
-        u16                             vref;
-};
-
-extern void __init at91_add_device_adc(struct at91_adc_data *data);
-#endif
diff --git a/include/linux/platform_data/ata-pxa.h b/include/linux/platform_data/ata-pxa.h
deleted file mode 100644
index 6cf7df1d583..00000000000
--- a/include/linux/platform_data/ata-pxa.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Generic PXA PATA driver
- *
- * Copyright (C) 2010 Marek Vasut <marek.vasut@gmail.com>
- *
- *  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, 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; see the file COPYING.  If not, write to
- *  the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __MACH_PATA_PXA_H__
-#define __MACH_PATA_PXA_H__
-
-struct pata_pxa_pdata {
-        /* PXA DMA DREQ<0:2> pin */
-        uint32_t        dma_dreq;
-        /* Register shift */
-        uint32_t        reg_shift;
-        /* IRQ flags */
-        uint32_t        irq_flags;
-};
-
-#endif  /* __MACH_PATA_PXA_H__ */
diff --git a/include/linux/platform_data/ata-samsung_cf.h b/include/linux/platform_data/ata-samsung_cf.h
deleted file mode 100644
index 2a3855a8372..00000000000
--- a/include/linux/platform_data/ata-samsung_cf.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* linux/arch/arm/plat-samsung/include/plat/ata.h
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * Samsung CF-ATA platform_device info
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#ifndef __ASM_PLAT_ATA_H
-#define __ASM_PLAT_ATA_H __FILE__
-
-/**
- * struct s3c_ide_platdata - S3C IDE driver platform data.
- * @setup_gpio: Setup the external GPIO pins to the right state for data
- * transfer in true-ide mode.
- */
-struct s3c_ide_platdata {
-        void (*setup_gpio)(void);
-};
-
-/*
- * s3c_ide_set_platdata() - Setup the platform specifc data for IDE driver.
- * @pdata: Platform data for IDE driver.
- */
-extern void s3c_ide_set_platdata(struct s3c_ide_platdata *pdata);
-
-/* architecture-specific IDE configuration */
-extern void s3c64xx_ide_setup_gpio(void);
-extern void s5pc100_ide_setup_gpio(void);
-extern void s5pv210_ide_setup_gpio(void);
-
-#endif /*__ASM_PLAT_ATA_H */
diff --git a/include/linux/platform_data/atmel-aes.h b/include/linux/platform_data/atmel-aes.h
deleted file mode 100644
index ab68082fbcb..00000000000
--- a/include/linux/platform_data/atmel-aes.h
+++ /dev/null
@@ -1,22 +0,0 @@
-#ifndef __LINUX_ATMEL_AES_H
-#define __LINUX_ATMEL_AES_H
-
-#include <linux/platform_data/dma-atmel.h>
-
-/**
- * struct aes_dma_data - DMA data for AES
- */
-struct aes_dma_data {
-        struct at_dma_slave     txdata;
-        struct at_dma_slave     rxdata;
-};
-
-/**
- * struct aes_platform_data - board-specific AES configuration
- * @dma_slave: DMA slave interface to use in data transfers.
- */
-struct aes_platform_data {
-        struct aes_dma_data     *dma_slave;
-};
-
-#endif /* __LINUX_ATMEL_AES_H */
diff --git a/include/linux/platform_data/atmel.h b/include/linux/platform_data/atmel.h
deleted file mode 100644
index 6a293b7fff3..00000000000
--- a/include/linux/platform_data/atmel.h
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * atmel platform data
- *
- * GPL v2 Only
- */
-
-#ifndef __ATMEL_H__
-#define __ATMEL_H__
-
-#include <linux/mtd/nand.h>
-#include <linux/mtd/partitions.h>
-#include <linux/device.h>
-#include <linux/i2c.h>
-#include <linux/leds.h>
-#include <linux/spi/spi.h>
-#include <linux/usb/atmel_usba_udc.h>
-#include <linux/atmel-mci.h>
-#include <sound/atmel-ac97c.h>
-#include <linux/serial.h>
-#include <linux/platform_data/macb.h>
-
-/*
- * at91: 6 USARTs and one DBGU port (SAM9260)
- * avr32: 4
- */
-#define ATMEL_MAX_UART  7
-
- /* USB Device */
-struct at91_udc_data {
-        int     vbus_pin;               /* high == host powering us */
-        u8      vbus_active_low;        /* vbus polarity */
-        u8      vbus_polled;            /* Use polling, not interrupt */
-        int     pullup_pin;             /* active == D+ pulled up */
-        u8      pullup_active_low;      /* true == pullup_pin is active low */
-};
-
- /* Compact Flash */
-struct at91_cf_data {
-        int     irq_pin;                /* I/O IRQ */
-        int     det_pin;                /* Card detect */
-        int     vcc_pin;                /* power switching */
-        int     rst_pin;                /* card reset */
-        u8      chipselect;             /* EBI Chip Select number */
-        u8      flags;
-#define AT91_CF_TRUE_IDE        0x01
-#define AT91_IDE_SWAP_A0_A2     0x02
-};
-
- /* USB Host */
-#define AT91_MAX_USBH_PORTS     3
-struct at91_usbh_data {
-        int             vbus_pin[AT91_MAX_USBH_PORTS];  /* port power-control pin */
-        int             overcurrent_pin[AT91_MAX_USBH_PORTS];
-        u8              ports;                          /* number of ports on root hub */
-        u8              overcurrent_supported;
-        u8              vbus_pin_active_low[AT91_MAX_USBH_PORTS];
-        u8              overcurrent_status[AT91_MAX_USBH_PORTS];
-        u8              overcurrent_changed[AT91_MAX_USBH_PORTS];
-};
-
- /* NAND / SmartMedia */
-struct atmel_nand_data {
-        int             enable_pin;             /* chip enable */
-        int             det_pin;                /* card detect */
-        int             rdy_pin;                /* ready/busy */
-        u8              rdy_pin_active_low;     /* rdy_pin value is inverted */
-        u8              ale;                    /* address line number connected to ALE */
-        u8              cle;                    /* address line number connected to CLE */
-        u8              bus_width_16;           /* buswidth is 16 bit */
-        u8              ecc_mode;               /* ecc mode */
-        u8              on_flash_bbt;           /* bbt on flash */
-        struct mtd_partition *parts;
-        unsigned int    num_parts;
-};
-
- /* Serial */
-struct atmel_uart_data {
-        int                     num;            /* port num */
-        short                   use_dma_tx;     /* use transmit DMA? */
-        short                   use_dma_rx;     /* use receive DMA? */
-        void __iomem            *regs;          /* virt. base address, if any */
-        struct serial_rs485     rs485;          /* rs485 settings */
-};
-
- /* Touchscreen Controller */
-struct at91_tsadcc_data {
-        unsigned int    adc_clock;
-        u8              pendet_debounce;
-        u8              ts_sample_hold_time;
-};
-
-/* CAN */
-struct at91_can_data {
-        void (*transceiver_switch)(int on);
-};
-
-/* FIXME: this needs a better location, but gets stuff building again */
-extern int at91_suspend_entering_slow_clock(void);
-
-#endif /* __ATMEL_H__ */
diff --git a/include/linux/platform_data/camera-mx1.h b/include/linux/platform_data/camera-mx1.h
deleted file mode 100644
index 4fd6c70314b..00000000000
--- a/include/linux/platform_data/camera-mx1.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * mx1_camera.h - i.MX1/i.MXL camera driver header file
- *
- * Copyright (c) 2008, Paulius Zaleckas <paulius.zaleckas@teltonika.lt>
- * Copyright (C) 2009, Darius Augulis <augulis.darius@gmail.com>
- *
- * Based on PXA camera.h file:
- * Copyright (C) 2003, Intel Corporation
- * Copyright (C) 2008, Guennadi Liakhovetski <kernel@pengutronix.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __ASM_ARCH_CAMERA_H_
-#define __ASM_ARCH_CAMERA_H_
-
-#define MX1_CAMERA_DATA_HIGH    1
-#define MX1_CAMERA_PCLK_RISING  2
-#define MX1_CAMERA_VSYNC_HIGH   4
-
-extern unsigned char mx1_camera_sof_fiq_start, mx1_camera_sof_fiq_end;
-
-/**
- * struct mx1_camera_pdata - i.MX1/i.MXL camera platform data
- * @mclk_10khz: master clock frequency in 10kHz units
- * @flags:      MX1 camera platform flags
- */
-struct mx1_camera_pdata {
-        unsigned long mclk_10khz;
-        unsigned long flags;
-};
-
-#endif /* __ASM_ARCH_CAMERA_H_ */
diff --git a/include/linux/platform_data/camera-mx2.h b/include/linux/platform_data/camera-mx2.h
deleted file mode 100644
index 7ded6f1f74b..00000000000
--- a/include/linux/platform_data/camera-mx2.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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_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)
-
-/**
- * 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_ */
diff --git a/include/linux/platform_data/camera-mx3.h b/include/linux/platform_data/camera-mx3.h
deleted file mode 100644
index f226ee3777e..00000000000
--- a/include/linux/platform_data/camera-mx3.h
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * mx3_camera.h - i.MX3x camera driver header file
- *
- * Copyright (C) 2008, Guennadi Liakhovetski, DENX Software Engineering, <lg@denx.de>
- *
- * 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.
- */
-
-#ifndef _MX3_CAMERA_H_
-#define _MX3_CAMERA_H_
-
-#include <linux/device.h>
-
-#define MX3_CAMERA_CLK_SRC      1
-#define MX3_CAMERA_EXT_VSYNC    2
-#define MX3_CAMERA_DP           4
-#define MX3_CAMERA_PCP          8
-#define MX3_CAMERA_HSP          0x10
-#define MX3_CAMERA_VSP          0x20
-#define MX3_CAMERA_DATAWIDTH_4  0x40
-#define MX3_CAMERA_DATAWIDTH_8  0x80
-#define MX3_CAMERA_DATAWIDTH_10 0x100
-#define MX3_CAMERA_DATAWIDTH_15 0x200
-
-#define MX3_CAMERA_DATAWIDTH_MASK (MX3_CAMERA_DATAWIDTH_4 | MX3_CAMERA_DATAWIDTH_8 | \
-                                   MX3_CAMERA_DATAWIDTH_10 | MX3_CAMERA_DATAWIDTH_15)
-
-/**
- * struct mx3_camera_pdata - i.MX3x camera platform data
- * @flags:      MX3_CAMERA_* flags
- * @mclk_10khz: master clock frequency in 10kHz units
- * @dma_dev:    IPU DMA device to match against in channel allocation
- */
-struct mx3_camera_pdata {
-        unsigned long flags;
-        unsigned long mclk_10khz;
-        struct device *dma_dev;
-};
-
-#endif
diff --git a/include/linux/platform_data/camera-pxa.h b/include/linux/platform_data/camera-pxa.h
deleted file mode 100644
index 6709b1cd7c7..00000000000
--- a/include/linux/platform_data/camera-pxa.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-    camera.h - PXA camera driver header file
-
-    Copyright (C) 2003, Intel Corporation
-    Copyright (C) 2008, Guennadi Liakhovetski <kernel@pengutronix.de>
-
-    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., 675 Mass Ave, Cambridge, MA 02139, USA.
-*/
-
-#ifndef __ASM_ARCH_CAMERA_H_
-#define __ASM_ARCH_CAMERA_H_
-
-#define PXA_CAMERA_MASTER       1
-#define PXA_CAMERA_DATAWIDTH_4  2
-#define PXA_CAMERA_DATAWIDTH_5  4
-#define PXA_CAMERA_DATAWIDTH_8  8
-#define PXA_CAMERA_DATAWIDTH_9  0x10
-#define PXA_CAMERA_DATAWIDTH_10 0x20
-#define PXA_CAMERA_PCLK_EN      0x40
-#define PXA_CAMERA_MCLK_EN      0x80
-#define PXA_CAMERA_PCP          0x100
-#define PXA_CAMERA_HSP          0x200
-#define PXA_CAMERA_VSP          0x400
-
-struct pxacamera_platform_data {
-        unsigned long flags;
-        unsigned long mclk_10khz;
-};
-
-extern void pxa_set_camera_info(struct pxacamera_platform_data *);
-
-#endif /* __ASM_ARCH_CAMERA_H_ */
diff --git a/include/linux/platform_data/clk-integrator.h b/include/linux/platform_data/clk-integrator.h
deleted file mode 100644
index 280edac9d0a..00000000000
--- a/include/linux/platform_data/clk-integrator.h
+++ /dev/null
@@ -1,3 +0,0 @@
-void integrator_clk_init(bool is_cp);
-void integrator_impd1_clk_init(void __iomem *base, unsigned int id);
-void integrator_impd1_clk_exit(unsigned int id);
diff --git a/include/linux/platform_data/clk-nomadik.h b/include/linux/platform_data/clk-nomadik.h
deleted file mode 100644
index 5713c87b247..00000000000
--- a/include/linux/platform_data/clk-nomadik.h
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Minimal platform data header */
-void nomadik_clk_init(void);
diff --git a/include/linux/platform_data/clk-realview.h b/include/linux/platform_data/clk-realview.h
deleted file mode 100644
index 2e426a7dbc5..00000000000
--- a/include/linux/platform_data/clk-realview.h
+++ /dev/null
@@ -1 +0,0 @@
-void realview_clk_init(void __iomem *sysbase, bool is_pb1176);
diff --git a/include/linux/platform_data/clk-u300.h b/include/linux/platform_data/clk-u300.h
deleted file mode 100644
index 8429e73911a..00000000000
--- a/include/linux/platform_data/clk-u300.h
+++ /dev/null
@@ -1 +0,0 @@
-void __init u300_clk_init(void __iomem *base);
diff --git a/include/linux/platform_data/clk-ux500.h b/include/linux/platform_data/clk-ux500.h
deleted file mode 100644
index 3af0da1f3be..00000000000
--- a/include/linux/platform_data/clk-ux500.h
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Clock definitions for ux500 platforms
- *
- * Copyright (C) 2012 ST-Ericsson SA
- * Author: Ulf Hansson <ulf.hansson@linaro.org>
- *
- * License terms: GNU General Public License (GPL) version 2
- */
-
-#ifndef __CLK_UX500_H
-#define __CLK_UX500_H
-
-void u8500_clk_init(void);
-void u9540_clk_init(void);
-void u8540_clk_init(void);
-
-#endif /* __CLK_UX500_H */
diff --git a/include/linux/platform_data/clocksource-nomadik-mtu.h b/include/linux/platform_data/clocksource-nomadik-mtu.h
deleted file mode 100644
index 80088973b73..00000000000
--- a/include/linux/platform_data/clocksource-nomadik-mtu.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __PLAT_MTU_H
-#define __PLAT_MTU_H
-
-void nmdk_timer_init(void __iomem *base, int irq);
-void nmdk_clkevt_reset(void);
-void nmdk_clksrc_reset(void);
-
-#endif /* __PLAT_MTU_H */
-
diff --git a/include/linux/platform_data/cpsw.h b/include/linux/platform_data/cpsw.h
deleted file mode 100644
index 24368a2e8b8..00000000000
--- a/include/linux/platform_data/cpsw.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Texas Instruments Ethernet Switch Driver
- *
- * Copyright (C) 2012 Texas Instruments
- *
- * 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 version 2.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
- * kind, whether express or implied; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-#ifndef __CPSW_H__
-#define __CPSW_H__
-
-#include <linux/if_ether.h>
-
-struct cpsw_slave_data {
-        char            phy_id[MII_BUS_ID_SIZE];
-        int             phy_if;
-        u8              mac_addr[ETH_ALEN];
-};
-
-struct cpsw_platform_data {
-        u32     ss_reg_ofs;     /* Subsystem control register offset */
-        u32     channels;       /* number of cpdma channels (symmetric) */
-        u32     slaves;         /* number of slave cpgmac ports */
-        struct cpsw_slave_data  *slave_data;
-        u32     cpts_active_slave; /* time stamping slave */
-        u32     cpts_clock_mult;  /* convert input clock ticks to nanoseconds */
-        u32     cpts_clock_shift; /* convert input clock ticks to nanoseconds */
-        u32     ale_entries;    /* ale table size */
-        u32     bd_ram_size;  /*buffer descriptor ram size */
-        u32     rx_descs;       /* Number of Rx Descriptios */
-        u32     mac_control;    /* Mac control register */
-};
-
-#endif /* __CPSW_H__ */
diff --git a/include/linux/platform_data/crypto-ux500.h b/include/linux/platform_data/crypto-ux500.h
deleted file mode 100644
index 94df96d9a33..00000000000
--- a/include/linux/platform_data/crypto-ux500.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2011
- *
- * Author: Joakim Bech <joakim.xx.bech@stericsson.com> for ST-Ericsson
- * License terms: GNU General Public License (GPL) version 2
- */
-#ifndef _CRYPTO_UX500_H
-#define _CRYPTO_UX500_H
-#include <linux/dmaengine.h>
-#include <linux/platform_data/dma-ste-dma40.h>
-
-struct hash_platform_data {
-        void *mem_to_engine;
-        bool (*dma_filter)(struct dma_chan *chan, void *filter_param);
-};
-
-struct cryp_platform_data {
-        struct stedma40_chan_cfg mem_to_engine;
-        struct stedma40_chan_cfg engine_to_mem;
-};
-
-#endif
diff --git a/include/linux/platform_data/davinci_asp.h b/include/linux/platform_data/davinci_asp.h
deleted file mode 100644
index 8db5ae03b6e..00000000000
--- a/include/linux/platform_data/davinci_asp.h
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * TI DaVinci Audio Serial Port support
- *
- * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com/
- *
- * 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 version 2.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
- * kind, whether express or implied; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- */
-
-#ifndef __DAVINCI_ASP_H
-#define __DAVINCI_ASP_H
-
-#include <linux/genalloc.h>
-
-struct snd_platform_data {
-        u32 tx_dma_offset;
-        u32 rx_dma_offset;
-        int asp_chan_q; /* event queue number for ASP channel */
-        int ram_chan_q; /* event queue number for RAM channel */
-        /*
-         * Allowing this is more efficient and eliminates left and right swaps
-         * caused by underruns, but will swap the left and right channels
-         * when compared to previous behavior.
-         */
-        unsigned enable_channel_combine:1;
-        unsigned sram_size_playback;
-        unsigned sram_size_capture;
-        struct gen_pool *sram_pool;
-
-        /*
-         * If McBSP peripheral gets the clock from an external pin,
-         * there are three chooses, that are MCBSP_CLKX, MCBSP_CLKR
-         * and MCBSP_CLKS.
-         * Depending on different hardware connections it is possible
-         * to use this setting to change the behaviour of McBSP
-         * driver.
-         */
-        int clk_input_pin;
-
-        /*
-         * This flag works when both clock and FS are outputs for the cpu
-         * and makes clock more accurate (FS is not symmetrical and the
-         * clock is very fast.
-         * The clock becoming faster is named
-         * i2s continuous serial clock (I2S_SCK) and it is an externally
-         * visible bit clock.
-         *
-         * first line : WordSelect
-         * second line : ContinuousSerialClock
-         * third line: SerialData
-         *
-         * SYMMETRICAL APPROACH:
-         *   _______________________          LEFT
-         * _|         RIGHT         |______________________|
-         *     _   _         _   _   _   _         _   _
-         *   _| |_| |_ x16 _| |_| |_| |_| |_ x16 _| |_| |_
-         *     _   _         _   _   _   _         _   _
-         *   _/ \_/ \_ ... _/ \_/ \_/ \_/ \_ ... _/ \_/ \_
-         *    \_/ \_/       \_/ \_/ \_/ \_/       \_/ \_/
-         *
-         * ACCURATE CLOCK APPROACH:
-         *   ______________          LEFT
-         * _|     RIGHT    |_______________________________|
-         *     _         _   _         _   _   _   _   _   _
-         *   _| |_ x16 _| |_| |_ x16 _| |_| |_| |_| |_| |_| |
-         *     _         _   _          _      dummy cycles
-         *   _/ \_ ... _/ \_/ \_  ... _/ \__________________
-         *    \_/       \_/ \_/        \_/
-         *
-         */
-        bool i2s_accurate_sck;
-
-        /* McASP specific fields */
-        int tdm_slots;
-        u8 op_mode;
-        u8 num_serializer;
-        u8 *serial_dir;
-        u8 version;
-        u8 txnumevt;
-        u8 rxnumevt;
-};
-
-enum {
-        MCASP_VERSION_1 = 0,    /* DM646x */
-        MCASP_VERSION_2,        /* DA8xx/OMAPL1x */
-        MCASP_VERSION_3,        /* TI81xx/AM33xx */
-};
-
-enum mcbsp_clk_input_pin {
-        MCBSP_CLKR = 0,         /* as in DM365 */
-        MCBSP_CLKS,
-};
-
-#define INACTIVE_MODE   0
-#define TX_MODE         1
-#define RX_MODE         2
-
-#define DAVINCI_MCASP_IIS_MODE  0
-#define DAVINCI_MCASP_DIT_MODE  1
-
-#endif
diff --git a/include/linux/platform_data/db8500_thermal.h b/include/linux/platform_data/db8500_thermal.h
deleted file mode 100644
index 3bf60902e90..00000000000
--- a/include/linux/platform_data/db8500_thermal.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * db8500_thermal.h - DB8500 Thermal Management Implementation
- *
- * Copyright (C) 2012 ST-Ericsson
- * Copyright (C) 2012 Linaro Ltd.
- *
- * Author: Hongbo Zhang <hongbo.zhang@linaro.com>
- *
- * 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.
- */
-
-#ifndef _DB8500_THERMAL_H_
-#define _DB8500_THERMAL_H_
-
-#include <linux/thermal.h>
-
-#define COOLING_DEV_MAX 8
-
-struct db8500_trip_point {
-        unsigned long temp;
-        enum thermal_trip_type type;
-        char cdev_name[COOLING_DEV_MAX][THERMAL_NAME_LENGTH];
-};
-
-struct db8500_thsens_platform_data {
-        struct db8500_trip_point trip_points[THERMAL_MAX_TRIPS];
-        int num_trips;
-};
-
-#endif /* _DB8500_THERMAL_H_ */
diff --git a/include/linux/platform_data/dma-atmel.h b/include/linux/platform_data/dma-atmel.h
deleted file mode 100644
index cab0997be3d..00000000000
--- a/include/linux/platform_data/dma-atmel.h
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Header file for the Atmel AHB DMA Controller driver
- *
- * Copyright (C) 2008 Atmel Corporation
- *
- * 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.
- */
-#ifndef AT_HDMAC_H
-#define AT_HDMAC_H
-
-#include <linux/dmaengine.h>
-
-/**
- * struct at_dma_platform_data - Controller configuration parameters
- * @nr_channels: Number of channels supported by hardware (max 8)
- * @cap_mask: dma_capability flags supported by the platform
- */
-struct at_dma_platform_data {
-        unsigned int    nr_channels;
-        dma_cap_mask_t  cap_mask;
-};
-
-/**
- * struct at_dma_slave - Controller-specific information about a slave
- * @dma_dev: required DMA master device
- * @cfg: Platform-specific initializer for the CFG register
- */
-struct at_dma_slave {
-        struct device           *dma_dev;
-        u32                     cfg;
-};
-
-
-/* Platform-configurable bits in CFG */
-#define ATC_SRC_PER(h)          (0xFU & (h))    /* Channel src rq associated with periph handshaking ifc h */
-#define ATC_DST_PER(h)          ((0xFU & (h)) <<  4)    /* Channel dst rq associated with periph handshaking ifc h */
-#define ATC_SRC_REP             (0x1 <<  8)     /* Source Replay Mod */
-#define ATC_SRC_H2SEL           (0x1 <<  9)     /* Source Handshaking Mod */
-#define         ATC_SRC_H2SEL_SW        (0x0 <<  9)
-#define         ATC_SRC_H2SEL_HW        (0x1 <<  9)
-#define ATC_DST_REP             (0x1 << 12)     /* Destination Replay Mod */
-#define ATC_DST_H2SEL           (0x1 << 13)     /* Destination Handshaking Mod */
-#define         ATC_DST_H2SEL_SW        (0x0 << 13)
-#define         ATC_DST_H2SEL_HW        (0x1 << 13)
-#define ATC_SOD                 (0x1 << 16)     /* Stop On Done */
-#define ATC_LOCK_IF             (0x1 << 20)     /* Interface Lock */
-#define ATC_LOCK_B              (0x1 << 21)     /* AHB Bus Lock */
-#define ATC_LOCK_IF_L           (0x1 << 22)     /* Master Interface Arbiter Lock */
-#define         ATC_LOCK_IF_L_CHUNK     (0x0 << 22)
-#define         ATC_LOCK_IF_L_BUFFER    (0x1 << 22)
-#define ATC_AHB_PROT_MASK       (0x7 << 24)     /* AHB Protection */
-#define ATC_FIFOCFG_MASK        (0x3 << 28)     /* FIFO Request Configuration */
-#define         ATC_FIFOCFG_LARGESTBURST        (0x0 << 28)
-#define         ATC_FIFOCFG_HALFFIFO            (0x1 << 28)
-#define         ATC_FIFOCFG_ENOUGHSPACE         (0x2 << 28)
-
-
-#endif /* AT_HDMAC_H */
diff --git a/include/linux/platform_data/dma-ep93xx.h b/include/linux/platform_data/dma-ep93xx.h
deleted file mode 100644
index e82c642fa53..00000000000
--- a/include/linux/platform_data/dma-ep93xx.h
+++ /dev/null
@@ -1,93 +0,0 @@
-#ifndef __ASM_ARCH_DMA_H
-#define __ASM_ARCH_DMA_H
-
-#include <linux/types.h>
-#include <linux/dmaengine.h>
-#include <linux/dma-mapping.h>
-
-/*
- * M2P channels.
- *
- * Note that these values are also directly used for setting the PPALLOC
- * register.
- */
-#define EP93XX_DMA_I2S1         0
-#define EP93XX_DMA_I2S2         1
-#define EP93XX_DMA_AAC1         2
-#define EP93XX_DMA_AAC2         3
-#define EP93XX_DMA_AAC3         4
-#define EP93XX_DMA_I2S3         5
-#define EP93XX_DMA_UART1        6
-#define EP93XX_DMA_UART2        7
-#define EP93XX_DMA_UART3        8
-#define EP93XX_DMA_IRDA         9
-/* M2M channels */
-#define EP93XX_DMA_SSP          10
-#define EP93XX_DMA_IDE          11
-
-/**
- * struct ep93xx_dma_data - configuration data for the EP93xx dmaengine
- * @port: peripheral which is requesting the channel
- * @direction: TX/RX channel
- * @name: optional name for the channel, this is displayed in /proc/interrupts
- *
- * This information is passed as private channel parameter in a filter
- * function. Note that this is only needed for slave/cyclic channels.  For
- * memcpy channels %NULL data should be passed.
- */
-struct ep93xx_dma_data {
-        int                             port;
-        enum dma_transfer_direction     direction;
-        const char                      *name;
-};
-
-/**
- * struct ep93xx_dma_chan_data - platform specific data for a DMA channel
- * @name: name of the channel, used for getting the right clock for the channel
- * @base: mapped registers
- * @irq: interrupt number used by this channel
- */
-struct ep93xx_dma_chan_data {
-        const char                      *name;
-        void __iomem                    *base;
-        int                             irq;
-};
-
-/**
- * struct ep93xx_dma_platform_data - platform data for the dmaengine driver
- * @channels: array of channels which are passed to the driver
- * @num_channels: number of channels in the array
- *
- * This structure is passed to the DMA engine driver via platform data. For
- * M2P channels, contract is that even channels are for TX and odd for RX.
- * There is no requirement for the M2M channels.
- */
-struct ep93xx_dma_platform_data {
-        struct ep93xx_dma_chan_data     *channels;
-        size_t                          num_channels;
-};
-
-static inline bool ep93xx_dma_chan_is_m2p(struct dma_chan *chan)
-{
-        return !strcmp(dev_name(chan->device->dev), "ep93xx-dma-m2p");
-}
-
-/**
- * ep93xx_dma_chan_direction - returns direction the channel can be used
- * @chan: channel
- *
- * This function can be used in filter functions to find out whether the
- * channel supports given DMA direction. Only M2P channels have such
- * limitation, for M2M channels the direction is configurable.
- */
-static inline enum dma_transfer_direction
-ep93xx_dma_chan_direction(struct dma_chan *chan)
-{
-        if (!ep93xx_dma_chan_is_m2p(chan))
-                return DMA_NONE;
-
-        /* even channels are for TX, odd for RX */
-        return (chan->chan_id % 2 == 0) ? DMA_MEM_TO_DEV : DMA_DEV_TO_MEM;
-}
-
-#endif /* __ASM_ARCH_DMA_H */
diff --git a/include/linux/platform_data/dma-imx-sdma.h b/include/linux/platform_data/dma-imx-sdma.h
deleted file mode 100644
index 3a3942823c2..00000000000
--- a/include/linux/platform_data/dma-imx-sdma.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef __MACH_MXC_SDMA_H__
-#define __MACH_MXC_SDMA_H__
-
-/**
- * struct sdma_script_start_addrs - SDMA script start pointers
- *
- * start addresses of the different functions in the physical
- * address space of the SDMA engine.
- */
-struct sdma_script_start_addrs {
-        s32 ap_2_ap_addr;
-        s32 ap_2_bp_addr;
-        s32 ap_2_ap_fixed_addr;
-        s32 bp_2_ap_addr;
-        s32 loopback_on_dsp_side_addr;
-        s32 mcu_interrupt_only_addr;
-        s32 firi_2_per_addr;
-        s32 firi_2_mcu_addr;
-        s32 per_2_firi_addr;
-        s32 mcu_2_firi_addr;
-        s32 uart_2_per_addr;
-        s32 uart_2_mcu_addr;
-        s32 per_2_app_addr;
-        s32 mcu_2_app_addr;
-        s32 per_2_per_addr;
-        s32 uartsh_2_per_addr;
-        s32 uartsh_2_mcu_addr;
-        s32 per_2_shp_addr;
-        s32 mcu_2_shp_addr;
-        s32 ata_2_mcu_addr;
-        s32 mcu_2_ata_addr;
-        s32 app_2_per_addr;
-        s32 app_2_mcu_addr;
-        s32 shp_2_per_addr;
-        s32 shp_2_mcu_addr;
-        s32 mshc_2_mcu_addr;
-        s32 mcu_2_mshc_addr;
-        s32 spdif_2_mcu_addr;
-        s32 mcu_2_spdif_addr;
-        s32 asrc_2_mcu_addr;
-        s32 ext_mem_2_ipu_addr;
-        s32 descrambler_addr;
-        s32 dptc_dvfs_addr;
-        s32 utra_addr;
-        s32 ram_code_start_addr;
-};
-
-/**
- * struct sdma_platform_data - platform specific data for SDMA engine
- *
- * @fw_name             The firmware name
- * @script_addrs        SDMA scripts addresses in SDMA ROM
- */
-struct sdma_platform_data {
-        char *fw_name;
-        struct sdma_script_start_addrs *script_addrs;
-};
-
-#endif /* __MACH_MXC_SDMA_H__ */
diff --git a/include/linux/platform_data/dma-imx.h b/include/linux/platform_data/dma-imx.h
deleted file mode 100644
index f6d30cc1cb7..00000000000
--- a/include/linux/platform_data/dma-imx.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright 2004-2009 Freescale Semiconductor, Inc. All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __ASM_ARCH_MXC_DMA_H__
-#define __ASM_ARCH_MXC_DMA_H__
-
-#include <linux/scatterlist.h>
-#include <linux/device.h>
-#include <linux/dmaengine.h>
-
-/*
- * This enumerates peripheral types. Used for SDMA.
- */
-enum sdma_peripheral_type {
-        IMX_DMATYPE_SSI,        /* MCU domain SSI */
-        IMX_DMATYPE_SSI_SP,     /* Shared SSI */
-        IMX_DMATYPE_MMC,        /* MMC */
-        IMX_DMATYPE_SDHC,       /* SDHC */
-        IMX_DMATYPE_UART,       /* MCU domain UART */
-        IMX_DMATYPE_UART_SP,    /* Shared UART */
-        IMX_DMATYPE_FIRI,       /* FIRI */
-        IMX_DMATYPE_CSPI,       /* MCU domain CSPI */
-        IMX_DMATYPE_CSPI_SP,    /* Shared CSPI */
-        IMX_DMATYPE_SIM,        /* SIM */
-        IMX_DMATYPE_ATA,        /* ATA */
-        IMX_DMATYPE_CCM,        /* CCM */
-        IMX_DMATYPE_EXT,        /* External peripheral */
-        IMX_DMATYPE_MSHC,       /* Memory Stick Host Controller */
-        IMX_DMATYPE_MSHC_SP,    /* Shared Memory Stick Host Controller */
-        IMX_DMATYPE_DSP,        /* DSP */
-        IMX_DMATYPE_MEMORY,     /* Memory */
-        IMX_DMATYPE_FIFO_MEMORY,/* FIFO type Memory */
-        IMX_DMATYPE_SPDIF,      /* SPDIF */
-        IMX_DMATYPE_IPU_MEMORY, /* IPU Memory */
-        IMX_DMATYPE_ASRC,       /* ASRC */
-        IMX_DMATYPE_ESAI,       /* ESAI */
-};
-
-enum imx_dma_prio {
-        DMA_PRIO_HIGH = 0,
-        DMA_PRIO_MEDIUM = 1,
-        DMA_PRIO_LOW = 2
-};
-
-struct imx_dma_data {
-        int dma_request; /* DMA request line */
-        enum sdma_peripheral_type peripheral_type;
-        int priority;
-};
-
-static inline int imx_dma_is_ipu(struct dma_chan *chan)
-{
-        return !strcmp(dev_name(chan->device->dev), "ipu-core");
-}
-
-static inline int imx_dma_is_general_purpose(struct dma_chan *chan)
-{
-        return strstr(dev_name(chan->device->dev), "sdma") ||
-                !strcmp(dev_name(chan->device->dev), "imx1-dma") ||
-                !strcmp(dev_name(chan->device->dev), "imx21-dma") ||
-                !strcmp(dev_name(chan->device->dev), "imx27-dma");
-}
-
-#endif
diff --git a/include/linux/platform_data/dma-mmp_tdma.h b/include/linux/platform_data/dma-mmp_tdma.h
deleted file mode 100644
index 239e0fc1bb1..00000000000
--- a/include/linux/platform_data/dma-mmp_tdma.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- *  linux/arch/arm/mach-mmp/include/mach/sram.h
- *
- *  SRAM Memory Management
- *
- *  Copyright (c) 2011 Marvell Semiconductors Inc.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- */
-
-#ifndef __ASM_ARCH_SRAM_H
-#define __ASM_ARCH_SRAM_H
-
-#include <linux/genalloc.h>
-
-/* ARBITRARY:  SRAM allocations are multiples of this 2^N size */
-#define SRAM_GRANULARITY        512
-
-enum sram_type {
-        MMP_SRAM_UNDEFINED = 0,
-        MMP_ASRAM,
-        MMP_ISRAM,
-};
-
-struct sram_platdata {
-        char *pool_name;
-        int granularity;
-};
-
-extern struct gen_pool *sram_get_gpool(char *pool_name);
-
-#endif /* __ASM_ARCH_SRAM_H */
diff --git a/include/linux/platform_data/dma-mv_xor.h b/include/linux/platform_data/dma-mv_xor.h
deleted file mode 100644
index 8ec18f64e39..00000000000
--- a/include/linux/platform_data/dma-mv_xor.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * arch/arm/plat-orion/include/plat/mv_xor.h
- *
- * Marvell XOR platform device data definition file.
- */
-
-#ifndef __PLAT_MV_XOR_H
-#define __PLAT_MV_XOR_H
-
-#include <linux/dmaengine.h>
-#include <linux/mbus.h>
-
-#define MV_XOR_NAME     "mv_xor"
-
-struct mv_xor_channel_data {
-        dma_cap_mask_t                  cap_mask;
-};
-
-struct mv_xor_platform_data {
-        struct mv_xor_channel_data    *channels;
-};
-
-#endif
diff --git a/include/linux/platform_data/dma-ste-dma40.h b/include/linux/platform_data/dma-ste-dma40.h
deleted file mode 100644
index 9ff93b06568..00000000000
--- a/include/linux/platform_data/dma-ste-dma40.h
+++ /dev/null
@@ -1,223 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2007-2010
- * Author: Per Forlin <per.forlin@stericsson.com> for ST-Ericsson
- * Author: Jonas Aaberg <jonas.aberg@stericsson.com> for ST-Ericsson
- * License terms: GNU General Public License (GPL) version 2
- */
-
-
-#ifndef STE_DMA40_H
-#define STE_DMA40_H
-
-#include <linux/dmaengine.h>
-#include <linux/scatterlist.h>
-#include <linux/workqueue.h>
-#include <linux/interrupt.h>
-
-/*
- * Maxium size for a single dma descriptor
- * Size is limited to 16 bits.
- * Size is in the units of addr-widths (1,2,4,8 bytes)
- * Larger transfers will be split up to multiple linked desc
- */
-#define STEDMA40_MAX_SEG_SIZE 0xFFFF
-
-/* dev types for memcpy */
-#define STEDMA40_DEV_DST_MEMORY (-1)
-#define STEDMA40_DEV_SRC_MEMORY (-1)
-
-enum stedma40_mode {
-        STEDMA40_MODE_LOGICAL = 0,
-        STEDMA40_MODE_PHYSICAL,
-        STEDMA40_MODE_OPERATION,
-};
-
-enum stedma40_mode_opt {
-        STEDMA40_PCHAN_BASIC_MODE = 0,
-        STEDMA40_LCHAN_SRC_LOG_DST_LOG = 0,
-        STEDMA40_PCHAN_MODULO_MODE,
-        STEDMA40_PCHAN_DOUBLE_DST_MODE,
-        STEDMA40_LCHAN_SRC_PHY_DST_LOG,
-        STEDMA40_LCHAN_SRC_LOG_DST_PHY,
-};
-
-#define STEDMA40_ESIZE_8_BIT  0x0
-#define STEDMA40_ESIZE_16_BIT 0x1
-#define STEDMA40_ESIZE_32_BIT 0x2
-#define STEDMA40_ESIZE_64_BIT 0x3
-
-/* The value 4 indicates that PEN-reg shall be set to 0 */
-#define STEDMA40_PSIZE_PHY_1  0x4
-#define STEDMA40_PSIZE_PHY_2  0x0
-#define STEDMA40_PSIZE_PHY_4  0x1
-#define STEDMA40_PSIZE_PHY_8  0x2
-#define STEDMA40_PSIZE_PHY_16 0x3
-
-/*
- * The number of elements differ in logical and
- * physical mode
- */
-#define STEDMA40_PSIZE_LOG_1  STEDMA40_PSIZE_PHY_2
-#define STEDMA40_PSIZE_LOG_4  STEDMA40_PSIZE_PHY_4
-#define STEDMA40_PSIZE_LOG_8  STEDMA40_PSIZE_PHY_8
-#define STEDMA40_PSIZE_LOG_16 STEDMA40_PSIZE_PHY_16
-
-/* Maximum number of possible physical channels */
-#define STEDMA40_MAX_PHYS 32
-
-enum stedma40_flow_ctrl {
-        STEDMA40_NO_FLOW_CTRL,
-        STEDMA40_FLOW_CTRL,
-};
-
-enum stedma40_periph_data_width {
-        STEDMA40_BYTE_WIDTH = STEDMA40_ESIZE_8_BIT,
-        STEDMA40_HALFWORD_WIDTH = STEDMA40_ESIZE_16_BIT,
-        STEDMA40_WORD_WIDTH = STEDMA40_ESIZE_32_BIT,
-        STEDMA40_DOUBLEWORD_WIDTH = STEDMA40_ESIZE_64_BIT
-};
-
-enum stedma40_xfer_dir {
-        STEDMA40_MEM_TO_MEM = 1,
-        STEDMA40_MEM_TO_PERIPH,
-        STEDMA40_PERIPH_TO_MEM,
-        STEDMA40_PERIPH_TO_PERIPH
-};
-
-
-/**
- * struct stedma40_chan_cfg - dst/src channel configuration
- *
- * @big_endian: true if the src/dst should be read as big endian
- * @data_width: Data width of the src/dst hardware
- * @p_size: Burst size
- * @flow_ctrl: Flow control on/off.
- */
-struct stedma40_half_channel_info {
-        bool big_endian;
-        enum stedma40_periph_data_width data_width;
-        int psize;
-        enum stedma40_flow_ctrl flow_ctrl;
-};
-
-/**
- * struct stedma40_chan_cfg - Structure to be filled by client drivers.
- *
- * @dir: MEM 2 MEM, PERIPH 2 MEM , MEM 2 PERIPH, PERIPH 2 PERIPH
- * @high_priority: true if high-priority
- * @realtime: true if realtime mode is to be enabled.  Only available on DMA40
- * version 3+, i.e DB8500v2+
- * @mode: channel mode: physical, logical, or operation
- * @mode_opt: options for the chosen channel mode
- * @src_dev_type: Src device type
- * @dst_dev_type: Dst device type
- * @src_info: Parameters for dst half channel
- * @dst_info: Parameters for dst half channel
- * @use_fixed_channel: if true, use physical channel specified by phy_channel
- * @phy_channel: physical channel to use, only if use_fixed_channel is true
- *
- * This structure has to be filled by the client drivers.
- * It is recommended to do all dma configurations for clients in the machine.
- *
- */
-struct stedma40_chan_cfg {
-        enum stedma40_xfer_dir                   dir;
-        bool                                     high_priority;
-        bool                                     realtime;
-        enum stedma40_mode                       mode;
-        enum stedma40_mode_opt                   mode_opt;
-        int                                      src_dev_type;
-        int                                      dst_dev_type;
-        struct stedma40_half_channel_info        src_info;
-        struct stedma40_half_channel_info        dst_info;
-
-        bool                                     use_fixed_channel;
-        int                                      phy_channel;
-};
-
-/**
- * struct stedma40_platform_data - Configuration struct for the dma device.
- *
- * @dev_len: length of dev_tx and dev_rx
- * @dev_tx: mapping between destination event line and io address
- * @dev_rx: mapping between source event line and io address
- * @memcpy: list of memcpy event lines
- * @memcpy_len: length of memcpy
- * @memcpy_conf_phy: default configuration of physical channel memcpy
- * @memcpy_conf_log: default configuration of logical channel memcpy
- * @disabled_channels: A vector, ending with -1, that marks physical channels
- * that are for different reasons not available for the driver.
- */
-struct stedma40_platform_data {
-        u32                              dev_len;
-        const dma_addr_t                *dev_tx;
-        const dma_addr_t                *dev_rx;
-        int                             *memcpy;
-        u32                              memcpy_len;
-        struct stedma40_chan_cfg        *memcpy_conf_phy;
-        struct stedma40_chan_cfg        *memcpy_conf_log;
-        int                              disabled_channels[STEDMA40_MAX_PHYS];
-        bool                             use_esram_lcla;
-};
-
-#ifdef CONFIG_STE_DMA40
-
-/**
- * stedma40_filter() - Provides stedma40_chan_cfg to the
- * ste_dma40 dma driver via the dmaengine framework.
- * does some checking of what's provided.
- *
- * Never directly called by client. It used by dmaengine.
- * @chan: dmaengine handle.
- * @data: Must be of type: struct stedma40_chan_cfg and is
- * the configuration of the framework.
- *
- *
- */
-
-bool stedma40_filter(struct dma_chan *chan, void *data);
-
-/**
- * stedma40_slave_mem() - Transfers a raw data buffer to or from a slave
- * (=device)
- *
- * @chan: dmaengine handle
- * @addr: source or destination physicall address.
- * @size: bytes to transfer
- * @direction: direction of transfer
- * @flags: is actually enum dma_ctrl_flags. See dmaengine.h
- */
-
-static inline struct
-dma_async_tx_descriptor *stedma40_slave_mem(struct dma_chan *chan,
-                                            dma_addr_t addr,
-                                            unsigned int size,
-                                            enum dma_transfer_direction direction,
-                                            unsigned long flags)
-{
-        struct scatterlist sg;
-        sg_init_table(&sg, 1);
-        sg.dma_address = addr;
-        sg.length = size;
-
-        return dmaengine_prep_slave_sg(chan, &sg, 1, direction, flags);
-}
-
-#else
-static inline bool stedma40_filter(struct dma_chan *chan, void *data)
-{
-        return false;
-}
-
-static inline struct
-dma_async_tx_descriptor *stedma40_slave_mem(struct dma_chan *chan,
-                                            dma_addr_t addr,
-                                            unsigned int size,
-                                            enum dma_transfer_direction direction,
-                                            unsigned long flags)
-{
-        return NULL;
-}
-#endif
-
-#endif
diff --git a/include/linux/platform_data/dmtimer-omap.h b/include/linux/platform_data/dmtimer-omap.h
deleted file mode 100644
index a19b78d826e..00000000000
--- a/include/linux/platform_data/dmtimer-omap.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * DMTIMER platform data for TI OMAP platforms
- *
- * Copyright (C) 2012 Texas Instruments
- * Author: Jon Hunter <jon-hunter@ti.com>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __PLATFORM_DATA_DMTIMER_OMAP_H__
-#define __PLATFORM_DATA_DMTIMER_OMAP_H__
-
-struct dmtimer_platform_data {
-        /* set_timer_src - Only used for OMAP1 devices */
-        int (*set_timer_src)(struct platform_device *pdev, int source);
-        u32 timer_capability;
-        u32 timer_errata;
-        int (*get_context_loss_count)(struct device *);
-};
-
-#endif /* __PLATFORM_DATA_DMTIMER_OMAP_H__ */
diff --git a/include/linux/platform_data/dsp-omap.h b/include/linux/platform_data/dsp-omap.h
deleted file mode 100644
index 5927709b190..00000000000
--- a/include/linux/platform_data/dsp-omap.h
+++ /dev/null
@@ -1,34 +0,0 @@
-#ifndef __OMAP_DSP_H__
-#define __OMAP_DSP_H__
-
-#include <linux/types.h>
-
-struct omap_dsp_platform_data {
-        void (*dsp_set_min_opp) (u8 opp_id);
-        u8 (*dsp_get_opp) (void);
-        void (*cpu_set_freq) (unsigned long f);
-        unsigned long (*cpu_get_freq) (void);
-        unsigned long mpu_speed[6];
-
-        /* functions to write and read PRCM registers */
-        void (*dsp_prm_write)(u32, s16 , u16);
-        u32 (*dsp_prm_read)(s16 , u16);
-        u32 (*dsp_prm_rmw_bits)(u32, u32, s16, s16);
-        void (*dsp_cm_write)(u32, s16 , u16);
-        u32 (*dsp_cm_read)(s16 , u16);
-        u32 (*dsp_cm_rmw_bits)(u32, u32, s16, s16);
-
-        void (*set_bootaddr)(u32);
-        void (*set_bootmode)(u8);
-
-        phys_addr_t phys_mempool_base;
-        phys_addr_t phys_mempool_size;
-};
-
-#if defined(CONFIG_TIDSPBRIDGE) || defined(CONFIG_TIDSPBRIDGE_MODULE)
-extern void omap_dsp_reserve_sdram_memblock(void);
-#else
-static inline void omap_dsp_reserve_sdram_memblock(void) { }
-#endif
-
-#endif
diff --git a/include/linux/platform_data/dwc3-exynos.h b/include/linux/platform_data/dwc3-exynos.h
deleted file mode 100644
index 5eb7da9b377..00000000000
--- a/include/linux/platform_data/dwc3-exynos.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * dwc3-exynos.h - Samsung EXYNOS DWC3 Specific Glue layer, header.
- *
- * Copyright (c) 2012 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com
- *
- * Author: Anton Tikhomirov <av.tikhomirov@samsung.com>
- *
- * 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.
- */
-
-#ifndef _DWC3_EXYNOS_H_
-#define _DWC3_EXYNOS_H_
-
-struct dwc3_exynos_data {
-        int phy_type;
-        int (*phy_init)(struct platform_device *pdev, int type);
-        int (*phy_exit)(struct platform_device *pdev, int type);
-};
-
-#endif /* _DWC3_EXYNOS_H_ */
diff --git a/include/linux/platform_data/dwc3-omap.h b/include/linux/platform_data/dwc3-omap.h
deleted file mode 100644
index ada401244e0..00000000000
--- a/include/linux/platform_data/dwc3-omap.h
+++ /dev/null
@@ -1,47 +0,0 @@
-/**
- * dwc3-omap.h - OMAP Specific Glue layer, header.
- *
- * Copyright (C) 2010-2011 Texas Instruments Incorporated - http://www.ti.com
- * All rights reserved.
- *
- * Author: Felipe Balbi <balbi@ti.com>
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions, and the following disclaimer,
- *    without modification.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The names of the above-listed copyright holders may not be used
- *    to endorse or promote products derived from this software without
- *    specific prior written permission.
- *
- * ALTERNATIVELY, this software may be distributed under the terms of the
- * GNU General Public License ("GPL") version 2, as published by the Free
- * Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
- * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-enum dwc3_omap_utmi_mode {
-        DWC3_OMAP_UTMI_MODE_UNKNOWN = 0,
-        DWC3_OMAP_UTMI_MODE_HW,
-        DWC3_OMAP_UTMI_MODE_SW,
-};
-
-struct dwc3_omap_data {
-        enum dwc3_omap_utmi_mode        utmi_mode;
-};
diff --git a/include/linux/platform_data/efm32-uart.h b/include/linux/platform_data/efm32-uart.h
deleted file mode 100644
index ed0e975b3c5..00000000000
--- a/include/linux/platform_data/efm32-uart.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- *
- *
- */
-#ifndef __LINUX_PLATFORM_DATA_EFM32_UART_H__
-#define __LINUX_PLATFORM_DATA_EFM32_UART_H__
-
-#include <linux/types.h>
-
-/**
- * struct efm32_uart_pdata
- * @location: pinmux location for the I/O pins (to be written to the ROUTE
- *      register)
- */
-struct efm32_uart_pdata {
-        u8 location;
-};
-#endif /* ifndef __LINUX_PLATFORM_DATA_EFM32_UART_H__ */
diff --git a/include/linux/platform_data/ehci-sh.h b/include/linux/platform_data/ehci-sh.h
deleted file mode 100644
index 5c15a738e11..00000000000
--- a/include/linux/platform_data/ehci-sh.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * EHCI SuperH driver platform data
- *
- * Copyright (C) 2012  Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
- * Copyright (C) 2012  Renesas Solutions Corp.
- *
- * 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; version 2 of the License.
- *
- * 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 __USB_EHCI_SH_H
-#define __USB_EHCI_SH_H
-
-struct ehci_sh_platdata {
-        void (*phy_init)(void); /* Phy init function */
-};
-
-#endif /* __USB_EHCI_SH_H */
diff --git a/include/linux/platform_data/emif_plat.h b/include/linux/platform_data/emif_plat.h
deleted file mode 100644
index 03378ca8406..00000000000
--- a/include/linux/platform_data/emif_plat.h
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Definitions for TI EMIF device platform data
- *
- * Copyright (C) 2012 Texas Instruments, Inc.
- *
- * Aneesh V <aneesh@ti.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __EMIF_PLAT_H
-#define __EMIF_PLAT_H
-
-/* Low power modes - EMIF_PWR_MGMT_CTRL */
-#define EMIF_LP_MODE_DISABLE                            0
-#define EMIF_LP_MODE_CLOCK_STOP                         1
-#define EMIF_LP_MODE_SELF_REFRESH                       2
-#define EMIF_LP_MODE_PWR_DN                             4
-
-/* Hardware capabilities */
-#define EMIF_HW_CAPS_LL_INTERFACE                       0x00000001
-
-/*
- * EMIF IP Revisions
- *      EMIF4D  - Used in OMAP4
- *      EMIF4D5 - Used in OMAP5
- */
-#define EMIF_4D                                         1
-#define EMIF_4D5                                        2
-
-/*
- * PHY types
- *      ATTILAPHY  - Used in OMAP4
- *      INTELLIPHY - Used in OMAP5
- */
-#define EMIF_PHY_TYPE_ATTILAPHY                         1
-#define EMIF_PHY_TYPE_INTELLIPHY                        2
-
-/* Custom config requests */
-#define EMIF_CUSTOM_CONFIG_LPMODE                       0x00000001
-#define EMIF_CUSTOM_CONFIG_TEMP_ALERT_POLL_INTERVAL     0x00000002
-
-#ifndef __ASSEMBLY__
-/**
- * struct ddr_device_info - All information about the DDR device except AC
- *              timing parameters
- * @type:       Device type (LPDDR2-S4, LPDDR2-S2 etc)
- * @density:    Device density
- * @io_width:   Bus width
- * @cs1_used:   Whether there is a DDR device attached to the second
- *              chip-select(CS1) of this EMIF instance
- * @cal_resistors_per_cs: Whether there is one calibration resistor per
- *              chip-select or whether it's a single one for both
- * @manufacturer: Manufacturer name string
- */
-struct ddr_device_info {
-        u32     type;
-        u32     density;
-        u32     io_width;
-        u32     cs1_used;
-        u32     cal_resistors_per_cs;
-        char    manufacturer[10];
-};
-
-/**
- * struct emif_custom_configs - Custom configuration parameters/policies
- *              passed from the platform layer
- * @mask:       Mask to indicate which configs are requested
- * @lpmode:     LPMODE to be used in PWR_MGMT_CTRL register
- * @lpmode_timeout_performance: Timeout before LPMODE entry when higher
- *              performance is desired at the cost of power (typically
- *              at higher OPPs)
- * @lpmode_timeout_power: Timeout before LPMODE entry when better power
- *              savings is desired and performance is not important
- *              (typically at lower loads indicated by lower OPPs)
- * @lpmode_freq_threshold: The DDR frequency threshold to identify between
- *              the above two cases:
- *              timeout = (freq >= lpmode_freq_threshold) ?
- *                      lpmode_timeout_performance :
- *                      lpmode_timeout_power;
- * @temp_alert_poll_interval_ms: LPDDR2 MR4 polling interval at nominal
- *              temperature(in milliseconds). When temperature is high
- *              polling is done 4 times as frequently.
- */
-struct emif_custom_configs {
-        u32 mask;
-        u32 lpmode;
-        u32 lpmode_timeout_performance;
-        u32 lpmode_timeout_power;
-        u32 lpmode_freq_threshold;
-        u32 temp_alert_poll_interval_ms;
-};
-
-/**
- * struct emif_platform_data - Platform data passed on EMIF platform
- *                              device creation. Used by the driver.
- * @hw_caps:            Hw capabilities of the EMIF IP in the respective SoC
- * @device_info:        Device info structure containing information such
- *                      as type, bus width, density etc
- * @timings:            Timings information from device datasheet passed
- *                      as an array of 'struct lpddr2_timings'. Can be NULL
- *                      if if default timings are ok
- * @timings_arr_size:   Size of the timings array. Depends on the number
- *                      of different frequencies for which timings data
- *                      is provided
- * @min_tck:            Minimum value of some timing parameters in terms
- *                      of number of cycles. Can be NULL if default values
- *                      are ok
- * @custom_configs:     Custom configurations requested by SoC or board
- *                      code and the data for them. Can be NULL if default
- *                      configurations done by the driver are ok. See
- *                      documentation for 'struct emif_custom_configs' for
- *                      more details
- */
-struct emif_platform_data {
-        u32 hw_caps;
-        struct ddr_device_info *device_info;
-        const struct lpddr2_timings *timings;
-        u32 timings_arr_size;
-        const struct lpddr2_min_tck *min_tck;
-        struct emif_custom_configs *custom_configs;
-        u32 ip_rev;
-        u32 phy_type;
-};
-#endif /* __ASSEMBLY__ */
-
-#endif /* __LINUX_EMIF_H */
diff --git a/include/linux/platform_data/eth-netx.h b/include/linux/platform_data/eth-netx.h
deleted file mode 100644
index 88af1ac28ea..00000000000
--- a/include/linux/platform_data/eth-netx.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * arch/arm/mach-netx/include/mach/eth.h
- *
- * Copyright (c) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2
- * as published by the Free Software Foundation.
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef ASMARM_ARCH_ETH_H
-#define ASMARM_ARCH_ETH_H
-
-struct netxeth_platform_data {
-        unsigned int xcno;      /* number of xmac/xpec engine this eth uses */
-};
-
-#endif
diff --git a/include/linux/platform_data/exynos_thermal.h b/include/linux/platform_data/exynos_thermal.h
deleted file mode 100644
index a7bdb2f63b7..00000000000
--- a/include/linux/platform_data/exynos_thermal.h
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * exynos_thermal.h - Samsung EXYNOS TMU (Thermal Management Unit)
- *
- *  Copyright (C) 2011 Samsung Electronics
- *  Donggeun Kim <dg77.kim@samsung.com>
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#ifndef _LINUX_EXYNOS_THERMAL_H
-#define _LINUX_EXYNOS_THERMAL_H
-#include <linux/cpu_cooling.h>
-
-enum calibration_type {
-        TYPE_ONE_POINT_TRIMMING,
-        TYPE_TWO_POINT_TRIMMING,
-        TYPE_NONE,
-};
-
-enum soc_type {
-        SOC_ARCH_EXYNOS4210 = 1,
-        SOC_ARCH_EXYNOS,
-};
-/**
- * struct freq_clip_table
- * @freq_clip_max: maximum frequency allowed for this cooling state.
- * @temp_level: Temperature level at which the temperature clipping will
- *      happen.
- * @mask_val: cpumask of the allowed cpu's where the clipping will take place.
- *
- * This structure is required to be filled and passed to the
- * cpufreq_cooling_unregister function.
- */
-struct freq_clip_table {
-        unsigned int freq_clip_max;
-        unsigned int temp_level;
-        const struct cpumask *mask_val;
-};
-
-/**
- * struct exynos_tmu_platform_data
- * @threshold: basic temperature for generating interrupt
- *             25 <= threshold <= 125 [unit: degree Celsius]
- * @trigger_levels: array for each interrupt levels
- *      [unit: degree Celsius]
- *      0: temperature for trigger_level0 interrupt
- *         condition for trigger_level0 interrupt:
- *              current temperature > threshold + trigger_levels[0]
- *      1: temperature for trigger_level1 interrupt
- *         condition for trigger_level1 interrupt:
- *              current temperature > threshold + trigger_levels[1]
- *      2: temperature for trigger_level2 interrupt
- *         condition for trigger_level2 interrupt:
- *              current temperature > threshold + trigger_levels[2]
- *      3: temperature for trigger_level3 interrupt
- *         condition for trigger_level3 interrupt:
- *              current temperature > threshold + trigger_levels[3]
- * @trigger_level0_en:
- *      1 = enable trigger_level0 interrupt,
- *      0 = disable trigger_level0 interrupt
- * @trigger_level1_en:
- *      1 = enable trigger_level1 interrupt,
- *      0 = disable trigger_level1 interrupt
- * @trigger_level2_en:
- *      1 = enable trigger_level2 interrupt,
- *      0 = disable trigger_level2 interrupt
- * @trigger_level3_en:
- *      1 = enable trigger_level3 interrupt,
- *      0 = disable trigger_level3 interrupt
- * @gain: gain of amplifier in the positive-TC generator block
- *      0 <= gain <= 15
- * @reference_voltage: reference voltage of amplifier
- *      in the positive-TC generator block
- *      0 <= reference_voltage <= 31
- * @noise_cancel_mode: noise cancellation mode
- *      000, 100, 101, 110 and 111 can be different modes
- * @type: determines the type of SOC
- * @efuse_value: platform defined fuse value
- * @cal_type: calibration type for temperature
- * @freq_clip_table: Table representing frequency reduction percentage.
- * @freq_tab_count: Count of the above table as frequency reduction may
- *      applicable to only some of the trigger levels.
- *
- * This structure is required for configuration of exynos_tmu driver.
- */
-struct exynos_tmu_platform_data {
-        u8 threshold;
-        u8 trigger_levels[4];
-        bool trigger_level0_en;
-        bool trigger_level1_en;
-        bool trigger_level2_en;
-        bool trigger_level3_en;
-
-        u8 gain;
-        u8 reference_voltage;
-        u8 noise_cancel_mode;
-        u32 efuse_value;
-
-        enum calibration_type cal_type;
-        enum soc_type type;
-        struct freq_clip_table freq_tab[4];
-        unsigned int freq_tab_count;
-};
-#endif /* _LINUX_EXYNOS_THERMAL_H */
diff --git a/include/linux/platform_data/gpio-em.h b/include/linux/platform_data/gpio-em.h
deleted file mode 100644
index 573edfb046c..00000000000
--- a/include/linux/platform_data/gpio-em.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __GPIO_EM_H__
-#define __GPIO_EM_H__
-
-struct gpio_em_config {
-        unsigned int gpio_base;
-        unsigned int irq_base;
-        unsigned int number_of_pins;
-};
-
-#endif /* __GPIO_EM_H__ */
diff --git a/include/linux/platform_data/gpio-omap.h b/include/linux/platform_data/gpio-omap.h
deleted file mode 100644
index 5d50b25a73d..00000000000
--- a/include/linux/platform_data/gpio-omap.h
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
- * OMAP GPIO handling defines and functions
- *
- * Copyright (C) 2003-2005 Nokia Corporation
- *
- * Written by Juha Yrjölä <juha.yrjola@nokia.com>
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- *
- */
-
-#ifndef __ASM_ARCH_OMAP_GPIO_H
-#define __ASM_ARCH_OMAP_GPIO_H
-
-#include <linux/io.h>
-#include <linux/platform_device.h>
-
-#define OMAP1_MPUIO_BASE                        0xfffb5000
-
-/*
- * These are the omap15xx/16xx offsets. The omap7xx offset are
- * OMAP_MPUIO_ / 2 offsets below.
- */
-#define OMAP_MPUIO_INPUT_LATCH          0x00
-#define OMAP_MPUIO_OUTPUT               0x04
-#define OMAP_MPUIO_IO_CNTL              0x08
-#define OMAP_MPUIO_KBR_LATCH            0x10
-#define OMAP_MPUIO_KBC                  0x14
-#define OMAP_MPUIO_GPIO_EVENT_MODE      0x18
-#define OMAP_MPUIO_GPIO_INT_EDGE        0x1c
-#define OMAP_MPUIO_KBD_INT              0x20
-#define OMAP_MPUIO_GPIO_INT             0x24
-#define OMAP_MPUIO_KBD_MASKIT           0x28
-#define OMAP_MPUIO_GPIO_MASKIT          0x2c
-#define OMAP_MPUIO_GPIO_DEBOUNCING      0x30
-#define OMAP_MPUIO_LATCH                0x34
-
-#define OMAP34XX_NR_GPIOS               6
-
-/*
- * OMAP1510 GPIO registers
- */
-#define OMAP1510_GPIO_DATA_INPUT        0x00
-#define OMAP1510_GPIO_DATA_OUTPUT       0x04
-#define OMAP1510_GPIO_DIR_CONTROL       0x08
-#define OMAP1510_GPIO_INT_CONTROL       0x0c
-#define OMAP1510_GPIO_INT_MASK          0x10
-#define OMAP1510_GPIO_INT_STATUS        0x14
-#define OMAP1510_GPIO_PIN_CONTROL       0x18
-
-#define OMAP1510_IH_GPIO_BASE           64
-
-/*
- * OMAP1610 specific GPIO registers
- */
-#define OMAP1610_GPIO_REVISION          0x0000
-#define OMAP1610_GPIO_SYSCONFIG         0x0010
-#define OMAP1610_GPIO_SYSSTATUS         0x0014
-#define OMAP1610_GPIO_IRQSTATUS1        0x0018
-#define OMAP1610_GPIO_IRQENABLE1        0x001c
-#define OMAP1610_GPIO_WAKEUPENABLE      0x0028
-#define OMAP1610_GPIO_DATAIN            0x002c
-#define OMAP1610_GPIO_DATAOUT           0x0030
-#define OMAP1610_GPIO_DIRECTION         0x0034
-#define OMAP1610_GPIO_EDGE_CTRL1        0x0038
-#define OMAP1610_GPIO_EDGE_CTRL2        0x003c
-#define OMAP1610_GPIO_CLEAR_IRQENABLE1  0x009c
-#define OMAP1610_GPIO_CLEAR_WAKEUPENA   0x00a8
-#define OMAP1610_GPIO_CLEAR_DATAOUT     0x00b0
-#define OMAP1610_GPIO_SET_IRQENABLE1    0x00dc
-#define OMAP1610_GPIO_SET_WAKEUPENA     0x00e8
-#define OMAP1610_GPIO_SET_DATAOUT       0x00f0
-
-/*
- * OMAP7XX specific GPIO registers
- */
-#define OMAP7XX_GPIO_DATA_INPUT         0x00
-#define OMAP7XX_GPIO_DATA_OUTPUT        0x04
-#define OMAP7XX_GPIO_DIR_CONTROL        0x08
-#define OMAP7XX_GPIO_INT_CONTROL        0x0c
-#define OMAP7XX_GPIO_INT_MASK           0x10
-#define OMAP7XX_GPIO_INT_STATUS         0x14
-
-/*
- * omap2+ specific GPIO registers
- */
-#define OMAP24XX_GPIO_REVISION          0x0000
-#define OMAP24XX_GPIO_IRQSTATUS1        0x0018
-#define OMAP24XX_GPIO_IRQSTATUS2        0x0028
-#define OMAP24XX_GPIO_IRQENABLE2        0x002c
-#define OMAP24XX_GPIO_IRQENABLE1        0x001c
-#define OMAP24XX_GPIO_WAKE_EN           0x0020
-#define OMAP24XX_GPIO_CTRL              0x0030
-#define OMAP24XX_GPIO_OE                0x0034
-#define OMAP24XX_GPIO_DATAIN            0x0038
-#define OMAP24XX_GPIO_DATAOUT           0x003c
-#define OMAP24XX_GPIO_LEVELDETECT0      0x0040
-#define OMAP24XX_GPIO_LEVELDETECT1      0x0044
-#define OMAP24XX_GPIO_RISINGDETECT      0x0048
-#define OMAP24XX_GPIO_FALLINGDETECT     0x004c
-#define OMAP24XX_GPIO_DEBOUNCE_EN       0x0050
-#define OMAP24XX_GPIO_DEBOUNCE_VAL      0x0054
-#define OMAP24XX_GPIO_CLEARIRQENABLE1   0x0060
-#define OMAP24XX_GPIO_SETIRQENABLE1     0x0064
-#define OMAP24XX_GPIO_CLEARWKUENA       0x0080
-#define OMAP24XX_GPIO_SETWKUENA         0x0084
-#define OMAP24XX_GPIO_CLEARDATAOUT      0x0090
-#define OMAP24XX_GPIO_SETDATAOUT        0x0094
-
-#define OMAP4_GPIO_REVISION             0x0000
-#define OMAP4_GPIO_EOI                  0x0020
-#define OMAP4_GPIO_IRQSTATUSRAW0        0x0024
-#define OMAP4_GPIO_IRQSTATUSRAW1        0x0028
-#define OMAP4_GPIO_IRQSTATUS0           0x002c
-#define OMAP4_GPIO_IRQSTATUS1           0x0030
-#define OMAP4_GPIO_IRQSTATUSSET0        0x0034
-#define OMAP4_GPIO_IRQSTATUSSET1        0x0038
-#define OMAP4_GPIO_IRQSTATUSCLR0        0x003c
-#define OMAP4_GPIO_IRQSTATUSCLR1        0x0040
-#define OMAP4_GPIO_IRQWAKEN0            0x0044
-#define OMAP4_GPIO_IRQWAKEN1            0x0048
-#define OMAP4_GPIO_IRQENABLE1           0x011c
-#define OMAP4_GPIO_WAKE_EN              0x0120
-#define OMAP4_GPIO_IRQSTATUS2           0x0128
-#define OMAP4_GPIO_IRQENABLE2           0x012c
-#define OMAP4_GPIO_CTRL                 0x0130
-#define OMAP4_GPIO_OE                   0x0134
-#define OMAP4_GPIO_DATAIN               0x0138
-#define OMAP4_GPIO_DATAOUT              0x013c
-#define OMAP4_GPIO_LEVELDETECT0         0x0140
-#define OMAP4_GPIO_LEVELDETECT1         0x0144
-#define OMAP4_GPIO_RISINGDETECT         0x0148
-#define OMAP4_GPIO_FALLINGDETECT        0x014c
-#define OMAP4_GPIO_DEBOUNCENABLE        0x0150
-#define OMAP4_GPIO_DEBOUNCINGTIME       0x0154
-#define OMAP4_GPIO_CLEARIRQENABLE1      0x0160
-#define OMAP4_GPIO_SETIRQENABLE1        0x0164
-#define OMAP4_GPIO_CLEARWKUENA          0x0180
-#define OMAP4_GPIO_SETWKUENA            0x0184
-#define OMAP4_GPIO_CLEARDATAOUT         0x0190
-#define OMAP4_GPIO_SETDATAOUT           0x0194
-
-#define OMAP_MAX_GPIO_LINES             192
-
-#define OMAP_MPUIO(nr)          (OMAP_MAX_GPIO_LINES + (nr))
-#define OMAP_GPIO_IS_MPUIO(nr)  ((nr) >= OMAP_MAX_GPIO_LINES)
-
-struct omap_gpio_dev_attr {
-        int bank_width;         /* GPIO bank width */
-        bool dbck_flag;         /* dbck required or not - True for OMAP3&4 */
-};
-
-struct omap_gpio_reg_offs {
-        u16 revision;
-        u16 direction;
-        u16 datain;
-        u16 dataout;
-        u16 set_dataout;
-        u16 clr_dataout;
-        u16 irqstatus;
-        u16 irqstatus2;
-        u16 irqstatus_raw0;
-        u16 irqstatus_raw1;
-        u16 irqenable;
-        u16 irqenable2;
-        u16 set_irqenable;
-        u16 clr_irqenable;
-        u16 debounce;
-        u16 debounce_en;
-        u16 ctrl;
-        u16 wkup_en;
-        u16 leveldetect0;
-        u16 leveldetect1;
-        u16 risingdetect;
-        u16 fallingdetect;
-        u16 irqctrl;
-        u16 edgectrl1;
-        u16 edgectrl2;
-        u16 pinctrl;
-
-        bool irqenable_inv;
-};
-
-struct omap_gpio_platform_data {
-        int bank_type;
-        int bank_width;         /* GPIO bank width */
-        int bank_stride;        /* Only needed for omap1 MPUIO */
-        bool dbck_flag;         /* dbck required or not - True for OMAP3&4 */
-        bool loses_context;     /* whether the bank would ever lose context */
-        bool is_mpuio;          /* whether the bank is of type MPUIO */
-        u32 non_wakeup_gpios;
-
-        struct omap_gpio_reg_offs *regs;
-
-        /* Return context loss count due to PM states changing */
-        int (*get_context_loss_count)(struct device *dev);
-};
-
-extern void omap2_gpio_prepare_for_idle(int off_mode);
-extern void omap2_gpio_resume_after_idle(void);
-extern void omap_set_gpio_debounce(int gpio, int enable);
-extern void omap_set_gpio_debounce_time(int gpio, int enable);
-
-#endif
diff --git a/include/linux/platform_data/gpio-ts5500.h b/include/linux/platform_data/gpio-ts5500.h
deleted file mode 100644
index b10d11c9bb4..00000000000
--- a/include/linux/platform_data/gpio-ts5500.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * GPIO (DIO) header for Technologic Systems TS-5500
- *
- * Copyright (c) 2012 Savoir-faire Linux Inc.
- *      Vivien Didelot <vivien.didelot@savoirfairelinux.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef _PDATA_GPIO_TS5500_H
-#define _PDATA_GPIO_TS5500_H
-
-/**
- * struct ts5500_dio_platform_data - TS-5500 pin block configuration
- * @base:       The GPIO base number to use.
- * @strap:      The only pin connected to an interrupt in a block is input-only.
- *              If you need a bidirectional line which can trigger an IRQ, you
- *              may strap it with an in/out pin. This flag indicates this case.
- */
-struct ts5500_dio_platform_data {
-        int base;
-        bool strap;
-};
-
-#endif /* _PDATA_GPIO_TS5500_H */
diff --git a/include/linux/platform_data/hwmon-s3c.h b/include/linux/platform_data/hwmon-s3c.h
deleted file mode 100644
index c167e4429bc..00000000000
--- a/include/linux/platform_data/hwmon-s3c.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/* linux/arch/arm/plat-s3c/include/plat/hwmon.h
- *
- * Copyright 2005 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * S3C - HWMon interface for ADC
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#ifndef __ASM_ARCH_ADC_HWMON_H
-#define __ASM_ARCH_ADC_HWMON_H __FILE__
-
-/**
- * s3c_hwmon_chcfg - channel configuration
- * @name: The name to give this channel.
- * @mult: Multiply the ADC value read by this.
- * @div: Divide the value from the ADC by this.
- *
- * The value read from the ADC is converted to a value that
- * hwmon expects (mV) by result = (value_read * @mult) / @div.
- */
-struct s3c_hwmon_chcfg {
-        const char      *name;
-        unsigned int    mult;
-        unsigned int    div;
-};
-
-/**
- * s3c_hwmon_pdata - HWMON platform data
- * @in: One configuration for each possible channel used.
- */
-struct s3c_hwmon_pdata {
-        struct s3c_hwmon_chcfg  *in[8];
-};
-
-/**
- * s3c_hwmon_set_platdata - Set platform data for S3C HWMON device
- * @pd: Platform data to register to device.
- *
- * Register the given platform data for use with the S3C HWMON device.
- * The call will copy the platform data, so the board definitions can
- * make the structure itself __initdata.
- */
-extern void __init s3c_hwmon_set_platdata(struct s3c_hwmon_pdata *pd);
-
-#endif /* __ASM_ARCH_ADC_HWMON_H */
-
diff --git a/include/linux/platform_data/i2c-cbus-gpio.h b/include/linux/platform_data/i2c-cbus-gpio.h
deleted file mode 100644
index 6faa992a950..00000000000
--- a/include/linux/platform_data/i2c-cbus-gpio.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * i2c-cbus-gpio.h - CBUS I2C platform_data definition
- *
- * Copyright (C) 2004-2009 Nokia Corporation
- *
- * Written by Felipe Balbi and Aaro Koskinen.
- *
- * This file is subject to the terms and conditions of the GNU General
- * Public License. See the file "COPYING" in the main directory of this
- * archive for more details.
- *
- * 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.
- */
-
-#ifndef __INCLUDE_LINUX_I2C_CBUS_GPIO_H
-#define __INCLUDE_LINUX_I2C_CBUS_GPIO_H
-
-struct i2c_cbus_platform_data {
-        int dat_gpio;
-        int clk_gpio;
-        int sel_gpio;
-};
-
-#endif /* __INCLUDE_LINUX_I2C_CBUS_GPIO_H */
diff --git a/include/linux/platform_data/i2c-davinci.h b/include/linux/platform_data/i2c-davinci.h
deleted file mode 100644
index 2312d197dfb..00000000000
--- a/include/linux/platform_data/i2c-davinci.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * DaVinci I2C controller platform_device info
- *
- * Author: Vladimir Barinov, MontaVista Software, Inc. <source@mvista.com>
- *
- * 2007 (c) MontaVista Software, Inc. This file is licensed under
- * the terms of the GNU General Public License version 2. This program
- * is licensed "as is" without any warranty of any kind, whether express
- * or implied.
-*/
-
-#ifndef __ASM_ARCH_I2C_H
-#define __ASM_ARCH_I2C_H
-
-/* All frequencies are expressed in kHz */
-struct davinci_i2c_platform_data {
-        unsigned int    bus_freq;       /* standard bus frequency (kHz) */
-        unsigned int    bus_delay;      /* post-transaction delay (usec) */
-        unsigned int    sda_pin;        /* GPIO pin ID to use for SDA */
-        unsigned int    scl_pin;        /* GPIO pin ID to use for SCL */
-};
-
-/* for board setup code */
-void davinci_init_i2c(struct davinci_i2c_platform_data *);
-
-#endif /* __ASM_ARCH_I2C_H */
diff --git a/include/linux/platform_data/i2c-imx.h b/include/linux/platform_data/i2c-imx.h
deleted file mode 100644
index 8289d915e61..00000000000
--- a/include/linux/platform_data/i2c-imx.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * i2c.h - i.MX I2C driver header file
- *
- * Copyright (c) 2008, Darius Augulis <augulis.darius@gmail.com>
- *
- * This file is released under the GPLv2
- */
-
-#ifndef __ASM_ARCH_I2C_H_
-#define __ASM_ARCH_I2C_H_
-
-/**
- * struct imxi2c_platform_data - structure of platform data for MXC I2C driver
- * @bitrate:    Bus speed measured in Hz
- *
- **/
-struct imxi2c_platform_data {
-        u32 bitrate;
-};
-
-#endif /* __ASM_ARCH_I2C_H_ */
diff --git a/include/linux/platform_data/i2c-nomadik.h b/include/linux/platform_data/i2c-nomadik.h
deleted file mode 100644
index 3a8be9cdc95..00000000000
--- a/include/linux/platform_data/i2c-nomadik.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2009 ST-Ericsson
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2, as
- * published by the Free Software Foundation.
- */
-#ifndef __PDATA_I2C_NOMADIK_H
-#define __PDATA_I2C_NOMADIK_H
-
-enum i2c_freq_mode {
-        I2C_FREQ_MODE_STANDARD,         /* up to 100 Kb/s */
-        I2C_FREQ_MODE_FAST,             /* up to 400 Kb/s */
-        I2C_FREQ_MODE_HIGH_SPEED,       /* up to 3.4 Mb/s */
-        I2C_FREQ_MODE_FAST_PLUS,        /* up to 1 Mb/s */
-};
-
-/**
- * struct nmk_i2c_controller - client specific controller configuration
- * @clk_freq:   clock frequency for the operation mode
- * @slsu:       Slave data setup time in ns.
- *              The needed setup time for three modes of operation
- *              are 250ns, 100ns and 10ns respectively thus leading
- *              to the values of 14, 6, 2 for a 48 MHz i2c clk
- * @tft:        Tx FIFO Threshold in bytes
- * @rft:        Rx FIFO Threshold in bytes
- * @timeout     Slave response timeout(ms)
- * @sm:         speed mode
- */
-struct nmk_i2c_controller {
-        u32             clk_freq;
-        unsigned short  slsu;
-        unsigned char   tft;
-        unsigned char   rft;
-        int timeout;
-        enum i2c_freq_mode      sm;
-};
-
-#endif  /* __PDATA_I2C_NOMADIK_H */
diff --git a/include/linux/platform_data/i2c-nuc900.h b/include/linux/platform_data/i2c-nuc900.h
deleted file mode 100644
index 9ffb12d06e9..00000000000
--- a/include/linux/platform_data/i2c-nuc900.h
+++ /dev/null
@@ -1,9 +0,0 @@
-#ifndef __ASM_ARCH_NUC900_I2C_H
-#define __ASM_ARCH_NUC900_I2C_H
-
-struct nuc900_platform_i2c {
-        int             bus_num;
-        unsigned long   bus_freq;
-};
-
-#endif /* __ASM_ARCH_NUC900_I2C_H */
diff --git a/include/linux/platform_data/i2c-s3c2410.h b/include/linux/platform_data/i2c-s3c2410.h
deleted file mode 100644
index 51d52e767a1..00000000000
--- a/include/linux/platform_data/i2c-s3c2410.h
+++ /dev/null
@@ -1,77 +0,0 @@
-/* arch/arm/plat-s3c/include/plat/iic.h
- *
- * Copyright 2004-2009 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *
- * S3C - I2C Controller platform_device info
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#ifndef __ASM_ARCH_IIC_H
-#define __ASM_ARCH_IIC_H __FILE__
-
-#define S3C_IICFLG_FILTER       (1<<0)  /* enable s3c2440 filter */
-
-/**
- *      struct s3c2410_platform_i2c - Platform data for s3c I2C.
- *      @bus_num: The bus number to use (if possible).
- *      @flags: Any flags for the I2C bus (E.g. S3C_IICFLK_FILTER).
- *      @slave_addr: The I2C address for the slave device (if enabled).
- *      @frequency: The desired frequency in Hz of the bus.  This is
- *                  guaranteed to not be exceeded.  If the caller does
- *                  not care, use zero and the driver will select a
- *                  useful default.
- *      @sda_delay: The delay (in ns) applied to SDA edges.
- *      @cfg_gpio: A callback to configure the pins for I2C operation.
- */
-struct s3c2410_platform_i2c {
-        int             bus_num;
-        unsigned int    flags;
-        unsigned int    slave_addr;
-        unsigned long   frequency;
-        unsigned int    sda_delay;
-
-        void    (*cfg_gpio)(struct platform_device *dev);
-};
-
-/**
- * s3c_i2c0_set_platdata - set platform data for i2c0 device
- * @i2c: The platform data to set, or NULL for default data.
- *
- * Register the given platform data for use with the i2c0 device. This
- * call copies the platform data, so the caller can use __initdata for
- * their copy.
- *
- * This call will set cfg_gpio if is null to the default platform
- * implementation.
- *
- * Any user of s3c_device_i2c0 should call this, even if it is with
- * NULL to ensure that the device is given the default platform data
- * as the driver will no longer carry defaults.
- */
-extern void s3c_i2c0_set_platdata(struct s3c2410_platform_i2c *i2c);
-extern void s3c_i2c1_set_platdata(struct s3c2410_platform_i2c *i2c);
-extern void s3c_i2c2_set_platdata(struct s3c2410_platform_i2c *i2c);
-extern void s3c_i2c3_set_platdata(struct s3c2410_platform_i2c *i2c);
-extern void s3c_i2c4_set_platdata(struct s3c2410_platform_i2c *i2c);
-extern void s3c_i2c5_set_platdata(struct s3c2410_platform_i2c *i2c);
-extern void s3c_i2c6_set_platdata(struct s3c2410_platform_i2c *i2c);
-extern void s3c_i2c7_set_platdata(struct s3c2410_platform_i2c *i2c);
-extern void s5p_i2c_hdmiphy_set_platdata(struct s3c2410_platform_i2c *i2c);
-
-/* defined by architecture to configure gpio */
-extern void s3c_i2c0_cfg_gpio(struct platform_device *dev);
-extern void s3c_i2c1_cfg_gpio(struct platform_device *dev);
-extern void s3c_i2c2_cfg_gpio(struct platform_device *dev);
-extern void s3c_i2c3_cfg_gpio(struct platform_device *dev);
-extern void s3c_i2c4_cfg_gpio(struct platform_device *dev);
-extern void s3c_i2c5_cfg_gpio(struct platform_device *dev);
-extern void s3c_i2c6_cfg_gpio(struct platform_device *dev);
-extern void s3c_i2c7_cfg_gpio(struct platform_device *dev);
-
-extern struct s3c2410_platform_i2c default_i2c_data;
-
-#endif /* __ASM_ARCH_IIC_H */
diff --git a/include/linux/platform_data/ina2xx.h b/include/linux/platform_data/ina2xx.h
deleted file mode 100644
index 9abc0ca7259..00000000000
--- a/include/linux/platform_data/ina2xx.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Driver for Texas Instruments INA219, INA226 power monitor chips
- *
- * Copyright (C) 2012 Lothar Felten <l-felten@ti.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * For further information, see the Documentation/hwmon/ina2xx file.
- */
-
-/**
- * struct ina2xx_platform_data - ina2xx info
- * @shunt_uohms         shunt resistance in microohms
- */
-struct ina2xx_platform_data {
-        long shunt_uohms;
-};
diff --git a/include/linux/platform_data/iommu-omap.h b/include/linux/platform_data/iommu-omap.h
deleted file mode 100644
index 5b429c43a29..00000000000
--- a/include/linux/platform_data/iommu-omap.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * omap iommu: main structures
- *
- * Copyright (C) 2008-2009 Nokia Corporation
- *
- * Written by Hiroshi DOYU <Hiroshi.DOYU@nokia.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#include <linux/platform_device.h>
-
-#define MMU_REG_SIZE            256
-
-/**
- * struct iommu_arch_data - omap iommu private data
- * @name: name of the iommu device
- * @iommu_dev: handle of the iommu device
- *
- * This is an omap iommu private data object, which binds an iommu user
- * to its iommu device. This object should be placed at the iommu user's
- * dev_archdata so generic IOMMU API can be used without having to
- * utilize omap-specific plumbing anymore.
- */
-struct omap_iommu_arch_data {
-        const char *name;
-        struct omap_iommu *iommu_dev;
-};
-
-/**
- * struct omap_mmu_dev_attr - OMAP mmu device attributes for omap_hwmod
- * @da_start:           device address where the va space starts.
- * @da_end:             device address where the va space ends.
- * @nr_tlb_entries:     number of entries supported by the translation
- *                      look-aside buffer (TLB).
- */
-struct omap_mmu_dev_attr {
-        u32 da_start;
-        u32 da_end;
-        int nr_tlb_entries;
-};
-
-struct iommu_platform_data {
-        const char *name;
-        const char *reset_name;
-        int nr_tlb_entries;
-        u32 da_start;
-        u32 da_end;
-
-        int (*assert_reset)(struct platform_device *pdev, const char *name);
-        int (*deassert_reset)(struct platform_device *pdev, const char *name);
-};
diff --git a/include/linux/platform_data/irda-pxaficp.h b/include/linux/platform_data/irda-pxaficp.h
deleted file mode 100644
index 3cd41f77dda..00000000000
--- a/include/linux/platform_data/irda-pxaficp.h
+++ /dev/null
@@ -1,25 +0,0 @@
-#ifndef ASMARM_ARCH_IRDA_H
-#define ASMARM_ARCH_IRDA_H
-
-/* board specific transceiver capabilities */
-
-#define IR_OFF          1
-#define IR_SIRMODE      2
-#define IR_FIRMODE      4
-
-struct pxaficp_platform_data {
-        int transceiver_cap;
-        void (*transceiver_mode)(struct device *dev, int mode);
-        int (*startup)(struct device *dev);
-        void (*shutdown)(struct device *dev);
-        int gpio_pwdown;                /* powerdown GPIO for the IrDA chip */
-        bool gpio_pwdown_inverted;      /* gpio_pwdown is inverted */
-};
-
-extern void pxa_set_ficp_info(struct pxaficp_platform_data *info);
-
-#if defined(CONFIG_PXA25x) || defined(CONFIG_PXA27x)
-void pxa2xx_transceiver_mode(struct device *dev, int mode);
-#endif
-
-#endif
diff --git a/include/linux/platform_data/keyboard-pxa930_rotary.h b/include/linux/platform_data/keyboard-pxa930_rotary.h
deleted file mode 100644
index 053587caffd..00000000000
--- a/include/linux/platform_data/keyboard-pxa930_rotary.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef __ASM_ARCH_PXA930_ROTARY_H
-#define __ASM_ARCH_PXA930_ROTARY_H
-
-/* NOTE:
- *
- * rotary can be either interpreted as a ralative input event (e.g.
- * REL_WHEEL or REL_HWHEEL) or a specific key event (e.g. UP/DOWN
- * or LEFT/RIGHT), depending on if up_key & down_key are assigned
- * or rel_code is assigned a non-zero value. When all are non-zero,
- * up_key and down_key will be preferred.
- */
-struct pxa930_rotary_platform_data {
-        int     up_key;
-        int     down_key;
-        int     rel_code;
-};
-
-void __init pxa930_set_rotarykey_info(struct pxa930_rotary_platform_data *info);
-
-#endif /* __ASM_ARCH_PXA930_ROTARY_H */
diff --git a/include/linux/platform_data/keyboard-spear.h b/include/linux/platform_data/keyboard-spear.h
deleted file mode 100644
index 9248e3a7e33..00000000000
--- a/include/linux/platform_data/keyboard-spear.h
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright (C) 2010 ST Microelectronics
- * Rajeev Kumar<rajeev-dlh.kumar@st.com>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#ifndef __PLAT_KEYBOARD_H
-#define __PLAT_KEYBOARD_H
-
-#include <linux/bitops.h>
-#include <linux/input.h>
-#include <linux/input/matrix_keypad.h>
-#include <linux/types.h>
-
-#define DECLARE_9x9_KEYMAP(_name) \
-int _name[] = { \
-        KEY(0, 0, KEY_ESC), \
-        KEY(0, 1, KEY_1), \
-        KEY(0, 2, KEY_2), \
-        KEY(0, 3, KEY_3), \
-        KEY(0, 4, KEY_4), \
-        KEY(0, 5, KEY_5), \
-        KEY(0, 6, KEY_6), \
-        KEY(0, 7, KEY_7), \
-        KEY(0, 8, KEY_8), \
-        KEY(1, 0, KEY_9), \
-        KEY(1, 1, KEY_MINUS), \
-        KEY(1, 2, KEY_EQUAL), \
-        KEY(1, 3, KEY_BACKSPACE), \
-        KEY(1, 4, KEY_TAB), \
-        KEY(1, 5, KEY_Q), \
-        KEY(1, 6, KEY_W), \
-        KEY(1, 7, KEY_E), \
-        KEY(1, 8, KEY_R), \
-        KEY(2, 0, KEY_T), \
-        KEY(2, 1, KEY_Y), \
-        KEY(2, 2, KEY_U), \
-        KEY(2, 3, KEY_I), \
-        KEY(2, 4, KEY_O), \
-        KEY(2, 5, KEY_P), \
-        KEY(2, 6, KEY_LEFTBRACE), \
-        KEY(2, 7, KEY_RIGHTBRACE), \
-        KEY(2, 8, KEY_ENTER), \
-        KEY(3, 0, KEY_LEFTCTRL), \
-        KEY(3, 1, KEY_A), \
-        KEY(3, 2, KEY_S), \
-        KEY(3, 3, KEY_D), \
-        KEY(3, 4, KEY_F), \
-        KEY(3, 5, KEY_G), \
-        KEY(3, 6, KEY_H), \
-        KEY(3, 7, KEY_J), \
-        KEY(3, 8, KEY_K), \
-        KEY(4, 0, KEY_L), \
-        KEY(4, 1, KEY_SEMICOLON), \
-        KEY(4, 2, KEY_APOSTROPHE), \
-        KEY(4, 3, KEY_GRAVE), \
-        KEY(4, 4, KEY_LEFTSHIFT), \
-        KEY(4, 5, KEY_BACKSLASH), \
-        KEY(4, 6, KEY_Z), \
-        KEY(4, 7, KEY_X), \
-        KEY(4, 8, KEY_C), \
-        KEY(5, 0, KEY_V), \
-        KEY(5, 1, KEY_B), \
-        KEY(5, 2, KEY_N), \
-        KEY(5, 3, KEY_M), \
-        KEY(5, 4, KEY_COMMA), \
-        KEY(5, 5, KEY_DOT), \
-        KEY(5, 6, KEY_SLASH), \
-        KEY(5, 7, KEY_RIGHTSHIFT), \
-        KEY(5, 8, KEY_KPASTERISK), \
-        KEY(6, 0, KEY_LEFTALT), \
-        KEY(6, 1, KEY_SPACE), \
-        KEY(6, 2, KEY_CAPSLOCK), \
-        KEY(6, 3, KEY_F1), \
-        KEY(6, 4, KEY_F2), \
-        KEY(6, 5, KEY_F3), \
-        KEY(6, 6, KEY_F4), \
-        KEY(6, 7, KEY_F5), \
-        KEY(6, 8, KEY_F6), \
-        KEY(7, 0, KEY_F7), \
-        KEY(7, 1, KEY_F8), \
-        KEY(7, 2, KEY_F9), \
-        KEY(7, 3, KEY_F10), \
-        KEY(7, 4, KEY_NUMLOCK), \
-        KEY(7, 5, KEY_SCROLLLOCK), \
-        KEY(7, 6, KEY_KP7), \
-        KEY(7, 7, KEY_KP8), \
-        KEY(7, 8, KEY_KP9), \
-        KEY(8, 0, KEY_KPMINUS), \
-        KEY(8, 1, KEY_KP4), \
-        KEY(8, 2, KEY_KP5), \
-        KEY(8, 3, KEY_KP6), \
-        KEY(8, 4, KEY_KPPLUS), \
-        KEY(8, 5, KEY_KP1), \
-        KEY(8, 6, KEY_KP2), \
-        KEY(8, 7, KEY_KP3), \
-        KEY(8, 8, KEY_KP0), \
-}
-
-#define DECLARE_6x6_KEYMAP(_name) \
-int _name[] = { \
-        KEY(0, 0, KEY_RESERVED), \
-        KEY(0, 1, KEY_1), \
-        KEY(0, 2, KEY_2), \
-        KEY(0, 3, KEY_3), \
-        KEY(0, 4, KEY_4), \
-        KEY(0, 5, KEY_5), \
-        KEY(1, 0, KEY_Q), \
-        KEY(1, 1, KEY_W), \
-        KEY(1, 2, KEY_E), \
-        KEY(1, 3, KEY_R), \
-        KEY(1, 4, KEY_T), \
-        KEY(1, 5, KEY_Y), \
-        KEY(2, 0, KEY_D), \
-        KEY(2, 1, KEY_F), \
-        KEY(2, 2, KEY_G), \
-        KEY(2, 3, KEY_H), \
-        KEY(2, 4, KEY_J), \
-        KEY(2, 5, KEY_K), \
-        KEY(3, 0, KEY_B), \
-        KEY(3, 1, KEY_N), \
-        KEY(3, 2, KEY_M), \
-        KEY(3, 3, KEY_COMMA), \
-        KEY(3, 4, KEY_DOT), \
-        KEY(3, 5, KEY_SLASH), \
-        KEY(4, 0, KEY_F6), \
-        KEY(4, 1, KEY_F7), \
-        KEY(4, 2, KEY_F8), \
-        KEY(4, 3, KEY_F9), \
-        KEY(4, 4, KEY_F10), \
-        KEY(4, 5, KEY_NUMLOCK), \
-        KEY(5, 0, KEY_KP2), \
-        KEY(5, 1, KEY_KP3), \
-        KEY(5, 2, KEY_KP0), \
-        KEY(5, 3, KEY_KPDOT), \
-        KEY(5, 4, KEY_RO), \
-        KEY(5, 5, KEY_ZENKAKUHANKAKU), \
-}
-
-#define KEYPAD_9x9     0
-#define KEYPAD_6x6     1
-#define KEYPAD_2x2     2
-
-/**
- * struct kbd_platform_data - spear keyboard platform data
- * keymap: pointer to keymap data (table and size)
- * rep: enables key autorepeat
- * mode: choose keyboard support(9x9, 6x6, 2x2)
- * suspended_rate: rate at which keyboard would operate in suspended mode
- *
- * This structure is supposed to be used by platform code to supply
- * keymaps to drivers that implement keyboards.
- */
-struct kbd_platform_data {
-        const struct matrix_keymap_data *keymap;
-        bool rep;
-        unsigned int mode;
-        unsigned int suspended_rate;
-};
-
-#endif /* __PLAT_KEYBOARD_H */
diff --git a/include/linux/platform_data/keypad-ep93xx.h b/include/linux/platform_data/keypad-ep93xx.h
deleted file mode 100644
index 1e2f4e97f42..00000000000
--- a/include/linux/platform_data/keypad-ep93xx.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * arch/arm/mach-ep93xx/include/mach/ep93xx_keypad.h
- */
-
-#ifndef __ASM_ARCH_EP93XX_KEYPAD_H
-#define __ASM_ARCH_EP93XX_KEYPAD_H
-
-struct matrix_keymap_data;
-
-/* flags for the ep93xx_keypad driver */
-#define EP93XX_KEYPAD_DISABLE_3_KEY     (1<<0)  /* disable 3-key reset */
-#define EP93XX_KEYPAD_DIAG_MODE         (1<<1)  /* diagnostic mode */
-#define EP93XX_KEYPAD_BACK_DRIVE        (1<<2)  /* back driving mode */
-#define EP93XX_KEYPAD_TEST_MODE         (1<<3)  /* scan only column 0 */
-#define EP93XX_KEYPAD_KDIV              (1<<4)  /* 1/4 clock or 1/16 clock */
-#define EP93XX_KEYPAD_AUTOREPEAT        (1<<5)  /* enable key autorepeat */
-
-/**
- * struct ep93xx_keypad_platform_data - platform specific device structure
- * @keymap_data:        pointer to &matrix_keymap_data
- * @debounce:           debounce start count; terminal count is 0xff
- * @prescale:           row/column counter pre-scaler load value
- * @flags:              see above
- */
-struct ep93xx_keypad_platform_data {
-        struct matrix_keymap_data *keymap_data;
-        unsigned int    debounce;
-        unsigned int    prescale;
-        unsigned int    flags;
-};
-
-#define EP93XX_MATRIX_ROWS              (8)
-#define EP93XX_MATRIX_COLS              (8)
-
-#endif  /* __ASM_ARCH_EP93XX_KEYPAD_H */
diff --git a/include/linux/platform_data/keypad-nomadik-ske.h b/include/linux/platform_data/keypad-nomadik-ske.h
deleted file mode 100644
index 31382fbc07d..00000000000
--- a/include/linux/platform_data/keypad-nomadik-ske.h
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2010
- *
- * License Terms: GNU General Public License v2
- * Author: Naveen Kumar Gaddipati <naveen.gaddipati@stericsson.com>
- *
- * ux500 Scroll key and Keypad Encoder (SKE) header
- */
-
-#ifndef __SKE_H
-#define __SKE_H
-
-#include <linux/input/matrix_keypad.h>
-
-/* register definitions for SKE peripheral */
-#define SKE_CR          0x00
-#define SKE_VAL0        0x04
-#define SKE_VAL1        0x08
-#define SKE_DBCR        0x0C
-#define SKE_IMSC        0x10
-#define SKE_RIS         0x14
-#define SKE_MIS         0x18
-#define SKE_ICR         0x1C
-
-/*
- * Keypad module
- */
-
-/**
- * struct keypad_platform_data - structure for platform specific data
- * @init:       pointer to keypad init function
- * @exit:       pointer to keypad deinitialisation function
- * @keymap_data: matrix scan code table for keycodes
- * @krow:       maximum number of rows
- * @kcol:       maximum number of columns
- * @debounce_ms: platform specific debounce time
- * @no_autorepeat: flag for auto repetition
- * @wakeup_enable: allow waking up the system
- */
-struct ske_keypad_platform_data {
-        int (*init)(void);
-        int (*exit)(void);
-        const struct matrix_keymap_data *keymap_data;
-        u8 krow;
-        u8 kcol;
-        u8 debounce_ms;
-        bool no_autorepeat;
-        bool wakeup_enable;
-};
-#endif  /*__SKE_KPD_H*/
diff --git a/include/linux/platform_data/keypad-omap.h b/include/linux/platform_data/keypad-omap.h
deleted file mode 100644
index a6b21eddb21..00000000000
--- a/include/linux/platform_data/keypad-omap.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- *  arch/arm/plat-omap/include/mach/keypad.h
- *
- *  Copyright (C) 2006 Komal Shah <komal_shah802003@yahoo.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef ASMARM_ARCH_KEYPAD_H
-#define ASMARM_ARCH_KEYPAD_H
-
-#ifndef CONFIG_ARCH_OMAP1
-#warning Please update the board to use matrix-keypad driver
-#define omap_readw(reg)         0
-#define omap_writew(val, reg)   do {} while (0)
-#endif
-#include <linux/input/matrix_keypad.h>
-
-struct omap_kp_platform_data {
-        int rows;
-        int cols;
-        const struct matrix_keymap_data *keymap_data;
-        bool rep;
-        unsigned long delay;
-        bool dbounce;
-        /* specific to OMAP242x*/
-        unsigned int *row_gpios;
-        unsigned int *col_gpios;
-};
-
-/* Group (0..3) -- when multiple keys are pressed, only the
- * keys pressed in the same group are considered as pressed. This is
- * in order to workaround certain crappy HW designs that produce ghost
- * keypresses. Two free bits, not used by neither row/col nor keynum,
- * must be available for use as group bits. The below GROUP_SHIFT
- * macro definition is based on some prior knowledge of the
- * matrix_keypad defined KEY() macro internals.
- */
-#define GROUP_SHIFT     14
-#define GROUP_0         (0 << GROUP_SHIFT)
-#define GROUP_1         (1 << GROUP_SHIFT)
-#define GROUP_2         (2 << GROUP_SHIFT)
-#define GROUP_3         (3 << GROUP_SHIFT)
-#define GROUP_MASK      GROUP_3
-#if KEY_MAX & GROUP_MASK
-#error Group bits in conflict with keynum bits
-#endif
-
-
-#endif
-
diff --git a/include/linux/platform_data/keypad-pxa27x.h b/include/linux/platform_data/keypad-pxa27x.h
deleted file mode 100644
index 5ce8d5e6ea5..00000000000
--- a/include/linux/platform_data/keypad-pxa27x.h
+++ /dev/null
@@ -1,73 +0,0 @@
-#ifndef __ASM_ARCH_PXA27x_KEYPAD_H
-#define __ASM_ARCH_PXA27x_KEYPAD_H
-
-#include <linux/input.h>
-#include <linux/input/matrix_keypad.h>
-
-#define MAX_MATRIX_KEY_ROWS     (8)
-#define MAX_MATRIX_KEY_COLS     (8)
-#define MATRIX_ROW_SHIFT        (3)
-#define MAX_DIRECT_KEY_NUM      (8)
-
-/* pxa3xx keypad platform specific parameters
- *
- * NOTE:
- * 1. direct_key_num indicates the number of keys in the direct keypad
- *    _plus_ the number of rotary-encoder sensor inputs,  this can be
- *    left as 0 if only rotary encoders are enabled,  the driver will
- *    automatically calculate this
- *
- * 2. direct_key_map is the key code map for the direct keys, if rotary
- *    encoder(s) are enabled, direct key 0/1(2/3) will be ignored
- *
- * 3. rotary can be either interpreted as a relative input event (e.g.
- *    REL_WHEEL/REL_HWHEEL) or specific keys (e.g. UP/DOWN/LEFT/RIGHT)
- *
- * 4. matrix key and direct key will use the same debounce_interval by
- *    default, which should be sufficient in most cases
- *
- * pxa168 keypad platform specific parameter
- *
- * NOTE:
- * clear_wakeup_event callback is a workaround required to clear the
- * keypad interrupt. The keypad wake must be cleared in addition to
- * reading the MI/DI bits in the KPC register.
- */
-struct pxa27x_keypad_platform_data {
-
-        /* code map for the matrix keys */
-        unsigned int    matrix_key_rows;
-        unsigned int    matrix_key_cols;
-        unsigned int    *matrix_key_map;
-        int             matrix_key_map_size;
-
-        /* direct keys */
-        int             direct_key_num;
-        unsigned int    direct_key_map[MAX_DIRECT_KEY_NUM];
-        /* the key output may be low active */
-        int             direct_key_low_active;
-        /* give board a chance to choose the start direct key */
-        unsigned int    direct_key_mask;
-
-        /* rotary encoders 0 */
-        int             enable_rotary0;
-        int             rotary0_rel_code;
-        int             rotary0_up_key;
-        int             rotary0_down_key;
-
-        /* rotary encoders 1 */
-        int             enable_rotary1;
-        int             rotary1_rel_code;
-        int             rotary1_up_key;
-        int             rotary1_down_key;
-
-        /* key debounce interval */
-        unsigned int    debounce_interval;
-
-        /* clear wakeup event requirement for pxa168 */
-        void            (*clear_wakeup_event)(void);
-};
-
-extern void pxa_set_keypad_info(struct pxa27x_keypad_platform_data *info);
-
-#endif /* __ASM_ARCH_PXA27x_KEYPAD_H */
diff --git a/include/linux/platform_data/keypad-w90p910.h b/include/linux/platform_data/keypad-w90p910.h
deleted file mode 100644
index 556778e8dda..00000000000
--- a/include/linux/platform_data/keypad-w90p910.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef __ASM_ARCH_W90P910_KEYPAD_H
-#define __ASM_ARCH_W90P910_KEYPAD_H
-
-#include <linux/input/matrix_keypad.h>
-
-extern void mfp_set_groupi(struct device *dev);
-
-struct w90p910_keypad_platform_data {
-        const struct matrix_keymap_data *keymap_data;
-
-        unsigned int    prescale;
-        unsigned int    debounce;
-};
-
-#endif /* __ASM_ARCH_W90P910_KEYPAD_H */
diff --git a/include/linux/platform_data/keyscan-davinci.h b/include/linux/platform_data/keyscan-davinci.h
deleted file mode 100644
index 7a560e05bda..00000000000
--- a/include/linux/platform_data/keyscan-davinci.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright (C) 2009 Texas Instruments, Inc
- *
- * Author: Miguel Aguilar <miguel.aguilar@ridgerun.com>
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef DAVINCI_KEYSCAN_H
-#define DAVINCI_KEYSCAN_H
-
-#include <linux/io.h>
-
-enum davinci_matrix_types {
-        DAVINCI_KEYSCAN_MATRIX_4X4,
-        DAVINCI_KEYSCAN_MATRIX_5X3,
-};
-
-struct davinci_ks_platform_data {
-        int             (*device_enable)(struct device *dev);
-        unsigned short  *keymap;
-        u32             keymapsize;
-        u8              rep:1;
-        u8              strobe;
-        u8              interval;
-        u8              matrix_type;
-};
-
-#endif
-
diff --git a/include/linux/platform_data/lcd-mipid.h b/include/linux/platform_data/lcd-mipid.h
deleted file mode 100644
index 8e52c657228..00000000000
--- a/include/linux/platform_data/lcd-mipid.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __LCD_MIPID_H
-#define __LCD_MIPID_H
-
-enum mipid_test_num {
-        MIPID_TEST_RGB_LINES,
-};
-
-enum mipid_test_result {
-        MIPID_TEST_SUCCESS,
-        MIPID_TEST_INVALID,
-        MIPID_TEST_FAILED,
-};
-
-#ifdef __KERNEL__
-
-struct mipid_platform_data {
-        int     nreset_gpio;
-        int     data_lines;
-
-        void    (*shutdown)(struct mipid_platform_data *pdata);
-        void    (*set_bklight_level)(struct mipid_platform_data *pdata,
-                                     int level);
-        int     (*get_bklight_level)(struct mipid_platform_data *pdata);
-        int     (*get_bklight_max)(struct mipid_platform_data *pdata);
-};
-
-#endif
-
-#endif
diff --git a/include/linux/platform_data/leds-kirkwood-netxbig.h b/include/linux/platform_data/leds-kirkwood-netxbig.h
deleted file mode 100644
index 24b536ebdf1..00000000000
--- a/include/linux/platform_data/leds-kirkwood-netxbig.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/include/mach/leds-netxbig.h
- *
- * Platform data structure for netxbig LED driver
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#ifndef __MACH_LEDS_NETXBIG_H
-#define __MACH_LEDS_NETXBIG_H
-
-struct netxbig_gpio_ext {
-        unsigned        *addr;
-        int             num_addr;
-        unsigned        *data;
-        int             num_data;
-        unsigned        enable;
-};
-
-enum netxbig_led_mode {
-        NETXBIG_LED_OFF,
-        NETXBIG_LED_ON,
-        NETXBIG_LED_SATA,
-        NETXBIG_LED_TIMER1,
-        NETXBIG_LED_TIMER2,
-        NETXBIG_LED_MODE_NUM,
-};
-
-#define NETXBIG_LED_INVALID_MODE NETXBIG_LED_MODE_NUM
-
-struct netxbig_led_timer {
-        unsigned long           delay_on;
-        unsigned long           delay_off;
-        enum netxbig_led_mode   mode;
-};
-
-struct netxbig_led {
-        const char      *name;
-        const char      *default_trigger;
-        int             mode_addr;
-        int             *mode_val;
-        int             bright_addr;
-};
-
-struct netxbig_led_platform_data {
-        struct netxbig_gpio_ext *gpio_ext;
-        struct netxbig_led_timer *timer;
-        int                     num_timer;
-        struct netxbig_led      *leds;
-        int                     num_leds;
-};
-
-#endif /* __MACH_LEDS_NETXBIG_H */
diff --git a/include/linux/platform_data/leds-kirkwood-ns2.h b/include/linux/platform_data/leds-kirkwood-ns2.h
deleted file mode 100644
index e21272e5f66..00000000000
--- a/include/linux/platform_data/leds-kirkwood-ns2.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * arch/arm/mach-kirkwood/include/mach/leds-ns2.h
- *
- * Platform data structure for Network Space v2 LED driver
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#ifndef __MACH_LEDS_NS2_H
-#define __MACH_LEDS_NS2_H
-
-struct ns2_led {
-        const char      *name;
-        const char      *default_trigger;
-        unsigned        cmd;
-        unsigned        slow;
-};
-
-struct ns2_led_platform_data {
-        int             num_leds;
-        struct ns2_led  *leds;
-};
-
-#endif /* __MACH_LEDS_NS2_H */
diff --git a/include/linux/platform_data/leds-lm355x.h b/include/linux/platform_data/leds-lm355x.h
deleted file mode 100644
index b88724bb0b4..00000000000
--- a/include/linux/platform_data/leds-lm355x.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (C) 2012 Texas Instruments
- *
- * License Terms: GNU General Public License v2
- *
- * Simple driver for Texas Instruments LM355x LED driver chip
- *
- * Author: G.Shark Jeong <gshark.jeong@gmail.com>
- *         Daniel Jeong <daniel.jeong@ti.com>
- */
-
-#define LM355x_NAME "leds-lm355x"
-#define LM3554_NAME "leds-lm3554"
-#define LM3556_NAME "leds-lm3556"
-
-/* lm3554 : strobe def. on */
-enum lm355x_strobe {
-        LM355x_PIN_STROBE_DISABLE = 0x00,
-        LM355x_PIN_STROBE_ENABLE = 0x01,
-};
-
-enum lm355x_torch {
-        LM355x_PIN_TORCH_DISABLE = 0,
-        LM3554_PIN_TORCH_ENABLE = 0x80,
-        LM3556_PIN_TORCH_ENABLE = 0x10,
-};
-
-enum lm355x_tx2 {
-        LM355x_PIN_TX_DISABLE = 0,
-        LM3554_PIN_TX_ENABLE = 0x20,
-        LM3556_PIN_TX_ENABLE = 0x40,
-};
-
-enum lm355x_ntc {
-        LM355x_PIN_NTC_DISABLE = 0,
-        LM3554_PIN_NTC_ENABLE = 0x08,
-        LM3556_PIN_NTC_ENABLE = 0x80,
-};
-
-enum lm355x_pmode {
-        LM355x_PMODE_DISABLE = 0,
-        LM355x_PMODE_ENABLE = 0x04,
-};
-
-/*
- * struct lm3554_platform_data
- * @pin_strobe: strobe input
- * @pin_torch : input pin
- *              lm3554-tx1/torch/gpio1
- *              lm3556-torch
- * @pin_tx2   : input pin
- *              lm3554-envm/tx2/gpio2
- *              lm3556-tx pin
- * @ntc_pin  : output pin
- *              lm3554-ledi/ntc
- *              lm3556-temp pin
- * @pass_mode : pass mode
- */
-struct lm355x_platform_data {
-        enum lm355x_strobe pin_strobe;
-        enum lm355x_torch pin_tx1;
-        enum lm355x_tx2 pin_tx2;
-        enum lm355x_ntc ntc_pin;
-
-        enum lm355x_pmode pass_mode;
-};
diff --git a/include/linux/platform_data/leds-lm3642.h b/include/linux/platform_data/leds-lm3642.h
deleted file mode 100644
index 72d6ee6ade5..00000000000
--- a/include/linux/platform_data/leds-lm3642.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-* Copyright (C) 2012 Texas Instruments
-*
-* License Terms: GNU General Public License v2
-*
-* Simple driver for Texas Instruments LM3642 LED driver chip
-*
-* Author: G.Shark Jeong <gshark.jeong@gmail.com>
-*         Daniel Jeong <daniel.jeong@ti.com>
-*/
-
-#ifndef __LINUX_LM3642_H
-#define __LINUX_LM3642_H
-
-#define LM3642_NAME "leds-lm3642"
-
-enum lm3642_torch_pin_enable {
-        LM3642_TORCH_PIN_DISABLE = 0x00,
-        LM3642_TORCH_PIN_ENABLE = 0x10,
-};
-
-enum lm3642_strobe_pin_enable {
-        LM3642_STROBE_PIN_DISABLE = 0x00,
-        LM3642_STROBE_PIN_ENABLE = 0x20,
-};
-
-enum lm3642_tx_pin_enable {
-        LM3642_TX_PIN_DISABLE = 0x00,
-        LM3642_TX_PIN_ENABLE = 0x40,
-};
-
-struct lm3642_platform_data {
-        enum lm3642_torch_pin_enable torch_pin;
-        enum lm3642_strobe_pin_enable strobe_pin;
-        enum lm3642_tx_pin_enable tx_pin;
-};
-
-#endif /* __LINUX_LM3642_H */
diff --git a/include/linux/platform_data/leds-omap.h b/include/linux/platform_data/leds-omap.h
deleted file mode 100644
index 56c9b2a0ada..00000000000
--- a/include/linux/platform_data/leds-omap.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  Copyright (C) 2006 Samsung Electronics
- *  Kyungmin Park <kyungmin.park@samsung.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef ASMARM_ARCH_LED_H
-#define ASMARM_ARCH_LED_H
-
-struct omap_led_config {
-        struct led_classdev     cdev;
-        s16                     gpio;
-};
-
-struct omap_led_platform_data {
-        s16                     nr_leds;
-        struct omap_led_config  *leds;
-};
-
-#endif
diff --git a/include/linux/platform_data/leds-pca9633.h b/include/linux/platform_data/leds-pca9633.h
deleted file mode 100644
index c5bf29b6fa7..00000000000
--- a/include/linux/platform_data/leds-pca9633.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * PCA9633 LED chip driver.
- *
- * Copyright 2012 bct electronic GmbH
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * 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 __LINUX_PCA9633_H
-#define __LINUX_PCA9633_H
-#include <linux/leds.h>
-
-enum pca9633_outdrv {
-        PCA9633_OPEN_DRAIN,
-        PCA9633_TOTEM_POLE, /* aka push-pull */
-};
-
-struct pca9633_platform_data {
-        struct led_platform_data leds;
-        enum pca9633_outdrv outdrv;
-};
-
-#endif /* __LINUX_PCA9633_H*/
diff --git a/include/linux/platform_data/leds-renesas-tpu.h b/include/linux/platform_data/leds-renesas-tpu.h
deleted file mode 100644
index 055387086fc..00000000000
--- a/include/linux/platform_data/leds-renesas-tpu.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __LEDS_RENESAS_TPU_H__
-#define __LEDS_RENESAS_TPU_H__
-
-struct led_renesas_tpu_config {
-        char *name;
-        unsigned pin_gpio_fn;
-        unsigned pin_gpio;
-        unsigned int channel_offset;
-        unsigned int timer_bit;
-        unsigned int max_brightness;
-        unsigned int refresh_rate;
-};
-
-#endif /* __LEDS_RENESAS_TPU_H__ */
diff --git a/include/linux/platform_data/leds-s3c24xx.h b/include/linux/platform_data/leds-s3c24xx.h
deleted file mode 100644
index d8a7672519b..00000000000
--- a/include/linux/platform_data/leds-s3c24xx.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/leds-gpio.h
- *
- * Copyright (c) 2006 Simtec Electronics
- *      http://armlinux.simtec.co.uk/
- *      Ben Dooks <ben@simtec.co.uk>
- *
- * S3C24XX - LEDs GPIO connector
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#ifndef __ASM_ARCH_LEDSGPIO_H
-#define __ASM_ARCH_LEDSGPIO_H "leds-gpio.h"
-
-#define S3C24XX_LEDF_ACTLOW     (1<<0)          /* LED is on when GPIO low */
-#define S3C24XX_LEDF_TRISTATE   (1<<1)          /* tristate to turn off */
-
-struct s3c24xx_led_platdata {
-        unsigned int             gpio;
-        unsigned int             flags;
-
-        char                    *name;
-        char                    *def_trigger;
-};
-
-#endif /* __ASM_ARCH_LEDSGPIO_H */
diff --git a/include/linux/platform_data/lm3630_bl.h b/include/linux/platform_data/lm3630_bl.h
deleted file mode 100644
index 9176dd3f2d6..00000000000
--- a/include/linux/platform_data/lm3630_bl.h
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-* Simple driver for Texas Instruments LM3630 LED Flash driver chip
-* Copyright (C) 2012 Texas Instruments
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License version 2 as
-* published by the Free Software Foundation.
-*
-*/
-
-#ifndef __LINUX_LM3630_H
-#define __LINUX_LM3630_H
-
-#define LM3630_NAME "lm3630_bl"
-
-enum lm3630_pwm_ctrl {
-        PWM_CTRL_DISABLE = 0,
-        PWM_CTRL_BANK_A,
-        PWM_CTRL_BANK_B,
-        PWM_CTRL_BANK_ALL,
-};
-
-enum lm3630_pwm_active {
-        PWM_ACTIVE_HIGH = 0,
-        PWM_ACTIVE_LOW,
-};
-
-enum lm3630_bank_a_ctrl {
-        BANK_A_CTRL_DISABLE = 0x0,
-        BANK_A_CTRL_LED1 = 0x4,
-        BANK_A_CTRL_LED2 = 0x1,
-        BANK_A_CTRL_ALL = 0x5,
-};
-
-enum lm3630_bank_b_ctrl {
-        BANK_B_CTRL_DISABLE = 0,
-        BANK_B_CTRL_LED2,
-};
-
-struct lm3630_platform_data {
-
-        /* maximum brightness */
-        int max_brt_led1;
-        int max_brt_led2;
-
-        /* initial on brightness */
-        int init_brt_led1;
-        int init_brt_led2;
-        enum lm3630_pwm_ctrl pwm_ctrl;
-        enum lm3630_pwm_active pwm_active;
-        enum lm3630_bank_a_ctrl bank_a_ctrl;
-        enum lm3630_bank_b_ctrl bank_b_ctrl;
-        unsigned int pwm_period;
-        void (*pwm_set_intensity) (int brightness, int max_brightness);
-};
-
-#endif /* __LINUX_LM3630_H */
diff --git a/include/linux/platform_data/lm3639_bl.h b/include/linux/platform_data/lm3639_bl.h
deleted file mode 100644
index 5234cd5ed16..00000000000
--- a/include/linux/platform_data/lm3639_bl.h
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-* Simple driver for Texas Instruments LM3630 LED Flash driver chip
-* Copyright (C) 2012 Texas Instruments
-*
-* This program is free software; you can redistribute it and/or modify
-* it under the terms of the GNU General Public License version 2 as
-* published by the Free Software Foundation.
-*
-*/
-
-#ifndef __LINUX_LM3639_H
-#define __LINUX_LM3639_H
-
-#define LM3639_NAME "lm3639_bl"
-
-enum lm3639_pwm {
-        LM3639_PWM_DISABLE = 0x00,
-        LM3639_PWM_EN_ACTLOW = 0x48,
-        LM3639_PWM_EN_ACTHIGH = 0x40,
-};
-
-enum lm3639_strobe {
-        LM3639_STROBE_DISABLE = 0x00,
-        LM3639_STROBE_EN_ACTLOW = 0x10,
-        LM3639_STROBE_EN_ACTHIGH = 0x30,
-};
-
-enum lm3639_txpin {
-        LM3639_TXPIN_DISABLE = 0x00,
-        LM3639_TXPIN_EN_ACTLOW = 0x04,
-        LM3639_TXPIN_EN_ACTHIGH = 0x0C,
-};
-
-enum lm3639_fleds {
-        LM3639_FLED_DIASBLE_ALL = 0x00,
-        LM3639_FLED_EN_1 = 0x40,
-        LM3639_FLED_EN_2 = 0x20,
-        LM3639_FLED_EN_ALL = 0x60,
-};
-
-enum lm3639_bleds {
-        LM3639_BLED_DIASBLE_ALL = 0x00,
-        LM3639_BLED_EN_1 = 0x10,
-        LM3639_BLED_EN_2 = 0x08,
-        LM3639_BLED_EN_ALL = 0x18,
-};
-enum lm3639_bled_mode {
-        LM3639_BLED_MODE_EXPONETIAL = 0x00,
-        LM3639_BLED_MODE_LINEAR = 0x10,
-};
-
-struct lm3639_platform_data {
-        unsigned int max_brt_led;
-        unsigned int init_brt_led;
-
-        /* input pins */
-        enum lm3639_pwm pin_pwm;
-        enum lm3639_strobe pin_strobe;
-        enum lm3639_txpin pin_tx;
-
-        /* output pins */
-        enum lm3639_fleds fled_pins;
-        enum lm3639_bleds bled_pins;
-        enum lm3639_bled_mode bled_mode;
-
-        void (*pwm_set_intensity) (int brightness, int max_brightness);
-        int (*pwm_get_intensity) (void);
-};
-#endif /* __LINUX_LM3639_H */
diff --git a/include/linux/platform_data/lp855x.h b/include/linux/platform_data/lp855x.h
deleted file mode 100644
index e81f62d24ee..00000000000
--- a/include/linux/platform_data/lp855x.h
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
- * LP855x Backlight Driver
- *
- *                      Copyright (C) 2011 Texas Instruments
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- */
-
-#ifndef _LP855X_H
-#define _LP855X_H
-
-#define BL_CTL_SHFT     (0)
-#define BRT_MODE_SHFT   (1)
-#define BRT_MODE_MASK   (0x06)
-
-/* Enable backlight. Only valid when BRT_MODE=10(I2C only) */
-#define ENABLE_BL       (1)
-#define DISABLE_BL      (0)
-
-#define I2C_CONFIG(id)  id ## _I2C_CONFIG
-#define PWM_CONFIG(id)  id ## _PWM_CONFIG
-
-/* DEVICE CONTROL register - LP8550 */
-#define LP8550_PWM_CONFIG       (LP8550_PWM_ONLY << BRT_MODE_SHFT)
-#define LP8550_I2C_CONFIG       ((ENABLE_BL << BL_CTL_SHFT) | \
-                                (LP8550_I2C_ONLY << BRT_MODE_SHFT))
-
-/* DEVICE CONTROL register - LP8551 */
-#define LP8551_PWM_CONFIG       LP8550_PWM_CONFIG
-#define LP8551_I2C_CONFIG       LP8550_I2C_CONFIG
-
-/* DEVICE CONTROL register - LP8552 */
-#define LP8552_PWM_CONFIG       LP8550_PWM_CONFIG
-#define LP8552_I2C_CONFIG       LP8550_I2C_CONFIG
-
-/* DEVICE CONTROL register - LP8553 */
-#define LP8553_PWM_CONFIG       LP8550_PWM_CONFIG
-#define LP8553_I2C_CONFIG       LP8550_I2C_CONFIG
-
-/* DEVICE CONTROL register - LP8556 */
-#define LP8556_PWM_CONFIG       (LP8556_PWM_ONLY << BRT_MODE_SHFT)
-#define LP8556_COMB1_CONFIG     (LP8556_COMBINED1 << BRT_MODE_SHFT)
-#define LP8556_I2C_CONFIG       ((ENABLE_BL << BL_CTL_SHFT) | \
-                                (LP8556_I2C_ONLY << BRT_MODE_SHFT))
-#define LP8556_COMB2_CONFIG     (LP8556_COMBINED2 << BRT_MODE_SHFT)
-#define LP8556_FAST_CONFIG      BIT(7) /* use it if EPROMs should be maintained
-                                          when exiting the low power mode */
-
-enum lp855x_chip_id {
-        LP8550,
-        LP8551,
-        LP8552,
-        LP8553,
-        LP8556,
-};
-
-enum lp855x_brightness_ctrl_mode {
-        PWM_BASED = 1,
-        REGISTER_BASED,
-};
-
-enum lp8550_brighntess_source {
-        LP8550_PWM_ONLY,
-        LP8550_I2C_ONLY = 2,
-};
-
-enum lp8551_brighntess_source {
-        LP8551_PWM_ONLY = LP8550_PWM_ONLY,
-        LP8551_I2C_ONLY = LP8550_I2C_ONLY,
-};
-
-enum lp8552_brighntess_source {
-        LP8552_PWM_ONLY = LP8550_PWM_ONLY,
-        LP8552_I2C_ONLY = LP8550_I2C_ONLY,
-};
-
-enum lp8553_brighntess_source {
-        LP8553_PWM_ONLY = LP8550_PWM_ONLY,
-        LP8553_I2C_ONLY = LP8550_I2C_ONLY,
-};
-
-enum lp8556_brightness_source {
-        LP8556_PWM_ONLY,
-        LP8556_COMBINED1,       /* pwm + i2c before the shaper block */
-        LP8556_I2C_ONLY,
-        LP8556_COMBINED2,       /* pwm + i2c after the shaper block */
-};
-
-struct lp855x_rom_data {
-        u8 addr;
-        u8 val;
-};
-
-/**
- * struct lp855x_platform_data
- * @name : Backlight driver name. If it is not defined, default name is set.
- * @mode : brightness control by pwm or lp855x register
- * @device_control : value of DEVICE CONTROL register
- * @initial_brightness : initial value of backlight brightness
- * @period_ns : platform specific pwm period value. unit is nano.
-                Only valid when mode is PWM_BASED.
- * @load_new_rom_data :
-        0 : use default configuration data
-        1 : update values of eeprom or eprom registers on loading driver
- * @size_program : total size of lp855x_rom_data
- * @rom_data : list of new eeprom/eprom registers
- */
-struct lp855x_platform_data {
-        char *name;
-        enum lp855x_brightness_ctrl_mode mode;
-        u8 device_control;
-        int initial_brightness;
-        unsigned int period_ns;
-        u8 load_new_rom_data;
-        int size_program;
-        struct lp855x_rom_data *rom_data;
-};
-
-#endif
diff --git a/include/linux/platform_data/lp8727.h b/include/linux/platform_data/lp8727.h
deleted file mode 100644
index 47128a50e04..00000000000
--- a/include/linux/platform_data/lp8727.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * LP8727 Micro/Mini USB IC with integrated charger
- *
- *                      Copyright (C) 2011 Texas Instruments
- *                      Copyright (C) 2011 National Semiconductor
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef _LP8727_H
-#define _LP8727_H
-
-enum lp8727_eoc_level {
-        LP8727_EOC_5P,
-        LP8727_EOC_10P,
-        LP8727_EOC_16P,
-        LP8727_EOC_20P,
-        LP8727_EOC_25P,
-        LP8727_EOC_33P,
-        LP8727_EOC_50P,
-};
-
-enum lp8727_ichg {
-        LP8727_ICHG_90mA,
-        LP8727_ICHG_100mA,
-        LP8727_ICHG_400mA,
-        LP8727_ICHG_450mA,
-        LP8727_ICHG_500mA,
-        LP8727_ICHG_600mA,
-        LP8727_ICHG_700mA,
-        LP8727_ICHG_800mA,
-        LP8727_ICHG_900mA,
-        LP8727_ICHG_1000mA,
-};
-
-/**
- * struct lp8727_chg_param
- * @eoc_level : end of charge level setting
- * @ichg      : charging current
- */
-struct lp8727_chg_param {
-        enum lp8727_eoc_level eoc_level;
-        enum lp8727_ichg ichg;
-};
-
-/**
- * struct lp8727_platform_data
- * @get_batt_present  : check battery status - exists or not
- * @get_batt_level    : get battery voltage (mV)
- * @get_batt_capacity : get battery capacity (%)
- * @get_batt_temp     : get battery temperature
- * @ac                : charging parameters for AC type charger
- * @usb               : charging parameters for USB type charger
- * @debounce_msec     : interrupt debounce time
- */
-struct lp8727_platform_data {
-        u8 (*get_batt_present)(void);
-        u16 (*get_batt_level)(void);
-        u8 (*get_batt_capacity)(void);
-        u8 (*get_batt_temp)(void);
-        struct lp8727_chg_param *ac;
-        struct lp8727_chg_param *usb;
-        unsigned int debounce_msec;
-};
-
-#endif
diff --git a/include/linux/platform_data/macb.h b/include/linux/platform_data/macb.h
deleted file mode 100644
index 044a124bfbb..00000000000
--- a/include/linux/platform_data/macb.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright (C) 2004-2006 Atmel Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __MACB_PDATA_H__
-#define __MACB_PDATA_H__
-
-struct macb_platform_data {
-        u32             phy_mask;
-        int             phy_irq_pin;    /* PHY IRQ */
-        u8              is_rmii;        /* using RMII interface? */
-        u8              rev_eth_addr;   /* reverse Ethernet address byte order */
-};
-
-#endif /* __MACB_PDATA_H__ */
diff --git a/include/linux/platform_data/max197.h b/include/linux/platform_data/max197.h
deleted file mode 100644
index e2a41dd7690..00000000000
--- a/include/linux/platform_data/max197.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Maxim MAX197 A/D Converter Driver
- *
- * Copyright (c) 2012 Savoir-faire Linux Inc.
- *          Vivien Didelot <vivien.didelot@savoirfairelinux.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * For further information, see the Documentation/hwmon/max197 file.
- */
-
-/**
- * struct max197_platform_data - MAX197 connectivity info
- * @convert:    Function used to start a conversion with control byte ctrl.
- *              It must return the raw data, or a negative error code.
- */
-struct max197_platform_data {
-        int (*convert)(u8 ctrl);
-};
diff --git a/include/linux/platform_data/max310x.h b/include/linux/platform_data/max310x.h
deleted file mode 100644
index 91648bf5fc5..00000000000
--- a/include/linux/platform_data/max310x.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- *  Maxim (Dallas) MAX3107/8 serial driver
- *
- *  Copyright (C) 2012 Alexander Shiyan <shc_work@mail.ru>
- *
- *  Based on max3100.c, by Christian Pellegrin <chripell@evolware.org>
- *  Based on max3110.c, by Feng Tang <feng.tang@intel.com>
- *  Based on max3107.c, by Aavamobile
- *
- *  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.
- */
-
-#ifndef _MAX310X_H_
-#define _MAX310X_H_
-
-/*
- * Example board initialization data:
- *
- * static struct max310x_pdata max3107_pdata = {
- *      .driver_flags   = MAX310X_EXT_CLK,
- *      .uart_flags[0]  = MAX310X_ECHO_SUPRESS | MAX310X_AUTO_DIR_CTRL,
- *      .frequency      = 3686400,
- *      .gpio_base      = -1,
- * };
- *
- * static struct spi_board_info spi_device_max3107[] = {
- *      {
- *              .modalias       = "max3107",
- *              .irq            = IRQ_EINT3,
- *              .bus_num        = 1,
- *              .chip_select    = 1,
- *              .platform_data  = &max3107_pdata,
- *      },
- * };
- */
-
-#define MAX310X_MAX_UARTS       1
-
-/* MAX310X platform data structure */
-struct max310x_pdata {
-        /* Flags global to driver */
-        const u8                driver_flags:2;
-#define MAX310X_EXT_CLK         (0x00000001)    /* External clock enable */
-#define MAX310X_AUTOSLEEP       (0x00000002)    /* Enable AutoSleep mode */
-        /* Flags global to UART port */
-        const u8                uart_flags[MAX310X_MAX_UARTS];
-#define MAX310X_LOOPBACK        (0x00000001)    /* Loopback mode enable */
-#define MAX310X_ECHO_SUPRESS    (0x00000002)    /* Enable echo supress */
-#define MAX310X_AUTO_DIR_CTRL   (0x00000004)    /* Enable Auto direction
-                                                 * control (RS-485)
-                                                 */
-        /* Frequency (extrenal clock or crystal) */
-        const int               frequency;
-        /* GPIO base number (can be negative) */
-        const int               gpio_base;
-        /* Called during startup */
-        void (*init)(void);
-        /* Called before finish */
-        void (*exit)(void);
-        /* Suspend callback */
-        void (*suspend)(int do_suspend);
-};
-
-#endif
diff --git a/include/linux/platform_data/mfd-mcp-sa11x0.h b/include/linux/platform_data/mfd-mcp-sa11x0.h
deleted file mode 100644
index 4b2860ae382..00000000000
--- a/include/linux/platform_data/mfd-mcp-sa11x0.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  arch/arm/mach-sa1100/include/mach/mcp.h
- *
- *  Copyright (C) 2005 Russell King.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __ASM_ARM_ARCH_MCP_H
-#define __ASM_ARM_ARCH_MCP_H
-
-#include <linux/types.h>
-
-struct mcp_plat_data {
-        u32 mccr0;
-        u32 mccr1;
-        unsigned int sclk_rate;
-        void *codec_pdata;
-};
-
-#endif
diff --git a/include/linux/platform_data/mipi-csis.h b/include/linux/platform_data/mipi-csis.h
deleted file mode 100644
index bf34e17cee7..00000000000
--- a/include/linux/platform_data/mipi-csis.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2010 - 2012 Samsung Electronics Co., Ltd.
- *
- * Samsung S5P/Exynos SoC series MIPI CSIS device support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __PLAT_SAMSUNG_MIPI_CSIS_H_
-#define __PLAT_SAMSUNG_MIPI_CSIS_H_ __FILE__
-
-/**
- * struct s5p_platform_mipi_csis - platform data for S5P MIPI-CSIS driver
- * @clk_rate:    bus clock frequency
- * @wclk_source: CSI wrapper clock selection: 0 - bus clock, 1 - ext. SCLK_CAM
- * @lanes:       number of data lanes used
- * @hs_settle:   HS-RX settle time
- */
-struct s5p_platform_mipi_csis {
-        unsigned long clk_rate;
-        u8 wclk_source;
-        u8 lanes;
-        u8 hs_settle;
-};
-
-/**
- * s5p_csis_phy_enable - global MIPI-CSI receiver D-PHY control
- * @id:     MIPI-CSIS harware instance index (0...1)
- * @on:     true to enable D-PHY and deassert its reset
- *          false to disable D-PHY
- * @return: 0 on success, or negative error code on failure
- */
-int s5p_csis_phy_enable(int id, bool on);
-
-#endif /* __PLAT_SAMSUNG_MIPI_CSIS_H_ */
diff --git a/include/linux/platform_data/mmc-davinci.h b/include/linux/platform_data/mmc-davinci.h
deleted file mode 100644
index 5ba6b22ce33..00000000000
--- a/include/linux/platform_data/mmc-davinci.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- *  Board-specific MMC configuration
- */
-
-#ifndef _DAVINCI_MMC_H
-#define _DAVINCI_MMC_H
-
-#include <linux/types.h>
-#include <linux/mmc/host.h>
-
-struct davinci_mmc_config {
-        /* get_cd()/get_wp() may sleep */
-        int     (*get_cd)(int module);
-        int     (*get_ro)(int module);
-
-        void    (*set_power)(int module, bool on);
-
-        /* wires == 0 is equivalent to wires == 4 (4-bit parallel) */
-        u8      wires;
-
-        u32     max_freq;
-
-        /* any additional host capabilities: OR'd in to mmc->f_caps */
-        u32     caps;
-
-        /* Version of the MMC/SD controller */
-        u8      version;
-
-        /* Number of sg segments */
-        u8      nr_sg;
-};
-void davinci_setup_mmc(int module, struct davinci_mmc_config *config);
-
-enum {
-        MMC_CTLR_VERSION_1 = 0, /* DM644x and DM355 */
-        MMC_CTLR_VERSION_2,     /* DA830 */
-};
-
-#endif
diff --git a/include/linux/platform_data/mmc-esdhc-imx.h b/include/linux/platform_data/mmc-esdhc-imx.h
deleted file mode 100644
index aaf97481f41..00000000000
--- a/include/linux/platform_data/mmc-esdhc-imx.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2010 Wolfram Sang <w.sang@pengutronix.de>
- *
- * 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; version 2
- * of the License.
- */
-
-#ifndef __ASM_ARCH_IMX_ESDHC_H
-#define __ASM_ARCH_IMX_ESDHC_H
-
-enum wp_types {
-        ESDHC_WP_NONE,          /* no WP, neither controller nor gpio */
-        ESDHC_WP_CONTROLLER,    /* mmc controller internal WP */
-        ESDHC_WP_GPIO,          /* external gpio pin for WP */
-};
-
-enum cd_types {
-        ESDHC_CD_NONE,          /* no CD, neither controller nor gpio */
-        ESDHC_CD_CONTROLLER,    /* mmc controller internal CD */
-        ESDHC_CD_GPIO,          /* external gpio pin for CD */
-        ESDHC_CD_PERMANENT,     /* no CD, card permanently wired to host */
-};
-
-/**
- * struct esdhc_platform_data - platform data for esdhc on i.MX
- *
- * ESDHC_WP(CD)_CONTROLLER type is not available on i.MX25/35.
- *
- * @wp_gpio:    gpio for write_protect
- * @cd_gpio:    gpio for card_detect interrupt
- * @wp_type:    type of write_protect method (see wp_types enum above)
- * @cd_type:    type of card_detect method (see cd_types enum above)
- */
-
-struct esdhc_platform_data {
-        unsigned int wp_gpio;
-        unsigned int cd_gpio;
-        enum wp_types wp_type;
-        enum cd_types cd_type;
-};
-#endif /* __ASM_ARCH_IMX_ESDHC_H */
diff --git a/include/linux/platform_data/mmc-msm_sdcc.h b/include/linux/platform_data/mmc-msm_sdcc.h
deleted file mode 100644
index ffcd9e3a6a7..00000000000
--- a/include/linux/platform_data/mmc-msm_sdcc.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- *  arch/arm/include/asm/mach/mmc.h
- */
-#ifndef ASMARM_MACH_MMC_H
-#define ASMARM_MACH_MMC_H
-
-#include <linux/mmc/host.h>
-#include <linux/mmc/card.h>
-#include <linux/mmc/sdio_func.h>
-
-struct msm_mmc_gpio {
-        unsigned no;
-        const char *name;
-};
-
-struct msm_mmc_gpio_data {
-        struct msm_mmc_gpio *gpio;
-        u8 size;
-};
-
-struct msm_mmc_platform_data {
-        unsigned int ocr_mask;                  /* available voltages */
-        u32 (*translate_vdd)(struct device *, unsigned int);
-        unsigned int (*status)(struct device *);
-        int (*register_status_notify)(void (*callback)(int card_present, void *dev_id), void *dev_id);
-        struct msm_mmc_gpio_data *gpio_data;
-        void (*init_card)(struct mmc_card *card);
-};
-
-#endif
diff --git a/include/linux/platform_data/mmc-mvsdio.h b/include/linux/platform_data/mmc-mvsdio.h
deleted file mode 100644
index 1190efedcb9..00000000000
--- a/include/linux/platform_data/mmc-mvsdio.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * arch/arm/plat-orion/include/plat/mvsdio.h
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#ifndef __MACH_MVSDIO_H
-#define __MACH_MVSDIO_H
-
-#include <linux/mbus.h>
-
-struct mvsdio_platform_data {
-        unsigned int clock;
-        int gpio_card_detect;
-        int gpio_write_protect;
-};
-
-#endif
diff --git a/include/linux/platform_data/mmc-mxcmmc.h b/include/linux/platform_data/mmc-mxcmmc.h
deleted file mode 100644
index 29115f405af..00000000000
--- a/include/linux/platform_data/mmc-mxcmmc.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef ASMARM_ARCH_MMC_H
-#define ASMARM_ARCH_MMC_H
-
-#include <linux/mmc/host.h>
-
-struct device;
-
-/* board specific SDHC data, optional.
- * If not present, a writable card with 3,3V is assumed.
- */
-struct imxmmc_platform_data {
-        /* Return values for the get_ro callback should be:
-         *   0 for a read/write card
-         *   1 for a read-only card
-         *   -ENOSYS when not supported (equal to NULL callback)
-         *   or a negative errno value when something bad happened
-         */
-        int (*get_ro)(struct device *);
-
-        /* board specific hook to (de)initialize the SD slot.
-         * The board code can call 'handler' on a card detection
-         * change giving data as argument.
-         */
-        int (*init)(struct device *dev, irq_handler_t handler, void *data);
-        void (*exit)(struct device *dev, void *data);
-
-        /* available voltages. If not given, assume
-         * MMC_VDD_32_33 | MMC_VDD_33_34
-         */
-        unsigned int ocr_avail;
-
-        /* adjust slot voltage */
-        void (*setpower)(struct device *, unsigned int vdd);
-
-        /* enable card detect using DAT3 */
-        int dat3_card_detect;
-};
-
-#endif
diff --git a/include/linux/platform_data/mmc-omap.h b/include/linux/platform_data/mmc-omap.h
deleted file mode 100644
index 2bf1b30cb5d..00000000000
--- a/include/linux/platform_data/mmc-omap.h
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * MMC definitions for OMAP2
- *
- * Copyright (C) 2006 Nokia Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#define OMAP_MMC_MAX_SLOTS      2
-
-/*
- * struct omap_mmc_dev_attr.flags possibilities
- *
- * OMAP_HSMMC_SUPPORTS_DUAL_VOLT: Some HSMMC controller instances can
- *    operate with either 1.8Vdc or 3.0Vdc card voltages; this flag
- *    should be set if this is the case.  See for example Section 22.5.3
- *    "MMC/SD/SDIO1 Bus Voltage Selection" of the OMAP34xx Multimedia
- *    Device Silicon Revision 3.1.x Revision ZR (July 2011) (SWPU223R).
- *
- * OMAP_HSMMC_BROKEN_MULTIBLOCK_READ: Multiple-block read transfers
- *    don't work correctly on some MMC controller instances on some
- *    OMAP3 SoCs; this flag should be set if this is the case.  See
- *    for example Advisory 2.1.1.128 "MMC: Multiple Block Read
- *    Operation Issue" in _OMAP3530/3525/3515/3503 Silicon Errata_
- *    Revision F (October 2010) (SPRZ278F).
- */
-#define OMAP_HSMMC_SUPPORTS_DUAL_VOLT           BIT(0)
-#define OMAP_HSMMC_BROKEN_MULTIBLOCK_READ       BIT(1)
-
-struct mmc_card;
-
-struct omap_mmc_dev_attr {
-        u8 flags;
-};
-
-struct omap_mmc_platform_data {
-        /* back-link to device */
-        struct device *dev;
-
-        /* number of slots per controller */
-        unsigned nr_slots:2;
-
-        /* set if your board has components or wiring that limits the
-         * maximum frequency on the MMC bus */
-        unsigned int max_freq;
-
-        /* switch the bus to a new slot */
-        int (*switch_slot)(struct device *dev, int slot);
-        /* initialize board-specific MMC functionality, can be NULL if
-         * not supported */
-        int (*init)(struct device *dev);
-        void (*cleanup)(struct device *dev);
-        void (*shutdown)(struct device *dev);
-
-        /* To handle board related suspend/resume functionality for MMC */
-        int (*suspend)(struct device *dev, int slot);
-        int (*resume)(struct device *dev, int slot);
-
-        /* Return context loss count due to PM states changing */
-        int (*get_context_loss_count)(struct device *dev);
-
-        /* Integrating attributes from the omap_hwmod layer */
-        u8 controller_flags;
-
-        /* Register offset deviation */
-        u16 reg_offset;
-
-        struct omap_mmc_slot_data {
-
-                /*
-                 * 4/8 wires and any additional host capabilities
-                 * need to OR'd all capabilities (ref. linux/mmc/host.h)
-                 */
-                u8  wires;      /* Used for the MMC driver on omap1 and 2420 */
-                u32 caps;       /* Used for the MMC driver on 2430 and later */
-                u32 pm_caps;    /* PM capabilities of the mmc */
-
-                /*
-                 * nomux means "standard" muxing is wrong on this board, and
-                 * that board-specific code handled it before common init logic.
-                 */
-                unsigned nomux:1;
-
-                /* switch pin can be for card detect (default) or card cover */
-                unsigned cover:1;
-
-                /* use the internal clock */
-                unsigned internal_clock:1;
-
-                /* nonremovable e.g. eMMC */
-                unsigned nonremovable:1;
-
-                /* Try to sleep or power off when possible */
-                unsigned power_saving:1;
-
-                /* If using power_saving and the MMC power is not to go off */
-                unsigned no_off:1;
-
-                /* eMMC does not handle power off when not in sleep state */
-                unsigned no_regulator_off_init:1;
-
-                /* Regulator off remapped to sleep */
-                unsigned vcc_aux_disable_is_sleep:1;
-
-                /* we can put the features above into this variable */
-#define HSMMC_HAS_PBIAS         (1 << 0)
-#define HSMMC_HAS_UPDATED_RESET (1 << 1)
-#define HSMMC_HAS_HSPE_SUPPORT  (1 << 2)
-#define MMC_OMAP7XX             (1 << 3)
-#define MMC_OMAP15XX            (1 << 4)
-#define MMC_OMAP16XX            (1 << 5)
-                unsigned features;
-
-                int switch_pin;                 /* gpio (card detect) */
-                int gpio_wp;                    /* gpio (write protect) */
-
-                int (*set_bus_mode)(struct device *dev, int slot, int bus_mode);
-                int (*set_power)(struct device *dev, int slot,
-                                 int power_on, int vdd);
-                int (*get_ro)(struct device *dev, int slot);
-                void (*remux)(struct device *dev, int slot, int power_on);
-                /* Call back before enabling / disabling regulators */
-                void (*before_set_reg)(struct device *dev, int slot,
-                                       int power_on, int vdd);
-                /* Call back after enabling / disabling regulators */
-                void (*after_set_reg)(struct device *dev, int slot,
-                                      int power_on, int vdd);
-                /* if we have special card, init it using this callback */
-                void (*init_card)(struct mmc_card *card);
-
-                /* return MMC cover switch state, can be NULL if not supported.
-                 *
-                 * possible return values:
-                 *   0 - closed
-                 *   1 - open
-                 */
-                int (*get_cover_state)(struct device *dev, int slot);
-
-                const char *name;
-                u32 ocr_mask;
-
-                /* Card detection IRQs */
-                int card_detect_irq;
-                int (*card_detect)(struct device *dev, int slot);
-
-                unsigned int ban_openended:1;
-
-        } slots[OMAP_MMC_MAX_SLOTS];
-};
diff --git a/include/linux/platform_data/mmc-pxamci.h b/include/linux/platform_data/mmc-pxamci.h
deleted file mode 100644
index 9eb515bb799..00000000000
--- a/include/linux/platform_data/mmc-pxamci.h
+++ /dev/null
@@ -1,28 +0,0 @@
-#ifndef ASMARM_ARCH_MMC_H
-#define ASMARM_ARCH_MMC_H
-
-#include <linux/mmc/host.h>
-#include <linux/interrupt.h>
-
-struct device;
-struct mmc_host;
-
-struct pxamci_platform_data {
-        unsigned int ocr_mask;                  /* available voltages */
-        unsigned long detect_delay_ms;          /* delay in millisecond before detecting cards after interrupt */
-        int (*init)(struct device *, irq_handler_t , void *);
-        int (*get_ro)(struct device *);
-        void (*setpower)(struct device *, unsigned int);
-        void (*exit)(struct device *, void *);
-        int gpio_card_detect;                   /* gpio detecting card insertion */
-        int gpio_card_ro;                       /* gpio detecting read only toggle */
-        bool gpio_card_ro_invert;               /* gpio ro is inverted */
-        int gpio_power;                         /* gpio powering up MMC bus */
-        bool gpio_power_invert;                 /* gpio power is inverted */
-};
-
-extern void pxa_set_mci_info(struct pxamci_platform_data *info);
-extern void pxa3xx_set_mci2_info(struct pxamci_platform_data *info);
-extern void pxa3xx_set_mci3_info(struct pxamci_platform_data *info);
-
-#endif
diff --git a/include/linux/platform_data/mmc-s3cmci.h b/include/linux/platform_data/mmc-s3cmci.h
deleted file mode 100644
index c42d3171194..00000000000
--- a/include/linux/platform_data/mmc-s3cmci.h
+++ /dev/null
@@ -1,52 +0,0 @@
-#ifndef _ARCH_MCI_H
-#define _ARCH_MCI_H
-
-/**
- * struct s3c24xx_mci_pdata - sd/mmc controller platform data
- * @no_wprotect: Set this to indicate there is no write-protect switch.
- * @no_detect: Set this if there is no detect switch.
- * @wprotect_invert: Invert the default sense of the write protect switch.
- * @detect_invert: Invert the default sense of the write protect switch.
- * @use_dma: Set to allow the use of DMA.
- * @gpio_detect: GPIO number for the card detect line.
- * @gpio_wprotect: GPIO number for the write protect line.
- * @ocr_avail: The mask of the available power states, non-zero to use.
- * @set_power: Callback to control the power mode.
- *
- * The @gpio_detect is used for card detection when @no_wprotect is unset,
- * and the default sense is that 0 returned from gpio_get_value() means
- * that a card is inserted. If @detect_invert is set, then the value from
- * gpio_get_value() is inverted, which makes 1 mean card inserted.
- *
- * The driver will use @gpio_wprotect to signal whether the card is write
- * protected if @no_wprotect is not set. A 0 returned from gpio_get_value()
- * means the card is read/write, and 1 means read-only. The @wprotect_invert
- * will invert the value returned from gpio_get_value().
- *
- * Card power is set by @ocr_availa, using MCC_VDD_ constants if it is set
- * to a non-zero value, otherwise the default of 3.2-3.4V is used.
- */
-struct s3c24xx_mci_pdata {
-        unsigned int    no_wprotect:1;
-        unsigned int    no_detect:1;
-        unsigned int    wprotect_invert:1;
-        unsigned int    detect_invert:1;        /* set => detect active high */
-        unsigned int    use_dma:1;
-
-        unsigned int    gpio_detect;
-        unsigned int    gpio_wprotect;
-        unsigned long   ocr_avail;
-        void            (*set_power)(unsigned char power_mode,
-                                     unsigned short vdd);
-};
-
-/**
- * s3c24xx_mci_set_platdata - set platform data for mmc/sdi device
- * @pdata: The platform data
- *
- * Copy the platform data supplied by @pdata so that this can be marked
- * __initdata.
- */
-extern void s3c24xx_mci_set_platdata(struct s3c24xx_mci_pdata *pdata);
-
-#endif /* _ARCH_NCI_H */
diff --git a/include/linux/platform_data/mmc-sdhci-tegra.h b/include/linux/platform_data/mmc-sdhci-tegra.h
deleted file mode 100644
index 8f843069768..00000000000
--- a/include/linux/platform_data/mmc-sdhci-tegra.h
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2009 Palm, Inc.
- * Author: Yvonne Yip <y@palm.com>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- *
- */
-#ifndef __PLATFORM_DATA_TEGRA_SDHCI_H
-#define __PLATFORM_DATA_TEGRA_SDHCI_H
-
-#include <linux/mmc/host.h>
-
-struct tegra_sdhci_platform_data {
-        int cd_gpio;
-        int wp_gpio;
-        int power_gpio;
-        int is_8bit;
-        int pm_flags;
-};
-
-#endif
diff --git a/include/linux/platform_data/mmp_audio.h b/include/linux/platform_data/mmp_audio.h
deleted file mode 100644
index 0f25d165abd..00000000000
--- a/include/linux/platform_data/mmp_audio.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- *  MMP Platform AUDIO Management
- *
- *  Copyright (c) 2011 Marvell Semiconductors Inc.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- */
-
-#ifndef MMP_AUDIO_H
-#define MMP_AUDIO_H
-
-struct mmp_audio_platdata {
-        u32 period_max_capture;
-        u32 buffer_max_capture;
-        u32 period_max_playback;
-        u32 buffer_max_playback;
-};
-
-#endif /* MMP_AUDIO_H */
diff --git a/include/linux/platform_data/mmp_dma.h b/include/linux/platform_data/mmp_dma.h
deleted file mode 100644
index 2a330ec9e2a..00000000000
--- a/include/linux/platform_data/mmp_dma.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- *  MMP Platform DMA Management
- *
- *  Copyright (c) 2011 Marvell Semiconductors Inc.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- *
- */
-
-#ifndef MMP_DMA_H
-#define MMP_DMA_H
-
-struct mmp_dma_platdata {
-        int dma_channels;
-};
-
-#endif /* MMP_DMA_H */
diff --git a/include/linux/platform_data/mouse-pxa930_trkball.h b/include/linux/platform_data/mouse-pxa930_trkball.h
deleted file mode 100644
index 5e0789bc472..00000000000
--- a/include/linux/platform_data/mouse-pxa930_trkball.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef __ASM_ARCH_PXA930_TRKBALL_H
-#define __ASM_ARCH_PXA930_TRKBALL_H
-
-struct pxa930_trkball_platform_data {
-        int x_filter;
-        int y_filter;
-};
-
-#endif /* __ASM_ARCH_PXA930_TRKBALL_H */
-
diff --git a/include/linux/platform_data/mtd-davinci-aemif.h b/include/linux/platform_data/mtd-davinci-aemif.h
deleted file mode 100644
index 05b29344309..00000000000
--- a/include/linux/platform_data/mtd-davinci-aemif.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * TI DaVinci AEMIF support
- *
- * Copyright 2010 (C) Texas Instruments, Inc. http://www.ti.com/
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- */
-#ifndef _MACH_DAVINCI_AEMIF_H
-#define _MACH_DAVINCI_AEMIF_H
-
-#define NRCSR_OFFSET            0x00
-#define AWCCR_OFFSET            0x04
-#define A1CR_OFFSET             0x10
-
-#define ACR_ASIZE_MASK          0x3
-#define ACR_EW_MASK             BIT(30)
-#define ACR_SS_MASK             BIT(31)
-
-/* All timings in nanoseconds */
-struct davinci_aemif_timing {
-        u8      wsetup;
-        u8      wstrobe;
-        u8      whold;
-
-        u8      rsetup;
-        u8      rstrobe;
-        u8      rhold;
-
-        u8      ta;
-};
-
-int davinci_aemif_setup_timing(struct davinci_aemif_timing *t,
-                                        void __iomem *base, unsigned cs);
-#endif
diff --git a/include/linux/platform_data/mtd-davinci.h b/include/linux/platform_data/mtd-davinci.h
deleted file mode 100644
index 1cf555aef89..00000000000
--- a/include/linux/platform_data/mtd-davinci.h
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
- * mach-davinci/nand.h
- *
- * Copyright © 2006 Texas Instruments.
- *
- * Ported to 2.6.23 Copyright © 2008 by
- *   Sander Huijsen <Shuijsen@optelecom-nkf.com>
- *   Troy Kisky <troy.kisky@boundarydevices.com>
- *   Dirk Behme <Dirk.Behme@gmail.com>
- *
- * --------------------------------------------------------------------------
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __ARCH_ARM_DAVINCI_NAND_H
-#define __ARCH_ARM_DAVINCI_NAND_H
-
-#include <linux/mtd/nand.h>
-
-#define NANDFCR_OFFSET          0x60
-#define NANDFSR_OFFSET          0x64
-#define NANDF1ECC_OFFSET        0x70
-
-/* 4-bit ECC syndrome registers */
-#define NAND_4BIT_ECC_LOAD_OFFSET       0xbc
-#define NAND_4BIT_ECC1_OFFSET           0xc0
-#define NAND_4BIT_ECC2_OFFSET           0xc4
-#define NAND_4BIT_ECC3_OFFSET           0xc8
-#define NAND_4BIT_ECC4_OFFSET           0xcc
-#define NAND_ERR_ADD1_OFFSET            0xd0
-#define NAND_ERR_ADD2_OFFSET            0xd4
-#define NAND_ERR_ERRVAL1_OFFSET         0xd8
-#define NAND_ERR_ERRVAL2_OFFSET         0xdc
-
-/* NOTE:  boards don't need to use these address bits
- * for ALE/CLE unless they support booting from NAND.
- * They're used unless platform data overrides them.
- */
-#define MASK_ALE                0x08
-#define MASK_CLE                0x10
-
-struct davinci_nand_pdata {             /* platform_data */
-        uint32_t                mask_ale;
-        uint32_t                mask_cle;
-
-        /* for packages using two chipselects */
-        uint32_t                mask_chipsel;
-
-        /* board's default static partition info */
-        struct mtd_partition    *parts;
-        unsigned                nr_parts;
-
-        /* none  == NAND_ECC_NONE (strongly *not* advised!!)
-         * soft  == NAND_ECC_SOFT
-         * else  == NAND_ECC_HW, according to ecc_bits
-         *
-         * All DaVinci-family chips support 1-bit hardware ECC.
-         * Newer ones also support 4-bit ECC, but are awkward
-         * using it with large page chips.
-         */
-        nand_ecc_modes_t        ecc_mode;
-        u8                      ecc_bits;
-
-        /* e.g. NAND_BUSWIDTH_16 */
-        unsigned                options;
-        /* e.g. NAND_BBT_USE_FLASH */
-        unsigned                bbt_options;
-
-        /* Main and mirror bbt descriptor overrides */
-        struct nand_bbt_descr   *bbt_td;
-        struct nand_bbt_descr   *bbt_md;
-
-        /* Access timings */
-        struct davinci_aemif_timing     *timing;
-};
-
-#endif  /* __ARCH_ARM_DAVINCI_NAND_H */
diff --git a/include/linux/platform_data/mtd-mxc_nand.h b/include/linux/platform_data/mtd-mxc_nand.h
deleted file mode 100644
index 6bb96ef1600..00000000000
--- a/include/linux/platform_data/mtd-mxc_nand.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright 2004-2007 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Sascha Hauer, kernel@pengutronix.de
- *
- * 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 Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef __ASM_ARCH_NAND_H
-#define __ASM_ARCH_NAND_H
-
-#include <linux/mtd/partitions.h>
-
-struct mxc_nand_platform_data {
-        unsigned int width;     /* data bus width in bytes */
-        unsigned int hw_ecc:1;  /* 0 if suppress hardware ECC */
-        unsigned int flash_bbt:1; /* set to 1 to use a flash based bbt */
-        struct mtd_partition *parts;    /* partition table */
-        int nr_parts;                   /* size of parts */
-};
-#endif /* __ASM_ARCH_NAND_H */
diff --git a/include/linux/platform_data/mtd-nand-omap2.h b/include/linux/platform_data/mtd-nand-omap2.h
deleted file mode 100644
index 24d32ca34be..00000000000
--- a/include/linux/platform_data/mtd-nand-omap2.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * arch/arm/plat-omap/include/mach/nand.h
- *
- * Copyright (C) 2006 Micron Technology Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef _MTD_NAND_OMAP2_H
-#define _MTD_NAND_OMAP2_H
-
-#include <linux/mtd/partitions.h>
-
-#define GPMC_BCH_NUM_REMAINDER  8
-
-enum nand_io {
-        NAND_OMAP_PREFETCH_POLLED = 0,  /* prefetch polled mode, default */
-        NAND_OMAP_POLLED,               /* polled mode, without prefetch */
-        NAND_OMAP_PREFETCH_DMA,         /* prefetch enabled sDMA mode */
-        NAND_OMAP_PREFETCH_IRQ          /* prefetch enabled irq mode */
-};
-
-enum omap_ecc {
-                /* 1-bit ecc: stored at end of spare area */
-        OMAP_ECC_HAMMING_CODE_DEFAULT = 0, /* Default, s/w method */
-        OMAP_ECC_HAMMING_CODE_HW, /* gpmc to detect the error */
-                /* 1-bit ecc: stored at beginning of spare area as romcode */
-        OMAP_ECC_HAMMING_CODE_HW_ROMCODE, /* gpmc method & romcode layout */
-        OMAP_ECC_BCH4_CODE_HW, /* 4-bit BCH ecc code */
-        OMAP_ECC_BCH8_CODE_HW, /* 8-bit BCH ecc code */
-};
-
-struct gpmc_nand_regs {
-        void __iomem    *gpmc_status;
-        void __iomem    *gpmc_nand_command;
-        void __iomem    *gpmc_nand_address;
-        void __iomem    *gpmc_nand_data;
-        void __iomem    *gpmc_prefetch_config1;
-        void __iomem    *gpmc_prefetch_config2;
-        void __iomem    *gpmc_prefetch_control;
-        void __iomem    *gpmc_prefetch_status;
-        void __iomem    *gpmc_ecc_config;
-        void __iomem    *gpmc_ecc_control;
-        void __iomem    *gpmc_ecc_size_config;
-        void __iomem    *gpmc_ecc1_result;
-        void __iomem    *gpmc_bch_result0[GPMC_BCH_NUM_REMAINDER];
-        void __iomem    *gpmc_bch_result1[GPMC_BCH_NUM_REMAINDER];
-        void __iomem    *gpmc_bch_result2[GPMC_BCH_NUM_REMAINDER];
-        void __iomem    *gpmc_bch_result3[GPMC_BCH_NUM_REMAINDER];
-};
-
-struct omap_nand_platform_data {
-        int                     cs;
-        struct mtd_partition    *parts;
-        int                     nr_parts;
-        bool                    dev_ready;
-        enum nand_io            xfer_type;
-        int                     devsize;
-        enum omap_ecc           ecc_opt;
-        struct gpmc_nand_regs   reg;
-};
-
-#endif
diff --git a/include/linux/platform_data/mtd-nand-pxa3xx.h b/include/linux/platform_data/mtd-nand-pxa3xx.h
deleted file mode 100644
index c42f39f2019..00000000000
--- a/include/linux/platform_data/mtd-nand-pxa3xx.h
+++ /dev/null
@@ -1,79 +0,0 @@
-#ifndef __ASM_ARCH_PXA3XX_NAND_H
-#define __ASM_ARCH_PXA3XX_NAND_H
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-
-struct pxa3xx_nand_timing {
-        unsigned int    tCH;  /* Enable signal hold time */
-        unsigned int    tCS;  /* Enable signal setup time */
-        unsigned int    tWH;  /* ND_nWE high duration */
-        unsigned int    tWP;  /* ND_nWE pulse time */
-        unsigned int    tRH;  /* ND_nRE high duration */
-        unsigned int    tRP;  /* ND_nRE pulse width */
-        unsigned int    tR;   /* ND_nWE high to ND_nRE low for read */
-        unsigned int    tWHR; /* ND_nWE high to ND_nRE low for status read */
-        unsigned int    tAR;  /* ND_ALE low to ND_nRE low delay */
-};
-
-struct pxa3xx_nand_cmdset {
-        uint16_t        read1;
-        uint16_t        read2;
-        uint16_t        program;
-        uint16_t        read_status;
-        uint16_t        read_id;
-        uint16_t        erase;
-        uint16_t        reset;
-        uint16_t        lock;
-        uint16_t        unlock;
-        uint16_t        lock_status;
-};
-
-struct pxa3xx_nand_flash {
-        char            *name;
-        uint32_t        chip_id;
-        unsigned int    page_per_block; /* Pages per block (PG_PER_BLK) */
-        unsigned int    page_size;      /* Page size in bytes (PAGE_SZ) */
-        unsigned int    flash_width;    /* Width of Flash memory (DWIDTH_M) */
-        unsigned int    dfc_width;      /* Width of flash controller(DWIDTH_C) */
-        unsigned int    num_blocks;     /* Number of physical blocks in Flash */
-
-        struct pxa3xx_nand_timing *timing;      /* NAND Flash timing */
-};
-
-/*
- * Current pxa3xx_nand controller has two chip select which
- * both be workable.
- *
- * Notice should be taken that:
- * When you want to use this feature, you should not enable the
- * keep configuration feature, for two chip select could be
- * attached with different nand chip. The different page size
- * and timing requirement make the keep configuration impossible.
- */
-
-/* The max num of chip select current support */
-#define NUM_CHIP_SELECT         (2)
-struct pxa3xx_nand_platform_data {
-
-        /* the data flash bus is shared between the Static Memory
-         * Controller and the Data Flash Controller,  the arbiter
-         * controls the ownership of the bus
-         */
-        int     enable_arbiter;
-
-        /* allow platform code to keep OBM/bootloader defined NFC config */
-        int     keep_config;
-
-        /* indicate how many chip selects will be used */
-        int     num_cs;
-
-        const struct mtd_partition              *parts[NUM_CHIP_SELECT];
-        unsigned int                            nr_parts[NUM_CHIP_SELECT];
-
-        const struct pxa3xx_nand_flash *        flash;
-        size_t                                  num_flash;
-};
-
-extern void pxa3xx_set_nand_info(struct pxa3xx_nand_platform_data *info);
-#endif /* __ASM_ARCH_PXA3XX_NAND_H */
diff --git a/include/linux/platform_data/mtd-nand-s3c2410.h b/include/linux/platform_data/mtd-nand-s3c2410.h
deleted file mode 100644
index b64115fa93a..00000000000
--- a/include/linux/platform_data/mtd-nand-s3c2410.h
+++ /dev/null
@@ -1,67 +0,0 @@
-/* arch/arm/mach-s3c2410/include/mach/nand.h
- *
- * Copyright (c) 2004 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *
- * S3C2410 - NAND device controller platform_device info
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-/**
- * struct s3c2410_nand_set - define a set of one or more nand chips
- * @disable_ecc:        Entirely disable ECC - Dangerous
- * @flash_bbt:          Openmoko u-boot can create a Bad Block Table
- *                      Setting this flag will allow the kernel to
- *                      look for it at boot time and also skip the NAND
- *                      scan.
- * @options:            Default value to set into 'struct nand_chip' options.
- * @nr_chips:           Number of chips in this set
- * @nr_partitions:      Number of partitions pointed to by @partitions
- * @name:               Name of set (optional)
- * @nr_map:             Map for low-layer logical to physical chip numbers (option)
- * @partitions:         The mtd partition list
- *
- * define a set of one or more nand chips registered with an unique mtd. Also
- * allows to pass flag to the underlying NAND layer. 'disable_ecc' will trigger
- * a warning at boot time.
- */
-struct s3c2410_nand_set {
-        unsigned int            disable_ecc:1;
-        unsigned int            flash_bbt:1;
-
-        unsigned int            options;
-        int                     nr_chips;
-        int                     nr_partitions;
-        char                    *name;
-        int                     *nr_map;
-        struct mtd_partition    *partitions;
-        struct nand_ecclayout   *ecc_layout;
-};
-
-struct s3c2410_platform_nand {
-        /* timing information for controller, all times in nanoseconds */
-
-        int     tacls;  /* time for active CLE/ALE to nWE/nOE */
-        int     twrph0; /* active time for nWE/nOE */
-        int     twrph1; /* time for release CLE/ALE from nWE/nOE inactive */
-
-        unsigned int    ignore_unset_ecc:1;
-
-        int                     nr_sets;
-        struct s3c2410_nand_set *sets;
-
-        void                    (*select_chip)(struct s3c2410_nand_set *,
-                                               int chip);
-};
-
-/**
- * s3c_nand_set_platdata() - register NAND platform data.
- * @nand: The NAND platform data to register with s3c_device_nand.
- *
- * This function copies the given NAND platform data, @nand and registers
- * it with the s3c_device_nand. This allows @nand to be __initdata.
-*/
-extern void s3c_nand_set_platdata(struct s3c2410_platform_nand *nand);
diff --git a/include/linux/platform_data/mtd-onenand-omap2.h b/include/linux/platform_data/mtd-onenand-omap2.h
deleted file mode 100644
index 685af7e8b12..00000000000
--- a/include/linux/platform_data/mtd-onenand-omap2.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * arch/arm/plat-omap/include/mach/onenand.h
- *
- * Copyright (C) 2006 Nokia Corporation
- * Author: Juha Yrjola
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __MTD_ONENAND_OMAP2_H
-#define __MTD_ONENAND_OMAP2_H
-
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-
-#define ONENAND_SYNC_READ       (1 << 0)
-#define ONENAND_SYNC_READWRITE  (1 << 1)
-#define ONENAND_IN_OMAP34XX     (1 << 2)
-
-struct omap_onenand_platform_data {
-        int                     cs;
-        int                     gpio_irq;
-        struct mtd_partition    *parts;
-        int                     nr_parts;
-        int                     (*onenand_setup)(void __iomem *, int *freq_ptr);
-        int                     dma_channel;
-        u8                      flags;
-        u8                      regulator_can_sleep;
-        u8                      skip_initial_unlocking;
-};
-#endif
diff --git a/include/linux/platform_data/mtd-orion_nand.h b/include/linux/platform_data/mtd-orion_nand.h
deleted file mode 100644
index 9f3c180834d..00000000000
--- a/include/linux/platform_data/mtd-orion_nand.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * arch/arm/plat-orion/include/plat/orion_nand.h
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#ifndef __PLAT_ORION_NAND_H
-#define __PLAT_ORION_NAND_H
-
-/*
- * Device bus NAND private data
- */
-struct orion_nand_data {
-        struct mtd_partition *parts;
-        int (*dev_ready)(struct mtd_info *mtd);
-        u32 nr_parts;
-        u8 ale;         /* address line number connected to ALE */
-        u8 cle;         /* address line number connected to CLE */
-        u8 width;       /* buswidth */
-        u8 chip_delay;
-};
-
-
-#endif
diff --git a/include/linux/platform_data/mv_usb.h b/include/linux/platform_data/mv_usb.h
deleted file mode 100644
index 944b01dd103..00000000000
--- a/include/linux/platform_data/mv_usb.h
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2011 Marvell International Ltd. All rights reserved.
- *
- * 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.
- */
-
-#ifndef __MV_PLATFORM_USB_H
-#define __MV_PLATFORM_USB_H
-
-enum pxa_ehci_type {
-        EHCI_UNDEFINED = 0,
-        PXA_U2OEHCI,    /* pxa 168, 9xx */
-        PXA_SPH,        /* pxa 168, 9xx SPH */
-        MMP3_HSIC,      /* mmp3 hsic */
-        MMP3_FSIC,      /* mmp3 fsic */
-};
-
-enum {
-        MV_USB_MODE_OTG,
-        MV_USB_MODE_HOST,
-};
-
-enum {
-        VBUS_LOW        = 0,
-        VBUS_HIGH       = 1 << 0,
-};
-
-struct mv_usb_addon_irq {
-        unsigned int    irq;
-        int             (*poll)(void);
-};
-
-struct mv_usb_platform_data {
-        unsigned int            clknum;
-        char                    **clkname;
-        struct mv_usb_addon_irq *id;    /* Only valid for OTG. ID pin change*/
-        struct mv_usb_addon_irq *vbus;  /* valid for OTG/UDC. VBUS change*/
-
-        /* only valid for HCD. OTG or Host only*/
-        unsigned int            mode;
-
-        /* This flag is used for that needs id pin checked by otg */
-        unsigned int    disable_otg_clock_gating:1;
-        /* Force a_bus_req to be asserted */
-         unsigned int    otg_force_a_bus_req:1;
-
-        int     (*phy_init)(void __iomem *regbase);
-        void    (*phy_deinit)(void __iomem *regbase);
-        int     (*set_vbus)(unsigned int vbus);
-        int     (*private_init)(void __iomem *opregs, void __iomem *phyregs);
-};
-#endif
diff --git a/include/linux/platform_data/ntc_thermistor.h b/include/linux/platform_data/ntc_thermistor.h
index 88734e871e3..abd28621527 100644
--- a/include/linux/platform_data/ntc_thermistor.h
+++ b/include/linux/platform_data/ntc_thermistor.h
@@ -36,7 +36,7 @@ struct ntc_thermistor_platform_data {
          * read_uV()
          *
          * How to setup pullup_ohm, pulldown_ohm, and connect is
-         * described at Documentation/hwmon/ntc_thermistor
+         * described at Documentation/hwmon/ntc
          *
          * pullup/down_ohm: 0 for infinite / not-connected
          */
diff --git a/include/linux/platform_data/omap-abe-twl6040.h b/include/linux/platform_data/omap-abe-twl6040.h
deleted file mode 100644
index 5d298ac10fc..00000000000
--- a/include/linux/platform_data/omap-abe-twl6040.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/**
- * omap-abe-twl6040.h - ASoC machine driver OMAP4+ devices, header.
- *
- * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com
- * All rights reserved.
- *
- * Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * 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 _OMAP_ABE_TWL6040_H_
-#define _OMAP_ABE_TWL6040_H_
-
-/* To select if only one channel is connected in a stereo port */
-#define ABE_TWL6040_LEFT        (1 << 0)
-#define ABE_TWL6040_RIGHT       (1 << 1)
-
-struct omap_abe_twl6040_data {
-        char *card_name;
-        /* Feature flags for connected audio pins */
-        u8      has_hs;
-        u8      has_hf;
-        bool    has_ep;
-        u8      has_aux;
-        u8      has_vibra;
-        bool    has_dmic;
-        bool    has_hsmic;
-        bool    has_mainmic;
-        bool    has_submic;
-        u8      has_afm;
-        /* Other features */
-        bool    jack_detection; /* board can detect jack events */
-        int     mclk_freq;      /* MCLK frequency speed for twl6040 */
-};
-
-#endif /* _OMAP_ABE_TWL6040_H_ */
diff --git a/include/linux/platform_data/omap-twl4030.h b/include/linux/platform_data/omap-twl4030.h
deleted file mode 100644
index ee60ef79d79..00000000000
--- a/include/linux/platform_data/omap-twl4030.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * omap-twl4030.h - ASoC machine driver for TI SoC based boards with twl4030
- *                  codec, header.
- *
- * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com
- * All rights reserved.
- *
- * Author: Peter Ujfalusi <peter.ujfalusi@ti.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * 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 _OMAP_TWL4030_H_
-#define _OMAP_TWL4030_H_
-
-/* To select if only one channel is connected in a stereo port */
-#define OMAP_TWL4030_LEFT       (1 << 0)
-#define OMAP_TWL4030_RIGHT      (1 << 1)
-
-struct omap_tw4030_pdata {
-        const char *card_name;
-        /* Voice port is connected to McBSP3 */
-        bool voice_connected;
-
-        /* The driver will parse the connection flags if this flag is set */
-        bool    custom_routing;
-        /* Flags to indicate connected audio ports. */
-        u8      has_hs;
-        u8      has_hf;
-        u8      has_predriv;
-        u8      has_carkit;
-        bool    has_ear;
-
-        bool    has_mainmic;
-        bool    has_submic;
-        bool    has_hsmic;
-        bool    has_carkitmic;
-        bool    has_digimic0;
-        bool    has_digimic1;
-        u8      has_linein;
-
-        /* Jack detect GPIO or  <= 0 if it is not implemented */
-        int jack_detect;
-};
-
-#endif /* _OMAP_TWL4030_H_ */
diff --git a/include/linux/platform_data/omap-wd-timer.h b/include/linux/platform_data/omap-wd-timer.h
deleted file mode 100644
index d75f5f802d9..00000000000
--- a/include/linux/platform_data/omap-wd-timer.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * OMAP2+ WDTIMER-specific function prototypes
- *
- * Copyright (C) 2012 Texas Instruments, Inc.
- * Paul Walmsley
- *
- * 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.
- */
-
-#ifndef __LINUX_PLATFORM_DATA_OMAP_WD_TIMER_H
-#define __LINUX_PLATFORM_DATA_OMAP_WD_TIMER_H
-
-#include <linux/types.h>
-
-/*
- * Standardized OMAP reset source bits
- *
- * This is a subset of the ones listed in arch/arm/mach-omap2/prm.h
- * and are the only ones needed in the watchdog driver.
- */
-#define OMAP_MPU_WD_RST_SRC_ID_SHIFT                            3
-
-/**
- * struct omap_wd_timer_platform_data - WDTIMER integration to the host SoC
- * @read_reset_sources - fn ptr for the SoC to indicate the last reset cause
- *
- * The function pointed to by @read_reset_sources must return its data
- * in a standard format - search for RST_SRC_ID_SHIFT in
- * arch/arm/mach-omap2
- */
-struct omap_wd_timer_platform_data {
-        u32 (*read_reset_sources)(void);
-};
-
-#endif
diff --git a/include/linux/platform_data/omap1_bl.h b/include/linux/platform_data/omap1_bl.h
deleted file mode 100644
index 881a8e92d60..00000000000
--- a/include/linux/platform_data/omap1_bl.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __OMAP1_BL_H__
-#define __OMAP1_BL_H__
-
-#include <linux/device.h>
-
-struct omap_backlight_config {
-        int default_intensity;
-        int (*set_power)(struct device *dev, int state);
-};
-
-#endif
diff --git a/include/linux/platform_data/omap4-keypad.h b/include/linux/platform_data/omap4-keypad.h
deleted file mode 100644
index 4eef5fb05a1..00000000000
--- a/include/linux/platform_data/omap4-keypad.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#ifndef __LINUX_INPUT_OMAP4_KEYPAD_H
-#define __LINUX_INPUT_OMAP4_KEYPAD_H
-
-#include <linux/input/matrix_keypad.h>
-
-struct omap4_keypad_platform_data {
-        const struct matrix_keymap_data *keymap_data;
-
-        u8 rows;
-        u8 cols;
-};
-
-#endif /* __LINUX_INPUT_OMAP4_KEYPAD_H */
diff --git a/include/linux/platform_data/omap_drm.h b/include/linux/platform_data/omap_drm.h
deleted file mode 100644
index f4e4a237ebd..00000000000
--- a/include/linux/platform_data/omap_drm.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * DRM/KMS platform data for TI OMAP platforms
- *
- * Copyright (C) 2012 Texas Instruments
- * Author: Rob Clark <rob.clark@linaro.org>
- *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License version 2 as published by
- * the Free Software Foundation.
- *
- * 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, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __PLATFORM_DATA_OMAP_DRM_H__
-#define __PLATFORM_DATA_OMAP_DRM_H__
-
-/*
- * Optional platform data to configure the default configuration of which
- * pipes/overlays/CRTCs are used.. if this is not provided, then instead the
- * first CONFIG_DRM_OMAP_NUM_CRTCS are used, and they are each connected to
- * one manager, with priority given to managers that are connected to
- * detected devices.  Remaining overlays are used as video planes.  This
- * should be a good default behavior for most cases, but yet there still
- * might be times when you wish to do something different.
- */
-struct omap_kms_platform_data {
-        /* overlays to use as CRTCs: */
-        int ovl_cnt;
-        const int *ovl_ids;
-
-        /* overlays to use as video planes: */
-        int pln_cnt;
-        const int *pln_ids;
-
-        int mgr_cnt;
-        const int *mgr_ids;
-
-        int dev_cnt;
-        const char **dev_names;
-};
-
-struct omap_drm_platform_data {
-        uint32_t omaprev;
-        struct omap_kms_platform_data *kms_pdata;
-};
-
-#endif /* __PLATFORM_DATA_OMAP_DRM_H__ */
diff --git a/include/linux/platform_data/omap_ocp2scp.h b/include/linux/platform_data/omap_ocp2scp.h
deleted file mode 100644
index 5c6c3939355..00000000000
--- a/include/linux/platform_data/omap_ocp2scp.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * omap_ocp2scp.h -- ocp2scp header file
- *
- * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com
- * 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.
- *
- * Author: Kishon Vijay Abraham I <kishon@ti.com>
- *
- * 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.
- *
- */
-
-#ifndef __DRIVERS_OMAP_OCP2SCP_H
-#define __DRIVERS_OMAP_OCP2SCP_H
-
-struct omap_ocp2scp_dev {
-        const char                      *drv_name;
-        struct resource                 *res;
-};
-
-struct omap_ocp2scp_platform_data {
-        int                             dev_cnt;
-        struct omap_ocp2scp_dev         **devices;
-};
-#endif /* __DRIVERS_OMAP_OCP2SCP_H */
diff --git a/include/linux/platform_data/pcmcia-pxa2xx_viper.h b/include/linux/platform_data/pcmcia-pxa2xx_viper.h
deleted file mode 100644
index d428be4db44..00000000000
--- a/include/linux/platform_data/pcmcia-pxa2xx_viper.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __ARCOM_PCMCIA_H
-#define __ARCOM_PCMCIA_H
-
-struct arcom_pcmcia_pdata {
-        int     cd_gpio;
-        int     rdy_gpio;
-        int     pwr_gpio;
-        void    (*reset)(int state);
-};
-
-#endif
diff --git a/include/linux/platform_data/pinctrl-coh901.h b/include/linux/platform_data/pinctrl-coh901.h
deleted file mode 100644
index dfbc65d1048..00000000000
--- a/include/linux/platform_data/pinctrl-coh901.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright (C) 2007-2012 ST-Ericsson AB
- * License terms: GNU General Public License (GPL) version 2
- * GPIO block resgister definitions and inline macros for
- * U300 GPIO COH 901 335 or COH 901 571/3
- * Author: Linus Walleij <linus.walleij@stericsson.com>
- */
-
-#ifndef __MACH_U300_GPIO_U300_H
-#define __MACH_U300_GPIO_U300_H
-
-/**
- * struct u300_gpio_platform - U300 GPIO platform data
- * @ports: number of GPIO block ports
- * @gpio_base: first GPIO number for this block (use a free range)
- */
-struct u300_gpio_platform {
-        u8 ports;
-        int gpio_base;
-};
-
-#endif /* __MACH_U300_GPIO_U300_H */
diff --git a/include/linux/platform_data/pinctrl-nomadik.h b/include/linux/platform_data/pinctrl-nomadik.h
deleted file mode 100644
index f73b2f0c55b..00000000000
--- a/include/linux/platform_data/pinctrl-nomadik.h
+++ /dev/null
@@ -1,266 +0,0 @@
-/*
- * Structures and registers for GPIO access in the Nomadik SoC
- *
- * Copyright (C) 2008 STMicroelectronics
- *     Author: Prafulla WADASKAR <prafulla.wadaskar@st.com>
- * Copyright (C) 2009 Alessandro Rubini <rubini@unipv.it>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __PLAT_NOMADIK_GPIO
-#define __PLAT_NOMADIK_GPIO
-
-/*
- * pin configurations are represented by 32-bit integers:
- *
- *      bit  0.. 8 - Pin Number (512 Pins Maximum)
- *      bit  9..10 - Alternate Function Selection
- *      bit 11..12 - Pull up/down state
- *      bit     13 - Sleep mode behaviour
- *      bit     14 - Direction
- *      bit     15 - Value (if output)
- *      bit 16..18 - SLPM pull up/down state
- *      bit 19..20 - SLPM direction
- *      bit 21..22 - SLPM Value (if output)
- *      bit 23..25 - PDIS value (if input)
- *      bit     26 - Gpio mode
- *      bit     27 - Sleep mode
- *
- * to facilitate the definition, the following macros are provided
- *
- * PIN_CFG_DEFAULT - default config (0):
- *                   pull up/down = disabled
- *                   sleep mode = input/wakeup
- *                   direction = input
- *                   value = low
- *                   SLPM direction = same as normal
- *                   SLPM pull = same as normal
- *                   SLPM value = same as normal
- *
- * PIN_CFG         - default config with alternate function
- */
-
-typedef unsigned long pin_cfg_t;
-
-#define PIN_NUM_MASK            0x1ff
-#define PIN_NUM(x)              ((x) & PIN_NUM_MASK)
-
-#define PIN_ALT_SHIFT           9
-#define PIN_ALT_MASK            (0x3 << PIN_ALT_SHIFT)
-#define PIN_ALT(x)              (((x) & PIN_ALT_MASK) >> PIN_ALT_SHIFT)
-#define PIN_GPIO                (NMK_GPIO_ALT_GPIO << PIN_ALT_SHIFT)
-#define PIN_ALT_A               (NMK_GPIO_ALT_A << PIN_ALT_SHIFT)
-#define PIN_ALT_B               (NMK_GPIO_ALT_B << PIN_ALT_SHIFT)
-#define PIN_ALT_C               (NMK_GPIO_ALT_C << PIN_ALT_SHIFT)
-
-#define PIN_PULL_SHIFT          11
-#define PIN_PULL_MASK           (0x3 << PIN_PULL_SHIFT)
-#define PIN_PULL(x)             (((x) & PIN_PULL_MASK) >> PIN_PULL_SHIFT)
-#define PIN_PULL_NONE           (NMK_GPIO_PULL_NONE << PIN_PULL_SHIFT)
-#define PIN_PULL_UP             (NMK_GPIO_PULL_UP << PIN_PULL_SHIFT)
-#define PIN_PULL_DOWN           (NMK_GPIO_PULL_DOWN << PIN_PULL_SHIFT)
-
-#define PIN_SLPM_SHIFT          13
-#define PIN_SLPM_MASK           (0x1 << PIN_SLPM_SHIFT)
-#define PIN_SLPM(x)             (((x) & PIN_SLPM_MASK) >> PIN_SLPM_SHIFT)
-#define PIN_SLPM_MAKE_INPUT     (NMK_GPIO_SLPM_INPUT << PIN_SLPM_SHIFT)
-#define PIN_SLPM_NOCHANGE       (NMK_GPIO_SLPM_NOCHANGE << PIN_SLPM_SHIFT)
-/* These two replace the above in DB8500v2+ */
-#define PIN_SLPM_WAKEUP_ENABLE  (NMK_GPIO_SLPM_WAKEUP_ENABLE << PIN_SLPM_SHIFT)
-#define PIN_SLPM_WAKEUP_DISABLE (NMK_GPIO_SLPM_WAKEUP_DISABLE << PIN_SLPM_SHIFT)
-#define PIN_SLPM_USE_MUX_SETTINGS_IN_SLEEP PIN_SLPM_WAKEUP_DISABLE
-
-#define PIN_SLPM_GPIO  PIN_SLPM_WAKEUP_ENABLE /* In SLPM, pin is a gpio */
-#define PIN_SLPM_ALTFUNC PIN_SLPM_WAKEUP_DISABLE /* In SLPM, pin is altfunc */
-
-#define PIN_DIR_SHIFT           14
-#define PIN_DIR_MASK            (0x1 << PIN_DIR_SHIFT)
-#define PIN_DIR(x)              (((x) & PIN_DIR_MASK) >> PIN_DIR_SHIFT)
-#define PIN_DIR_INPUT           (0 << PIN_DIR_SHIFT)
-#define PIN_DIR_OUTPUT          (1 << PIN_DIR_SHIFT)
-
-#define PIN_VAL_SHIFT           15
-#define PIN_VAL_MASK            (0x1 << PIN_VAL_SHIFT)
-#define PIN_VAL(x)              (((x) & PIN_VAL_MASK) >> PIN_VAL_SHIFT)
-#define PIN_VAL_LOW             (0 << PIN_VAL_SHIFT)
-#define PIN_VAL_HIGH            (1 << PIN_VAL_SHIFT)
-
-#define PIN_SLPM_PULL_SHIFT     16
-#define PIN_SLPM_PULL_MASK      (0x7 << PIN_SLPM_PULL_SHIFT)
-#define PIN_SLPM_PULL(x)        \
-        (((x) & PIN_SLPM_PULL_MASK) >> PIN_SLPM_PULL_SHIFT)
-#define PIN_SLPM_PULL_NONE      \
-        ((1 + NMK_GPIO_PULL_NONE) << PIN_SLPM_PULL_SHIFT)
-#define PIN_SLPM_PULL_UP        \
-        ((1 + NMK_GPIO_PULL_UP) << PIN_SLPM_PULL_SHIFT)
-#define PIN_SLPM_PULL_DOWN      \
-        ((1 + NMK_GPIO_PULL_DOWN) << PIN_SLPM_PULL_SHIFT)
-
-#define PIN_SLPM_DIR_SHIFT      19
-#define PIN_SLPM_DIR_MASK       (0x3 << PIN_SLPM_DIR_SHIFT)
-#define PIN_SLPM_DIR(x)         \
-        (((x) & PIN_SLPM_DIR_MASK) >> PIN_SLPM_DIR_SHIFT)
-#define PIN_SLPM_DIR_INPUT      ((1 + 0) << PIN_SLPM_DIR_SHIFT)
-#define PIN_SLPM_DIR_OUTPUT     ((1 + 1) << PIN_SLPM_DIR_SHIFT)
-
-#define PIN_SLPM_VAL_SHIFT      21
-#define PIN_SLPM_VAL_MASK       (0x3 << PIN_SLPM_VAL_SHIFT)
-#define PIN_SLPM_VAL(x)         \
-        (((x) & PIN_SLPM_VAL_MASK) >> PIN_SLPM_VAL_SHIFT)
-#define PIN_SLPM_VAL_LOW        ((1 + 0) << PIN_SLPM_VAL_SHIFT)
-#define PIN_SLPM_VAL_HIGH       ((1 + 1) << PIN_SLPM_VAL_SHIFT)
-
-#define PIN_SLPM_PDIS_SHIFT             23
-#define PIN_SLPM_PDIS_MASK              (0x3 << PIN_SLPM_PDIS_SHIFT)
-#define PIN_SLPM_PDIS(x)        \
-        (((x) & PIN_SLPM_PDIS_MASK) >> PIN_SLPM_PDIS_SHIFT)
-#define PIN_SLPM_PDIS_NO_CHANGE         (0 << PIN_SLPM_PDIS_SHIFT)
-#define PIN_SLPM_PDIS_DISABLED          (1 << PIN_SLPM_PDIS_SHIFT)
-#define PIN_SLPM_PDIS_ENABLED           (2 << PIN_SLPM_PDIS_SHIFT)
-
-#define PIN_LOWEMI_SHIFT        25
-#define PIN_LOWEMI_MASK         (0x1 << PIN_LOWEMI_SHIFT)
-#define PIN_LOWEMI(x)           (((x) & PIN_LOWEMI_MASK) >> PIN_LOWEMI_SHIFT)
-#define PIN_LOWEMI_DISABLED     (0 << PIN_LOWEMI_SHIFT)
-#define PIN_LOWEMI_ENABLED      (1 << PIN_LOWEMI_SHIFT)
-
-#define PIN_GPIOMODE_SHIFT      26
-#define PIN_GPIOMODE_MASK       (0x1 << PIN_GPIOMODE_SHIFT)
-#define PIN_GPIOMODE(x)         (((x) & PIN_GPIOMODE_MASK) >> PIN_GPIOMODE_SHIFT)
-#define PIN_GPIOMODE_DISABLED   (0 << PIN_GPIOMODE_SHIFT)
-#define PIN_GPIOMODE_ENABLED    (1 << PIN_GPIOMODE_SHIFT)
-
-#define PIN_SLEEPMODE_SHIFT     27
-#define PIN_SLEEPMODE_MASK      (0x1 << PIN_SLEEPMODE_SHIFT)
-#define PIN_SLEEPMODE(x)        (((x) & PIN_SLEEPMODE_MASK) >> PIN_SLEEPMODE_SHIFT)
-#define PIN_SLEEPMODE_DISABLED  (0 << PIN_SLEEPMODE_SHIFT)
-#define PIN_SLEEPMODE_ENABLED   (1 << PIN_SLEEPMODE_SHIFT)
-
-
-/* Shortcuts.  Use these instead of separate DIR, PULL, and VAL.  */
-#define PIN_INPUT_PULLDOWN      (PIN_DIR_INPUT | PIN_PULL_DOWN)
-#define PIN_INPUT_PULLUP        (PIN_DIR_INPUT | PIN_PULL_UP)
-#define PIN_INPUT_NOPULL        (PIN_DIR_INPUT | PIN_PULL_NONE)
-#define PIN_OUTPUT_LOW          (PIN_DIR_OUTPUT | PIN_VAL_LOW)
-#define PIN_OUTPUT_HIGH         (PIN_DIR_OUTPUT | PIN_VAL_HIGH)
-
-#define PIN_SLPM_INPUT_PULLDOWN (PIN_SLPM_DIR_INPUT | PIN_SLPM_PULL_DOWN)
-#define PIN_SLPM_INPUT_PULLUP   (PIN_SLPM_DIR_INPUT | PIN_SLPM_PULL_UP)
-#define PIN_SLPM_INPUT_NOPULL   (PIN_SLPM_DIR_INPUT | PIN_SLPM_PULL_NONE)
-#define PIN_SLPM_OUTPUT_LOW     (PIN_SLPM_DIR_OUTPUT | PIN_SLPM_VAL_LOW)
-#define PIN_SLPM_OUTPUT_HIGH    (PIN_SLPM_DIR_OUTPUT | PIN_SLPM_VAL_HIGH)
-
-#define PIN_CFG_DEFAULT         (0)
-
-#define PIN_CFG(num, alt)               \
-        (PIN_CFG_DEFAULT |\
-         (PIN_NUM(num) | PIN_##alt))
-
-#define PIN_CFG_INPUT(num, alt, pull)           \
-        (PIN_CFG_DEFAULT |\
-         (PIN_NUM(num) | PIN_##alt | PIN_INPUT_##pull))
-
-#define PIN_CFG_OUTPUT(num, alt, val)           \
-        (PIN_CFG_DEFAULT |\
-         (PIN_NUM(num) | PIN_##alt | PIN_OUTPUT_##val))
-
-/*
- * "nmk_gpio" and "NMK_GPIO" stand for "Nomadik GPIO", leaving
- * the "gpio" namespace for generic and cross-machine functions
- */
-
-#define GPIO_BLOCK_SHIFT 5
-#define NMK_GPIO_PER_CHIP (1 << GPIO_BLOCK_SHIFT)
-
-/* Register in the logic block */
-#define NMK_GPIO_DAT    0x00
-#define NMK_GPIO_DATS   0x04
-#define NMK_GPIO_DATC   0x08
-#define NMK_GPIO_PDIS   0x0c
-#define NMK_GPIO_DIR    0x10
-#define NMK_GPIO_DIRS   0x14
-#define NMK_GPIO_DIRC   0x18
-#define NMK_GPIO_SLPC   0x1c
-#define NMK_GPIO_AFSLA  0x20
-#define NMK_GPIO_AFSLB  0x24
-#define NMK_GPIO_LOWEMI 0x28
-
-#define NMK_GPIO_RIMSC  0x40
-#define NMK_GPIO_FIMSC  0x44
-#define NMK_GPIO_IS     0x48
-#define NMK_GPIO_IC     0x4c
-#define NMK_GPIO_RWIMSC 0x50
-#define NMK_GPIO_FWIMSC 0x54
-#define NMK_GPIO_WKS    0x58
-/* These appear in DB8540 and later ASICs */
-#define NMK_GPIO_EDGELEVEL 0x5C
-#define NMK_GPIO_LEVEL  0x60
-
-/* Alternate functions: function C is set in hw by setting both A and B */
-#define NMK_GPIO_ALT_GPIO       0
-#define NMK_GPIO_ALT_A  1
-#define NMK_GPIO_ALT_B  2
-#define NMK_GPIO_ALT_C  (NMK_GPIO_ALT_A | NMK_GPIO_ALT_B)
-
-#define NMK_GPIO_ALT_CX_SHIFT 2
-#define NMK_GPIO_ALT_C1 ((1<<NMK_GPIO_ALT_CX_SHIFT) | NMK_GPIO_ALT_C)
-#define NMK_GPIO_ALT_C2 ((2<<NMK_GPIO_ALT_CX_SHIFT) | NMK_GPIO_ALT_C)
-#define NMK_GPIO_ALT_C3 ((3<<NMK_GPIO_ALT_CX_SHIFT) | NMK_GPIO_ALT_C)
-#define NMK_GPIO_ALT_C4 ((4<<NMK_GPIO_ALT_CX_SHIFT) | NMK_GPIO_ALT_C)
-
-/* Pull up/down values */
-enum nmk_gpio_pull {
-        NMK_GPIO_PULL_NONE,
-        NMK_GPIO_PULL_UP,
-        NMK_GPIO_PULL_DOWN,
-};
-
-/* Sleep mode */
-enum nmk_gpio_slpm {
-        NMK_GPIO_SLPM_INPUT,
-        NMK_GPIO_SLPM_WAKEUP_ENABLE = NMK_GPIO_SLPM_INPUT,
-        NMK_GPIO_SLPM_NOCHANGE,
-        NMK_GPIO_SLPM_WAKEUP_DISABLE = NMK_GPIO_SLPM_NOCHANGE,
-};
-
-/* Older deprecated pin config API that should go away soon */
-extern int nmk_config_pin(pin_cfg_t cfg, bool sleep);
-extern int nmk_config_pins(pin_cfg_t *cfgs, int num);
-extern int nmk_config_pins_sleep(pin_cfg_t *cfgs, int num);
-extern int nmk_gpio_set_slpm(int gpio, enum nmk_gpio_slpm mode);
-extern int nmk_gpio_set_pull(int gpio, enum nmk_gpio_pull pull);
-#ifdef CONFIG_PINCTRL_NOMADIK
-extern int nmk_gpio_set_mode(int gpio, int gpio_mode);
-#else
-static inline int nmk_gpio_set_mode(int gpio, int gpio_mode)
-{
-        return -ENODEV;
-}
-#endif
-extern int nmk_gpio_get_mode(int gpio);
-
-extern void nmk_gpio_wakeups_suspend(void);
-extern void nmk_gpio_wakeups_resume(void);
-
-extern void nmk_gpio_clocks_enable(void);
-extern void nmk_gpio_clocks_disable(void);
-
-extern void nmk_gpio_read_pull(int gpio_bank, u32 *pull_up);
-
-/*
- * Platform data to register a block: only the initial gpio/irq number.
- */
-struct nmk_gpio_platform_data {
-        char *name;
-        int first_gpio;
-        int first_irq;
-        int num_gpio;
-        u32 (*get_secondary_status)(unsigned int bank);
-        void (*set_ioforce)(bool enable);
-        bool supports_sleepmode;
-};
-
-#endif /* __PLAT_NOMADIK_GPIO */
diff --git a/include/linux/platform_data/pn544.h b/include/linux/platform_data/pn544.h
deleted file mode 100644
index 713bfd70334..00000000000
--- a/include/linux/platform_data/pn544.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Driver include for the PN544 NFC chip.
- *
- * Copyright (C) Nokia Corporation
- *
- * Author: Jari Vanhala <ext-jari.vanhala@nokia.com>
- * Contact: Matti Aaltoenn <matti.j.aaltonen@nokia.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- */
-
-#ifndef _PN544_H_
-#define _PN544_H_
-
-#include <linux/i2c.h>
-
-enum {
-        NFC_GPIO_ENABLE,
-        NFC_GPIO_FW_RESET,
-        NFC_GPIO_IRQ
-};
-
-/* board config */
-struct pn544_nfc_platform_data {
-        int (*request_resources) (struct i2c_client *client);
-        void (*free_resources) (void);
-        void (*enable) (int fw);
-        int (*test) (void);
-        void (*disable) (void);
-        int (*get_gpio)(int type);
-};
-
-#endif /* _PN544_H_ */
diff --git a/include/linux/platform_data/pxa2xx_udc.h b/include/linux/platform_data/pxa2xx_udc.h
deleted file mode 100644
index c6c5e98b5b8..00000000000
--- a/include/linux/platform_data/pxa2xx_udc.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * This supports machine-specific differences in how the PXA2xx
- * USB Device Controller (UDC) is wired.
- *
- * It is set in linux/arch/arm/mach-pxa/<machine>.c or in
- * linux/arch/mach-ixp4xx/<machine>.c and used in
- * the probe routine of linux/drivers/usb/gadget/pxa2xx_udc.c
- */
-#ifndef PXA2XX_UDC_H
-#define PXA2XX_UDC_H
-
-struct pxa2xx_udc_mach_info {
-        int  (*udc_is_connected)(void);         /* do we see host? */
-        void (*udc_command)(int cmd);
-#define PXA2XX_UDC_CMD_CONNECT          0       /* let host see us */
-#define PXA2XX_UDC_CMD_DISCONNECT       1       /* so host won't see us */
-
-        /* Boards following the design guidelines in the developer's manual,
-         * with on-chip GPIOs not Lubbock's weird hardware, can have a sane
-         * VBUS IRQ and omit the methods above.  Store the GPIO number
-         * here.  Note that sometimes the signals go through inverters...
-         */
-        bool    gpio_pullup_inverted;
-        int     gpio_pullup;                    /* high == pullup activated */
-};
-
-#endif
diff --git a/include/linux/platform_data/pxa_sdhci.h b/include/linux/platform_data/pxa_sdhci.h
index 27d3156d093..51ad0995aba 100644
--- a/include/linux/platform_data/pxa_sdhci.h
+++ b/include/linux/platform_data/pxa_sdhci.h
@@ -38,7 +38,6 @@
  * @max_speed: the maximum speed supported
  * @host_caps: Standard MMC host capabilities bit field.
  * @quirks: quirks of platfrom
- * @quirks2: quirks2 of platfrom
  * @pm_caps: pm_caps of platfrom
  */
 struct sdhci_pxa_platdata {
@@ -49,10 +48,8 @@ struct sdhci_pxa_platdata {
         unsigned int    ext_cd_gpio;
         bool            ext_cd_gpio_invert;
         unsigned int    max_speed;
-        u32             host_caps;
-        u32             host_caps2;
+        unsigned int    host_caps;
         unsigned int    quirks;
-        unsigned int    quirks2;
         unsigned int    pm_caps;
 };
 
diff --git a/include/linux/platform_data/remoteproc-omap.h b/include/linux/platform_data/remoteproc-omap.h
deleted file mode 100644
index 3c1c6444ec4..00000000000
--- a/include/linux/platform_data/remoteproc-omap.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Remote Processor - omap-specific bits
- *
- * Copyright (C) 2011 Texas Instruments, Inc.
- * Copyright (C) 2011 Google, Inc.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * 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.
- */
-
-#ifndef _PLAT_REMOTEPROC_H
-#define _PLAT_REMOTEPROC_H
-
-struct rproc_ops;
-struct platform_device;
-
-/*
- * struct omap_rproc_pdata - omap remoteproc's platform data
- * @name: the remoteproc's name
- * @oh_name: omap hwmod device
- * @oh_name_opt: optional, secondary omap hwmod device
- * @firmware: name of firmware file to load
- * @mbox_name: name of omap mailbox device to use with this rproc
- * @ops: start/stop rproc handlers
- * @device_enable: omap-specific handler for enabling a device
- * @device_shutdown: omap-specific handler for shutting down a device
- * @set_bootaddr: omap-specific handler for setting the rproc boot address
- */
-struct omap_rproc_pdata {
-        const char *name;
-        const char *oh_name;
-        const char *oh_name_opt;
-        const char *firmware;
-        const char *mbox_name;
-        const struct rproc_ops *ops;
-        int (*device_enable) (struct platform_device *pdev);
-        int (*device_shutdown) (struct platform_device *pdev);
-        void(*set_bootaddr)(u32);
-};
-
-#if defined(CONFIG_OMAP_REMOTEPROC) || defined(CONFIG_OMAP_REMOTEPROC_MODULE)
-
-void __init omap_rproc_reserve_cma(void);
-
-#else
-
-void __init omap_rproc_reserve_cma(void)
-{
-}
-
-#endif
-
-#endif /* _PLAT_REMOTEPROC_H */
diff --git a/include/linux/platform_data/s3c-hsotg.h b/include/linux/platform_data/s3c-hsotg.h
deleted file mode 100644
index 8b79e0967f9..00000000000
--- a/include/linux/platform_data/s3c-hsotg.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* include/linux/platform_data/s3c-hsotg.h
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *      http://armlinux.simtec.co.uk/
- *
- * S3C USB2.0 High-speed / OtG platform information
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#ifndef __LINUX_USB_S3C_HSOTG_H
-#define __LINUX_USB_S3C_HSOTG_H
-
-enum s3c_hsotg_dmamode {
-        S3C_HSOTG_DMA_NONE,     /* do not use DMA at-all */
-        S3C_HSOTG_DMA_ONLY,     /* always use DMA */
-        S3C_HSOTG_DMA_DRV,      /* DMA is chosen by driver */
-};
-
-/**
- * struct s3c_hsotg_plat - platform data for high-speed otg/udc
- * @dma: Whether to use DMA or not.
- * @is_osc: The clock source is an oscillator, not a crystal
- */
-struct s3c_hsotg_plat {
-        enum s3c_hsotg_dmamode  dma;
-        unsigned int            is_osc:1;
-        int                     phy_type;
-
-        int (*phy_init)(struct platform_device *pdev, int type);
-        int (*phy_exit)(struct platform_device *pdev, int type);
-};
-
-extern void s3c_hsotg_set_platdata(struct s3c_hsotg_plat *pd);
-
-#endif /* __LINUX_USB_S3C_HSOTG_H */
diff --git a/include/linux/platform_data/s3c-hsudc.h b/include/linux/platform_data/s3c-hsudc.h
deleted file mode 100644
index 6fa109339bf..00000000000
--- a/include/linux/platform_data/s3c-hsudc.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * S3C24XX USB 2.0 High-speed USB controller gadget driver
- *
- * Copyright (c) 2010 Samsung Electronics Co., Ltd.
- *              http://www.samsung.com/
- *
- * The S3C24XX USB 2.0 high-speed USB controller supports upto 9 endpoints.
- * Each endpoint can be configured as either in or out endpoint. Endpoints
- * can be configured for Bulk or Interrupt transfer mode.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#ifndef __LINUX_USB_S3C_HSUDC_H
-#define __LINUX_USB_S3C_HSUDC_H
-
-/**
- * s3c24xx_hsudc_platdata - Platform data for USB High-Speed gadget controller.
- * @epnum: Number of endpoints to be instantiated by the controller driver.
- * @gpio_init: Platform specific USB related GPIO initialization.
- * @gpio_uninit: Platform specific USB releted GPIO uninitialzation.
- *
- * Representation of platform data for the S3C24XX USB 2.0 High Speed gadget
- * controllers.
- */
-struct s3c24xx_hsudc_platdata {
-        unsigned int    epnum;
-        void            (*gpio_init)(void);
-        void            (*gpio_uninit)(void);
-};
-
-#endif  /* __LINUX_USB_S3C_HSUDC_H */
diff --git a/include/linux/platform_data/sa11x0-serial.h b/include/linux/platform_data/sa11x0-serial.h
deleted file mode 100644
index 4504d5d592f..00000000000
--- a/include/linux/platform_data/sa11x0-serial.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- *  Author: Nicolas Pitre
- *
- * Moved and changed lots, Russell King
- *
- * Low level machine dependent UART functions.
- */
-#ifndef SA11X0_SERIAL_H
-#define SA11X0_SERIAL_H
-
-struct uart_port;
-struct uart_info;
-
-/*
- * This is a temporary structure for registering these
- * functions; it is intended to be discarded after boot.
- */
-struct sa1100_port_fns {
-        void    (*set_mctrl)(struct uart_port *, u_int);
-        u_int   (*get_mctrl)(struct uart_port *);
-        void    (*pm)(struct uart_port *, u_int, u_int);
-        int     (*set_wake)(struct uart_port *, u_int);
-};
-
-#ifdef CONFIG_SERIAL_SA1100
-void sa1100_register_uart_fns(struct sa1100_port_fns *fns);
-void sa1100_register_uart(int idx, int port);
-#else
-#define sa1100_register_uart_fns(fns) do { } while (0)
-#define sa1100_register_uart(idx,port) do { } while (0)
-#endif
-
-#endif
diff --git a/include/linux/platform_data/sc18is602.h b/include/linux/platform_data/sc18is602.h
deleted file mode 100644
index 997b0663415..00000000000
--- a/include/linux/platform_data/sc18is602.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Platform data for NXP SC18IS602/603
- *
- * Copyright (C) 2012 Guenter Roeck <linux@roeck-us.net>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * For further information, see the Documentation/spi/sc18is602 file.
- */
-
-/**
- * struct sc18is602_platform_data - sc18is602 info
- * @clock_frequency             SC18IS603 oscillator frequency
- */
-struct sc18is602_platform_data {
-        u32 clock_frequency;
-};
diff --git a/include/linux/platform_data/sccnxp.h b/include/linux/platform_data/sccnxp.h
deleted file mode 100644
index 7311ccd3217..00000000000
--- a/include/linux/platform_data/sccnxp.h
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- *  NXP (Philips) SCC+++(SCN+++) serial driver
- *
- *  Copyright (C) 2012 Alexander Shiyan <shc_work@mail.ru>
- *
- *  Based on sc26xx.c, by Thomas Bogendörfer (tsbogend@alpha.franken.de)
- *
- *  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.
- */
-
-#ifndef __SCCNXP_H
-#define __SCCNXP_H
-
-#define SCCNXP_MAX_UARTS        2
-
-/* Output lines */
-#define LINE_OP0                1
-#define LINE_OP1                2
-#define LINE_OP2                3
-#define LINE_OP3                4
-#define LINE_OP4                5
-#define LINE_OP5                6
-#define LINE_OP6                7
-#define LINE_OP7                8
-
-/* Input lines */
-#define LINE_IP0                9
-#define LINE_IP1                10
-#define LINE_IP2                11
-#define LINE_IP3                12
-#define LINE_IP4                13
-#define LINE_IP5                14
-#define LINE_IP6                15
-
-/* Signals */
-#define DTR_OP                  0       /* DTR */
-#define RTS_OP                  4       /* RTS */
-#define DSR_IP                  8       /* DSR */
-#define CTS_IP                  12      /* CTS */
-#define DCD_IP                  16      /* DCD */
-#define RNG_IP                  20      /* RNG */
-
-#define DIR_OP                  24      /* Special signal for control RS-485.
-                                         * Goes high when transmit,
-                                         * then goes low.
-                                         */
-
-/* Routing control signal 'sig' to line 'line' */
-#define MCTRL_SIG(sig, line)    ((line) << (sig))
-
-/*
- * Example board initialization data:
- *
- * static struct resource sc2892_resources[] = {
- *      DEFINE_RES_MEM(UART_PHYS_START, 0x10),
- *      DEFINE_RES_IRQ(IRQ_EXT2),
- * };
- *
- * static struct sccnxp_pdata sc2892_info = {
- *      .frequency      = 3686400,
- *      .mctrl_cfg[0]   = MCTRL_SIG(DIR_OP, LINE_OP0),
- *      .mctrl_cfg[1]   = MCTRL_SIG(DIR_OP, LINE_OP1),
- * };
- *
- * static struct platform_device sc2892 = {
- *      .name           = "sc2892",
- *      .id             = -1,
- *      .resource       = sc2892_resources,
- *      .num_resources  = ARRAY_SIZE(sc2892_resources),
- *      .dev = {
- *              .platform_data  = &sc2892_info,
- *      },
- * };
- */
-
-/* SCCNXP platform data structure */
-struct sccnxp_pdata {
-        /* Frequency (extrenal clock or crystal) */
-        int                     frequency;
-        /* Shift for A0 line */
-        const u8                reg_shift;
-        /* Modem control lines configuration */
-        const u32               mctrl_cfg[SCCNXP_MAX_UARTS];
-        /* Called during startup */
-        void (*init)(void);
-        /* Called before finish */
-        void (*exit)(void);
-};
-
-#endif
diff --git a/include/linux/platform_data/serial-imx.h b/include/linux/platform_data/serial-imx.h
deleted file mode 100644
index 4adec9b154d..00000000000
--- a/include/linux/platform_data/serial-imx.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * Copyright (C) 2008 by Sascha Hauer <kernel@pengutronix.de>
- *
- * 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 Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-
-#ifndef ASMARM_ARCH_UART_H
-#define ASMARM_ARCH_UART_H
-
-#define IMXUART_HAVE_RTSCTS (1<<0)
-#define IMXUART_IRDA        (1<<1)
-
-struct imxuart_platform_data {
-        int (*init)(struct platform_device *pdev);
-        void (*exit)(struct platform_device *pdev);
-        unsigned int flags;
-        void (*irda_enable)(int enable);
-        unsigned int irda_inv_rx:1;
-        unsigned int irda_inv_tx:1;
-        unsigned short transceiver_delay;
-};
-
-#endif
diff --git a/include/linux/platform_data/serial-omap.h b/include/linux/platform_data/serial-omap.h
deleted file mode 100644
index ff9b0aab528..00000000000
--- a/include/linux/platform_data/serial-omap.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Driver for OMAP-UART controller.
- * Based on drivers/serial/8250.c
- *
- * Copyright (C) 2010 Texas Instruments.
- *
- * Authors:
- *      Govindraj R     <govindraj.raja@ti.com>
- *      Thara Gopinath  <thara@ti.com>
- *
- * 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.
- */
-
-#ifndef __OMAP_SERIAL_H__
-#define __OMAP_SERIAL_H__
-
-#include <linux/serial_core.h>
-#include <linux/device.h>
-#include <linux/pm_qos.h>
-
-#define DRIVER_NAME     "omap_uart"
-
-/*
- * Use tty device name as ttyO, [O -> OMAP]
- * in bootargs we specify as console=ttyO0 if uart1
- * is used as console uart.
- */
-#define OMAP_SERIAL_NAME        "ttyO"
-
-struct omap_uart_port_info {
-        bool                    dma_enabled;    /* To specify DMA Mode */
-        unsigned int            uartclk;        /* UART clock rate */
-        upf_t                   flags;          /* UPF_* flags */
-        unsigned int            dma_rx_buf_size;
-        unsigned int            dma_rx_timeout;
-        unsigned int            autosuspend_timeout;
-        unsigned int            dma_rx_poll_rate;
-        int                     DTR_gpio;
-        int                     DTR_inverted;
-        int                     DTR_present;
-
-        int (*get_context_loss_count)(struct device *);
-        void (*set_forceidle)(struct device *);
-        void (*set_noidle)(struct device *);
-        void (*enable_wakeup)(struct device *, bool);
-};
-
-#endif /* __OMAP_SERIAL_H__ */
diff --git a/include/linux/platform_data/shmob_drm.h b/include/linux/platform_data/shmob_drm.h
deleted file mode 100644
index 7c686d335c1..00000000000
--- a/include/linux/platform_data/shmob_drm.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * shmob_drm.h  --  SH Mobile DRM driver
- *
- * Copyright (C) 2012 Renesas Corporation
- *
- * Laurent Pinchart (laurent.pinchart@ideasonboard.com)
- *
- * 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.
- */
-
-#ifndef __SHMOB_DRM_H__
-#define __SHMOB_DRM_H__
-
-#include <linux/kernel.h>
-
-#include <drm/drm_mode.h>
-
-struct sh_mobile_meram_cfg;
-struct sh_mobile_meram_info;
-
-enum shmob_drm_clk_source {
-        SHMOB_DRM_CLK_BUS,
-        SHMOB_DRM_CLK_PERIPHERAL,
-        SHMOB_DRM_CLK_EXTERNAL,
-};
-
-enum shmob_drm_interface {
-        SHMOB_DRM_IFACE_RGB8,           /* 24bpp, 8:8:8 */
-        SHMOB_DRM_IFACE_RGB9,           /* 18bpp, 9:9 */
-        SHMOB_DRM_IFACE_RGB12A,         /* 24bpp, 12:12 */
-        SHMOB_DRM_IFACE_RGB12B,         /* 12bpp */
-        SHMOB_DRM_IFACE_RGB16,          /* 16bpp */
-        SHMOB_DRM_IFACE_RGB18,          /* 18bpp */
-        SHMOB_DRM_IFACE_RGB24,          /* 24bpp */
-        SHMOB_DRM_IFACE_YUV422,         /* 16bpp */
-        SHMOB_DRM_IFACE_SYS8A,          /* 24bpp, 8:8:8 */
-        SHMOB_DRM_IFACE_SYS8B,          /* 18bpp, 8:8:2 */
-        SHMOB_DRM_IFACE_SYS8C,          /* 18bpp, 2:8:8 */
-        SHMOB_DRM_IFACE_SYS8D,          /* 16bpp, 8:8 */
-        SHMOB_DRM_IFACE_SYS9,           /* 18bpp, 9:9 */
-        SHMOB_DRM_IFACE_SYS12,          /* 24bpp, 12:12 */
-        SHMOB_DRM_IFACE_SYS16A,         /* 16bpp */
-        SHMOB_DRM_IFACE_SYS16B,         /* 18bpp, 16:2 */
-        SHMOB_DRM_IFACE_SYS16C,         /* 18bpp, 2:16 */
-        SHMOB_DRM_IFACE_SYS18,          /* 18bpp */
-        SHMOB_DRM_IFACE_SYS24,          /* 24bpp */
-};
-
-struct shmob_drm_backlight_data {
-        const char *name;
-        int max_brightness;
-        int (*get_brightness)(void);
-        int (*set_brightness)(int brightness);
-};
-
-struct shmob_drm_panel_data {
-        unsigned int width_mm;          /* Panel width in mm */
-        unsigned int height_mm;         /* Panel height in mm */
-        struct drm_mode_modeinfo mode;
-};
-
-struct shmob_drm_sys_interface_data {
-        unsigned int read_latch:6;
-        unsigned int read_setup:8;
-        unsigned int read_cycle:8;
-        unsigned int read_strobe:8;
-        unsigned int write_setup:8;
-        unsigned int write_cycle:8;
-        unsigned int write_strobe:8;
-        unsigned int cs_setup:3;
-        unsigned int vsync_active_high:1;
-        unsigned int vsync_dir_input:1;
-};
-
-#define SHMOB_DRM_IFACE_FL_DWPOL (1 << 0) /* Rising edge dot clock data latch */
-#define SHMOB_DRM_IFACE_FL_DIPOL (1 << 1) /* Active low display enable */
-#define SHMOB_DRM_IFACE_FL_DAPOL (1 << 2) /* Active low display data */
-#define SHMOB_DRM_IFACE_FL_HSCNT (1 << 3) /* Disable HSYNC during VBLANK */
-#define SHMOB_DRM_IFACE_FL_DWCNT (1 << 4) /* Disable dotclock during blanking */
-
-struct shmob_drm_interface_data {
-        enum shmob_drm_interface interface;
-        struct shmob_drm_sys_interface_data sys;
-        unsigned int clk_div;
-        unsigned int flags;
-};
-
-struct shmob_drm_platform_data {
-        enum shmob_drm_clk_source clk_source;
-        struct shmob_drm_interface_data iface;
-        struct shmob_drm_panel_data panel;
-        struct shmob_drm_backlight_data backlight;
-        const struct sh_mobile_meram_cfg *meram;
-};
-
-#endif /* __SHMOB_DRM_H__ */
diff --git a/include/linux/platform_data/sht15.h b/include/linux/platform_data/sht15.h
deleted file mode 100644
index 33e0fd27225..00000000000
--- a/include/linux/platform_data/sht15.h
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * sht15.h - support for the SHT15 Temperature and Humidity Sensor
- *
- * Copyright (c) 2009 Jonathan Cameron
- *
- * Copyright (c) 2007 Wouter Horre
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * For further information, see the Documentation/hwmon/sht15 file.
- */
-
-/**
- * struct sht15_platform_data - sht15 connectivity info
- * @gpio_data:          no. of gpio to which bidirectional data line is
- *                      connected.
- * @gpio_sck:           no. of gpio to which the data clock is connected.
- * @supply_mv:          supply voltage in mv. Overridden by regulator if
- *                      available.
- * @checksum:           flag to indicate the checksum should be validated.
- * @no_otp_reload:      flag to indicate no reload from OTP.
- * @low_resolution:     flag to indicate the temp/humidity resolution to use.
- */
-struct sht15_platform_data {
-        int gpio_data;
-        int gpio_sck;
-        int supply_mv;
-        bool checksum;
-        bool no_otp_reload;
-        bool low_resolution;
-};
diff --git a/include/linux/platform_data/spi-clps711x.h b/include/linux/platform_data/spi-clps711x.h
deleted file mode 100644
index 301956e6314..00000000000
--- a/include/linux/platform_data/spi-clps711x.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- *  CLPS711X SPI bus driver definitions
- *
- *  Copyright (C) 2012 Alexander Shiyan <shc_work@mail.ru>
- *
- * 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.
- */
-
-#ifndef ____LINUX_PLATFORM_DATA_SPI_CLPS711X_H
-#define ____LINUX_PLATFORM_DATA_SPI_CLPS711X_H
-
-/* Board specific platform_data */
-struct spi_clps711x_pdata {
-        int *chipselect;        /* Array of GPIO-numbers */
-        int num_chipselect;     /* Total count of GPIOs */
-};
-
-#endif
diff --git a/include/linux/platform_data/spi-davinci.h b/include/linux/platform_data/spi-davinci.h
deleted file mode 100644
index 7af305b3786..00000000000
--- a/include/linux/platform_data/spi-davinci.h
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright 2009 Texas Instruments.
- *
- * 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., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __ARCH_ARM_DAVINCI_SPI_H
-#define __ARCH_ARM_DAVINCI_SPI_H
-
-#include <mach/edma.h>
-
-#define SPI_INTERN_CS   0xFF
-
-enum {
-        SPI_VERSION_1, /* For DM355/DM365/DM6467 */
-        SPI_VERSION_2, /* For DA8xx */
-};
-
-/**
- * davinci_spi_platform_data - Platform data for SPI master device on DaVinci
- *
- * @version:    version of the SPI IP. Different DaVinci devices have slightly
- *              varying versions of the same IP.
- * @num_chipselect: number of chipselects supported by this SPI master
- * @intr_line:  interrupt line used to connect the SPI IP to the ARM interrupt
- *              controller withn the SoC. Possible values are 0 and 1.
- * @chip_sel:   list of GPIOs which can act as chip-selects for the SPI.
- *              SPI_INTERN_CS denotes internal SPI chip-select. Not necessary
- *              to populate if all chip-selects are internal.
- * @cshold_bug: set this to true if the SPI controller on your chip requires
- *              a write to CSHOLD bit in between transfers (like in DM355).
- * @dma_event_q: DMA event queue to use if SPI_IO_TYPE_DMA is used for any
- *              device on the bus.
- */
-struct davinci_spi_platform_data {
-        u8                      version;
-        u8                      num_chipselect;
-        u8                      intr_line;
-        u8                      *chip_sel;
-        bool                    cshold_bug;
-        enum dma_event_q        dma_event_q;
-};
-
-/**
- * davinci_spi_config - Per-chip-select configuration for SPI slave devices
- *
- * @wdelay:     amount of delay between transmissions. Measured in number of
- *              SPI module clocks.
- * @odd_parity: polarity of parity flag at the end of transmit data stream.
- *              0 - odd parity, 1 - even parity.
- * @parity_enable: enable transmission of parity at end of each transmit
- *              data stream.
- * @io_type:    type of IO transfer. Choose between polled, interrupt and DMA.
- * @timer_disable: disable chip-select timers (setup and hold)
- * @c2tdelay:   chip-select setup time. Measured in number of SPI module clocks.
- * @t2cdelay:   chip-select hold time. Measured in number of SPI module clocks.
- * @t2edelay:   transmit data finished to SPI ENAn pin inactive time. Measured
- *              in number of SPI clocks.
- * @c2edelay:   chip-select active to SPI ENAn signal active time. Measured in
- *              number of SPI clocks.
- */
-struct davinci_spi_config {
-        u8      wdelay;
-        u8      odd_parity;
-        u8      parity_enable;
-#define SPI_IO_TYPE_INTR        0
-#define SPI_IO_TYPE_POLL        1
-#define SPI_IO_TYPE_DMA         2
-        u8      io_type;
-        u8      timer_disable;
-        u8      c2tdelay;
-        u8      t2cdelay;
-        u8      t2edelay;
-        u8      c2edelay;
-};
-
-#endif  /* __ARCH_ARM_DAVINCI_SPI_H */
diff --git a/include/linux/platform_data/spi-ep93xx.h b/include/linux/platform_data/spi-ep93xx.h
deleted file mode 100644
index 9bb63ac13f0..00000000000
--- a/include/linux/platform_data/spi-ep93xx.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef __ASM_MACH_EP93XX_SPI_H
-#define __ASM_MACH_EP93XX_SPI_H
-
-struct spi_device;
-
-/**
- * struct ep93xx_spi_info - EP93xx specific SPI descriptor
- * @num_chipselect: number of chip selects on this board, must be
- *                  at least one
- * @use_dma: use DMA for the transfers
- */
-struct ep93xx_spi_info {
-        int     num_chipselect;
-        bool    use_dma;
-};
-
-/**
- * struct ep93xx_spi_chip_ops - operation callbacks for SPI slave device
- * @setup: setup the chip select mechanism
- * @cleanup: cleanup the chip select mechanism
- * @cs_control: control the device chip select
- */
-struct ep93xx_spi_chip_ops {
-        int     (*setup)(struct spi_device *spi);
-        void    (*cleanup)(struct spi_device *spi);
-        void    (*cs_control)(struct spi_device *spi, int value);
-};
-
-#endif /* __ASM_MACH_EP93XX_SPI_H */
diff --git a/include/linux/platform_data/spi-imx.h b/include/linux/platform_data/spi-imx.h
deleted file mode 100644
index 08be445e8eb..00000000000
--- a/include/linux/platform_data/spi-imx.h
+++ /dev/null
@@ -1,27 +0,0 @@
-
-#ifndef __MACH_SPI_H_
-#define __MACH_SPI_H_
-
-/*
- * struct spi_imx_master - device.platform_data for SPI controller devices.
- * @chipselect: Array of chipselects for this master. Numbers >= 0 mean gpio
- *              pins, numbers < 0 mean internal CSPI chipselects according
- *              to MXC_SPI_CS(). Normally you want to use gpio based chip
- *              selects as the CSPI module tries to be intelligent about
- *              when to assert the chipselect: The CSPI module deasserts the
- *              chipselect once it runs out of input data. The other problem
- *              is that it is not possible to mix between high active and low
- *              active chipselects on one single bus using the internal
- *              chipselects. Unfortunately Freescale decided to put some
- *              chipselects on dedicated pins which are not usable as gpios,
- *              so we have to support the internal chipselects.
- * @num_chipselect: ARRAY_SIZE(chipselect)
- */
-struct spi_imx_master {
-        int     *chipselect;
-        int     num_chipselect;
-};
-
-#define MXC_SPI_CS(no)  ((no) - 32)
-
-#endif /* __MACH_SPI_H_*/
diff --git a/include/linux/platform_data/spi-nuc900.h b/include/linux/platform_data/spi-nuc900.h
deleted file mode 100644
index 2c4e0c12850..00000000000
--- a/include/linux/platform_data/spi-nuc900.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * arch/arm/mach-w90x900/include/mach/nuc900_spi.h
- *
- * Copyright (c) 2009 Nuvoton technology corporation.
- *
- * Wan ZongShun <mcuos.com@gmail.com>
- *
- * 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;version 2 of the License.
- *
- */
-
-#ifndef __ASM_ARCH_SPI_H
-#define __ASM_ARCH_SPI_H
-
-extern void mfp_set_groupg(struct device *dev, const char *subname);
-
-struct nuc900_spi_info {
-        unsigned int num_cs;
-        unsigned int lsb;
-        unsigned int txneg;
-        unsigned int rxneg;
-        unsigned int divider;
-        unsigned int sleep;
-        unsigned int txnum;
-        unsigned int txbitlen;
-        int bus_num;
-};
-
-struct nuc900_spi_chip {
-        unsigned char bits_per_word;
-};
-
-#endif /* __ASM_ARCH_SPI_H */
diff --git a/include/linux/platform_data/spi-omap2-mcspi.h b/include/linux/platform_data/spi-omap2-mcspi.h
deleted file mode 100644
index a65572d5321..00000000000
--- a/include/linux/platform_data/spi-omap2-mcspi.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _OMAP2_MCSPI_H
-#define _OMAP2_MCSPI_H
-
-#define OMAP2_MCSPI_REV 0
-#define OMAP3_MCSPI_REV 1
-#define OMAP4_MCSPI_REV 2
-
-#define OMAP4_MCSPI_REG_OFFSET 0x100
-
-#define MCSPI_PINDIR_D0_IN_D1_OUT       0
-#define MCSPI_PINDIR_D0_OUT_D1_IN       1
-
-struct omap2_mcspi_platform_config {
-        unsigned short  num_cs;
-        unsigned int regs_offset;
-        unsigned int pin_dir:1;
-};
-
-struct omap2_mcspi_dev_attr {
-        unsigned short num_chipselect;
-};
-
-struct omap2_mcspi_device_config {
-        unsigned turbo_mode:1;
-};
-
-#endif
diff --git a/include/linux/platform_data/spi-s3c64xx.h b/include/linux/platform_data/spi-s3c64xx.h
deleted file mode 100644
index ceba18d23a5..00000000000
--- a/include/linux/platform_data/spi-s3c64xx.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/* linux/arch/arm/plat-samsung/include/plat/s3c64xx-spi.h
- *
- * Copyright (C) 2009 Samsung Electronics Ltd.
- *      Jaswinder Singh <jassi.brar@samsung.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __S3C64XX_PLAT_SPI_H
-#define __S3C64XX_PLAT_SPI_H
-
-struct platform_device;
-
-/**
- * struct s3c64xx_spi_csinfo - ChipSelect description
- * @fb_delay: Slave specific feedback delay.
- *            Refer to FB_CLK_SEL register definition in SPI chapter.
- * @line: Custom 'identity' of the CS line.
- *
- * This is per SPI-Slave Chipselect information.
- * Allocate and initialize one in machine init code and make the
- * spi_board_info.controller_data point to it.
- */
-struct s3c64xx_spi_csinfo {
-        u8 fb_delay;
-        unsigned line;
-};
-
-/**
- * struct s3c64xx_spi_info - SPI Controller defining structure
- * @src_clk_nr: Clock source index for the CLK_CFG[SPI_CLKSEL] field.
- * @num_cs: Number of CS this controller emulates.
- * @cfg_gpio: Configure pins for this SPI controller.
- */
-struct s3c64xx_spi_info {
-        int src_clk_nr;
-        int num_cs;
-        int (*cfg_gpio)(void);
-};
-
-/**
- * s3c64xx_spi_set_platdata - SPI Controller configure callback by the board
- *                              initialization code.
- * @cfg_gpio: Pointer to gpio setup function.
- * @src_clk_nr: Clock the SPI controller is to use to generate SPI clocks.
- * @num_cs: Number of elements in the 'cs' array.
- *
- * Call this from machine init code for each SPI Controller that
- * has some chips attached to it.
- */
-extern void s3c64xx_spi0_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,
-                                                int num_cs);
-extern void s3c64xx_spi1_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,
-                                                int num_cs);
-extern void s3c64xx_spi2_set_platdata(int (*cfg_gpio)(void), int src_clk_nr,
-                                                int num_cs);
-
-/* defined by architecture to configure gpio */
-extern int s3c64xx_spi0_cfg_gpio(void);
-extern int s3c64xx_spi1_cfg_gpio(void);
-extern int s3c64xx_spi2_cfg_gpio(void);
-
-extern struct s3c64xx_spi_info s3c64xx_spi0_pdata;
-extern struct s3c64xx_spi_info s3c64xx_spi1_pdata;
-extern struct s3c64xx_spi_info s3c64xx_spi2_pdata;
-#endif /* __S3C64XX_PLAT_SPI_H */
diff --git a/include/linux/platform_data/tegra_emc.h b/include/linux/platform_data/tegra_emc.h
deleted file mode 100644
index df67505e98f..00000000000
--- a/include/linux/platform_data/tegra_emc.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright (C) 2011 Google, Inc.
- *
- * Author:
- *      Colin Cross <ccross@android.com>
- *      Olof Johansson <olof@lixom.net>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- *
- */
-
-#ifndef __TEGRA_EMC_H_
-#define __TEGRA_EMC_H_
-
-#define TEGRA_EMC_NUM_REGS 46
-
-struct tegra_emc_table {
-        unsigned long rate;
-        u32 regs[TEGRA_EMC_NUM_REGS];
-};
-
-struct tegra_emc_pdata {
-        int num_tables;
-        struct tegra_emc_table *tables;
-};
-
-#endif
diff --git a/include/linux/platform_data/tegra_usb.h b/include/linux/platform_data/tegra_usb.h
index 66c673fef40..e6377c379b4 100644
--- a/include/linux/platform_data/tegra_usb.h
+++ b/include/linux/platform_data/tegra_usb.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2010 Google, Inc.
+ * Copyright (C) 2010-2011 NVIDIA Corporation
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -21,12 +22,27 @@ enum tegra_usb_operating_modes {
         TEGRA_USB_OTG,
 };
 
+enum tegra_usb_phy_type {
+        TEGRA_USB_PHY_TYPE_UTMIP = 0,
+        TEGRA_USB_PHY_TYPE_LINK_ULPI = 1,
+        TEGRA_USB_PHY_TYPE_NULL_ULPI = 2,
+        TEGRA_USB_PHY_TYPE_HSIC = 3,
+        TEGRA_USB_PHY_TYPE_ICUSB = 4,
+};
+
 struct tegra_ehci_platform_data {
         enum tegra_usb_operating_modes operating_mode;
         /* power down the phy on bus suspend */
         int power_down_on_bus_suspend;
+        int hotplug;
+        int default_enable;
         void *phy_config;
-        int vbus_gpio;
+        enum tegra_usb_phy_type phy_type;
+};
+
+struct tegra_otg_platform_data {
+        struct platform_device *ehci_device;
+        struct tegra_ehci_platform_data *ehci_pdata;
 };
 
 #endif /* _TEGRA_USB_H_ */
diff --git a/include/linux/platform_data/ti_am335x_adc.h b/include/linux/platform_data/ti_am335x_adc.h
deleted file mode 100644
index e41d5834cb8..00000000000
--- a/include/linux/platform_data/ti_am335x_adc.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef __LINUX_TI_AM335X_ADC_H
-#define __LINUX_TI_AM335X_ADC_H
-
-/**
- * struct adc_data      ADC Input information
- * @adc_channels:       Number of analog inputs
- *                      available for ADC.
- */
-
-struct adc_data {
-        unsigned int adc_channels;
-};
-
-#endif
diff --git a/include/linux/platform_data/touchscreen-s3c2410.h b/include/linux/platform_data/touchscreen-s3c2410.h
deleted file mode 100644
index 26fdb22e0fc..00000000000
--- a/include/linux/platform_data/touchscreen-s3c2410.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* arch/arm/plat-samsung/include/plat/ts.h
- *
- * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#ifndef __ASM_ARM_TS_H
-#define __ASM_ARM_TS_H
-
-struct s3c2410_ts_mach_info {
-       int             delay;
-       int             presc;
-       int             oversampling_shift;
-        void    (*cfg_gpio)(struct platform_device *dev);
-};
-
-extern void s3c24xx_ts_set_platdata(struct s3c2410_ts_mach_info *);
-
-/* defined by architecture to configure gpio */
-extern void s3c24xx_ts_cfg_gpio(struct platform_device *dev);
-
-#endif /* __ASM_ARM_TS_H */
diff --git a/include/linux/platform_data/uio_dmem_genirq.h b/include/linux/platform_data/uio_dmem_genirq.h
deleted file mode 100644
index 973c1bb3216..00000000000
--- a/include/linux/platform_data/uio_dmem_genirq.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * include/linux/platform_data/uio_dmem_genirq.h
- *
- * Copyright (C) 2012 Damian Hobson-Garcia
- *
- * 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 version 2.
- *
- * This program is distributed "as is" WITHOUT ANY WARRANTY of any
- * kind, whether express or implied; without even the implied warranty
- * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef _UIO_DMEM_GENIRQ_H
-#define _UIO_DMEM_GENIRQ_H
-
-#include <linux/uio_driver.h>
-
-struct uio_dmem_genirq_pdata {
-        struct uio_info uioinfo;
-        unsigned int *dynamic_region_sizes;
-        unsigned int num_dynamic_regions;
-};
-#endif /* _UIO_DMEM_GENIRQ_H */
diff --git a/include/linux/platform_data/uio_pruss.h b/include/linux/platform_data/uio_pruss.h
index 3d47d219827..f39140aabc6 100644
--- a/include/linux/platform_data/uio_pruss.h
+++ b/include/linux/platform_data/uio_pruss.h
@@ -20,7 +20,6 @@
 
 /* To configure the PRUSS INTC base offset for UIO driver */
 struct uio_pruss_pdata {
-        u32             pintc_base;
-        struct gen_pool *sram_pool;
+        u32     pintc_base;
 };
 #endif /* _UIO_PRUSS_H_ */
diff --git a/include/linux/platform_data/usb-davinci.h b/include/linux/platform_data/usb-davinci.h
deleted file mode 100644
index e0bc4abe69c..00000000000
--- a/include/linux/platform_data/usb-davinci.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * USB related definitions
- *
- * Copyright (C) 2009 MontaVista Software, Inc. <source@mvista.com>
- *
- * This file is licensed under the terms of the GNU General Public License
- * version 2. This program is licensed "as is" without any warranty of any
- * kind, whether express or implied.
- */
-
-#ifndef __ASM_ARCH_USB_H
-#define __ASM_ARCH_USB_H
-
-/* DA8xx CFGCHIP2 (USB 2.0 PHY Control) register bits */
-#define CFGCHIP2_PHYCLKGD       (1 << 17)
-#define CFGCHIP2_VBUSSENSE      (1 << 16)
-#define CFGCHIP2_RESET          (1 << 15)
-#define CFGCHIP2_OTGMODE        (3 << 13)
-#define CFGCHIP2_NO_OVERRIDE    (0 << 13)
-#define CFGCHIP2_FORCE_HOST     (1 << 13)
-#define CFGCHIP2_FORCE_DEVICE   (2 << 13)
-#define CFGCHIP2_FORCE_HOST_VBUS_LOW (3 << 13)
-#define CFGCHIP2_USB1PHYCLKMUX  (1 << 12)
-#define CFGCHIP2_USB2PHYCLKMUX  (1 << 11)
-#define CFGCHIP2_PHYPWRDN       (1 << 10)
-#define CFGCHIP2_OTGPWRDN       (1 << 9)
-#define CFGCHIP2_DATPOL         (1 << 8)
-#define CFGCHIP2_USB1SUSPENDM   (1 << 7)
-#define CFGCHIP2_PHY_PLLON      (1 << 6)        /* override PLL suspend */
-#define CFGCHIP2_SESENDEN       (1 << 5)        /* Vsess_end comparator */
-#define CFGCHIP2_VBDTCTEN       (1 << 4)        /* Vbus comparator */
-#define CFGCHIP2_REFFREQ        (0xf << 0)
-#define CFGCHIP2_REFFREQ_12MHZ  (1 << 0)
-#define CFGCHIP2_REFFREQ_24MHZ  (2 << 0)
-#define CFGCHIP2_REFFREQ_48MHZ  (3 << 0)
-
-struct  da8xx_ohci_root_hub;
-
-typedef void (*da8xx_ocic_handler_t)(struct da8xx_ohci_root_hub *hub,
-                                     unsigned port);
-
-/* Passed as the platform data to the OHCI driver */
-struct  da8xx_ohci_root_hub {
-        /* Switch the port power on/off */
-        int     (*set_power)(unsigned port, int on);
-        /* Read the port power status */
-        int     (*get_power)(unsigned port);
-        /* Read the port over-current indicator */
-        int     (*get_oci)(unsigned port);
-        /* Over-current indicator change notification (pass NULL to disable) */
-        int     (*ocic_notify)(da8xx_ocic_handler_t handler);
-
-        /* Time from power on to power good (in 2 ms units) */
-        u8      potpgt;
-};
-
-void davinci_setup_usb(unsigned mA, unsigned potpgt_ms);
-
-#endif  /* ifndef __ASM_ARCH_USB_H */
diff --git a/include/linux/platform_data/usb-ehci-mxc.h b/include/linux/platform_data/usb-ehci-mxc.h
deleted file mode 100644
index 7eb9d132967..00000000000
--- a/include/linux/platform_data/usb-ehci-mxc.h
+++ /dev/null
@@ -1,59 +0,0 @@
-#ifndef __INCLUDE_ASM_ARCH_MXC_EHCI_H
-#define __INCLUDE_ASM_ARCH_MXC_EHCI_H
-
-/* values for portsc field */
-#define MXC_EHCI_PHY_LOW_POWER_SUSPEND  (1 << 23)
-#define MXC_EHCI_FORCE_FS               (1 << 24)
-#define MXC_EHCI_UTMI_8BIT              (0 << 28)
-#define MXC_EHCI_UTMI_16BIT             (1 << 28)
-#define MXC_EHCI_SERIAL                 (1 << 29)
-#define MXC_EHCI_MODE_UTMI              (0 << 30)
-#define MXC_EHCI_MODE_PHILIPS           (1 << 30)
-#define MXC_EHCI_MODE_ULPI              (2 << 30)
-#define MXC_EHCI_MODE_SERIAL            (3 << 30)
-
-/* values for flags field */
-#define MXC_EHCI_INTERFACE_DIFF_UNI     (0 << 0)
-#define MXC_EHCI_INTERFACE_DIFF_BI      (1 << 0)
-#define MXC_EHCI_INTERFACE_SINGLE_UNI   (2 << 0)
-#define MXC_EHCI_INTERFACE_SINGLE_BI    (3 << 0)
-#define MXC_EHCI_INTERFACE_MASK         (0xf)
-
-#define MXC_EHCI_POWER_PINS_ENABLED     (1 << 5)
-#define MXC_EHCI_PWR_PIN_ACTIVE_HIGH    (1 << 6)
-#define MXC_EHCI_OC_PIN_ACTIVE_LOW      (1 << 7)
-#define MXC_EHCI_TTL_ENABLED            (1 << 8)
-
-#define MXC_EHCI_INTERNAL_PHY           (1 << 9)
-#define MXC_EHCI_IPPUE_DOWN             (1 << 10)
-#define MXC_EHCI_IPPUE_UP               (1 << 11)
-#define MXC_EHCI_WAKEUP_ENABLED         (1 << 12)
-#define MXC_EHCI_ITC_NO_THRESHOLD       (1 << 13)
-
-#define MXC_USBCTRL_OFFSET              0
-#define MXC_USB_PHY_CTR_FUNC_OFFSET     0x8
-#define MXC_USB_PHY_CTR_FUNC2_OFFSET    0xc
-#define MXC_USBH2CTRL_OFFSET            0x14
-
-#define MX5_USBOTHER_REGS_OFFSET        0x800
-
-/* USB_PHY_CTRL_FUNC2*/
-#define MX5_USB_UTMI_PHYCTRL1_PLLDIV_MASK               0x3
-#define MX5_USB_UTMI_PHYCTRL1_PLLDIV_SHIFT              0
-
-struct mxc_usbh_platform_data {
-        int (*init)(struct platform_device *pdev);
-        int (*exit)(struct platform_device *pdev);
-
-        unsigned int             portsc;
-        struct usb_phy          *otg;
-};
-
-int mx51_initialize_usb_hw(int port, unsigned int flags);
-int mx25_initialize_usb_hw(int port, unsigned int flags);
-int mx31_initialize_usb_hw(int port, unsigned int flags);
-int mx35_initialize_usb_hw(int port, unsigned int flags);
-int mx27_initialize_usb_hw(int port, unsigned int flags);
-
-#endif /* __INCLUDE_ASM_ARCH_MXC_EHCI_H */
-
diff --git a/include/linux/platform_data/usb-ehci-orion.h b/include/linux/platform_data/usb-ehci-orion.h
deleted file mode 100644
index 6fc78e43042..00000000000
--- a/include/linux/platform_data/usb-ehci-orion.h
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * arch/arm/plat-orion/include/plat/ehci-orion.h
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without any
- * warranty of any kind, whether express or implied.
- */
-
-#ifndef __PLAT_EHCI_ORION_H
-#define __PLAT_EHCI_ORION_H
-
-#include <linux/mbus.h>
-
-enum orion_ehci_phy_ver {
-        EHCI_PHY_ORION,
-        EHCI_PHY_DD,
-        EHCI_PHY_KW,
-        EHCI_PHY_NA,
-};
-
-struct orion_ehci_data {
-        enum orion_ehci_phy_ver phy_version;
-};
-
-
-#endif
diff --git a/include/linux/platform_data/usb-ehci-s5p.h b/include/linux/platform_data/usb-ehci-s5p.h
deleted file mode 100644
index 5f28cae1858..00000000000
--- a/include/linux/platform_data/usb-ehci-s5p.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2011 Samsung Electronics Co.Ltd
- * Author: Joonyoung Shim <jy0922.shim@samsung.com>
- *
- * 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.
- */
-
-#ifndef __PLAT_SAMSUNG_EHCI_H
-#define __PLAT_SAMSUNG_EHCI_H __FILE__
-
-struct s5p_ehci_platdata {
-        int (*phy_init)(struct platform_device *pdev, int type);
-        int (*phy_exit)(struct platform_device *pdev, int type);
-};
-
-extern void s5p_ehci_set_platdata(struct s5p_ehci_platdata *pd);
-
-#endif /* __PLAT_SAMSUNG_EHCI_H */
diff --git a/include/linux/platform_data/usb-exynos.h b/include/linux/platform_data/usb-exynos.h
deleted file mode 100644
index c256c595be5..00000000000
--- a/include/linux/platform_data/usb-exynos.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
- * Copyright (C) 2011 Samsung Electronics Co.Ltd
- *              http://www.samsung.com/
- *
- * 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.
- */
-
-#ifndef __MACH_EXYNOS_OHCI_H
-#define __MACH_EXYNOS_OHCI_H
-
-struct exynos4_ohci_platdata {
-        int (*phy_init)(struct platform_device *pdev, int type);
-        int (*phy_exit)(struct platform_device *pdev, int type);
-};
-
-extern void exynos4_ohci_set_platdata(struct exynos4_ohci_platdata *pd);
-
-#endif /* __MACH_EXYNOS_OHCI_H */
diff --git a/include/linux/platform_data/usb-imx_udc.h b/include/linux/platform_data/usb-imx_udc.h
deleted file mode 100644
index be273371f34..00000000000
--- a/include/linux/platform_data/usb-imx_udc.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- *      Copyright (C) 2008 Darius Augulis <augulis.darius@gmail.com>
- *
- *      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.
- */
-
-#ifndef __ASM_ARCH_MXC_USB
-#define __ASM_ARCH_MXC_USB
-
-struct imxusb_platform_data {
-        int (*init)(struct device *);
-        void (*exit)(struct device *);
-};
-
-#endif /* __ASM_ARCH_MXC_USB */
diff --git a/include/linux/platform_data/usb-musb-ux500.h b/include/linux/platform_data/usb-musb-ux500.h
deleted file mode 100644
index 4c1cc50a595..00000000000
--- a/include/linux/platform_data/usb-musb-ux500.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (C) ST-Ericsson SA 2011
- *
- * Author: Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com>
- * License terms: GNU General Public License (GPL) version 2
- */
-#ifndef __ASM_ARCH_USB_H
-#define __ASM_ARCH_USB_H
-
-#include <linux/dmaengine.h>
-
-#define UX500_MUSB_DMA_NUM_RX_CHANNELS 8
-#define UX500_MUSB_DMA_NUM_TX_CHANNELS 8
-
-struct ux500_musb_board_data {
-        void    **dma_rx_param_array;
-        void    **dma_tx_param_array;
-        u32     num_rx_channels;
-        u32     num_tx_channels;
-        bool (*dma_filter)(struct dma_chan *chan, void *filter_param);
-};
-
-void ux500_add_usb(struct device *parent, resource_size_t base,
-                   int irq, int *dma_rx_cfg, int *dma_tx_cfg);
-#endif
diff --git a/include/linux/platform_data/usb-mx2.h b/include/linux/platform_data/usb-mx2.h
deleted file mode 100644
index 22d0b596262..00000000000
--- a/include/linux/platform_data/usb-mx2.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- *      Copyright (C) 2009 Martin Fuzzey <mfuzzey@gmail.com>
- *
- *      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.
- */
-
-#ifndef __ASM_ARCH_MX21_USBH
-#define __ASM_ARCH_MX21_USBH
-
-enum mx21_usbh_xcvr {
-        /* Values below as used by hardware (HWMODE register) */
-        MX21_USBXCVR_TXDIF_RXDIF = 0,
-        MX21_USBXCVR_TXDIF_RXSE = 1,
-        MX21_USBXCVR_TXSE_RXDIF = 2,
-        MX21_USBXCVR_TXSE_RXSE = 3,
-};
-
-struct mx21_usbh_platform_data {
-        enum mx21_usbh_xcvr host_xcvr; /* tranceiver mode host 1,2 ports */
-        enum mx21_usbh_xcvr otg_xcvr; /* tranceiver mode otg (as host) port */
-        u16     enable_host1:1,
-                enable_host2:1,
-                enable_otg_host:1, /* enable "OTG" port (as host) */
-                host1_xcverless:1, /* traceiverless host1 port */
-                host1_txenoe:1, /* output enable host1 transmit enable */
-                otg_ext_xcvr:1, /* external tranceiver for OTG port */
-                unused:10;
-};
-
-#endif /* __ASM_ARCH_MX21_USBH */
diff --git a/include/linux/platform_data/usb-ohci-pxa27x.h b/include/linux/platform_data/usb-ohci-pxa27x.h
deleted file mode 100644
index 95b6e2a6e51..00000000000
--- a/include/linux/platform_data/usb-ohci-pxa27x.h
+++ /dev/null
@@ -1,36 +0,0 @@
-#ifndef ASMARM_ARCH_OHCI_H
-#define ASMARM_ARCH_OHCI_H
-
-struct device;
-
-struct pxaohci_platform_data {
-        int (*init)(struct device *);
-        void (*exit)(struct device *);
-
-        unsigned long flags;
-#define ENABLE_PORT1            (1 << 0)
-#define ENABLE_PORT2            (1 << 1)
-#define ENABLE_PORT3            (1 << 2)
-#define ENABLE_PORT_ALL         (ENABLE_PORT1 | ENABLE_PORT2 | ENABLE_PORT3)
-
-#define POWER_SENSE_LOW         (1 << 3)
-#define POWER_CONTROL_LOW       (1 << 4)
-#define NO_OC_PROTECTION        (1 << 5)
-#define OC_MODE_GLOBAL          (0 << 6)
-#define OC_MODE_PERPORT         (1 << 6)
-
-        int power_on_delay;     /* Power On to Power Good time - in ms
-                                 * HCD must wait for this duration before
-                                 * accessing a powered on port
-                                 */
-        int port_mode;
-#define PMM_NPS_MODE           1
-#define PMM_GLOBAL_MODE        2
-#define PMM_PERPORT_MODE       3
-
-        int power_budget;
-};
-
-extern void pxa_set_ohci_info(struct pxaohci_platform_data *info);
-
-#endif
diff --git a/include/linux/platform_data/usb-ohci-s3c2410.h b/include/linux/platform_data/usb-ohci-s3c2410.h
deleted file mode 100644
index 7fa1fbefc3f..00000000000
--- a/include/linux/platform_data/usb-ohci-s3c2410.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* arch/arm/plat-samsung/include/plat/usb-control.h
- *
- * Copyright (c) 2004 Simtec Electronics
- *      Ben Dooks <ben@simtec.co.uk>
- *
- * S3C - USB host port information
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-#ifndef __ASM_ARCH_USBCONTROL_H
-#define __ASM_ARCH_USBCONTROL_H
-
-#define S3C_HCDFLG_USED (1)
-
-struct s3c2410_hcd_port {
-        unsigned char   flags;
-        unsigned char   power;
-        unsigned char   oc_status;
-        unsigned char   oc_changed;
-};
-
-struct s3c2410_hcd_info {
-        struct usb_hcd          *hcd;
-        struct s3c2410_hcd_port port[2];
-
-        void            (*power_control)(int port, int to);
-        void            (*enable_oc)(struct s3c2410_hcd_info *, int on);
-        void            (*report_oc)(struct s3c2410_hcd_info *, int ports);
-};
-
-static void inline s3c2410_usb_report_oc(struct s3c2410_hcd_info *info, int ports)
-{
-        if (info->report_oc != NULL) {
-                (info->report_oc)(info, ports);
-        }
-}
-
-extern void s3c_ohci_set_platdata(struct s3c2410_hcd_info *info);
-
-#endif /*__ASM_ARCH_USBCONTROL_H */
diff --git a/include/linux/platform_data/usb-omap.h b/include/linux/platform_data/usb-omap.h
deleted file mode 100644
index ef65b67c56c..00000000000
--- a/include/linux/platform_data/usb-omap.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
- * usb-omap.h - Platform data for the various OMAP USB IPs
- *
- * Copyright (C) 2012 Texas Instruments Incorporated - http://www.ti.com
- *
- * This software is distributed under the terms of the GNU General Public
- * License ("GPL") version 2, as published by the Free Software Foundation.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#define OMAP3_HS_USB_PORTS      3
-
-enum usbhs_omap_port_mode {
-        OMAP_USBHS_PORT_MODE_UNUSED,
-        OMAP_EHCI_PORT_MODE_PHY,
-        OMAP_EHCI_PORT_MODE_TLL,
-        OMAP_EHCI_PORT_MODE_HSIC,
-        OMAP_OHCI_PORT_MODE_PHY_6PIN_DATSE0,
-        OMAP_OHCI_PORT_MODE_PHY_6PIN_DPDM,
-        OMAP_OHCI_PORT_MODE_PHY_3PIN_DATSE0,
-        OMAP_OHCI_PORT_MODE_PHY_4PIN_DPDM,
-        OMAP_OHCI_PORT_MODE_TLL_6PIN_DATSE0,
-        OMAP_OHCI_PORT_MODE_TLL_6PIN_DPDM,
-        OMAP_OHCI_PORT_MODE_TLL_3PIN_DATSE0,
-        OMAP_OHCI_PORT_MODE_TLL_4PIN_DPDM,
-        OMAP_OHCI_PORT_MODE_TLL_2PIN_DATSE0,
-        OMAP_OHCI_PORT_MODE_TLL_2PIN_DPDM
-};
-
-struct usbtll_omap_platform_data {
-        enum usbhs_omap_port_mode               port_mode[OMAP3_HS_USB_PORTS];
-};
-
-struct ehci_hcd_omap_platform_data {
-        enum usbhs_omap_port_mode       port_mode[OMAP3_HS_USB_PORTS];
-        int                             reset_gpio_port[OMAP3_HS_USB_PORTS];
-        struct regulator                *regulator[OMAP3_HS_USB_PORTS];
-        unsigned                        phy_reset:1;
-};
-
-struct ohci_hcd_omap_platform_data {
-        enum usbhs_omap_port_mode       port_mode[OMAP3_HS_USB_PORTS];
-        unsigned                        es2_compatibility:1;
-};
-
-struct usbhs_omap_platform_data {
-        enum usbhs_omap_port_mode               port_mode[OMAP3_HS_USB_PORTS];
-
-        struct ehci_hcd_omap_platform_data      *ehci_data;
-        struct ohci_hcd_omap_platform_data      *ohci_data;
-
-        /* OMAP3 <= ES2.1 have a single ulpi bypass control bit */
-        unsigned                                single_ulpi_bypass:1;
-};
-
-/*-------------------------------------------------------------------------*/
-
-struct omap_musb_board_data {
-        u8      interface_type;
-        u8      mode;
-        u16     power;
-        unsigned extvbus:1;
-        void    (*set_phy_power)(u8 on);
-        void    (*clear_irq)(void);
-        void    (*set_mode)(u8 mode);
-        void    (*reset)(void);
-};
-
-enum musb_interface {
-        MUSB_INTERFACE_ULPI,
-        MUSB_INTERFACE_UTMI
-};
diff --git a/include/linux/platform_data/usb-pxa3xx-ulpi.h b/include/linux/platform_data/usb-pxa3xx-ulpi.h
deleted file mode 100644
index 9d82cb65ea5..00000000000
--- a/include/linux/platform_data/usb-pxa3xx-ulpi.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
- * PXA3xx U2D header
- *
- * Copyright (C) 2010 CompuLab Ltd.
- *
- * Igor Grinberg <grinberg@compulab.co.il>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-#ifndef __PXA310_U2D__
-#define __PXA310_U2D__
-
-#include <linux/usb/ulpi.h>
-
-struct pxa3xx_u2d_platform_data {
-
-#define ULPI_SER_6PIN   (1 << 0)
-#define ULPI_SER_3PIN   (1 << 1)
-        unsigned int ulpi_mode;
-
-        int (*init)(struct device *);
-        void (*exit)(struct device *);
-};
-
-
-/* Start PXA3xx U2D host */
-int pxa3xx_u2d_start_hc(struct usb_bus *host);
-/* Stop PXA3xx U2D host */
-void pxa3xx_u2d_stop_hc(struct usb_bus *host);
-
-extern void pxa3xx_set_u2d_info(struct pxa3xx_u2d_platform_data *info);
-
-#endif /* __PXA310_U2D__ */
diff --git a/include/linux/platform_data/usb-s3c2410_udc.h b/include/linux/platform_data/usb-s3c2410_udc.h
deleted file mode 100644
index de8e2288a50..00000000000
--- a/include/linux/platform_data/usb-s3c2410_udc.h
+++ /dev/null
@@ -1,44 +0,0 @@
-/* arch/arm/plat-samsung/include/plat/udc.h
- *
- * Copyright (c) 2005 Arnaud Patard <arnaud.patard@rtp-net.org>
- *
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- *
- *  Changelog:
- *      14-Mar-2005     RTP     Created file
- *      02-Aug-2005     RTP     File rename
- *      07-Sep-2005     BJD     Minor cleanups, changed cmd to enum
- *      18-Jan-2007     HMW     Add per-platform vbus_draw function
-*/
-
-#ifndef __ASM_ARM_ARCH_UDC_H
-#define __ASM_ARM_ARCH_UDC_H
-
-enum s3c2410_udc_cmd_e {
-        S3C2410_UDC_P_ENABLE    = 1,    /* Pull-up enable        */
-        S3C2410_UDC_P_DISABLE   = 2,    /* Pull-up disable       */
-        S3C2410_UDC_P_RESET     = 3,    /* UDC reset, in case of */
-};
-
-struct s3c2410_udc_mach_info {
-        void    (*udc_command)(enum s3c2410_udc_cmd_e);
-        void    (*vbus_draw)(unsigned int ma);
-
-        unsigned int pullup_pin;
-        unsigned int pullup_pin_inverted;
-
-        unsigned int vbus_pin;
-        unsigned char vbus_pin_inverted;
-};
-
-extern void __init s3c24xx_udc_set_platdata(struct s3c2410_udc_mach_info *);
-
-struct s3c24xx_hsudc_platdata;
-
-extern void __init s3c24xx_hsudc_set_platdata(struct s3c24xx_hsudc_platdata *pd);
-
-#endif /* __ASM_ARM_ARCH_UDC_H */
diff --git a/include/linux/platform_data/video-ep93xx.h b/include/linux/platform_data/video-ep93xx.h
deleted file mode 100644
index d5ae11d7c45..00000000000
--- a/include/linux/platform_data/video-ep93xx.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * arch/arm/mach-ep93xx/include/mach/fb.h
- */
-
-#ifndef __ASM_ARCH_EP93XXFB_H
-#define __ASM_ARCH_EP93XXFB_H
-
-struct platform_device;
-struct fb_videomode;
-struct fb_info;
-
-#define EP93XXFB_USE_MODEDB             0
-
-/* VideoAttributes flags */
-#define EP93XXFB_STATE_MACHINE_ENABLE   (1 << 0)
-#define EP93XXFB_PIXEL_CLOCK_ENABLE     (1 << 1)
-#define EP93XXFB_VSYNC_ENABLE           (1 << 2)
-#define EP93XXFB_PIXEL_DATA_ENABLE      (1 << 3)
-#define EP93XXFB_COMPOSITE_SYNC         (1 << 4)
-#define EP93XXFB_SYNC_VERT_HIGH         (1 << 5)
-#define EP93XXFB_SYNC_HORIZ_HIGH        (1 << 6)
-#define EP93XXFB_SYNC_BLANK_HIGH        (1 << 7)
-#define EP93XXFB_PCLK_FALLING           (1 << 8)
-#define EP93XXFB_ENABLE_AC              (1 << 9)
-#define EP93XXFB_ENABLE_LCD             (1 << 10)
-#define EP93XXFB_ENABLE_CCIR            (1 << 12)
-#define EP93XXFB_USE_PARALLEL_INTERFACE (1 << 13)
-#define EP93XXFB_ENABLE_INTERRUPT       (1 << 14)
-#define EP93XXFB_USB_INTERLACE          (1 << 16)
-#define EP93XXFB_USE_EQUALIZATION       (1 << 17)
-#define EP93XXFB_USE_DOUBLE_HORZ        (1 << 18)
-#define EP93XXFB_USE_DOUBLE_VERT        (1 << 19)
-#define EP93XXFB_USE_BLANK_PIXEL        (1 << 20)
-#define EP93XXFB_USE_SDCSN0             (0 << 21)
-#define EP93XXFB_USE_SDCSN1             (1 << 21)
-#define EP93XXFB_USE_SDCSN2             (2 << 21)
-#define EP93XXFB_USE_SDCSN3             (3 << 21)
-
-#define EP93XXFB_ENABLE                 (EP93XXFB_STATE_MACHINE_ENABLE  | \
-                                         EP93XXFB_PIXEL_CLOCK_ENABLE    | \
-                                         EP93XXFB_VSYNC_ENABLE          | \
-                                         EP93XXFB_PIXEL_DATA_ENABLE)
-
-struct ep93xxfb_mach_info {
-        unsigned int                    num_modes;
-        const struct fb_videomode       *modes;
-        const struct fb_videomode       *default_mode;
-        int                             bpp;
-        unsigned int                    flags;
-
-        int     (*setup)(struct platform_device *pdev);
-        void    (*teardown)(struct platform_device *pdev);
-        void    (*blank)(int blank_mode, struct fb_info *info);
-};
-
-#endif /* __ASM_ARCH_EP93XXFB_H */
diff --git a/include/linux/platform_data/video-imxfb.h b/include/linux/platform_data/video-imxfb.h
deleted file mode 100644
index 9de8f062ad5..00000000000
--- a/include/linux/platform_data/video-imxfb.h
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * This structure describes the machine which we are running on.
- */
-#ifndef __MACH_IMXFB_H__
-#define __MACH_IMXFB_H__
-
-#include <linux/fb.h>
-
-#define PCR_TFT         (1 << 31)
-#define PCR_COLOR       (1 << 30)
-#define PCR_PBSIZ_1     (0 << 28)
-#define PCR_PBSIZ_2     (1 << 28)
-#define PCR_PBSIZ_4     (2 << 28)
-#define PCR_PBSIZ_8     (3 << 28)
-#define PCR_BPIX_1      (0 << 25)
-#define PCR_BPIX_2      (1 << 25)
-#define PCR_BPIX_4      (2 << 25)
-#define PCR_BPIX_8      (3 << 25)
-#define PCR_BPIX_12     (4 << 25)
-#define PCR_BPIX_16     (5 << 25)
-#define PCR_BPIX_18     (6 << 25)
-#define PCR_PIXPOL      (1 << 24)
-#define PCR_FLMPOL      (1 << 23)
-#define PCR_LPPOL       (1 << 22)
-#define PCR_CLKPOL      (1 << 21)
-#define PCR_OEPOL       (1 << 20)
-#define PCR_SCLKIDLE    (1 << 19)
-#define PCR_END_SEL     (1 << 18)
-#define PCR_END_BYTE_SWAP (1 << 17)
-#define PCR_REV_VS      (1 << 16)
-#define PCR_ACD_SEL     (1 << 15)
-#define PCR_ACD(x)      (((x) & 0x7f) << 8)
-#define PCR_SCLK_SEL    (1 << 7)
-#define PCR_SHARP       (1 << 6)
-#define PCR_PCD(x)      ((x) & 0x3f)
-
-#define PWMR_CLS(x)     (((x) & 0x1ff) << 16)
-#define PWMR_LDMSK      (1 << 15)
-#define PWMR_SCR1       (1 << 10)
-#define PWMR_SCR0       (1 << 9)
-#define PWMR_CC_EN      (1 << 8)
-#define PWMR_PW(x)      ((x) & 0xff)
-
-#define LSCR1_PS_RISE_DELAY(x)    (((x) & 0x7f) << 26)
-#define LSCR1_CLS_RISE_DELAY(x)   (((x) & 0x3f) << 16)
-#define LSCR1_REV_TOGGLE_DELAY(x) (((x) & 0xf) << 8)
-#define LSCR1_GRAY2(x)            (((x) & 0xf) << 4)
-#define LSCR1_GRAY1(x)            (((x) & 0xf))
-
-#define DMACR_BURST     (1 << 31)
-#define DMACR_HM(x)     (((x) & 0xf) << 16)
-#define DMACR_TM(x)     ((x) & 0xf)
-
-struct imx_fb_videomode {
-        struct fb_videomode mode;
-        u32 pcr;
-        unsigned char   bpp;
-};
-
-struct imx_fb_platform_data {
-        struct imx_fb_videomode *mode;
-        int             num_modes;
-
-        u_int           cmap_greyscale:1,
-                        cmap_inverse:1,
-                        cmap_static:1,
-                        unused:29;
-
-        u_int           pwmr;
-        u_int           lscr1;
-        u_int           dmacr;
-
-        u_char * fixed_screen_cpu;
-        dma_addr_t fixed_screen_dma;
-
-        int (*init)(struct platform_device *);
-        void (*exit)(struct platform_device *);
-
-        void (*lcd_power)(int);
-        void (*backlight_power)(int);
-};
-
-void set_imx_fb_info(struct imx_fb_platform_data *);
-#endif /* ifndef __MACH_IMXFB_H__ */
diff --git a/include/linux/platform_data/video-msm_fb.h b/include/linux/platform_data/video-msm_fb.h
deleted file mode 100644
index 1f4fc81b3d8..00000000000
--- a/include/linux/platform_data/video-msm_fb.h
+++ /dev/null
@@ -1,147 +0,0 @@
-/* arch/arm/mach-msm/include/mach/msm_fb.h
- *
- * Internal shared definitions for various MSM framebuffer parts.
- *
- * Copyright (C) 2007 Google Incorporated
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- */
-
-#ifndef _MSM_FB_H_
-#define _MSM_FB_H_
-
-#include <linux/device.h>
-
-struct mddi_info;
-
-struct msm_fb_data {
-        int xres;       /* x resolution in pixels */
-        int yres;       /* y resolution in pixels */
-        int width;      /* disply width in mm */
-        int height;     /* display height in mm */
-        unsigned output_format;
-};
-
-struct msmfb_callback {
-        void (*func)(struct msmfb_callback *);
-};
-
-enum {
-        MSM_MDDI_PMDH_INTERFACE,
-        MSM_MDDI_EMDH_INTERFACE,
-        MSM_EBI2_INTERFACE,
-};
-
-#define MSMFB_CAP_PARTIAL_UPDATES       (1 << 0)
-
-struct msm_panel_data {
-        /* turns off the fb memory */
-        int (*suspend)(struct msm_panel_data *);
-        /* turns on the fb memory */
-        int (*resume)(struct msm_panel_data *);
-        /* turns off the panel */
-        int (*blank)(struct msm_panel_data *);
-        /* turns on the panel */
-        int (*unblank)(struct msm_panel_data *);
-        void (*wait_vsync)(struct msm_panel_data *);
-        void (*request_vsync)(struct msm_panel_data *, struct msmfb_callback *);
-        void (*clear_vsync)(struct msm_panel_data *);
-        /* from the enum above */
-        unsigned interface_type;
-        /* data to be passed to the fb driver */
-        struct msm_fb_data *fb_data;
-
-        /* capabilities supported by the panel */
-        uint32_t caps;
-};
-
-struct msm_mddi_client_data {
-        void (*suspend)(struct msm_mddi_client_data *);
-        void (*resume)(struct msm_mddi_client_data *);
-        void (*activate_link)(struct msm_mddi_client_data *);
-        void (*remote_write)(struct msm_mddi_client_data *, uint32_t val,
-                             uint32_t reg);
-        uint32_t (*remote_read)(struct msm_mddi_client_data *, uint32_t reg);
-        void (*auto_hibernate)(struct msm_mddi_client_data *, int);
-        /* custom data that needs to be passed from the board file to a 
-         * particular client */
-        void *private_client_data;
-        struct resource *fb_resource;
-        /* from the list above */
-        unsigned interface_type;
-};
-
-struct msm_mddi_platform_data {
-        unsigned int clk_rate;
-        void (*power_client)(struct msm_mddi_client_data *, int on);
-
-        /* fixup the mfr name, product id */
-        void (*fixup)(uint16_t *mfr_name, uint16_t *product_id);
-
-        struct resource *fb_resource; /*optional*/
-        /* number of clients in the list that follows */
-        int num_clients;
-        /* array of client information of clients */
-        struct {
-                unsigned product_id; /* mfr id in top 16 bits, product id
-                                      * in lower 16 bits
-                                      */
-                char *name;     /* the device name will be the platform
-                                 * device name registered for the client,
-                                 * it should match the name of the associated
-                                 * driver
-                                 */
-                unsigned id;    /* id for mddi client device node, will also
-                                 * be used as device id of panel devices, if
-                                 * the client device will have multiple panels
-                                 * space must be left here for them
-                                 */
-                void *client_data;      /* required private client data */
-                unsigned int clk_rate;  /* optional: if the client requires a
-                                        * different mddi clk rate
-                                        */
-        } client_platform_data[];
-};
-
-struct mdp_blit_req;
-struct fb_info;
-struct mdp_device {
-        struct device dev;
-        void (*dma)(struct mdp_device *mpd, uint32_t addr,
-                    uint32_t stride, uint32_t w, uint32_t h, uint32_t x,
-                    uint32_t y, struct msmfb_callback *callback, int interface);
-        void (*dma_wait)(struct mdp_device *mdp);
-        int (*blit)(struct mdp_device *mdp, struct fb_info *fb,
-                    struct mdp_blit_req *req);
-        void (*set_grp_disp)(struct mdp_device *mdp, uint32_t disp_id);
-};
-
-struct class_interface;
-int register_mdp_client(struct class_interface *class_intf);
-
-/**** private client data structs go below this line ***/
-
-struct msm_mddi_bridge_platform_data {
-        /* from board file */
-        int (*init)(struct msm_mddi_bridge_platform_data *,
-                    struct msm_mddi_client_data *);
-        int (*uninit)(struct msm_mddi_bridge_platform_data *,
-                      struct msm_mddi_client_data *);
-        /* passed to panel for use by the fb driver */
-        int (*blank)(struct msm_mddi_bridge_platform_data *,
-                     struct msm_mddi_client_data *);
-        int (*unblank)(struct msm_mddi_bridge_platform_data *,
-                       struct msm_mddi_client_data *);
-        struct msm_fb_data fb_data;
-};
-
-
-
-#endif
diff --git a/include/linux/platform_data/video-mx3fb.h b/include/linux/platform_data/video-mx3fb.h
deleted file mode 100644
index fdbe6000154..00000000000
--- a/include/linux/platform_data/video-mx3fb.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright (C) 2008
- * Guennadi Liakhovetski, DENX Software Engineering, <lg@denx.de>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __ASM_ARCH_MX3FB_H__
-#define __ASM_ARCH_MX3FB_H__
-
-#include <linux/device.h>
-#include <linux/fb.h>
-
-/* Proprietary FB_SYNC_ flags */
-#define FB_SYNC_OE_ACT_HIGH     0x80000000
-#define FB_SYNC_CLK_INVERT      0x40000000
-#define FB_SYNC_DATA_INVERT     0x20000000
-#define FB_SYNC_CLK_IDLE_EN     0x10000000
-#define FB_SYNC_SHARP_MODE      0x08000000
-#define FB_SYNC_SWAP_RGB        0x04000000
-#define FB_SYNC_CLK_SEL_EN      0x02000000
-
-/*
- * Specify the way your display is connected. The IPU can arbitrarily
- * map the internal colors to the external data lines. We only support
- * the following mappings at the moment.
- */
-enum disp_data_mapping {
-        /* blue -> d[0..5], green -> d[6..11], red -> d[12..17] */
-        IPU_DISP_DATA_MAPPING_RGB666,
-        /* blue -> d[0..4], green -> d[5..10], red -> d[11..15] */
-        IPU_DISP_DATA_MAPPING_RGB565,
-        /* blue -> d[0..7], green -> d[8..15], red -> d[16..23] */
-        IPU_DISP_DATA_MAPPING_RGB888,
-};
-
-/**
- * struct mx3fb_platform_data - mx3fb platform data
- *
- * @dma_dev:    pointer to the dma-device, used for dma-slave connection
- * @mode:       pointer to a platform-provided per mxc_register_fb() videomode
- */
-struct mx3fb_platform_data {
-        struct device                   *dma_dev;
-        const char                      *name;
-        const struct fb_videomode       *mode;
-        int                             num_modes;
-        enum disp_data_mapping          disp_data_fmt;
-};
-
-#endif
diff --git a/include/linux/platform_data/video-nuc900fb.h b/include/linux/platform_data/video-nuc900fb.h
deleted file mode 100644
index cec5ece765e..00000000000
--- a/include/linux/platform_data/video-nuc900fb.h
+++ /dev/null
@@ -1,83 +0,0 @@
-/* linux/include/asm/arch-nuc900/fb.h
- *
- * Copyright (c) 2008 Nuvoton technology corporation
- * All rights reserved.
- *
- * 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.
- *
- * Changelog:
- *
- *   2008/08/26     vincen.zswan modify this file for LCD.
- */
-
-#ifndef __ASM_ARM_FB_H
-#define __ASM_ARM_FB_H
-
-
-
-/* LCD Controller Hardware Desc */
-struct nuc900fb_hw {
-        unsigned int lcd_dccs;
-        unsigned int lcd_device_ctrl;
-        unsigned int lcd_mpulcd_cmd;
-        unsigned int lcd_int_cs;
-        unsigned int lcd_crtc_size;
-        unsigned int lcd_crtc_dend;
-        unsigned int lcd_crtc_hr;
-        unsigned int lcd_crtc_hsync;
-        unsigned int lcd_crtc_vr;
-        unsigned int lcd_va_baddr0;
-        unsigned int lcd_va_baddr1;
-        unsigned int lcd_va_fbctrl;
-        unsigned int lcd_va_scale;
-        unsigned int lcd_va_test;
-        unsigned int lcd_va_win;
-        unsigned int lcd_va_stuff;
-};
-
-/* LCD Display Description */
-struct nuc900fb_display {
-        /* LCD Image type */
-        unsigned type;
-
-        /* LCD Screen Size */
-        unsigned short width;
-        unsigned short height;
-
-        /* LCD Screen Info */
-        unsigned short xres;
-        unsigned short yres;
-        unsigned short bpp;
-
-        unsigned long pixclock;
-        unsigned short left_margin;
-        unsigned short right_margin;
-        unsigned short hsync_len;
-        unsigned short upper_margin;
-        unsigned short lower_margin;
-        unsigned short vsync_len;
-
-        /* hardware special register value */
-        unsigned int dccs;
-        unsigned int devctl;
-        unsigned int fbctrl;
-        unsigned int scale;
-};
-
-struct nuc900fb_mach_info {
-        struct nuc900fb_display *displays;
-        unsigned num_displays;
-        unsigned default_display;
-        /* GPIO Setting  Info */
-        unsigned gpio_dir;
-        unsigned gpio_dir_mask;
-        unsigned gpio_data;
-        unsigned gpio_data_mask;
-};
-
-extern void __init nuc900_fb_set_platdata(struct nuc900fb_mach_info *);
-
-#endif /* __ASM_ARM_FB_H */
diff --git a/include/linux/platform_data/video-pxafb.h b/include/linux/platform_data/video-pxafb.h
deleted file mode 100644
index 486b4c519ae..00000000000
--- a/include/linux/platform_data/video-pxafb.h
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- *  arch/arm/mach-pxa/include/mach/pxafb.h
- *
- *  Support for the xscale frame buffer.
- *
- *  Author:     Jean-Frederic Clere
- *  Created:    Sep 22, 2003
- *  Copyright:  jfclere@sinix.net
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License version 2 as
- *  published by the Free Software Foundation.
- */
-
-#include <linux/fb.h>
-#include <mach/regs-lcd.h>
-
-/*
- * Supported LCD connections
- *
- * bits 0 - 3: for LCD panel type:
- *
- *   STN  - for passive matrix
- *   DSTN - for dual scan passive matrix
- *   TFT  - for active matrix
- *
- * bits 4 - 9 : for bus width
- * bits 10-17 : for AC Bias Pin Frequency
- * bit     18 : for output enable polarity
- * bit     19 : for pixel clock edge
- * bit     20 : for output pixel format when base is RGBT16
- */
-#define LCD_CONN_TYPE(_x)       ((_x) & 0x0f)
-#define LCD_CONN_WIDTH(_x)      (((_x) >> 4) & 0x1f)
-
-#define LCD_TYPE_MASK           0xf
-#define LCD_TYPE_UNKNOWN        0
-#define LCD_TYPE_MONO_STN       1
-#define LCD_TYPE_MONO_DSTN      2
-#define LCD_TYPE_COLOR_STN      3
-#define LCD_TYPE_COLOR_DSTN     4
-#define LCD_TYPE_COLOR_TFT      5
-#define LCD_TYPE_SMART_PANEL    6
-#define LCD_TYPE_MAX            7
-
-#define LCD_MONO_STN_4BPP       ((4  << 4) | LCD_TYPE_MONO_STN)
-#define LCD_MONO_STN_8BPP       ((8  << 4) | LCD_TYPE_MONO_STN)
-#define LCD_MONO_DSTN_8BPP      ((8  << 4) | LCD_TYPE_MONO_DSTN)
-#define LCD_COLOR_STN_8BPP      ((8  << 4) | LCD_TYPE_COLOR_STN)
-#define LCD_COLOR_DSTN_16BPP    ((16 << 4) | LCD_TYPE_COLOR_DSTN)
-#define LCD_COLOR_TFT_8BPP      ((8  << 4) | LCD_TYPE_COLOR_TFT)
-#define LCD_COLOR_TFT_16BPP     ((16 << 4) | LCD_TYPE_COLOR_TFT)
-#define LCD_COLOR_TFT_18BPP     ((18 << 4) | LCD_TYPE_COLOR_TFT)
-#define LCD_SMART_PANEL_8BPP    ((8  << 4) | LCD_TYPE_SMART_PANEL)
-#define LCD_SMART_PANEL_16BPP   ((16 << 4) | LCD_TYPE_SMART_PANEL)
-#define LCD_SMART_PANEL_18BPP   ((18 << 4) | LCD_TYPE_SMART_PANEL)
-
-#define LCD_AC_BIAS_FREQ(x)     (((x) & 0xff) << 10)
-#define LCD_BIAS_ACTIVE_HIGH    (0 << 18)
-#define LCD_BIAS_ACTIVE_LOW     (1 << 18)
-#define LCD_PCLK_EDGE_RISE      (0 << 19)
-#define LCD_PCLK_EDGE_FALL      (1 << 19)
-#define LCD_ALTERNATE_MAPPING   (1 << 20)
-
-/*
- * This structure describes the machine which we are running on.
- * It is set in linux/arch/arm/mach-pxa/machine_name.c and used in the probe routine
- * of linux/drivers/video/pxafb.c
- */
-struct pxafb_mode_info {
-        u_long          pixclock;
-
-        u_short         xres;
-        u_short         yres;
-
-        u_char          bpp;
-        u_int           cmap_greyscale:1,
-                        depth:8,
-                        transparency:1,
-                        unused:22;
-
-        /* Parallel Mode Timing */
-        u_char          hsync_len;
-        u_char          left_margin;
-        u_char          right_margin;
-
-        u_char          vsync_len;
-        u_char          upper_margin;
-        u_char          lower_margin;
-        u_char          sync;
-
-        /* Smart Panel Mode Timing - see PXA27x DM 7.4.15.0.3 for details
-         * Note:
-         * 1. all parameters in nanosecond (ns)
-         * 2. a0cs{rd,wr}_set_hld are controlled by the same register bits
-         *    in pxa27x and pxa3xx, initialize them to the same value or
-         *    the larger one will be used
-         * 3. same to {rd,wr}_pulse_width
-         *
-         * 4. LCD_PCLK_EDGE_{RISE,FALL} controls the L_PCLK_WR polarity
-         * 5. sync & FB_SYNC_HOR_HIGH_ACT controls the L_LCLK_A0
-         * 6. sync & FB_SYNC_VERT_HIGH_ACT controls the L_LCLK_RD
-         */
-        unsigned        a0csrd_set_hld; /* A0 and CS Setup/Hold Time before/after L_FCLK_RD */
-        unsigned        a0cswr_set_hld; /* A0 and CS Setup/Hold Time before/after L_PCLK_WR */
-        unsigned        wr_pulse_width; /* L_PCLK_WR pulse width */
-        unsigned        rd_pulse_width; /* L_FCLK_RD pulse width */
-        unsigned        cmd_inh_time;   /* Command Inhibit time between two writes */
-        unsigned        op_hold_time;   /* Output Hold time from L_FCLK_RD negation */
-};
-
-struct pxafb_mach_info {
-        struct pxafb_mode_info *modes;
-        unsigned int num_modes;
-
-        unsigned int    lcd_conn;
-        unsigned long   video_mem_size;
-
-        u_int           fixed_modes:1,
-                        cmap_inverse:1,
-                        cmap_static:1,
-                        acceleration_enabled:1,
-                        unused:28;
-
-        /* The following should be defined in LCCR0
-         *      LCCR0_Act or LCCR0_Pas          Active or Passive
-         *      LCCR0_Sngl or LCCR0_Dual        Single/Dual panel
-         *      LCCR0_Mono or LCCR0_Color       Mono/Color
-         *      LCCR0_4PixMono or LCCR0_8PixMono (in mono single mode)
-         *      LCCR0_DMADel(Tcpu) (optional)   DMA request delay
-         *
-         * The following should not be defined in LCCR0:
-         *      LCCR0_OUM, LCCR0_BM, LCCR0_QDM, LCCR0_DIS, LCCR0_EFM
-         *      LCCR0_IUM, LCCR0_SFM, LCCR0_LDM, LCCR0_ENB
-         */
-        u_int           lccr0;
-        /* The following should be defined in LCCR3
-         *      LCCR3_OutEnH or LCCR3_OutEnL    Output enable polarity
-         *      LCCR3_PixRsEdg or LCCR3_PixFlEdg Pixel clock edge type
-         *      LCCR3_Acb(X)                    AB Bias pin frequency
-         *      LCCR3_DPC (optional)            Double Pixel Clock mode (untested)
-         *
-         * The following should not be defined in LCCR3
-         *      LCCR3_HSP, LCCR3_VSP, LCCR0_Pcd(x), LCCR3_Bpp
-         */
-        u_int           lccr3;
-        /* The following should be defined in LCCR4
-         *      LCCR4_PAL_FOR_0 or LCCR4_PAL_FOR_1 or LCCR4_PAL_FOR_2
-         *
-         * All other bits in LCCR4 should be left alone.
-         */
-        u_int           lccr4;
-        void (*pxafb_backlight_power)(int);
-        void (*pxafb_lcd_power)(int, struct fb_var_screeninfo *);
-        void (*smart_update)(struct fb_info *);
-};
-
-void pxa_set_fb_info(struct device *, struct pxafb_mach_info *);
-unsigned long pxafb_get_hsync_time(struct device *dev);
-
-#ifdef CONFIG_FB_PXA_SMARTPANEL
-extern int pxafb_smart_queue(struct fb_info *info, uint16_t *cmds, int);
-extern int pxafb_smart_flush(struct fb_info *info);
-#else
-static inline int pxafb_smart_queue(struct fb_info *info,
-                                    uint16_t *cmds, int n)
-{
-        return 0;
-}
-
-static inline int pxafb_smart_flush(struct fb_info *info)
-{
-        return 0;
-}
-#endif
diff --git a/include/linux/platform_data/video-vt8500lcdfb.h b/include/linux/platform_data/video-vt8500lcdfb.h
deleted file mode 100644
index 7f399c370fe..00000000000
--- a/include/linux/platform_data/video-vt8500lcdfb.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- *  VT8500/WM8505 Frame Buffer platform data definitions
- *
- *  Copyright (C) 2010 Ed Spiridonov <edo.rus@gmail.com>
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * 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.
- */
-
-#ifndef _VT8500FB_H
-#define _VT8500FB_H
-
-#include <linux/fb.h>
-
-struct vt8500fb_platform_data {
-        struct fb_videomode     mode;
-        u32                     xres_virtual;
-        u32                     yres_virtual;
-        u32                     bpp;
-        unsigned long           video_mem_phys;
-        void                    *video_mem_virt;
-        unsigned long           video_mem_len;
-};
-
-#endif /* _VT8500FB_H */
diff --git a/include/linux/platform_data/voltage-omap.h b/include/linux/platform_data/voltage-omap.h
deleted file mode 100644
index 5be4d5def42..00000000000
--- a/include/linux/platform_data/voltage-omap.h
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * OMAP Voltage Management Routines
- *
- * Copyright (C) 2011, Texas Instruments, Inc.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- */
-
-#ifndef __ARCH_ARM_OMAP_VOLTAGE_H
-#define __ARCH_ARM_OMAP_VOLTAGE_H
-
-/**
- * struct omap_volt_data - Omap voltage specific data.
- * @voltage_nominal:    The possible voltage value in uV
- * @sr_efuse_offs:      The offset of the efuse register(from system
- *                      control module base address) from where to read
- *                      the n-target value for the smartreflex module.
- * @sr_errminlimit:     Error min limit value for smartreflex. This value
- *                      differs at differnet opp and thus is linked
- *                      with voltage.
- * @vp_errorgain:       Error gain value for the voltage processor. This
- *                      field also differs according to the voltage/opp.
- */
-struct omap_volt_data {
-        u32     volt_nominal;
-        u32     sr_efuse_offs;
-        u8      sr_errminlimit;
-        u8      vp_errgain;
-};
-struct voltagedomain;
-
-struct voltagedomain *voltdm_lookup(const char *name);
-int voltdm_scale(struct voltagedomain *voltdm, unsigned long target_volt);
-unsigned long voltdm_get_voltage(struct voltagedomain *voltdm);
-struct omap_volt_data *omap_voltage_get_voltdata(struct voltagedomain *voltdm,
-                unsigned long volt);
-#endif
diff --git a/include/linux/platform_data/wiznet.h b/include/linux/platform_data/wiznet.h
deleted file mode 100644
index b5d8c192d84..00000000000
--- a/include/linux/platform_data/wiznet.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Ethernet driver for the WIZnet W5x00 chip.
- *
- * Licensed under the GPL-2 or later.
- */
-
-#ifndef PLATFORM_DATA_WIZNET_H
-#define PLATFORM_DATA_WIZNET_H
-
-#include <linux/if_ether.h>
-
-struct wiznet_platform_data {
-        int     link_gpio;
-        u8      mac_addr[ETH_ALEN];
-};
-
-#ifndef CONFIG_WIZNET_BUS_SHIFT
-#define CONFIG_WIZNET_BUS_SHIFT 0
-#endif
-
-#define W5100_BUS_DIRECT_SIZE   (0x8000 << CONFIG_WIZNET_BUS_SHIFT)
-#define W5300_BUS_DIRECT_SIZE   (0x0400 << CONFIG_WIZNET_BUS_SHIFT)
-
-#endif /* PLATFORM_DATA_WIZNET_H */