diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/drm/drm_crtc.h | 3 | ||||
-rw-r--r-- | include/drm/drm_mode.h | 5 | ||||
-rw-r--r-- | include/linux/blkdev.h | 14 | ||||
-rw-r--r-- | include/linux/cpuidle.h | 4 | ||||
-rw-r--r-- | include/linux/ktime.h | 7 | ||||
-rw-r--r-- | include/linux/mv643xx_eth.h | 2 | ||||
-rw-r--r-- | include/linux/time.h | 29 | ||||
-rw-r--r-- | include/video/omapdss.h | 112 | ||||
-rw-r--r-- | include/xen/events.h | 2 |
9 files changed, 144 insertions, 34 deletions
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index ced362533e3c..bfacf0d5a225 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h | |||
@@ -118,7 +118,8 @@ enum drm_mode_status { | |||
118 | .hdisplay = (hd), .hsync_start = (hss), .hsync_end = (hse), \ | 118 | .hdisplay = (hd), .hsync_start = (hss), .hsync_end = (hse), \ |
119 | .htotal = (ht), .hskew = (hsk), .vdisplay = (vd), \ | 119 | .htotal = (ht), .hskew = (hsk), .vdisplay = (vd), \ |
120 | .vsync_start = (vss), .vsync_end = (vse), .vtotal = (vt), \ | 120 | .vsync_start = (vss), .vsync_end = (vse), .vtotal = (vt), \ |
121 | .vscan = (vs), .flags = (f), .vrefresh = 0 | 121 | .vscan = (vs), .flags = (f), .vrefresh = 0, \ |
122 | .base.type = DRM_MODE_OBJECT_MODE | ||
122 | 123 | ||
123 | #define CRTC_INTERLACE_HALVE_V 0x1 /* halve V values for interlacing */ | 124 | #define CRTC_INTERLACE_HALVE_V 0x1 /* halve V values for interlacing */ |
124 | 125 | ||
diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h index 5581980b14f6..3d6301b6ec16 100644 --- a/include/drm/drm_mode.h +++ b/include/drm/drm_mode.h | |||
@@ -359,8 +359,9 @@ struct drm_mode_mode_cmd { | |||
359 | struct drm_mode_modeinfo mode; | 359 | struct drm_mode_modeinfo mode; |
360 | }; | 360 | }; |
361 | 361 | ||
362 | #define DRM_MODE_CURSOR_BO (1<<0) | 362 | #define DRM_MODE_CURSOR_BO 0x01 |
363 | #define DRM_MODE_CURSOR_MOVE (1<<1) | 363 | #define DRM_MODE_CURSOR_MOVE 0x02 |
364 | #define DRM_MODE_CURSOR_FLAGS 0x03 | ||
364 | 365 | ||
365 | /* | 366 | /* |
366 | * depending on the value in flags different members are used. | 367 | * depending on the value in flags different members are used. |
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 4e72a9d48232..4a2ab7c85393 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
@@ -601,7 +601,7 @@ static inline void blk_clear_rl_full(struct request_list *rl, bool sync) | |||
601 | * it already be started by driver. | 601 | * it already be started by driver. |
602 | */ | 602 | */ |
603 | #define RQ_NOMERGE_FLAGS \ | 603 | #define RQ_NOMERGE_FLAGS \ |
604 | (REQ_NOMERGE | REQ_STARTED | REQ_SOFTBARRIER | REQ_FLUSH | REQ_FUA) | 604 | (REQ_NOMERGE | REQ_STARTED | REQ_SOFTBARRIER | REQ_FLUSH | REQ_FUA | REQ_DISCARD) |
605 | #define rq_mergeable(rq) \ | 605 | #define rq_mergeable(rq) \ |
606 | (!((rq)->cmd_flags & RQ_NOMERGE_FLAGS) && \ | 606 | (!((rq)->cmd_flags & RQ_NOMERGE_FLAGS) && \ |
607 | (((rq)->cmd_flags & REQ_DISCARD) || \ | 607 | (((rq)->cmd_flags & REQ_DISCARD) || \ |
@@ -894,6 +894,8 @@ extern void blk_queue_flush_queueable(struct request_queue *q, bool queueable); | |||
894 | extern struct backing_dev_info *blk_get_backing_dev_info(struct block_device *bdev); | 894 | extern struct backing_dev_info *blk_get_backing_dev_info(struct block_device *bdev); |
895 | 895 | ||
896 | extern int blk_rq_map_sg(struct request_queue *, struct request *, struct scatterlist *); | 896 | extern int blk_rq_map_sg(struct request_queue *, struct request *, struct scatterlist *); |
897 | extern int blk_bio_map_sg(struct request_queue *q, struct bio *bio, | ||
898 | struct scatterlist *sglist); | ||
897 | extern void blk_dump_rq_flags(struct request *, char *); | 899 | extern void blk_dump_rq_flags(struct request *, char *); |
898 | extern long nr_blockdev_pages(void); | 900 | extern long nr_blockdev_pages(void); |
899 | 901 | ||
@@ -1139,6 +1141,16 @@ static inline int queue_limit_discard_alignment(struct queue_limits *lim, sector | |||
1139 | & (lim->discard_granularity - 1); | 1141 | & (lim->discard_granularity - 1); |
1140 | } | 1142 | } |
1141 | 1143 | ||
1144 | static inline int bdev_discard_alignment(struct block_device *bdev) | ||
1145 | { | ||
1146 | struct request_queue *q = bdev_get_queue(bdev); | ||
1147 | |||
1148 | if (bdev != bdev->bd_contains) | ||
1149 | return bdev->bd_part->discard_alignment; | ||
1150 | |||
1151 | return q->limits.discard_alignment; | ||
1152 | } | ||
1153 | |||
1142 | static inline unsigned int queue_discard_zeroes_data(struct request_queue *q) | 1154 | static inline unsigned int queue_discard_zeroes_data(struct request_queue *q) |
1143 | { | 1155 | { |
1144 | if (q->limits.max_discard_sectors && q->limits.discard_zeroes_data == 1) | 1156 | if (q->limits.max_discard_sectors && q->limits.discard_zeroes_data == 1) |
diff --git a/include/linux/cpuidle.h b/include/linux/cpuidle.h index 040b13b5c14a..279b1eaa8b73 100644 --- a/include/linux/cpuidle.h +++ b/include/linux/cpuidle.h | |||
@@ -194,6 +194,10 @@ static inline int cpuidle_play_dead(void) {return -ENODEV; } | |||
194 | 194 | ||
195 | #ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED | 195 | #ifdef CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED |
196 | void cpuidle_coupled_parallel_barrier(struct cpuidle_device *dev, atomic_t *a); | 196 | void cpuidle_coupled_parallel_barrier(struct cpuidle_device *dev, atomic_t *a); |
197 | #else | ||
198 | static inline void cpuidle_coupled_parallel_barrier(struct cpuidle_device *dev, atomic_t *a) | ||
199 | { | ||
200 | } | ||
197 | #endif | 201 | #endif |
198 | 202 | ||
199 | /****************************** | 203 | /****************************** |
diff --git a/include/linux/ktime.h b/include/linux/ktime.h index 603bec2913b0..06177ba10a16 100644 --- a/include/linux/ktime.h +++ b/include/linux/ktime.h | |||
@@ -58,13 +58,6 @@ union ktime { | |||
58 | 58 | ||
59 | typedef union ktime ktime_t; /* Kill this */ | 59 | typedef union ktime ktime_t; /* Kill this */ |
60 | 60 | ||
61 | #define KTIME_MAX ((s64)~((u64)1 << 63)) | ||
62 | #if (BITS_PER_LONG == 64) | ||
63 | # define KTIME_SEC_MAX (KTIME_MAX / NSEC_PER_SEC) | ||
64 | #else | ||
65 | # define KTIME_SEC_MAX LONG_MAX | ||
66 | #endif | ||
67 | |||
68 | /* | 61 | /* |
69 | * ktime_t definitions when using the 64-bit scalar representation: | 62 | * ktime_t definitions when using the 64-bit scalar representation: |
70 | */ | 63 | */ |
diff --git a/include/linux/mv643xx_eth.h b/include/linux/mv643xx_eth.h index 51bf8ada6dc0..49258e0ed1c6 100644 --- a/include/linux/mv643xx_eth.h +++ b/include/linux/mv643xx_eth.h | |||
@@ -15,6 +15,8 @@ | |||
15 | #define MV643XX_ETH_SIZE_REG_4 0x2224 | 15 | #define MV643XX_ETH_SIZE_REG_4 0x2224 |
16 | #define MV643XX_ETH_BASE_ADDR_ENABLE_REG 0x2290 | 16 | #define MV643XX_ETH_BASE_ADDR_ENABLE_REG 0x2290 |
17 | 17 | ||
18 | #define MV643XX_TX_CSUM_DEFAULT_LIMIT 0 | ||
19 | |||
18 | struct mv643xx_eth_shared_platform_data { | 20 | struct mv643xx_eth_shared_platform_data { |
19 | struct mbus_dram_target_info *dram; | 21 | struct mbus_dram_target_info *dram; |
20 | struct platform_device *shared_smi; | 22 | struct platform_device *shared_smi; |
diff --git a/include/linux/time.h b/include/linux/time.h index c81c5e40fcb5..b51e664c83e7 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
@@ -107,11 +107,36 @@ static inline struct timespec timespec_sub(struct timespec lhs, | |||
107 | return ts_delta; | 107 | return ts_delta; |
108 | } | 108 | } |
109 | 109 | ||
110 | #define KTIME_MAX ((s64)~((u64)1 << 63)) | ||
111 | #if (BITS_PER_LONG == 64) | ||
112 | # define KTIME_SEC_MAX (KTIME_MAX / NSEC_PER_SEC) | ||
113 | #else | ||
114 | # define KTIME_SEC_MAX LONG_MAX | ||
115 | #endif | ||
116 | |||
110 | /* | 117 | /* |
111 | * Returns true if the timespec is norm, false if denorm: | 118 | * Returns true if the timespec is norm, false if denorm: |
112 | */ | 119 | */ |
113 | #define timespec_valid(ts) \ | 120 | static inline bool timespec_valid(const struct timespec *ts) |
114 | (((ts)->tv_sec >= 0) && (((unsigned long) (ts)->tv_nsec) < NSEC_PER_SEC)) | 121 | { |
122 | /* Dates before 1970 are bogus */ | ||
123 | if (ts->tv_sec < 0) | ||
124 | return false; | ||
125 | /* Can't have more nanoseconds then a second */ | ||
126 | if ((unsigned long)ts->tv_nsec >= NSEC_PER_SEC) | ||
127 | return false; | ||
128 | return true; | ||
129 | } | ||
130 | |||
131 | static inline bool timespec_valid_strict(const struct timespec *ts) | ||
132 | { | ||
133 | if (!timespec_valid(ts)) | ||
134 | return false; | ||
135 | /* Disallow values that could overflow ktime_t */ | ||
136 | if ((unsigned long long)ts->tv_sec >= KTIME_SEC_MAX) | ||
137 | return false; | ||
138 | return true; | ||
139 | } | ||
115 | 140 | ||
116 | extern void read_persistent_clock(struct timespec *ts); | 141 | extern void read_persistent_clock(struct timespec *ts); |
117 | extern void read_boot_clock(struct timespec *ts); | 142 | extern void read_boot_clock(struct timespec *ts); |
diff --git a/include/video/omapdss.h b/include/video/omapdss.h index a6267a2d292b..3729173b7fbc 100644 --- a/include/video/omapdss.h +++ b/include/video/omapdss.h | |||
@@ -48,10 +48,10 @@ | |||
48 | #define DISPC_IRQ_FRAMEDONEWB (1 << 23) | 48 | #define DISPC_IRQ_FRAMEDONEWB (1 << 23) |
49 | #define DISPC_IRQ_FRAMEDONETV (1 << 24) | 49 | #define DISPC_IRQ_FRAMEDONETV (1 << 24) |
50 | #define DISPC_IRQ_WBBUFFEROVERFLOW (1 << 25) | 50 | #define DISPC_IRQ_WBBUFFEROVERFLOW (1 << 25) |
51 | #define DISPC_IRQ_FRAMEDONE3 (1 << 26) | 51 | #define DISPC_IRQ_SYNC_LOST3 (1 << 27) |
52 | #define DISPC_IRQ_VSYNC3 (1 << 27) | 52 | #define DISPC_IRQ_VSYNC3 (1 << 28) |
53 | #define DISPC_IRQ_ACBIAS_COUNT_STAT3 (1 << 28) | 53 | #define DISPC_IRQ_ACBIAS_COUNT_STAT3 (1 << 29) |
54 | #define DISPC_IRQ_SYNC_LOST3 (1 << 29) | 54 | #define DISPC_IRQ_FRAMEDONE3 (1 << 30) |
55 | 55 | ||
56 | struct omap_dss_device; | 56 | struct omap_dss_device; |
57 | struct omap_overlay_manager; | 57 | struct omap_overlay_manager; |
@@ -73,6 +73,7 @@ enum omap_plane { | |||
73 | OMAP_DSS_VIDEO1 = 1, | 73 | OMAP_DSS_VIDEO1 = 1, |
74 | OMAP_DSS_VIDEO2 = 2, | 74 | OMAP_DSS_VIDEO2 = 2, |
75 | OMAP_DSS_VIDEO3 = 3, | 75 | OMAP_DSS_VIDEO3 = 3, |
76 | OMAP_DSS_WB = 4, | ||
76 | }; | 77 | }; |
77 | 78 | ||
78 | enum omap_channel { | 79 | enum omap_channel { |
@@ -186,6 +187,8 @@ enum omap_overlay_caps { | |||
186 | OMAP_DSS_OVL_CAP_GLOBAL_ALPHA = 1 << 1, | 187 | OMAP_DSS_OVL_CAP_GLOBAL_ALPHA = 1 << 1, |
187 | OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA = 1 << 2, | 188 | OMAP_DSS_OVL_CAP_PRE_MULT_ALPHA = 1 << 2, |
188 | OMAP_DSS_OVL_CAP_ZORDER = 1 << 3, | 189 | OMAP_DSS_OVL_CAP_ZORDER = 1 << 3, |
190 | OMAP_DSS_OVL_CAP_POS = 1 << 4, | ||
191 | OMAP_DSS_OVL_CAP_REPLICATION = 1 << 5, | ||
189 | }; | 192 | }; |
190 | 193 | ||
191 | enum omap_overlay_manager_caps { | 194 | enum omap_overlay_manager_caps { |
@@ -207,6 +210,16 @@ enum omap_hdmi_flags { | |||
207 | OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP = 1 << 0, | 210 | OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP = 1 << 0, |
208 | }; | 211 | }; |
209 | 212 | ||
213 | enum omap_dss_output_id { | ||
214 | OMAP_DSS_OUTPUT_DPI = 1 << 0, | ||
215 | OMAP_DSS_OUTPUT_DBI = 1 << 1, | ||
216 | OMAP_DSS_OUTPUT_SDI = 1 << 2, | ||
217 | OMAP_DSS_OUTPUT_DSI1 = 1 << 3, | ||
218 | OMAP_DSS_OUTPUT_DSI2 = 1 << 4, | ||
219 | OMAP_DSS_OUTPUT_VENC = 1 << 5, | ||
220 | OMAP_DSS_OUTPUT_HDMI = 1 << 6, | ||
221 | }; | ||
222 | |||
210 | /* RFBI */ | 223 | /* RFBI */ |
211 | 224 | ||
212 | struct rfbi_timings { | 225 | struct rfbi_timings { |
@@ -243,7 +256,7 @@ void rfbi_bus_unlock(void); | |||
243 | 256 | ||
244 | /* DSI */ | 257 | /* DSI */ |
245 | 258 | ||
246 | struct omap_dss_dsi_videomode_data { | 259 | struct omap_dss_dsi_videomode_timings { |
247 | /* DSI video mode blanking data */ | 260 | /* DSI video mode blanking data */ |
248 | /* Unit: byte clock cycles */ | 261 | /* Unit: byte clock cycles */ |
249 | u16 hsa; | 262 | u16 hsa; |
@@ -424,6 +437,8 @@ struct omap_overlay { | |||
424 | struct omap_overlay_info *info); | 437 | struct omap_overlay_info *info); |
425 | 438 | ||
426 | int (*wait_for_go)(struct omap_overlay *ovl); | 439 | int (*wait_for_go)(struct omap_overlay *ovl); |
440 | |||
441 | struct omap_dss_device *(*get_device)(struct omap_overlay *ovl); | ||
427 | }; | 442 | }; |
428 | 443 | ||
429 | struct omap_overlay_manager_info { | 444 | struct omap_overlay_manager_info { |
@@ -448,9 +463,10 @@ struct omap_overlay_manager { | |||
448 | enum omap_overlay_manager_caps caps; | 463 | enum omap_overlay_manager_caps caps; |
449 | struct list_head overlays; | 464 | struct list_head overlays; |
450 | enum omap_display_type supported_displays; | 465 | enum omap_display_type supported_displays; |
466 | enum omap_dss_output_id supported_outputs; | ||
451 | 467 | ||
452 | /* dynamic fields */ | 468 | /* dynamic fields */ |
453 | struct omap_dss_device *device; | 469 | struct omap_dss_output *output; |
454 | 470 | ||
455 | /* | 471 | /* |
456 | * The following functions do not block: | 472 | * The following functions do not block: |
@@ -463,9 +479,9 @@ struct omap_overlay_manager { | |||
463 | * interrupt context | 479 | * interrupt context |
464 | */ | 480 | */ |
465 | 481 | ||
466 | int (*set_device)(struct omap_overlay_manager *mgr, | 482 | int (*set_output)(struct omap_overlay_manager *mgr, |
467 | struct omap_dss_device *dssdev); | 483 | struct omap_dss_output *output); |
468 | int (*unset_device)(struct omap_overlay_manager *mgr); | 484 | int (*unset_output)(struct omap_overlay_manager *mgr); |
469 | 485 | ||
470 | int (*set_manager_info)(struct omap_overlay_manager *mgr, | 486 | int (*set_manager_info)(struct omap_overlay_manager *mgr, |
471 | struct omap_overlay_manager_info *info); | 487 | struct omap_overlay_manager_info *info); |
@@ -475,6 +491,8 @@ struct omap_overlay_manager { | |||
475 | int (*apply)(struct omap_overlay_manager *mgr); | 491 | int (*apply)(struct omap_overlay_manager *mgr); |
476 | int (*wait_for_go)(struct omap_overlay_manager *mgr); | 492 | int (*wait_for_go)(struct omap_overlay_manager *mgr); |
477 | int (*wait_for_vsync)(struct omap_overlay_manager *mgr); | 493 | int (*wait_for_vsync)(struct omap_overlay_manager *mgr); |
494 | |||
495 | struct omap_dss_device *(*get_device)(struct omap_overlay_manager *mgr); | ||
478 | }; | 496 | }; |
479 | 497 | ||
480 | /* 22 pins means 1 clk lane and 10 data lanes */ | 498 | /* 22 pins means 1 clk lane and 10 data lanes */ |
@@ -492,6 +510,37 @@ struct omap_dsi_pin_config { | |||
492 | int pins[OMAP_DSS_MAX_DSI_PINS]; | 510 | int pins[OMAP_DSS_MAX_DSI_PINS]; |
493 | }; | 511 | }; |
494 | 512 | ||
513 | struct omap_dss_writeback_info { | ||
514 | u32 paddr; | ||
515 | u32 p_uv_addr; | ||
516 | u16 buf_width; | ||
517 | u16 width; | ||
518 | u16 height; | ||
519 | enum omap_color_mode color_mode; | ||
520 | u8 rotation; | ||
521 | enum omap_dss_rotation_type rotation_type; | ||
522 | bool mirror; | ||
523 | u8 pre_mult_alpha; | ||
524 | }; | ||
525 | |||
526 | struct omap_dss_output { | ||
527 | struct list_head list; | ||
528 | |||
529 | /* display type supported by the output */ | ||
530 | enum omap_display_type type; | ||
531 | |||
532 | /* output instance */ | ||
533 | enum omap_dss_output_id id; | ||
534 | |||
535 | /* output's platform device pointer */ | ||
536 | struct platform_device *pdev; | ||
537 | |||
538 | /* dynamic fields */ | ||
539 | struct omap_overlay_manager *manager; | ||
540 | |||
541 | struct omap_dss_device *device; | ||
542 | }; | ||
543 | |||
495 | struct omap_dss_device { | 544 | struct omap_dss_device { |
496 | struct device dev; | 545 | struct device dev; |
497 | 546 | ||
@@ -564,7 +613,7 @@ struct omap_dss_device { | |||
564 | 613 | ||
565 | enum omap_dss_dsi_pixel_format dsi_pix_fmt; | 614 | enum omap_dss_dsi_pixel_format dsi_pix_fmt; |
566 | enum omap_dss_dsi_mode dsi_mode; | 615 | enum omap_dss_dsi_mode dsi_mode; |
567 | struct omap_dss_dsi_videomode_data dsi_vm_data; | 616 | struct omap_dss_dsi_videomode_timings dsi_vm_timings; |
568 | } panel; | 617 | } panel; |
569 | 618 | ||
570 | struct { | 619 | struct { |
@@ -590,7 +639,7 @@ struct omap_dss_device { | |||
590 | 639 | ||
591 | enum omap_display_caps caps; | 640 | enum omap_display_caps caps; |
592 | 641 | ||
593 | struct omap_overlay_manager *manager; | 642 | struct omap_dss_output *output; |
594 | 643 | ||
595 | enum omap_dss_display_state state; | 644 | enum omap_dss_display_state state; |
596 | 645 | ||
@@ -605,6 +654,8 @@ struct omap_dss_device { | |||
605 | 654 | ||
606 | struct omap_dss_hdmi_data | 655 | struct omap_dss_hdmi_data |
607 | { | 656 | { |
657 | int ct_cp_hpd_gpio; | ||
658 | int ls_oe_gpio; | ||
608 | int hpd_gpio; | 659 | int hpd_gpio; |
609 | }; | 660 | }; |
610 | 661 | ||
@@ -699,6 +750,11 @@ struct omap_overlay_manager *omap_dss_get_overlay_manager(int num); | |||
699 | int omap_dss_get_num_overlays(void); | 750 | int omap_dss_get_num_overlays(void); |
700 | struct omap_overlay *omap_dss_get_overlay(int num); | 751 | struct omap_overlay *omap_dss_get_overlay(int num); |
701 | 752 | ||
753 | struct omap_dss_output *omap_dss_get_output(enum omap_dss_output_id id); | ||
754 | int omapdss_output_set_device(struct omap_dss_output *out, | ||
755 | struct omap_dss_device *dssdev); | ||
756 | int omapdss_output_unset_device(struct omap_dss_output *out); | ||
757 | |||
702 | void omapdss_default_get_resolution(struct omap_dss_device *dssdev, | 758 | void omapdss_default_get_resolution(struct omap_dss_device *dssdev, |
703 | u16 *xres, u16 *yres); | 759 | u16 *xres, u16 *yres); |
704 | int omapdss_default_get_recommended_bpp(struct omap_dss_device *dssdev); | 760 | int omapdss_default_get_recommended_bpp(struct omap_dss_device *dssdev); |
@@ -719,6 +775,15 @@ int omap_dispc_wait_for_irq_interruptible_timeout(u32 irqmask, | |||
719 | void omapdss_dsi_vc_enable_hs(struct omap_dss_device *dssdev, int channel, | 775 | void omapdss_dsi_vc_enable_hs(struct omap_dss_device *dssdev, int channel, |
720 | bool enable); | 776 | bool enable); |
721 | int omapdss_dsi_enable_te(struct omap_dss_device *dssdev, bool enable); | 777 | int omapdss_dsi_enable_te(struct omap_dss_device *dssdev, bool enable); |
778 | void omapdss_dsi_set_timings(struct omap_dss_device *dssdev, | ||
779 | struct omap_video_timings *timings); | ||
780 | void omapdss_dsi_set_size(struct omap_dss_device *dssdev, u16 w, u16 h); | ||
781 | void omapdss_dsi_set_pixel_format(struct omap_dss_device *dssdev, | ||
782 | enum omap_dss_dsi_pixel_format fmt); | ||
783 | void omapdss_dsi_set_operation_mode(struct omap_dss_device *dssdev, | ||
784 | enum omap_dss_dsi_mode mode); | ||
785 | void omapdss_dsi_set_videomode_timings(struct omap_dss_device *dssdev, | ||
786 | struct omap_dss_dsi_videomode_timings *timings); | ||
722 | 787 | ||
723 | int omap_dsi_update(struct omap_dss_device *dssdev, int channel, | 788 | int omap_dsi_update(struct omap_dss_device *dssdev, int channel, |
724 | void (*callback)(int, void *), void *data); | 789 | void (*callback)(int, void *), void *data); |
@@ -727,6 +792,8 @@ int omap_dsi_set_vc_id(struct omap_dss_device *dssdev, int channel, int vc_id); | |||
727 | void omap_dsi_release_vc(struct omap_dss_device *dssdev, int channel); | 792 | void omap_dsi_release_vc(struct omap_dss_device *dssdev, int channel); |
728 | int omapdss_dsi_configure_pins(struct omap_dss_device *dssdev, | 793 | int omapdss_dsi_configure_pins(struct omap_dss_device *dssdev, |
729 | const struct omap_dsi_pin_config *pin_cfg); | 794 | const struct omap_dsi_pin_config *pin_cfg); |
795 | int omapdss_dsi_set_clocks(struct omap_dss_device *dssdev, | ||
796 | unsigned long ddr_clk, unsigned long lp_clk); | ||
730 | 797 | ||
731 | int omapdss_dsi_display_enable(struct omap_dss_device *dssdev); | 798 | int omapdss_dsi_display_enable(struct omap_dss_device *dssdev); |
732 | void omapdss_dsi_display_disable(struct omap_dss_device *dssdev, | 799 | void omapdss_dsi_display_disable(struct omap_dss_device *dssdev, |
@@ -734,22 +801,29 @@ void omapdss_dsi_display_disable(struct omap_dss_device *dssdev, | |||
734 | 801 | ||
735 | int omapdss_dpi_display_enable(struct omap_dss_device *dssdev); | 802 | int omapdss_dpi_display_enable(struct omap_dss_device *dssdev); |
736 | void omapdss_dpi_display_disable(struct omap_dss_device *dssdev); | 803 | void omapdss_dpi_display_disable(struct omap_dss_device *dssdev); |
737 | void dpi_set_timings(struct omap_dss_device *dssdev, | 804 | void omapdss_dpi_set_timings(struct omap_dss_device *dssdev, |
738 | struct omap_video_timings *timings); | 805 | struct omap_video_timings *timings); |
739 | int dpi_check_timings(struct omap_dss_device *dssdev, | 806 | int dpi_check_timings(struct omap_dss_device *dssdev, |
740 | struct omap_video_timings *timings); | 807 | struct omap_video_timings *timings); |
808 | void omapdss_dpi_set_data_lines(struct omap_dss_device *dssdev, int data_lines); | ||
741 | 809 | ||
742 | int omapdss_sdi_display_enable(struct omap_dss_device *dssdev); | 810 | int omapdss_sdi_display_enable(struct omap_dss_device *dssdev); |
743 | void omapdss_sdi_display_disable(struct omap_dss_device *dssdev); | 811 | void omapdss_sdi_display_disable(struct omap_dss_device *dssdev); |
812 | void omapdss_sdi_set_timings(struct omap_dss_device *dssdev, | ||
813 | struct omap_video_timings *timings); | ||
814 | void omapdss_sdi_set_datapairs(struct omap_dss_device *dssdev, int datapairs); | ||
744 | 815 | ||
745 | int omapdss_rfbi_display_enable(struct omap_dss_device *dssdev); | 816 | int omapdss_rfbi_display_enable(struct omap_dss_device *dssdev); |
746 | void omapdss_rfbi_display_disable(struct omap_dss_device *dssdev); | 817 | void omapdss_rfbi_display_disable(struct omap_dss_device *dssdev); |
747 | int omap_rfbi_prepare_update(struct omap_dss_device *dssdev, | 818 | int omap_rfbi_update(struct omap_dss_device *dssdev, void (*callback)(void *), |
748 | u16 *x, u16 *y, u16 *w, u16 *h); | 819 | void *data); |
749 | int omap_rfbi_update(struct omap_dss_device *dssdev, | 820 | int omap_rfbi_configure(struct omap_dss_device *dssdev); |
750 | u16 x, u16 y, u16 w, u16 h, | 821 | void omapdss_rfbi_set_size(struct omap_dss_device *dssdev, u16 w, u16 h); |
751 | void (*callback)(void *), void *data); | 822 | void omapdss_rfbi_set_pixel_size(struct omap_dss_device *dssdev, |
752 | int omap_rfbi_configure(struct omap_dss_device *dssdev, int pixel_size, | 823 | int pixel_size); |
824 | void omapdss_rfbi_set_data_lines(struct omap_dss_device *dssdev, | ||
753 | int data_lines); | 825 | int data_lines); |
826 | void omapdss_rfbi_set_interface_timings(struct omap_dss_device *dssdev, | ||
827 | struct rfbi_timings *timings); | ||
754 | 828 | ||
755 | #endif | 829 | #endif |
diff --git a/include/xen/events.h b/include/xen/events.h index 9c641deb65d2..04399b28e821 100644 --- a/include/xen/events.h +++ b/include/xen/events.h | |||
@@ -58,8 +58,6 @@ void notify_remote_via_irq(int irq); | |||
58 | 58 | ||
59 | void xen_irq_resume(void); | 59 | void xen_irq_resume(void); |
60 | 60 | ||
61 | void xen_hvm_prepare_kexec(struct shared_info *sip, unsigned long pfn); | ||
62 | |||
63 | /* Clear an irq's pending state, in preparation for polling on it */ | 61 | /* Clear an irq's pending state, in preparation for polling on it */ |
64 | void xen_clear_irq_pending(int irq); | 62 | void xen_clear_irq_pending(int irq); |
65 | void xen_set_irq_pending(int irq); | 63 | void xen_set_irq_pending(int irq); |