Lines Matching +full:usb +full:- +full:b +full:- +full:connector
1 diff --git a/include/drm/bridge/analogix_dp.h b/include/drm/bridge/analogix_dp.h
3 --- a/include/drm/bridge/analogix_dp.h
4 +++ b/include/drm/bridge/analogix_dp.h
5 @@ -8,6 +8,7 @@
9 +#include <sound/hdmi-codec.h>
13 @@ -25,21 +26,32 @@ static inline bool is_rockchip(enum analogix_dp_devtype type)
19 struct drm_connector *connector;
46 @@ -50,4 +62,13 @@ void analogix_dp_remove(struct analogix_dp_device *dp);
47 int analogix_dp_start_crc(struct drm_connector *connector);
48 int analogix_dp_stop_crc(struct drm_connector *connector);
60 diff --git a/include/drm/bridge/dw_hdmi.h b/include/drm/bridge/dw_hdmi.h
62 --- a/include/drm/bridge/dw_hdmi.h
63 +++ b/include/drm/bridge/dw_hdmi.h
64 @@ -6,12 +6,15 @@
69 #include <sound/hdmi-codec.h>
80 @@ -92,6 +95,13 @@ enum dw_hdmi_phy_type {
94 @@ -112,6 +122,15 @@ struct dw_hdmi_phy_config {
110 @@ -123,12 +142,48 @@ struct dw_hdmi_phy_ops {
128 + void (*attach_properties)(struct drm_connector *connector,
131 + void (*destroy_properties)(struct drm_connector *connector,
133 + int (*set_property)(struct drm_connector *connector,
138 + int (*get_property)(struct drm_connector *connector,
159 @@ -137,22 +192,55 @@ struct dw_hdmi_plat_data {
162 /* Platform-specific mode validation (optional). */
163 - enum drm_mode_status (*mode_valid)(struct dw_hdmi *hdmi, void *data,
164 + enum drm_mode_status (*mode_valid)(struct drm_connector *connector,
199 + int (*get_yuv422_format)(struct drm_connector *connector,
203 + struct drm_connector *connector);
212 + struct drm_connector *connector;
216 @@ -161,8 +249,9 @@ void dw_hdmi_remove(struct dw_hdmi *hdmi);
220 - const struct dw_hdmi_plat_data *plat_data);
227 @@ -192,5 +281,31 @@ enum drm_connector_status dw_hdmi_phy_read_hpd(struct dw_hdmi *hdmi,
259 diff --git a/include/drm/bridge/dw_mipi_dsi.h b/include/drm/bridge/dw_mipi_dsi.h
261 --- a/include/drm/bridge/dw_mipi_dsi.h
262 +++ b/include/drm/bridge/dw_mipi_dsi.h
263 @@ -66,5 +66,6 @@ void dw_mipi_dsi_remove(struct dw_mipi_dsi *dsi);
270 diff --git a/include/drm/drm_auth.h b/include/drm/drm_auth.h
272 --- a/include/drm/drm_auth.h
273 +++ b/include/drm/drm_auth.h
274 @@ -107,7 +107,6 @@ struct drm_master {
278 -struct drm_master *drm_file_get_master(struct drm_file *file_priv);
282 diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h
284 --- a/include/drm/drm_connector.h
285 +++ b/include/drm/drm_connector.h
286 @@ -175,6 +175,48 @@ struct drm_scdc {
292 + * struct drm_hdmi_dsc_cap - DSC capabilities of HDMI sink
334 * struct drm_hdmi_info - runtime information about the connected HDMI sink
335 @@ -207,6 +249,17 @@ struct drm_hdmi_info {
353 @@ -1596,6 +1649,7 @@ drm_connector_is_unregistered(struct drm_connector *connector)
361 diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
363 --- a/include/drm/drm_crtc.h
364 +++ b/include/drm/drm_crtc.h
365 @@ -287,7 +287,16 @@ struct drm_crtc_state {
369 -
383 diff --git a/include/drm/drm_drv.h b/include/drm/drm_drv.h
385 --- a/include/drm/drm_drv.h
386 +++ b/include/drm/drm_drv.h
387 @@ -29,6 +29,7 @@
395 @@ -460,6 +461,15 @@ struct drm_driver {
411 diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h
413 --- a/include/drm/drm_edid.h
414 +++ b/include/drm/drm_edid.h
415 @@ -229,6 +229,38 @@ struct detailed_timing {
454 @@ -359,8 +391,6 @@ drm_load_edid_firmware(struct drm_connector *connector)
458 -bool drm_edid_are_equal(const struct edid *edid1, const struct edid *edid2);
459 -
462 const struct drm_connector *connector,
463 @@ -483,35 +513,99 @@ struct edid *drm_do_get_edid(struct drm_connector *connector,
467 -struct edid *drm_get_edid(struct drm_connector *connector,
468 - struct i2c_adapter *adapter);
469 struct edid *drm_get_edid_switcheroo(struct drm_connector *connector,
471 -struct edid *drm_edid_duplicate(const struct edid *edid);
472 -int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid);
473 -int drm_add_override_edid_modes(struct drm_connector *connector);
475 -u8 drm_match_cea_mode(const struct drm_display_mode *to_match);
477 -bool drm_detect_monitor_audio(struct edid *edid);
480 -int drm_add_modes_noedid(struct drm_connector *connector,
481 - int hdisplay, int vdisplay);
482 void drm_set_preferred_mode(struct drm_connector *connector,
488 -bool drm_edid_is_valid(struct edid *edid);
494 +struct edid *drm_get_edid(struct drm_connector *connector,
497 +int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid);
498 +int drm_add_override_edid_modes(struct drm_connector *connector);
500 +int drm_add_modes_noedid(struct drm_connector *connector,
510 -struct drm_display_mode *
511 -drm_display_mode_from_cea_vic(struct drm_device *dev,
512 - u8 video_code);
514 +static inline struct edid *drm_get_edid(struct drm_connector *connector,
525 +static inline int drm_add_edid_modes(struct drm_connector *connector,
531 +static inline int drm_add_override_edid_modes(struct drm_connector *connector)
541 +static inline int drm_add_modes_noedid(struct drm_connector *connector,
576 diff --git a/include/drm/drm_file.h b/include/drm/drm_file.h
578 --- a/include/drm/drm_file.h
579 +++ b/include/drm/drm_file.h
580 @@ -226,27 +226,15 @@ struct drm_file {
584 - * Master this node is currently associated with. Protected by struct
585 - * &drm_device.master_mutex, and serialized by @master_lookup_lock.
586 - *
587 - * Only relevant if drm_is_primary_client() returns true. Note that
588 - * this only matches &drm_device.master if the master is the currently
589 - * active one.
590 - *
591 - * When dereferencing this pointer, either hold struct
592 - * &drm_device.master_mutex for the duration of the pointer's use, or
593 - * use drm_file_get_master() if struct &drm_device.master_mutex is not
594 - * currently held and there is no other need to hold it. This prevents
595 - * @master from being freed during use.
605 - /** @master_lock: Serializes @master. */
606 - spinlock_t master_lookup_lock;
607 -
611 @@ -411,6 +399,9 @@ void drm_event_cancel_free(struct drm_device *dev,
621 diff --git a/include/drm/drm_mipi_dsi.h b/include/drm/drm_mipi_dsi.h
623 --- a/include/drm/drm_mipi_dsi.h
624 +++ b/include/drm/drm_mipi_dsi.h
625 @@ -19,12 +19,18 @@ struct drm_dsc_picture_parameter_set;
635 * struct mipi_dsi_msg - read/write DSI buffer
644 @@ -34,6 +40,8 @@ struct mipi_dsi_msg {
653 @@ -132,6 +140,10 @@ struct mipi_dsi_host *of_find_mipi_dsi_host_by_node(struct device_node *node);
664 diff --git a/include/drm/drm_mode_config.h b/include/drm/drm_mode_config.h
666 --- a/include/drm/drm_mode_config.h
667 +++ b/include/drm/drm_mode_config.h
668 @@ -794,6 +794,19 @@ struct drm_mode_config {
680 + * 3D LUT as supported by the driver (read-only).
686 * @suggested_x_property: Optional connector property with a hint for
688 diff --git a/include/drm/drm_mode_object.h b/include/drm/drm_mode_object.h
690 --- a/include/drm/drm_mode_object.h
691 +++ b/include/drm/drm_mode_object.h
692 @@ -60,7 +60,7 @@ struct drm_mode_object {
696 -#define DRM_OBJECT_MAX_PROPERTY 24
699 * struct drm_object_properties - property tracking for &drm_mode_object
701 diff --git a/include/drm/drm_prime.h b/include/drm/drm_prime.h
703 --- a/include/drm/drm_prime.h
704 +++ b/include/drm/drm_prime.h
705 @@ -107,5 +107,6 @@ void drm_prime_gem_destroy(struct drm_gem_object *obj, struct sg_table *sg);
712 diff --git a/include/dt-bindings/clock/rk3399-cru.h b/include/dt-bindings/clock/rk3399-cru.h
714 --- a/include/dt-bindings/clock/rk3399-cru.h
715 +++ b/include/dt-bindings/clock/rk3399-cru.h
716 @@ -7,6 +7,8 @@
725 @@ -19,6 +21,7 @@
733 @@ -122,9 +125,18 @@
737 -#define SCLK_DDRC 168
738 -#define SCLK_TESTCLKOUT1 169
739 -#define SCLK_TESTCLKOUT2 170
755 @@ -351,6 +363,7 @@
763 @@ -421,7 +434,7 @@
767 -#define SRST_L2_B_T 43
772 @@ -594,13 +607,13 @@
776 -#define SRST_P_SPI3 217
777 -#define SRST_P_SPI4 218
783 -#define SRST_SPI3 222
784 -#define SRST_SPI4 223
790 @@ -722,8 +735,8 @@
794 -#define SRST_P_SPI6 6
795 -#define SRST_SPI6 7
801 diff --git a/include/dt-bindings/soc/rockchip,boot-mode.h b/include/dt-bindings/soc/rockchip,boot-m…
803 --- a/include/dt-bindings/soc/rockchip,boot-mode.h
804 +++ b/include/dt-bindings/soc/rockchip,boot-mode.h
805 @@ -10,7 +10,15 @@
809 - /* enter fastboot mode */
818 +/* enter usb mass storage mode */
822 diff --git a/include/linux/blk_types.h b/include/linux/blk_types.h
824 --- a/include/linux/blk_types.h
825 +++ b/include/linux/blk_types.h
826 @@ -46,6 +46,7 @@ struct block_device {
834 diff --git a/include/linux/bpf.h b/include/linux/bpf.h
836 --- a/include/linux/bpf.h
837 +++ b/include/linux/bpf.h
838 @@ -173,7 +173,7 @@ struct bpf_map {
842 - atomic64_t writecnt;
847 @@ -1333,7 +1333,6 @@ void bpf_map_charge_move(struct bpf_map_memory *dst,
851 -bool bpf_map_write_active(const struct bpf_map *map);
855 diff --git a/include/linux/cgroup.h b/include/linux/cgroup.h
857 --- a/include/linux/cgroup.h
858 +++ b/include/linux/cgroup.h
859 @@ -676,6 +676,8 @@ static inline struct psi_group *cgroup_psi(struct cgroup *cgrp)
860 return &cgrp->psi;
868 @@ -735,6 +737,11 @@ static inline struct psi_group *cgroup_psi(struct cgroup *cgrp)
880 @@ -816,13 +823,33 @@ static inline void cgroup_account_cputime_field(struct task_struct *task,
895 - return skcd->cgroup;
900 + * @skcd->val is 64bit but the following is safe on 32bit too as we
903 + v = READ_ONCE(skcd->val);
910 + return (struct cgroup *)(unsigned long)skcd->val;
915 diff --git a/include/linux/clk-provider.h b/include/linux/clk-provider.h
917 --- a/include/linux/clk-provider.h
918 +++ b/include/linux/clk-provider.h
919 @@ -599,6 +599,7 @@ struct clk_divider {
927 @@ -936,6 +937,8 @@ void clk_hw_unregister_fixed_factor(struct clk_hw *hw);
928 * CLK_FRAC_DIVIDER_BIG_ENDIAN - By default little endian register accesses are
931 + * CLK_FRAC_DIVIDER_NO_LIMIT - not need to follow the 20 times limit on
936 @@ -947,6 +950,7 @@ struct clk_fractional_divider {
944 @@ -957,6 +961,7 @@ struct clk_fractional_divider {
952 @@ -1017,6 +1022,9 @@ extern const struct clk_ops clk_multiplier_ops;
953 * @mux_hw: handle between composite and hardware-specific mux clock
954 * @rate_hw: handle between composite and hardware-specific rate clock
955 * @gate_hw: handle between composite and hardware-specific gate clock
958 + * common and hardware-specific interfaces
962 @@ -1028,6 +1036,7 @@ struct clk_composite {
970 diff --git a/include/linux/cpuset.h b/include/linux/cpuset.h
972 --- a/include/linux/cpuset.h
973 +++ b/include/linux/cpuset.h
974 @@ -15,6 +15,7 @@
982 @@ -162,6 +163,8 @@ static inline void set_mems_allowed(nodemask_t nodemask)
991 @@ -184,7 +187,7 @@ static inline void cpuset_read_unlock(void) { }
995 - cpumask_copy(mask, cpu_possible_mask);
1000 @@ -280,6 +283,8 @@ static inline bool read_mems_allowed_retry(unsigned int seq)
1009 diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h
1011 --- a/include/linux/dma-buf.h
1012 +++ b/include/linux/dma-buf.h
1013 @@ -209,6 +209,41 @@ struct dma_buf_ops {
1022 + * available for cpu access - the exporter might need to allocate or
1023 + * swap-in and pin the backing storage.
1035 + * de-factor mlock rights to userspace) and for the kernel-internal
1038 + * there's no in-kernel users of the kmap interfaces yet this isn't a
1045 + * return -ERESTARTSYS or -EINTR when the call has been interrupted and
1055 @@ -228,6 +263,28 @@ struct dma_buf_ops {
1074 + * -ERESTARTSYS or -EINTR when the call has been interrupted and needs
1084 @@ -267,6 +324,35 @@ struct dma_buf_ops {
1120 @@ -297,6 +383,9 @@ struct dma_buf_ops {
1130 @@ -341,7 +430,12 @@ struct dma_buf {
1143 @@ -392,6 +486,9 @@ struct dma_buf_attach_ops {
1153 @@ -412,6 +509,14 @@ struct dma_buf_attachment {
1168 @@ -489,6 +594,9 @@ dma_buf_attachment_is_dynamic(struct dma_buf_attachment *attach)
1169 return !!attach->importer_ops;
1178 @@ -513,13 +621,21 @@ void dma_buf_unmap_attachment(struct dma_buf_attachment *, struct sg_table *,
1200 diff --git a/include/linux/dma-fence.h b/include/linux/dma-fence.h
1202 --- a/include/linux/dma-fence.h
1203 +++ b/include/linux/dma-fence.h
1204 @@ -372,6 +372,9 @@ static inline void __dma_fence_might_wait(void) {}
1214 diff --git a/include/linux/dma-heap.h b/include/linux/dma-heap.h
1216 --- a/include/linux/dma-heap.h
1217 +++ b/include/linux/dma-heap.h
1218 @@ -16,15 +16,17 @@ struct dma_heap;
1221 * struct dma_heap_ops - ops to operate on a given heap
1222 - * @allocate: allocate dmabuf and return fd
1226 - * allocate returns dmabuf fd on success, -errno on error.
1227 + * allocate returns dmabuf on success, ERR_PTR(-errno) on error.
1230 - int (*allocate)(struct dma_heap *heap,
1239 @@ -50,6 +52,15 @@ struct dma_heap_export_info {
1244 + * dma_heap_get_dev() - get device struct for the heap
1245 + * @heap: DMA-Heap to retrieve device struct from
1253 * dma_heap_get_name() - get heap name
1254 * @heap: DMA-Heap to retrieve private data for
1255 @@ -65,4 +76,49 @@ const char *dma_heap_get_name(struct dma_heap *heap);
1260 + * dma_heap_put - drops a reference to a dmabuf heaps, potentially freeing it
1266 + * dma_heap_find - Returns the registered dma_heap with the specified name
1275 + * dma_heap_buffer_alloc - Allocate dma-buf from a dma_heap
1278 + * @fd_flags: flags to set on returned dma-buf fd
1281 + * This is for internal dma-buf allocations only.
1287 +/** dma_heap_buffer_free - Free dma_buf allocated by dma_heap_buffer_alloc
1295 + * dma_heap_bufferfd_alloc - Allocate dma-buf fd from a dma_heap
1298 + * @fd_flags: flags to set on returned dma-buf fd
1305 diff --git a/include/linux/dma-iommu.h b/include/linux/dma-iommu.h
1307 --- a/include/linux/dma-iommu.h
1308 +++ b/include/linux/dma-iommu.h
1309 @@ -37,6 +37,11 @@ void iommu_dma_compose_msi_msg(struct msi_desc *desc,
1321 @@ -78,5 +83,16 @@ static inline void iommu_dma_get_resv_regions(struct device *dev, struct list_he
1328 + return -ENODEV;
1333 + return -ENODEV;
1338 diff --git a/include/linux/dma-map-ops.h b/include/linux/dma-map-ops.h
1340 --- a/include/linux/dma-map-ops.h
1341 +++ b/include/linux/dma-map-ops.h
1342 @@ -258,6 +258,14 @@ void arch_dma_free(struct device *dev, size_t size, void *cpu_addr,
1357 diff --git a/include/linux/dma-mapping.h b/include/linux/dma-mapping.h
1359 --- a/include/linux/dma-mapping.h
1360 +++ b/include/linux/dma-mapping.h
1361 @@ -61,6 +61,23 @@
1369 + * devices that are non-coherent, but can use the system cache.
1377 + * useful for buffers that are being mapped for devices that are non-coherent,
1385 diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
1387 --- a/include/linux/dmaengine.h
1388 +++ b/include/linux/dmaengine.h
1389 @@ -418,6 +418,9 @@ enum dma_slave_buswidth {
1399 @@ -443,6 +446,8 @@ struct dma_slave_config {
1408 diff --git a/include/linux/energy_model.h b/include/linux/energy_model.h
1410 --- a/include/linux/energy_model.h
1411 +++ b/include/linux/energy_model.h
1412 @@ -29,6 +29,8 @@ struct em_perf_state {
1413 * em_perf_domain - Performance domain
1416 + * @milliwatts: Flag indicating the power values are in milli-Watts
1421 @@ -43,6 +45,7 @@ struct em_perf_state {
1429 @@ -95,7 +98,8 @@ struct em_data_callback {
1433 - struct em_data_callback *cb, cpumask_t *span);
1439 @@ -119,6 +123,9 @@ static inline unsigned long em_cpu_energy(struct em_perf_domain *pd,
1449 @@ -202,7 +209,8 @@ struct em_data_callback {};
1453 - struct em_data_callback *cb, cpumask_t *span)
1457 return -EINVAL;
1459 diff --git a/include/linux/extcon.h b/include/linux/extcon.h
1461 --- a/include/linux/extcon.h
1462 +++ b/include/linux/extcon.h
1463 @@ -37,6 +37,7 @@
1464 /* USB external connector */
1470 * Charging external connector
1471 diff --git a/include/linux/freezer.h b/include/linux/freezer.h
1473 --- a/include/linux/freezer.h
1474 +++ b/include/linux/freezer.h
1475 @@ -27,6 +27,11 @@ static inline bool frozen(struct task_struct *p)
1476 return p->flags & PF_FROZEN;
1481 + return p->flags & (PF_FROZEN | PF_FREEZER_SKIP);
1487 @@ -270,6 +275,7 @@ static inline int freezable_schedule_hrtimeout_range(ktime_t *expires,
1495 diff --git a/include/linux/iommu.h b/include/linux/iommu.h
1497 --- a/include/linux/iommu.h
1498 +++ b/include/linux/iommu.h
1499 @@ -31,6 +31,26 @@
1504 + * Non-coherent masters can use this page protection flag to set cacheable
1506 + * the last-level or system cache.
1510 + * Non-coherent masters can use this page protection flag to set cacheable
1512 + * transparent outer level of cache, also known as the last-level or system
1526 @@ -190,7 +210,12 @@ struct iommu_iotlb_gather {
1532 + * @map_sg: map a scatter-gather list of physically contiguous chunks to
1539 @@ -241,10 +266,20 @@ struct iommu_ops {
1555 - void (*iotlb_sync_map)(struct iommu_domain *domain);
1561 @@ -561,6 +596,8 @@ static inline void iommu_iotlb_gather_add_page(struct iommu_domain *domain,
1567 /* FSL-MC device grouping function */
1570 @@ -1069,6 +1106,14 @@ static inline struct iommu_fwspec *dev_iommu_fwspec_get(struct device *dev)
1585 diff --git a/include/linux/iova.h b/include/linux/iova.h
1587 --- a/include/linux/iova.h
1588 +++ b/include/linux/iova.h
1589 @@ -95,6 +95,7 @@ struct iova_domain {
1590 flush-queues */
1597 diff --git a/include/linux/irqchip/arm-gic-v3.h b/include/linux/irqchip/arm-gic-v3.h
1599 --- a/include/linux/irqchip/arm-gic-v3.h
1600 +++ b/include/linux/irqchip/arm-gic-v3.h
1601 @@ -708,6 +708,8 @@ static inline bool gic_enable_sre(void)
1610 diff --git a/include/linux/irqchip/arm-gic-v4.h b/include/linux/irqchip/arm-gic-v4.h
1612 --- a/include/linux/irqchip/arm-gic-v4.h
1613 +++ b/include/linux/irqchip/arm-gic-v4.h
1614 @@ -39,6 +39,8 @@ struct its_vpe {
1623 @@ -104,6 +106,7 @@ enum its_vcpu_info_cmd_type {
1631 @@ -129,6 +132,7 @@ int its_alloc_vcpu_irqs(struct its_vm *vm);
1639 diff --git a/include/linux/memblock.h b/include/linux/memblock.h
1641 --- a/include/linux/memblock.h
1642 +++ b/include/linux/memblock.h
1643 @@ -25,6 +25,10 @@ extern unsigned long max_pfn;
1652 * enum memblock_flags - definition of memory region attributes
1654 @@ -404,13 +408,13 @@ void *memblock_alloc_try_nid(phys_addr_t size, phys_addr_t align,
1658 -static inline void * __init memblock_alloc(phys_addr_t size, phys_addr_t align)
1665 -static inline void * __init memblock_alloc_raw(phys_addr_t size,
1670 @@ -418,7 +422,7 @@ static inline void * __init memblock_alloc_raw(phys_addr_t size,
1674 -static inline void * __init memblock_alloc_from(phys_addr_t size,
1679 @@ -426,33 +430,33 @@ static inline void * __init memblock_alloc_from(phys_addr_t size,
1683 -static inline void * __init memblock_alloc_low(phys_addr_t size,
1691 -static inline void * __init memblock_alloc_node(phys_addr_t size,
1699 -static inline void __init memblock_free_early(phys_addr_t base,
1706 -static inline void __init memblock_free_early_nid(phys_addr_t base,
1713 -static inline void __init memblock_free_late(phys_addr_t base, phys_addr_t size)
1718 @@ -460,7 +464,7 @@ static inline void __init memblock_free_late(phys_addr_t base, phys_addr_t size)
1720 * Set the allocation direction to bottom-up or top-down.
1722 -static inline void __init memblock_set_bottom_up(bool enable)
1727 @@ -470,7 +474,7 @@ static inline void __init memblock_set_bottom_up(bool enable)
1729 * in bottom-up direction.
1731 -static inline bool memblock_bottom_up(void)
1736 diff --git a/include/linux/mfd/rk808.h b/include/linux/mfd/rk808.h
1738 --- a/include/linux/mfd/rk808.h
1739 +++ b/include/linux/mfd/rk808.h
1740 @@ -113,6 +113,235 @@ enum rk808_reg {
1976 @@ -138,6 +367,8 @@ enum rk818_reg {
1985 @@ -190,7 +421,84 @@ enum rk818_reg {
2070 @@ -255,14 +563,22 @@ enum rk805_reg {
2074 -#define RK805_IRQ_PWRON_RISE 0
2081 -#define RK805_IRQ_PWRON_FALL 7
2084 + * When PMIC irq occurs, regmap-irq.c will traverse all PMIC child
2095 @@ -289,6 +605,16 @@ enum rk805_reg {
2099 +#define RK805_SLP_LDO_EN_OFFSET -1
2112 @@ -348,6 +674,107 @@ enum rk805_reg {
2220 @@ -381,7 +808,10 @@ enum rk805_reg {
2231 @@ -391,6 +821,7 @@ enum rk805_reg {
2239 @@ -436,6 +867,10 @@ enum rk809_reg_id {
2250 @@ -462,6 +897,9 @@ enum rk809_reg_id {
2260 @@ -609,16 +1047,27 @@ enum {
2288 diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
2290 --- a/include/linux/mmc/host.h
2291 +++ b/include/linux/mmc/host.h
2292 @@ -141,6 +141,7 @@ struct mmc_host_ops {
2300 @@ -483,6 +484,9 @@ void mmc_free_host(struct mmc_host *);
2309 return (void *)host->private;
2310 diff --git a/include/linux/mmu_context.h b/include/linux/mmu_context.h
2312 --- a/include/linux/mmu_context.h
2313 +++ b/include/linux/mmu_context.h
2314 @@ -14,4 +14,12 @@
2327 diff --git a/include/linux/power_supply.h b/include/linux/power_supply.h
2329 --- a/include/linux/power_supply.h
2330 +++ b/include/linux/power_supply.h
2331 @@ -49,6 +49,12 @@ enum {
2344 @@ -386,12 +392,22 @@ extern void power_supply_put(struct power_supply *psy);
2367 @@ -426,9 +442,16 @@ static inline int power_supply_is_system_supplied(void) { return -ENOSYS; }
2384 diff --git a/include/linux/psi_types.h b/include/linux/psi_types.h
2386 --- a/include/linux/psi_types.h
2387 +++ b/include/linux/psi_types.h
2388 @@ -154,6 +154,7 @@ struct psi_group {
2396 diff --git a/include/linux/pwm.h b/include/linux/pwm.h
2398 --- a/include/linux/pwm.h
2399 +++ b/include/linux/pwm.h
2400 @@ -59,6 +59,9 @@ struct pwm_state {
2410 diff --git a/include/linux/reboot.h b/include/linux/reboot.h
2412 --- a/include/linux/reboot.h
2413 +++ b/include/linux/reboot.h
2414 @@ -49,6 +49,26 @@ extern int register_restart_handler(struct notifier_block *);
2439 * Architecture-specific implementations of sys_reboot commands.
2441 diff --git a/include/linux/regulator/driver.h b/include/linux/regulator/driver.h
2443 --- a/include/linux/regulator/driver.h
2444 +++ b/include/linux/regulator/driver.h
2445 @@ -223,6 +223,8 @@ enum regulator_type {
2454 @@ -314,6 +316,7 @@ struct regulator_desc {
2462 diff --git a/include/linux/regulator/fan53555.h b/include/linux/regulator/fan53555.h
2464 --- a/include/linux/regulator/fan53555.h
2465 +++ b/include/linux/regulator/fan53555.h
2466 @@ -52,6 +52,8 @@ struct fan53555_platform_data {
2475 diff --git a/include/linux/sched.h b/include/linux/sched.h
2477 --- a/include/linux/sched.h
2478 +++ b/include/linux/sched.h
2479 @@ -1356,7 +1356,7 @@ struct task_struct {
2483 -#ifdef CONFIG_KASAN
2488 diff --git a/include/linux/sched/hotplug.h b/include/linux/sched/hotplug.h
2490 --- a/include/linux/sched/hotplug.h
2491 +++ b/include/linux/sched/hotplug.h
2492 @@ -8,7 +8,11 @@
2504 diff --git a/include/linux/sched/isolation.h b/include/linux/sched/isolation.h
2506 --- a/include/linux/sched/isolation.h
2507 +++ b/include/linux/sched/isolation.h
2508 @@ -28,25 +28,10 @@ extern void __init housekeeping_init(void);
2512 -#ifdef CONFIG_CPU_ISOLATION_OPT
2513 -static inline int housekeeping_any_cpu(enum hk_flags flags)
2514 -{
2515 - cpumask_t available;
2516 - int cpu;
2517 -
2518 - cpumask_andnot(&available, cpu_online_mask, cpu_isolated_mask);
2519 - cpu = cpumask_any(&available);
2520 - if (cpu >= nr_cpu_ids)
2521 - cpu = smp_processor_id();
2522 -
2523 - return cpu;
2524 -}
2525 -#else
2530 -#endif
2534 @@ -69,11 +54,7 @@ static inline bool housekeeping_cpu(int cpu, enum hk_flags flags)
2538 -#ifdef CONFIG_CPU_ISOLATION_OPT
2539 - return !cpu_isolated(cpu);
2540 -#else
2542 -#endif
2546 diff --git a/include/linux/sched/wake_q.h b/include/linux/sched/wake_q.h
2548 --- a/include/linux/sched/wake_q.h
2549 +++ b/include/linux/sched/wake_q.h
2550 @@ -38,6 +38,7 @@
2558 @@ -49,6 +50,7 @@ static inline void wake_q_init(struct wake_q_head *head)
2560 head->first = WAKE_Q_TAIL;
2561 head->lastp = &head->first;
2562 + head->count = 0;
2566 diff --git a/include/linux/sched/xacct.h b/include/linux/sched/xacct.h
2568 --- a/include/linux/sched/xacct.h
2569 +++ b/include/linux/sched/xacct.h
2570 @@ -28,6 +28,11 @@ static inline void inc_syscw(struct task_struct *tsk)
2572 tsk->ioac.syscw++;
2577 + tsk->ioac.syscfs++;
2582 @@ -44,6 +49,10 @@ static inline void inc_syscr(struct task_struct *tsk)
2593 diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
2595 --- a/include/linux/stmmac.h
2596 +++ b/include/linux/stmmac.h
2597 @@ -183,6 +183,7 @@ struct plat_stmmacenet_data {
2605 diff --git a/include/linux/thermal.h b/include/linux/thermal.h
2607 --- a/include/linux/thermal.h
2608 +++ b/include/linux/thermal.h
2609 @@ -399,6 +399,7 @@ void thermal_cdev_update(struct thermal_cooling_device *);
2617 @@ -453,6 +454,10 @@ static inline int thermal_zone_device_enable(struct thermal_zone_device *tz)
2620 { return -ENODEV; }
2624 +{ return -ENODEV; }
2628 diff --git a/include/linux/usb/audio-v2.h b/include/linux/usb/audio-v2.h
2630 --- a/include/linux/usb/audio-v2.h
2631 +++ b/include/linux/usb/audio-v2.h
2632 @@ -168,6 +168,20 @@ struct uac2_effect_unit_descriptor {
2650 /* 4.9.2 Class-Specific AS Interface Descriptor */
2653 @@ -331,6 +345,9 @@ struct uac2_interrupt_data_msg {
2657 +#define UAC2_CONTROL_BIT_RO(CS) (0x01 << (((CS) - 1) << 1))
2658 +#define UAC2_CONTROL_BIT_RW(CS) (0x03 << (((CS) - 1) << 1))
2663 diff --git a/include/linux/usb/audio.h b/include/linux/usb/audio.h
2665 --- a/include/linux/usb/audio.h
2666 +++ b/include/linux/usb/audio.h
2667 @@ -31,6 +31,7 @@ struct usb_audio_control {
2675 diff --git a/include/linux/usb/composite.h b/include/linux/usb/composite.h
2677 --- a/include/linux/usb/composite.h
2678 +++ b/include/linux/usb/composite.h
2679 @@ -525,6 +525,8 @@ extern struct usb_string *usb_gstrings_attach(struct usb_composite_dev *cdev,
2688 @@ -590,6 +592,7 @@ struct usb_function_instance {
2696 diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h
2698 --- a/include/linux/usb/gadget.h
2699 +++ b/include/linux/usb/gadget.h
2700 @@ -217,6 +217,7 @@ struct usb_ep_caps {
2707 * gadget->ep_list. the control endpoint (gadget->ep0) is not in that list,
2708 @@ -240,6 +241,9 @@ struct usb_ep {
2717 /*-------------------------------------------------------------------------*/
2718 @@ -323,6 +327,8 @@ struct usb_gadget_ops {
2727 @@ -339,6 +345,10 @@ struct usb_gadget_ops {
2728 * @speed: Speed of current connection to USB host.
2738 @@ -406,6 +416,11 @@ struct usb_gadget {
2743 + /* USB SuperSpeed Plus only */
2750 diff --git a/include/linux/usb/pd.h b/include/linux/usb/pd.h
2752 --- a/include/linux/usb/pd.h
2753 +++ b/include/linux/usb/pd.h
2754 @@ -225,6 +225,7 @@ enum pd_pdo_type {
2756 #define PDO_FIXED_USB_COMM BIT(26) /* USB communications capable */
2762 @@ -466,6 +467,7 @@ static inline unsigned int rdo_max_power(u32 rdo)
2766 +#define PD_T_PS_SOURCE_ON_PRS 450 /* 390 - 480ms */
2770 @@ -478,14 +480,19 @@ static inline unsigned int rdo_max_power(u32 rdo)
2773 #define PD_T_BIST_CONT_MODE 50 /* 30 - 60 ms */
2774 +#define PD_T_SINK_TX 16 /* 16 - 20 ms */
2775 +#define PD_T_CHUNK_NOT_SUPP 42 /* 40 - 50 ms */
2777 #define PD_T_DRP_TRY 100 /* 75 - 150 ms */
2778 #define PD_T_DRP_TRYWAIT 600 /* 400 - 800 ms */
2780 #define PD_T_CC_DEBOUNCE 200 /* 100 - 200 ms */
2781 #define PD_T_PD_DEBOUNCE 20 /* 10 - 20 ms */
2782 +#define PD_T_TRY_CC_DEBOUNCE 15 /* 10 - 20 ms */
2790 diff --git a/include/linux/usb/pd_ext_sdb.h b/include/linux/usb/pd_ext_sdb.h
2792 --- a/include/linux/usb/pd_ext_sdb.h
2793 +++ b/include/linux/usb/pd_ext_sdb.h
2794 @@ -24,8 +24,4 @@ enum usb_pd_ext_sdb_fields {
2798 -#define USB_PD_EXT_SDB_PPS_EVENTS (USB_PD_EXT_SDB_EVENT_OCP | \
2799 - USB_PD_EXT_SDB_EVENT_OTP | \
2800 - USB_PD_EXT_SDB_EVENT_OVP)
2801 -
2803 diff --git a/include/linux/usb/pd_vdo.h b/include/linux/usb/pd_vdo.h
2805 --- a/include/linux/usb/pd_vdo.h
2806 +++ b/include/linux/usb/pd_vdo.h
2807 @@ -21,22 +21,24 @@
2808 * ----------
2810 * <15> :: VDM type ( 1b == structured, 0b == unstructured )
2811 - * <14:13> :: Structured VDM version (can only be 00 == 1.0 currently)
2814 * <10:8> :: object position (1-7 valid ... used for enter/exit mode only)
2819 -#define VDO(vid, type, custom) \
2834 @@ -74,6 +76,7 @@
2842 @@ -103,25 +106,50 @@
2843 * --------------------
2844 * <31> :: data capable as a USB host
2845 * <30> :: data capable as a USB device
2846 - * <29:27> :: product type
2848 * <26> :: modal operation supported (1b == yes)
2849 - * <25:16> :: Reserved, Shall be set to zero
2851 + * <22:21> :: connector type (SVDM version 2.0+ only; set to zero in version 1.0)
2853 * <15:0> :: USB-IF assigned VID for this cable vendor
2870 -#define IDH_PTYPE_AMA 5
2873 -#define VDO_IDH(usbh, usbd, ptype, is_modal, vid) \
2874 - ((usbh) << 31 | (usbd) << 30 | ((ptype) & 0x7) << 27 \
2875 - | (is_modal) << 26 | ((vid) & 0xffff))
2899 @@ -129,6 +157,7 @@
2900 * <31:0> : USB-IF assigned XID for this cable
2907 @@ -140,77 +169,270 @@
2911 - * UFP VDO1
2913 * --------
2917 - * <23:6> :: Reserved
2918 + * <23:22> :: Connector type (10b == receptacle, 11b == captive plug)
2921 + * <7> :: Vconn required (AMA only, 0b == no, 1b == yes)
2922 + * <6> :: Vbus required (AMA only, 0b == yes, 1b == no)
2924 * <2:0> :: USB highest speed
2926 -#define PD_VDO1_UFP_DEVCAP(vdo) (((vdo) & GENMASK(27, 24)) >> 24)
2938 +/* Connector Type */
2965 +/* USB Highest Speed */
2977 - * DFP VDO
2979 * --------
2983 - * <23:5> :: Reserved
2984 + * <23:22> :: Connector type (10b == receptacle, 11b == captive plug)
3002 - * Cable VDO
3004 * ---------
3008 - * <19:18> :: type-C to Type-A/B/C (00b == A, 01 == B, 10 == C)
3009 - * <17> :: Type-C to Plug/Receptacle (0b == plug, 1b == receptacle)
3010 + * <19:18> :: type-C to Type-A/B/C/Captive (00b == A, 01 == B, 10 == C, 11 == Captive)
3013 * <12:11> :: cable termination type (11b == both ends active VCONN req)
3014 * <10> :: SSTX1 Directionality support (0b == fixed, 1b == cfgable)
3018 - * <6:5> :: Vbus current handling capability
3019 + * <6:5> :: Vbus current handling capability (01b == 3A, 10b == 5A)
3020 * <4> :: Vbus through cable (0b == no, 1b == yes)
3021 * <3> :: SOP" controller present? (0b == no, 1b == yes)
3022 * <2:0> :: USB SS Signaling support
3025 + * ---------
3030 + * <19:18> :: Type-C to Type-C/Captive (10b == C, 11b == Captive)
3033 + * <12:11> :: cable termination type (10b == Vconn not req, 01b == Vconn req)
3034 + * <10:9> :: Maximum Vbus voltage (00b == 20V, 01b == 30V, 10b == 40V, 11b == 50V)
3036 + * <6:5> :: Vbus current handling capability (01b == 3A, 10b == 5A)
3038 + * <2:0> :: USB highest speed
3041 + * ---------
3046 + * <19:18> :: Connector type (10b == C, 11b == Captive)
3049 + * <12:11> :: cable termination type (10b == one end active, 11b == both ends active VCONN req)
3050 + * <10:9> :: Maximum Vbus voltage (00b == 20V, 01b == 30V, 10b == 40V, 11b == 50V)
3051 + * <8> :: SBU supported (0b == supported, 1b == not supported)
3052 + * <7> :: SBU type (0b == passive, 1b == active)
3053 + * <6:5> :: Vbus current handling capability (01b == 3A, 10b == 5A)
3054 + * <2:0> :: USB highest speed
3060 +/* Connector Type (_ATYPE and _BTYPE are for PD Rev2.0 only) */
3064 -#define CABLE_PLUG 0
3065 -#define CABLE_RECEPTACLE 1
3066 -#define CABLE_CURR_1A5 0
3102 +/* USB SuperSpeed Signaling Support (PD Rev2.0) */
3106 -#define VDO_CABLE(hw, fw, cbl, gdr, lat, term, tx1d, tx2d, rx1d, rx2d, cur,\
3107 - vps, sopp, usbss) \
3108 - (((hw) & 0x7) << 28 | ((fw) & 0x7) << 24 | ((cbl) & 0x3) << 18 \
3109 - | (gdr) << 17 | ((lat) & 0x7) << 13 | ((term) & 0x3) << 11 \
3110 - | (tx1d) << 10 | (tx2d) << 9 | (rx1d) << 8 | (rx2d) << 7 \
3111 - | ((cur) & 0x3) << 5 | (vps) << 4 | (sopp) << 3 \
3112 - | ((usbss) & 0x7))
3114 +/* USB Highest Speed */
3139 + * ---------
3144 + * <11> :: U3 to U0 transition mode (0b == direct, 1b == through U3S)
3145 + * <10> :: Physical connection (0b == copper, 1b == optical)
3146 + * <9> :: Active element (0b == redriver, 1b == retimer)
3147 + * <8> :: USB4 supported (0b == yes, 1b == no)
3149 + * <5> :: USB2 supported (0b == yes, 1b == no)
3150 + * <4> :: USB3.2 supported (0b == yes, 1b == no)
3151 + * <3> :: USB lanes supported (0b == one lane, 1b == two lanes)
3152 + * <2> :: Optically isolated active cable (0b == no, 1b == yes)
3154 + * <0> :: USB gen (0b == gen1, 1b == gen2+)
3193 - * AMA VDO
3195 * ---------
3198 @@ -233,18 +455,40 @@
3202 -#define AMA_VCONN_PWR_1W 0
3203 -#define AMA_VCONN_PWR_1W5 1
3204 -#define AMA_VCONN_PWR_2W 2
3205 -#define AMA_VCONN_PWR_3W 3
3206 -#define AMA_VCONN_PWR_4W 4
3207 -#define AMA_VCONN_PWR_5W 5
3208 -#define AMA_VCONN_PWR_6W 6
3216 + * ---------
3221 + * <16:15> :: Maximum Vbus voltage (00b == 20V, 01b == 30V, 10b == 40V, 11b == 50V)
3222 + * <14> :: Charge through current support (0b == 3A, 1b == 5A)
3226 + * <0> :: Charge through support (0b == no, 1b == yes)
3244 * SVDM Discover SVIDs request -> response
3246 diff --git a/include/linux/usb/quirks.h b/include/linux/usb/quirks.h
3248 --- a/include/linux/usb/quirks.h
3249 +++ b/include/linux/usb/quirks.h
3250 @@ -72,4 +72,7 @@
3258 diff --git a/include/linux/usb/tcpm.h b/include/linux/usb/tcpm.h
3260 --- a/include/linux/usb/tcpm.h
3261 +++ b/include/linux/usb/tcpm.h
3262 @@ -19,6 +19,10 @@ enum typec_cc_status {
3273 @@ -62,6 +66,8 @@ enum tcpm_transmit_type {
3282 @@ -83,6 +89,39 @@ enum tcpm_transmit_type {
3308 + * Optional; The USB Communications Capable bit indicates if port
3309 + * partner is capable of communication over the USB data lines
3310 + * (e.g. D+/- or SS Tx/Rx). Called to notify the status of the bit.
3314 + * expected to check for contaminant and re-enable toggling if
3316 + * restart toggling after checking the connector for contaminant.
3322 @@ -91,6 +130,8 @@ struct tcpc_dev {
3331 @@ -106,9 +147,16 @@ struct tcpc_dev {
3335 - const struct pd_message *msg);
3349 @@ -116,6 +164,10 @@ struct tcpm_port;
3360 @@ -126,5 +178,7 @@ void tcpm_pd_transmit_complete(struct tcpm_port *port,
3368 diff --git a/include/linux/usb/typec.h b/include/linux/usb/typec.h
3370 --- a/include/linux/usb/typec.h
3371 +++ b/include/linux/usb/typec.h
3372 @@ -126,9 +126,12 @@ struct typec_altmode_desc {
3385 @@ -162,6 +165,7 @@ struct typec_plug_desc {
3386 * @type: The plug type from USB PD Cable VDO
3389 + * @pd_revision: USB Power Delivery Specification revision if supported
3391 * Represents USB Type-C Cable attached to USB Type-C port.
3393 @@ -169,6 +173,8 @@ struct typec_cable_desc {
3402 @@ -176,15 +182,22 @@ struct typec_cable_desc {
3403 * @usb_pd: USB Power Delivery support
3406 + * @pd_revision: USB Power Delivery Specification Revision if supported
3408 * Details about a partner that is attached to USB Type-C port. If @identity
3425 @@ -204,12 +217,19 @@ struct typec_operations {
3436 * struct typec_capability - USB Type-C Port Capabilities
3439 * @revision: USB Type-C Specification release. Binary coded decimal
3440 * @pd_revision: USB Power Delivery Specification revision if supported
3441 + * @svdm_version: USB PD Structured VDM version if supported
3445 @@ -223,6 +243,7 @@ struct typec_capability {
3453 @@ -273,4 +294,8 @@ int typec_find_orientation(const char *name);
3462 diff --git a/include/linux/usb/typec_altmode.h b/include/linux/usb/typec_altmode.h
3464 --- a/include/linux/usb/typec_altmode.h
3465 +++ b/include/linux/usb/typec_altmode.h
3466 @@ -132,6 +132,16 @@ typec_altmode_get_orientation(struct typec_altmode *altmode)
3471 + * typec_altmode_get_svdm_version - Get negotiated SVDM version
3481 * struct typec_altmode_driver - USB Type-C alternate mode device driver
3483 diff --git a/include/linux/usb/typec_tbt.h b/include/linux/usb/typec_tbt.h
3485 --- a/include/linux/usb/typec_tbt.h
3486 +++ b/include/linux/usb/typec_tbt.h
3487 @@ -39,12 +39,16 @@ struct typec_thunderbolt_data {
3491 -#define TBT_CABLE_ROUNDED BIT(19)
3505 diff --git a/include/linux/usb/usbnet.h b/include/linux/usb/usbnet.h
3507 --- a/include/linux/usb/usbnet.h
3508 +++ b/include/linux/usb/usbnet.h
3509 @@ -83,8 +83,6 @@ struct usbnet {
3513 - u32 rx_speed; /* in bps - NOT Mbps */
3514 - u32 tx_speed; /* in bps - NOT Mbps */
3518 diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
3520 --- a/include/media/v4l2-async.h
3521 +++ b/include/media/v4l2-async.h
3522 @@ -266,6 +266,21 @@ int v4l2_async_notifier_register(struct v4l2_device *v4l2_dev,
3527 + * v4l2_async_notifier_clr_unready_dev - remove unready subdevice
3542 * v4l2_async_notifier_unregister - unregisters a subdevice
3544 diff --git a/include/soc/rockchip/rockchip_sip.h b/include/soc/rockchip/rockchip_sip.h
3546 --- a/include/soc/rockchip/rockchip_sip.h
3547 +++ b/include/soc/rockchip/rockchip_sip.h
3548 @@ -15,6 +15,12 @@
3552 -#define ROCKCHIP_SIP_CONFIG_DRAM_SET_ODT_PD 0x08
3562 diff --git a/include/sound/hdmi-codec.h b/include/sound/hdmi-codec.h
3564 --- a/include/sound/hdmi-codec.h
3565 +++ b/include/sound/hdmi-codec.h
3566 @@ -34,6 +34,11 @@ struct hdmi_codec_daifmt {
3578 @@ -60,12 +65,22 @@ struct hdmi_codec_ops {
3581 * Configures HDMI-encoder for audio stream.
3582 - * Mandatory
3590 + * Configures HDMI-encoder for audio stream. Can be called
3602 diff --git a/include/trace/events/cpuhp.h b/include/trace/events/cpuhp.h
3604 --- a/include/trace/events/cpuhp.h
3605 +++ b/include/trace/events/cpuhp.h
3606 @@ -89,6 +89,28 @@ TRACE_EVENT(cpuhp_exit,
3607 __entry->cpu, __entry->state, __entry->idx, __entry->ret)
3623 + __entry->cpus = cpumask_bits(cpus)[0];
3624 + __entry->active_cpus = cpumask_bits(cpu_active_mask)[0];
3625 + __entry->time = div64_u64(sched_clock() - start_time, 1000);
3626 + __entry->pause = pause;
3630 + __entry->cpus, __entry->active_cpus, __entry->time, __entry->pause)
3635 diff --git a/include/trace/events/sched.h b/include/trace/events/sched.h
3637 --- a/include/trace/events/sched.h
3638 +++ b/include/trace/events/sched.h
3639 @@ -203,6 +203,7 @@ TRACE_EVENT(sched_migrate_task,
3647 @@ -211,11 +212,13 @@ TRACE_EVENT(sched_migrate_task,
3648 __entry->prio = p->prio; /* XXX SCHED_DEADLINE */
3649 __entry->orig_cpu = task_cpu(p);
3650 __entry->dest_cpu = dest_cpu;
3651 + __entry->running = (p->state == TASK_RUNNING);
3654 - TP_printk("comm=%s pid=%d prio=%d orig_cpu=%d dest_cpu=%d",
3656 __entry->comm, __entry->pid, __entry->prio,
3657 - __entry->orig_cpu, __entry->dest_cpu)
3658 + __entry->orig_cpu, __entry->dest_cpu,
3659 + __entry->running)
3663 diff --git a/include/uapi/drm/drm_fourcc.h b/include/uapi/drm/drm_fourcc.h
3665 --- a/include/uapi/drm/drm_fourcc.h
3666 +++ b/include/uapi/drm/drm_fourcc.h
3667 @@ -242,6 +242,8 @@ extern "C" {
3672 +#define DRM_FORMAT_NV30 fourcc_code('N', 'V', '3', '0') /* non-subsampled Cr:Cb plane */
3676 diff --git a/include/uapi/linux/media-bus-format.h b/include/uapi/linux/media-bus-format.h
3678 --- a/include/uapi/linux/media-bus-format.h
3679 +++ b/include/uapi/linux/media-bus-format.h
3680 @@ -34,7 +34,7 @@
3684 -/* RGB - next is 0x101d */
3685 +/* RGB - next is 0x1024 */
3689 @@ -63,6 +63,10 @@
3698 /* YUV (including grey) - next is 0x202e */
3700 diff --git a/include/uapi/linux/serial_reg.h b/include/uapi/linux/serial_reg.h
3702 --- a/include/uapi/linux/serial_reg.h
3703 +++ b/include/uapi/linux/serial_reg.h
3704 @@ -30,6 +30,7 @@
3712 diff --git a/include/uapi/linux/usb/f_accessory.h b/include/uapi/linux/usb/f_accessory.h
3715 --- /dev/null
3716 +++ b/include/uapi/linux/usb/f_accessory.h
3717 @@ -0,0 +1,146 @@
3719 + * Gadget Function Driver for Android USB accessories
3844 + * value: 0 - no audio
3845 + * 1 - device to host, 44100 16-bit stereo PCM
3864 diff --git a/include/uapi/linux/usb/g_uvc.h b/include/uapi/linux/usb/g_uvc.h
3866 --- a/include/uapi/linux/usb/g_uvc.h
3867 +++ b/include/uapi/linux/usb/g_uvc.h
3868 @@ -19,7 +19,9 @@
3872 -#define UVC_EVENT_LAST (V4L2_EVENT_PRIVATE_START + 5)
3879 diff --git a/include/uapi/linux/usb/video.h b/include/uapi/linux/usb/video.h
3881 --- a/include/uapi/linux/usb/video.h
3882 +++ b/include/uapi/linux/usb/video.h
3883 @@ -567,5 +567,63 @@ struct UVC_FRAME_MJPEG(n) { \
3887 +/* Frame Based Payload - 3.1.1. Frame Based Video Format Descriptor */
3906 +/* Frame Based Payload - 3.1.2. Frame Based Video Frame Descriptor */
3947 diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
3949 --- a/include/uapi/linux/v4l2-controls.h
3950 +++ b/include/uapi/linux/v4l2-controls.h
3951 @@ -188,6 +188,12 @@ enum v4l2_colorfx {
3964 diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
3966 --- a/include/uapi/linux/videodev2.h
3967 +++ b/include/uapi/linux/videodev2.h
3968 @@ -689,6 +689,7 @@ struct v4l2_pix_format {
3971 #define V4L2_PIX_FMT_MPEG v4l2_fourcc('M', 'P', 'E', 'G') /* MPEG-1/2/4 Multiplexed */