diff options
| author | Xinyu Chen <xinyu.chen@freescale.com> | 2011-11-18 15:11:35 +0800 |
|---|---|---|
| committer | Xinyu Chen <xinyu.chen@freescale.com> | 2011-11-18 15:11:35 +0800 |
| commit | b92410aeb51ed48429b59395b7966dbdf616b854 (patch) | |
| tree | f6df7b89c40da66630e5672ef0b0488b048a3731 /include | |
| parent | 1e71c6ba95b0386fda935d022c8f6bba8ed94bce (diff) | |
| parent | c7f6e5da736db878ae58b123f28010c9355337aa (diff) | |
Merge commit 'rel_imx_2.6.38_11.11.00_RC1' into imx_2.6.38_android
Conflicts:
arch/arm/mach-mx6/board-mx6q_sabrelite.c
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/fec.h | 1 | ||||
| -rw-r--r-- | include/linux/ipu.h | 16 | ||||
| -rw-r--r-- | include/linux/mfd/max17135.h | 3 | ||||
| -rw-r--r-- | include/linux/thermal.h | 2 |
4 files changed, 21 insertions, 1 deletions
diff --git a/include/linux/fec.h b/include/linux/fec.h index d6a07048f842..8f69cb58d458 100644 --- a/include/linux/fec.h +++ b/include/linux/fec.h @@ -18,6 +18,7 @@ struct fec_platform_data { int (*init) (struct phy_device *); + int (*power_hibernate) (struct phy_device *); phy_interface_t phy; unsigned char mac[ETH_ALEN]; }; diff --git a/include/linux/ipu.h b/include/linux/ipu.h index 17638ab15120..051624854558 100644 --- a/include/linux/ipu.h +++ b/include/linux/ipu.h @@ -138,6 +138,12 @@ typedef enum { /*! @} */ /* IPU device */ +typedef enum { + RGB_CS, + YUV_CS, + NULL_CS +} cs_t; + struct ipu_pos { u32 x; u32 y; @@ -246,4 +252,14 @@ enum { #define IPU_ALLOC _IOWR('I', 0x3, int) #define IPU_FREE _IOW('I', 0x4, int) +/* export functions */ +#ifdef __KERNEL__ +unsigned int fmt_to_bpp(unsigned int pixelformat); +cs_t colorspaceofpixel(int fmt); +int need_csc(int ifmt, int ofmt); + +int ipu_queue_task(struct ipu_task *task); +int ipu_check_task(struct ipu_task *task); +#endif + #endif diff --git a/include/linux/mfd/max17135.h b/include/linux/mfd/max17135.h index 0a8af30853c1..265b1588c10a 100644 --- a/include/linux/mfd/max17135.h +++ b/include/linux/mfd/max17135.h @@ -154,6 +154,7 @@ struct max17135 { int gpio_pmic_pwrgood; int gpio_pmic_vcom_ctrl; int gpio_pmic_wakeup; + int gpio_pmic_v3p3; int gpio_pmic_intr; /* MAX17135 part variables */ @@ -181,6 +182,7 @@ enum { MAX17135_VCOM, MAX17135_VNEG, MAX17135_VPOS, + MAX17135_V3P3, MAX17135_NUM_REGULATORS, }; @@ -201,6 +203,7 @@ struct max17135_platform_data { int gpio_pmic_pwrgood; int gpio_pmic_vcom_ctrl; int gpio_pmic_wakeup; + int gpio_pmic_v3p3; int gpio_pmic_intr; int pass_num; int vcom_uV; diff --git a/include/linux/thermal.h b/include/linux/thermal.h index b7c80e19b7b1..5269d34c5a04 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -50,7 +50,7 @@ struct thermal_zone_device_ops { struct thermal_cooling_device *); int (*unbind) (struct thermal_zone_device *, struct thermal_cooling_device *); - int (*get_temp) (struct thermal_zone_device *, unsigned long *); + int (*get_temp) (struct thermal_zone_device *, long *); int (*get_mode) (struct thermal_zone_device *, enum thermal_device_mode *); int (*set_mode) (struct thermal_zone_device *, |