diff options
author | Xinyu Chen <xinyu.chen@freescale.com> | 2012-10-09 16:47:47 +0800 |
---|---|---|
committer | Xinyu Chen <xinyu.chen@freescale.com> | 2012-10-09 16:47:47 +0800 |
commit | eba86309d9ba74153b7853cd8fb97f2484679219 (patch) | |
tree | 2eca312c9a1dde28c0e376156e5cad1704de08c9 /include | |
parent | 58d8257e51439a6c1ac2c95441f7ec119568dd5b (diff) | |
parent | 45c27e3123e45eb27f3e5933862936e9beda38cd (diff) |
Merge remote branch 'fsl-linux-sdk/imx_3.0.35' into imx_3.0.35_android
Conflicts:
arch/arm/configs/imx6s_updater_defconfig
arch/arm/include/asm/hardware/coresight.h
arch/arm/kernel/etm.c
arch/arm/mach-mx6/board-mx6q_sabresd.c
arch/arm/mach-mx6/cpu_op-mx6.c
arch/arm/mach-mx6/mx6_suspend.S
arch/arm/mach-mx6/pm.c
arch/arm/mach-mx6/system.c
arch/arm/plat-mxc/cpufreq.c
drivers/mfd/mxc-hdmi-core.c
drivers/power/sabresd_battery.c
drivers/video/mxc/mxc_ipuv3_fb.c
drivers/video/mxc_hdmi.c
include/linux/mfd/mxc-hdmi-core.h
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/fsl_devices.h | 1 | ||||
-rw-r--r-- | include/linux/mfd/mxc-hdmi-core.h | 1 | ||||
-rw-r--r-- | include/linux/mtd/nand.h | 11 | ||||
-rw-r--r-- | include/linux/mxcfb.h | 11 | ||||
-rw-r--r-- | include/linux/power/sabresd_battery.h | 1 |
5 files changed, 20 insertions, 5 deletions
diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h index 2a9557307643..ab22c4a9472e 100644 --- a/include/linux/fsl_devices.h +++ b/include/linux/fsl_devices.h @@ -135,6 +135,7 @@ struct fsl_usb2_platform_data { void (*platform_rh_suspend)(struct fsl_usb2_platform_data *); void (*platform_rh_resume)(struct fsl_usb2_platform_data *); void (*platform_set_disconnect_det)(struct fsl_usb2_platform_data *, bool); + void (*platform_phy_power_on)(void); struct fsl_usb2_wakeup_platform_data *wakeup_pdata; struct platform_device *pdev; diff --git a/include/linux/mfd/mxc-hdmi-core.h b/include/linux/mfd/mxc-hdmi-core.h index f16b11cb5cf4..26fa47d09abf 100644 --- a/include/linux/mfd/mxc-hdmi-core.h +++ b/include/linux/mfd/mxc-hdmi-core.h @@ -60,5 +60,6 @@ int mxc_hdmi_register_audio(struct snd_pcm_substream *substream); void mxc_hdmi_unregister_audio(struct snd_pcm_substream *substream); unsigned int hdmi_set_cable_state(unsigned int state); unsigned int hdmi_set_blank_state(unsigned int state); +int check_hdmi_state(void); #endif diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index 1cd6d901dcd4..57aac193a943 100644 --- a/include/linux/mtd/nand.h +++ b/include/linux/mtd/nand.h @@ -373,15 +373,15 @@ struct nand_ecc_ctrl { int (*correct)(struct mtd_info *mtd, uint8_t *dat, uint8_t *read_ecc, uint8_t *calc_ecc); int (*read_page_raw)(struct mtd_info *mtd, struct nand_chip *chip, - uint8_t *buf, int page); + uint8_t *buf, int oob_required, int page); void (*write_page_raw)(struct mtd_info *mtd, struct nand_chip *chip, - const uint8_t *buf); + const uint8_t *buf, int oob_required); int (*read_page)(struct mtd_info *mtd, struct nand_chip *chip, - uint8_t *buf, int page); + uint8_t *buf, int oob_required, int page); int (*read_subpage)(struct mtd_info *mtd, struct nand_chip *chip, uint32_t offs, uint32_t len, uint8_t *buf); void (*write_page)(struct mtd_info *mtd, struct nand_chip *chip, - const uint8_t *buf); + const uint8_t *buf, int oob_required); int (*read_oob)(struct mtd_info *mtd, struct nand_chip *chip, int page, int sndcmd); int (*write_oob)(struct mtd_info *mtd, struct nand_chip *chip, @@ -507,7 +507,8 @@ struct nand_chip { int (*errstat)(struct mtd_info *mtd, struct nand_chip *this, int state, int status, int page); int (*write_page)(struct mtd_info *mtd, struct nand_chip *chip, - const uint8_t *buf, int page, int cached, int raw); + const uint8_t *buf, int oob_required, int page, + int cached, int raw); int chip_delay; unsigned int options; diff --git a/include/linux/mxcfb.h b/include/linux/mxcfb.h index 7588d9d09d16..962aa6072b82 100644 --- a/include/linux/mxcfb.h +++ b/include/linux/mxcfb.h @@ -92,6 +92,8 @@ struct mxcfb_rect { #define EPDC_FLAG_USE_ALT_BUFFER 0x100 #define EPDC_FLAG_TEST_COLLISION 0x200 #define EPDC_FLAG_GROUP_UPDATE 0x400 +#define EPDC_FLAG_USE_DITHERING_Y1 0x2000 +#define EPDC_FLAG_USE_DITHERING_Y4 0x4000 #define FB_POWERDOWN_DISABLE -1 @@ -153,6 +155,7 @@ struct mxcfb_waveform_modes { #define MXCFB_SET_PWRDOWN_DELAY _IOW('F', 0x30, int32_t) #define MXCFB_GET_PWRDOWN_DELAY _IOR('F', 0x31, int32_t) #define MXCFB_SET_UPDATE_SCHEME _IOW('F', 0x32, __u32) +#define MXCFB_GET_WORK_BUFFER _IOWR('F', 0x34, unsigned long) #ifdef __KERNEL__ @@ -160,6 +163,11 @@ extern struct fb_videomode mxcfb_modedb[]; extern int mxcfb_modedb_sz; enum { + MXC_DISP_SPEC_DEV = 0, + MXC_DISP_DDC_DEV = 1, +}; + +enum { MXCFB_REFRESH_OFF, MXCFB_REFRESH_AUTO, MXCFB_REFRESH_PARTIAL, @@ -168,5 +176,8 @@ enum { int mxcfb_set_refresh_mode(struct fb_info *fbi, int mode, struct mxcfb_rect *update_region); int mxc_elcdif_frame_addr_setup(dma_addr_t phys); +void mxcfb_elcdif_register_mode(const struct fb_videomode *modedb, + int num_modes, int dev_mode); + #endif /* __KERNEL__ */ #endif diff --git a/include/linux/power/sabresd_battery.h b/include/linux/power/sabresd_battery.h index c251a748a0db..463fa90afdb6 100644 --- a/include/linux/power/sabresd_battery.h +++ b/include/linux/power/sabresd_battery.h @@ -38,6 +38,7 @@ struct max8903_pdata { int flt; /* Fault output */ int dcm; /* Current-Limit Mode input (1: DC, 2: USB) */ int usus; /* USB Suspend Input (1: suspended) */ + int feature_flag;/*battery capacity feature(0:enable, 1:disable)*/ /* DCM wired to Logic High Set this true when DCM pin connect to Logic high.*/ |