Merge branch 'osd-devel' into nfs-for-next

5 files changed, 195 insertions, 1 deletions

diff --git a/include/linux/platform_data/dwc3-omap.h b/include/linux/platform_data/dwc3-omap.h
new file mode 100644
index 000000000000..ada401244e0b
--- /dev/null
+++ b/include/linux/platform_data/dwc3-omap.h
@@ -0,0 +1,47 @@
+/**
+ * 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/exynos4_tmu.h b/include/linux/platform_data/exynos4_tmu.h
new file mode 100644
index 000000000000..39e038cca590
--- /dev/null
+++ b/include/linux/platform_data/exynos4_tmu.h
@@ -0,0 +1,83 @@
+/*
+ * exynos4_tmu.h - Samsung EXYNOS4 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_EXYNOS4_TMU_H
+#define _LINUX_EXYNOS4_TMU_H
+
+enum calibration_type {
+        TYPE_ONE_POINT_TRIMMING,
+        TYPE_TWO_POINT_TRIMMING,
+        TYPE_NONE,
+};
+
+/**
+ * struct exynos4_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
+ * @cal_type: calibration type for temperature
+ *
+ * This structure is required for configuration of exynos4_tmu driver.
+ */
+struct exynos4_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;
+
+        enum calibration_type cal_type;
+};
+#endif /* _LINUX_EXYNOS4_TMU_H */
diff --git a/include/linux/platform_data/leds-renesas-tpu.h b/include/linux/platform_data/leds-renesas-tpu.h
new file mode 100644
index 000000000000..055387086fc1
--- /dev/null
+++ b/include/linux/platform_data/leds-renesas-tpu.h
@@ -0,0 +1,14 @@
+#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/mv_usb.h b/include/linux/platform_data/mv_usb.h
new file mode 100644
index 000000000000..e9d9149ddf38
--- /dev/null
+++ b/include/linux/platform_data/mv_usb.h
@@ -0,0 +1,50 @@
+/*
+ * 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;
+
+        int     (*phy_init)(unsigned int regbase);
+        void    (*phy_deinit)(unsigned int regbase);
+        int     (*set_vbus)(unsigned int vbus);
+};
+
+#endif
diff --git a/include/linux/platform_data/ntc_thermistor.h b/include/linux/platform_data/ntc_thermistor.h
index abd286215279..88734e871e3a 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
+         * described at Documentation/hwmon/ntc_thermistor
          *
          * pullup/down_ohm: 0 for infinite / not-connected
          */