87 files changed, 5798 insertions, 1834 deletions
diff --git a/include/asm-generic/pci_iomap.h b/include/asm-generic/pci_iomap.h
index b1e17fcee2d0..854f96ad5ccb 100644
--- a/include/asm-generic/pci_iomap.h
+++ b/include/asm-generic/pci_iomap.h
@@ -1,12 +1,8 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /* Generic I/O port emulation, based on MN10300 code
 *
 * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
 * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
 */
 #ifndef __ASM_GENERIC_PCI_IOMAP_H
 #define __ASM_GENERIC_PCI_IOMAP_H
diff --git a/include/linux/dcache.h b/include/linux/dcache.h
index 65cd8ab60b7a..82a99d366aec 100644
--- a/include/linux/dcache.h
+++ b/include/linux/dcache.h
@@ -227,6 +227,7 @@ extern seqlock_t rename_lock;
 */
 extern void d_instantiate(struct dentry *, struct inode *);
 extern struct dentry * d_instantiate_unique(struct dentry *, struct inode *);
+extern struct dentry * d_instantiate_anon(struct dentry *, struct inode *);
 extern int d_instantiate_no_diralias(struct dentry *, struct inode *);
 extern void __d_drop(struct dentry *dentry);
 extern void d_drop(struct dentry *dentry);
@@ -235,6 +236,7 @@ extern void d_set_d_op(struct dentry *dentry, const struct dentry_operations *op
 /* allocate/de-allocate */
 extern struct dentry * d_alloc(struct dentry *, const struct qstr *);
+extern struct dentry * d_alloc_anon(struct super_block *);
 extern struct dentry * d_alloc_pseudo(struct super_block *, const struct qstr *);
 extern struct dentry * d_alloc_parallel(struct dentry *, const struct qstr *,
                                        wait_queue_head_t *);
diff --git a/include/linux/kfifo.h b/include/linux/kfifo.h
index 7b45959ebd92..e251533a5939 100644
--- a/include/linux/kfifo.h
+++ b/include/linux/kfifo.h
@@ -113,7 +113,8 @@ struct kfifo_rec_ptr_2 __STRUCT_KFIFO_PTR(unsigned char, 2, void);
 * array is a part of the structure and the fifo type where the array is
 * outside of the fifo structure.
 */
-#define __is_kfifo_ptr(fifo)    (sizeof(*fifo) == sizeof(struct __kfifo))
+#define __is_kfifo_ptr(fifo) \
+        (sizeof(*fifo) == sizeof(STRUCT_KFIFO_PTR(typeof(*(fifo)->type))))
 /**
 * DECLARE_KFIFO_PTR - macro to declare a fifo pointer object
diff --git a/include/linux/led-class-flash.h b/include/linux/led-class-flash.h
index e97966d1fb8d..700efaa9e115 100644
--- a/include/linux/led-class-flash.h
+++ b/include/linux/led-class-flash.h
@@ -121,6 +121,8 @@ extern void led_classdev_flash_unregister(struct led_classdev_flash *fled_cdev);
 static inline int led_set_flash_strobe(struct led_classdev_flash *fled_cdev,
                                        bool state)
 {
+        if (!fled_cdev)
+                return -EINVAL;
        return fled_cdev->ops->strobe_set(fled_cdev, state);
 }
@@ -136,6 +138,8 @@ static inline int led_set_flash_strobe(struct led_classdev_flash *fled_cdev,
 static inline int led_get_flash_strobe(struct led_classdev_flash *fled_cdev,
                                        bool *state)
 {
+        if (!fled_cdev)
+                return -EINVAL;
        if (fled_cdev->ops->strobe_get)
                return fled_cdev->ops->strobe_get(fled_cdev, state);
diff --git a/include/linux/libnvdimm.h b/include/linux/libnvdimm.h
index f8109ddb5ef1..ff855ed965fb 100644
--- a/include/linux/libnvdimm.h
+++ b/include/linux/libnvdimm.h
@@ -47,6 +47,17 @@ enum {
        /* region flag indicating to direct-map persistent memory by default */
        ND_REGION_PAGEMAP = 0,
+        /*
+         * Platform ensures entire CPU store data path is flushed to pmem on
+         * system power loss.
+         */
+        ND_REGION_PERSIST_CACHE = 1,
+        /*
+         * Platform provides mechanisms to automatically flush outstanding
+         * write data from memory controler to pmem on system power loss.
+         * (ADR)
+         */
+        ND_REGION_PERSIST_MEMCTRL = 2,
        /* mark newly adjusted resources as requiring a label update */
        DPA_RESOURCE_ADJUSTED = 1 << 0,
diff --git a/include/linux/memory_hotplug.h b/include/linux/memory_hotplug.h
index 58e110aee7ab..aba5f86eb038 100644
--- a/include/linux/memory_hotplug.h
+++ b/include/linux/memory_hotplug.h
@@ -13,6 +13,7 @@ struct pglist_data;
 struct mem_section;
 struct memory_block;
 struct resource;
+struct vmem_altmap;
 #ifdef CONFIG_MEMORY_HOTPLUG
 /*
@@ -125,24 +126,26 @@ static inline bool movable_node_is_enabled(void)
 #ifdef CONFIG_MEMORY_HOTREMOVE
 extern bool is_pageblock_removable_nolock(struct page *page);
-extern int arch_remove_memory(u64 start, u64 size);
+extern int arch_remove_memory(u64 start, u64 size,
+                struct vmem_altmap *altmap);
 extern int __remove_pages(struct zone *zone, unsigned long start_pfn,
-        unsigned long nr_pages);
+        unsigned long nr_pages, struct vmem_altmap *altmap);
 #endif /* CONFIG_MEMORY_HOTREMOVE */
 /* reasonably generic interface to expand the physical pages */
-extern int __add_pages(int nid, unsigned long start_pfn,
+extern int __add_pages(int nid, unsigned long start_pfn, unsigned long nr_pages,
-        unsigned long nr_pages, bool want_memblock);
+                struct vmem_altmap *altmap, bool want_memblock);
 #ifndef CONFIG_ARCH_HAS_ADD_PAGES
 static inline int add_pages(int nid, unsigned long start_pfn,
-                            unsigned long nr_pages, bool want_memblock)
+                unsigned long nr_pages, struct vmem_altmap *altmap,
+                bool want_memblock)
 {
-        return __add_pages(nid, start_pfn, nr_pages, want_memblock);
+        return __add_pages(nid, start_pfn, nr_pages, altmap, want_memblock);
 }
 #else /* ARCH_HAS_ADD_PAGES */
-int add_pages(int nid, unsigned long start_pfn,
+int add_pages(int nid, unsigned long start_pfn, unsigned long nr_pages,
-              unsigned long nr_pages, bool want_memblock);
+                struct vmem_altmap *altmap, bool want_memblock);
 #endif /* ARCH_HAS_ADD_PAGES */
 #ifdef CONFIG_NUMA
@@ -318,15 +321,17 @@ extern int walk_memory_range(unsigned long start_pfn, unsigned long end_pfn,
                void *arg, int (*func)(struct memory_block *, void *));
 extern int add_memory(int nid, u64 start, u64 size);
 extern int add_memory_resource(int nid, struct resource *resource, bool online);
-extern int arch_add_memory(int nid, u64 start, u64 size, bool want_memblock);
+extern int arch_add_memory(int nid, u64 start, u64 size,
+                struct vmem_altmap *altmap, bool want_memblock);
 extern void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn,
-                unsigned long nr_pages);
+                unsigned long nr_pages, struct vmem_altmap *altmap);
 extern int offline_pages(unsigned long start_pfn, unsigned long nr_pages);
 extern bool is_memblock_offlined(struct memory_block *mem);
 extern void remove_memory(int nid, u64 start, u64 size);
-extern int sparse_add_one_section(struct pglist_data *pgdat, unsigned long start_pfn);
+extern int sparse_add_one_section(struct pglist_data *pgdat,
+                unsigned long start_pfn, struct vmem_altmap *altmap);
 extern void sparse_remove_one_section(struct zone *zone, struct mem_section *ms,
-                unsigned long map_offset);
+                unsigned long map_offset, struct vmem_altmap *altmap);
 extern struct page *sparse_decode_mem_map(unsigned long coded_mem_map,
                                          unsigned long pnum);
 extern bool allow_online_pfn_range(int nid, unsigned long pfn, unsigned long nr_pages,
diff --git a/include/linux/memremap.h b/include/linux/memremap.h
index 10d23c367048..7b4899c06f49 100644
--- a/include/linux/memremap.h
+++ b/include/linux/memremap.h
@@ -26,18 +26,6 @@ struct vmem_altmap {
        unsigned long alloc;
 };
-unsigned long vmem_altmap_offset(struct vmem_altmap *altmap);
-void vmem_altmap_free(struct vmem_altmap *altmap, unsigned long nr_pfns);
-#ifdef CONFIG_ZONE_DEVICE
-struct vmem_altmap *to_vmem_altmap(unsigned long memmap_start);
-#else
-static inline struct vmem_altmap *to_vmem_altmap(unsigned long memmap_start)
-{
-        return NULL;
-}
-#endif
 /*
 * Specialize ZONE_DEVICE memory into multiple types each having differents
 * usage.
@@ -125,8 +113,9 @@ typedef void (*dev_page_free_t)(struct page *page, void *data);
 struct dev_pagemap {
        dev_page_fault_t page_fault;
        dev_page_free_t page_free;
-        struct vmem_altmap *altmap;
+        struct vmem_altmap altmap;
-        const struct resource *res;
+        bool altmap_valid;
+        struct resource res;
        struct percpu_ref *ref;
        struct device *dev;
        void *data;
@@ -134,15 +123,17 @@ struct dev_pagemap {
 };
 #ifdef CONFIG_ZONE_DEVICE
-void *devm_memremap_pages(struct device *dev, struct resource *res,
+void *devm_memremap_pages(struct device *dev, struct dev_pagemap *pgmap);
-                struct percpu_ref *ref, struct vmem_altmap *altmap);
+struct dev_pagemap *get_dev_pagemap(unsigned long pfn,
-struct dev_pagemap *find_dev_pagemap(resource_size_t phys);
+                struct dev_pagemap *pgmap);
+unsigned long vmem_altmap_offset(struct vmem_altmap *altmap);
+void vmem_altmap_free(struct vmem_altmap *altmap, unsigned long nr_pfns);
 static inline bool is_zone_device_page(const struct page *page);
 #else
 static inline void *devm_memremap_pages(struct device *dev,
-                struct resource *res, struct percpu_ref *ref,
+                struct dev_pagemap *pgmap)
-                struct vmem_altmap *altmap)
 {
        /*
         * Fail attempts to call devm_memremap_pages() without
@@ -153,11 +144,22 @@ static inline void *devm_memremap_pages(struct device *dev,
        return ERR_PTR(-ENXIO);
 }
-static inline struct dev_pagemap *find_dev_pagemap(resource_size_t phys)
+static inline struct dev_pagemap *get_dev_pagemap(unsigned long pfn,
+                struct dev_pagemap *pgmap)
 {
        return NULL;
 }
-#endif
+static inline unsigned long vmem_altmap_offset(struct vmem_altmap *altmap)
+{
+        return 0;
+}
+static inline void vmem_altmap_free(struct vmem_altmap *altmap,
+                unsigned long nr_pfns)
+{
+}
+#endif /* CONFIG_ZONE_DEVICE */
 #if defined(CONFIG_DEVICE_PRIVATE) || defined(CONFIG_DEVICE_PUBLIC)
 static inline bool is_device_private_page(const struct page *page)
@@ -173,39 +175,6 @@ static inline bool is_device_public_page(const struct page *page)
 }
 #endif /* CONFIG_DEVICE_PRIVATE || CONFIG_DEVICE_PUBLIC */
-/**
- * get_dev_pagemap() - take a new live reference on the dev_pagemap for @pfn
- * @pfn: page frame number to lookup page_map
- * @pgmap: optional known pgmap that already has a reference
- *
- * @pgmap allows the overhead of a lookup to be bypassed when @pfn lands in the
- * same mapping.
- */
-static inline struct dev_pagemap *get_dev_pagemap(unsigned long pfn,
-                struct dev_pagemap *pgmap)
-{
-        const struct resource *res = pgmap ? pgmap->res : NULL;
-        resource_size_t phys = PFN_PHYS(pfn);
-        /*
-         * In the cached case we're already holding a live reference so
-         * we can simply do a blind increment
-         */
-        if (res && phys >= res->start && phys <= res->end) {
-                percpu_ref_get(pgmap->ref);
-                return pgmap;
-        }
-        /* fall back to slow path lookup */
-        rcu_read_lock();
-        pgmap = find_dev_pagemap(phys);
-        if (pgmap && !percpu_ref_tryget_live(pgmap->ref))
-                pgmap = NULL;
-        rcu_read_unlock();
-        return pgmap;
-}
 static inline void put_dev_pagemap(struct dev_pagemap *pgmap)
 {
        if (pgmap)
diff --git a/include/linux/mlx5/driver.h b/include/linux/mlx5/driver.h
index fb7e8b205eb9..6ed79a8a8318 100644
--- a/include/linux/mlx5/driver.h
+++ b/include/linux/mlx5/driver.h
@@ -1277,7 +1277,7 @@ mlx5_get_vector_affinity(struct mlx5_core_dev *dev, int vector)
        int eqn;
        int err;
-        err = mlx5_vector2eqn(dev, vector, &eqn, &irq);
+        err = mlx5_vector2eqn(dev, MLX5_EQ_VEC_COMP_BASE + vector, &eqn, &irq);
        if (err)
                return NULL;
diff --git a/include/linux/mm.h b/include/linux/mm.h
index 173d2484f6e3..ad06d42adb1a 100644
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@ -2075,8 +2075,8 @@ static inline void zero_resv_unavail(void) {}
 #endif
 extern void set_dma_reserve(unsigned long new_dma_reserve);
-extern void memmap_init_zone(unsigned long, int, unsigned long,
+extern void memmap_init_zone(unsigned long, int, unsigned long, unsigned long,
-                                unsigned long, enum memmap_context);
+                enum memmap_context, struct vmem_altmap *);
 extern void setup_per_zone_wmarks(void);
 extern int __meminit init_per_zone_wmark_min(void);
 extern void mem_init(void);
@@ -2544,7 +2544,8 @@ void sparse_mem_maps_populate_node(struct page **map_map,
                                   unsigned long map_count,
                                   int nodeid);
-struct page *sparse_mem_map_populate(unsigned long pnum, int nid);
+struct page *sparse_mem_map_populate(unsigned long pnum, int nid,
+                struct vmem_altmap *altmap);
 pgd_t *vmemmap_pgd_populate(unsigned long addr, int node);
 p4d_t *vmemmap_p4d_populate(pgd_t *pgd, unsigned long addr, int node);
 pud_t *vmemmap_pud_populate(p4d_t *p4d, unsigned long addr, int node);
@@ -2552,20 +2553,17 @@ pmd_t *vmemmap_pmd_populate(pud_t *pud, unsigned long addr, int node);
 pte_t *vmemmap_pte_populate(pmd_t *pmd, unsigned long addr, int node);
 void *vmemmap_alloc_block(unsigned long size, int node);
 struct vmem_altmap;
-void *__vmemmap_alloc_block_buf(unsigned long size, int node,
+void *vmemmap_alloc_block_buf(unsigned long size, int node);
-                struct vmem_altmap *altmap);
+void *altmap_alloc_block_buf(unsigned long size, struct vmem_altmap *altmap);
-static inline void *vmemmap_alloc_block_buf(unsigned long size, int node)
-{
-        return __vmemmap_alloc_block_buf(size, node, NULL);
-}
 void vmemmap_verify(pte_t *, int, unsigned long, unsigned long);
 int vmemmap_populate_basepages(unsigned long start, unsigned long end,
                               int node);
-int vmemmap_populate(unsigned long start, unsigned long end, int node);
+int vmemmap_populate(unsigned long start, unsigned long end, int node,
+                struct vmem_altmap *altmap);
 void vmemmap_populate_print_last(void);
 #ifdef CONFIG_MEMORY_HOTPLUG
-void vmemmap_free(unsigned long start, unsigned long end);
+void vmemmap_free(unsigned long start, unsigned long end,
+                struct vmem_altmap *altmap);
 #endif
 void register_page_bootmem_memmap(unsigned long section_nr, struct page *map,
                                  unsigned long nr_pages);
diff --git a/include/linux/of_pci.h b/include/linux/of_pci.h
index bf588a05d0d0..88865e0ebf4d 100644
--- a/include/linux/of_pci.h
+++ b/include/linux/of_pci.h
@@ -9,8 +9,7 @@ struct pci_dev;
 struct of_phandle_args;
 struct device_node;
-#ifdef CONFIG_OF_PCI
+#if IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_PCI)
-int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq);
 struct device_node *of_pci_find_child_device(struct device_node *parent,
                                             unsigned int devfn);
 int of_pci_get_devfn(struct device_node *np);
@@ -23,11 +22,6 @@ int of_pci_map_rid(struct device_node *np, u32 rid,
                   const char *map_name, const char *map_mask_name,
                   struct device_node **target, u32 *id_out);
 #else
-static inline int of_irq_parse_pci(const struct pci_dev *pdev, struct of_phandle_args *out_irq)
-{
-        return 0;
-}
 static inline struct device_node *of_pci_find_child_device(struct device_node *parent,
                                             unsigned int devfn)
 {
diff --git a/include/linux/pci-aspm.h b/include/linux/pci-aspm.h
index 3cc06b059017..df28af5cef21 100644
--- a/include/linux/pci-aspm.h
+++ b/include/linux/pci-aspm.h
@@ -24,43 +24,12 @@
 #define PCIE_LINK_STATE_CLKPM   4
 #ifdef CONFIG_PCIEASPM
-void pcie_aspm_init_link_state(struct pci_dev *pdev);
-void pcie_aspm_exit_link_state(struct pci_dev *pdev);
-void pcie_aspm_pm_state_change(struct pci_dev *pdev);
-void pcie_aspm_powersave_config_link(struct pci_dev *pdev);
 void pci_disable_link_state(struct pci_dev *pdev, int state);
 void pci_disable_link_state_locked(struct pci_dev *pdev, int state);
 void pcie_no_aspm(void);
 #else
-static inline void pcie_aspm_init_link_state(struct pci_dev *pdev)
+static inline void pci_disable_link_state(struct pci_dev *pdev, int state) { }
-{
+static inline void pcie_no_aspm(void) { }
-}
-static inline void pcie_aspm_exit_link_state(struct pci_dev *pdev)
-{
-}
-static inline void pcie_aspm_pm_state_change(struct pci_dev *pdev)
-{
-}
-static inline void pcie_aspm_powersave_config_link(struct pci_dev *pdev)
-{
-}
-static inline void pci_disable_link_state(struct pci_dev *pdev, int state)
-{
-}
-static inline void pcie_no_aspm(void)
-{
-}
 #endif
-#ifdef CONFIG_PCIEASPM_DEBUG /* this depends on CONFIG_PCIEASPM */
-void pcie_aspm_create_sysfs_dev_files(struct pci_dev *pdev);
-void pcie_aspm_remove_sysfs_dev_files(struct pci_dev *pdev);
-#else
-static inline void pcie_aspm_create_sysfs_dev_files(struct pci_dev *pdev)
-{
-}
-static inline void pcie_aspm_remove_sysfs_dev_files(struct pci_dev *pdev)
-{
-}
-#endif
 #endif /* LINUX_ASPM_H */
diff --git a/include/linux/pci-dma-compat.h b/include/linux/pci-dma-compat.h
index d1f9fdade1e0..0dd1a3f7b309 100644
--- a/include/linux/pci-dma-compat.h
+++ b/include/linux/pci-dma-compat.h
@@ -17,91 +17,90 @@ static inline void *
 pci_alloc_consistent(struct pci_dev *hwdev, size_t size,
                     dma_addr_t *dma_handle)
 {
-        return dma_alloc_coherent(hwdev == NULL ? NULL : &hwdev->dev, size, dma_handle, GFP_ATOMIC);
+        return dma_alloc_coherent(&hwdev->dev, size, dma_handle, GFP_ATOMIC);
 }
 static inline void *
 pci_zalloc_consistent(struct pci_dev *hwdev, size_t size,
                      dma_addr_t *dma_handle)
 {
-        return dma_zalloc_coherent(hwdev == NULL ? NULL : &hwdev->dev,
+        return dma_zalloc_coherent(&hwdev->dev, size, dma_handle, GFP_ATOMIC);
-                                   size, dma_handle, GFP_ATOMIC);
 }
 static inline void
 pci_free_consistent(struct pci_dev *hwdev, size_t size,
                    void *vaddr, dma_addr_t dma_handle)
 {
-        dma_free_coherent(hwdev == NULL ? NULL : &hwdev->dev, size, vaddr, dma_handle);
+        dma_free_coherent(&hwdev->dev, size, vaddr, dma_handle);
 }
 static inline dma_addr_t
 pci_map_single(struct pci_dev *hwdev, void *ptr, size_t size, int direction)
 {
-        return dma_map_single(hwdev == NULL ? NULL : &hwdev->dev, ptr, size, (enum dma_data_direction)direction);
+        return dma_map_single(&hwdev->dev, ptr, size, (enum dma_data_direction)direction);
 }
 static inline void
 pci_unmap_single(struct pci_dev *hwdev, dma_addr_t dma_addr,
                 size_t size, int direction)
 {
-        dma_unmap_single(hwdev == NULL ? NULL : &hwdev->dev, dma_addr, size, (enum dma_data_direction)direction);
+        dma_unmap_single(&hwdev->dev, dma_addr, size, (enum dma_data_direction)direction);
 }
 static inline dma_addr_t
 pci_map_page(struct pci_dev *hwdev, struct page *page,
             unsigned long offset, size_t size, int direction)
 {
-        return dma_map_page(hwdev == NULL ? NULL : &hwdev->dev, page, offset, size, (enum dma_data_direction)direction);
+        return dma_map_page(&hwdev->dev, page, offset, size, (enum dma_data_direction)direction);
 }
 static inline void
 pci_unmap_page(struct pci_dev *hwdev, dma_addr_t dma_address,
               size_t size, int direction)
 {
-        dma_unmap_page(hwdev == NULL ? NULL : &hwdev->dev, dma_address, size, (enum dma_data_direction)direction);
+        dma_unmap_page(&hwdev->dev, dma_address, size, (enum dma_data_direction)direction);
 }
 static inline int
 pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg,
           int nents, int direction)
 {
-        return dma_map_sg(hwdev == NULL ? NULL : &hwdev->dev, sg, nents, (enum dma_data_direction)direction);
+        return dma_map_sg(&hwdev->dev, sg, nents, (enum dma_data_direction)direction);
 }
 static inline void
 pci_unmap_sg(struct pci_dev *hwdev, struct scatterlist *sg,
             int nents, int direction)
 {
-        dma_unmap_sg(hwdev == NULL ? NULL : &hwdev->dev, sg, nents, (enum dma_data_direction)direction);
+        dma_unmap_sg(&hwdev->dev, sg, nents, (enum dma_data_direction)direction);
 }
 static inline void
 pci_dma_sync_single_for_cpu(struct pci_dev *hwdev, dma_addr_t dma_handle,
                    size_t size, int direction)
 {
-        dma_sync_single_for_cpu(hwdev == NULL ? NULL : &hwdev->dev, dma_handle, size, (enum dma_data_direction)direction);
+        dma_sync_single_for_cpu(&hwdev->dev, dma_handle, size, (enum dma_data_direction)direction);
 }
 static inline void
 pci_dma_sync_single_for_device(struct pci_dev *hwdev, dma_addr_t dma_handle,
                    size_t size, int direction)
 {
-        dma_sync_single_for_device(hwdev == NULL ? NULL : &hwdev->dev, dma_handle, size, (enum dma_data_direction)direction);
+        dma_sync_single_for_device(&hwdev->dev, dma_handle, size, (enum dma_data_direction)direction);
 }
 static inline void
 pci_dma_sync_sg_for_cpu(struct pci_dev *hwdev, struct scatterlist *sg,
                int nelems, int direction)
 {
-        dma_sync_sg_for_cpu(hwdev == NULL ? NULL : &hwdev->dev, sg, nelems, (enum dma_data_direction)direction);
+        dma_sync_sg_for_cpu(&hwdev->dev, sg, nelems, (enum dma_data_direction)direction);
 }
 static inline void
 pci_dma_sync_sg_for_device(struct pci_dev *hwdev, struct scatterlist *sg,
                int nelems, int direction)
 {
-        dma_sync_sg_for_device(hwdev == NULL ? NULL : &hwdev->dev, sg, nelems, (enum dma_data_direction)direction);
+        dma_sync_sg_for_device(&hwdev->dev, sg, nelems, (enum dma_data_direction)direction);
 }
 static inline int
diff --git a/include/linux/pci-ecam.h b/include/linux/pci-ecam.h
index 809c2f1873ac..baadad1aabbc 100644
--- a/include/linux/pci-ecam.h
+++ b/include/linux/pci-ecam.h
@@ -1,17 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /*
 * Copyright 2016 Broadcom
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2, as
- * published by the Free Software Foundation (the "GPL").
- *
- * 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 version 2 (GPLv2) for more details.
- *
- * You should have received a copy of the GNU General Public License
- * version 2 (GPLv2) along with this source code.
 */
 #ifndef DRIVERS_PCI_ECAM_H
 #define DRIVERS_PCI_ECAM_H
diff --git a/include/linux/pci-ep-cfs.h b/include/linux/pci-ep-cfs.h
index 263b89ea5705..f42b0fd4b4bc 100644
--- a/include/linux/pci-ep-cfs.h
+++ b/include/linux/pci-ep-cfs.h
@@ -1,12 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /**
 * PCI Endpoint ConfigFS header file
 *
 * Copyright (C) 2017 Texas Instruments
 * Author: Kishon Vijay Abraham I <kishon@ti.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 of
- * the License as published by the Free Software Foundation.
 */
 #ifndef __LINUX_PCI_EP_CFS_H
diff --git a/include/linux/pci-epc.h b/include/linux/pci-epc.h
index f7a04e1af112..a1a5e5df0f66 100644
--- a/include/linux/pci-epc.h
+++ b/include/linux/pci-epc.h
@@ -1,12 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /**
 * PCI Endpoint *Controller* (EPC) header file
 *
 * Copyright (C) 2017 Texas Instruments
 * Author: Kishon Vijay Abraham I <kishon@ti.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 of
- * the License as published by the Free Software Foundation.
 */
 #ifndef __LINUX_PCI_EPC_H
@@ -39,17 +36,20 @@ enum pci_epc_irq_type {
 * @owner: the module owner containing the ops
 */
 struct pci_epc_ops {
-        int     (*write_header)(struct pci_epc *pci_epc,
+        int     (*write_header)(struct pci_epc *epc, u8 func_no,
                                struct pci_epf_header *hdr);
-        int     (*set_bar)(struct pci_epc *epc, enum pci_barno bar,
+        int     (*set_bar)(struct pci_epc *epc, u8 func_no,
+                           enum pci_barno bar,
                           dma_addr_t bar_phys, size_t size, int flags);
-        void    (*clear_bar)(struct pci_epc *epc, enum pci_barno bar);
+        void    (*clear_bar)(struct pci_epc *epc, u8 func_no,
-        int     (*map_addr)(struct pci_epc *epc, phys_addr_t addr,
+                             enum pci_barno bar);
-                            u64 pci_addr, size_t size);
+        int     (*map_addr)(struct pci_epc *epc, u8 func_no,
-        void    (*unmap_addr)(struct pci_epc *epc, phys_addr_t addr);
+                            phys_addr_t addr, u64 pci_addr, size_t size);
-        int     (*set_msi)(struct pci_epc *epc, u8 interrupts);
+        void    (*unmap_addr)(struct pci_epc *epc, u8 func_no,
-        int     (*get_msi)(struct pci_epc *epc);
+                              phys_addr_t addr);
-        int     (*raise_irq)(struct pci_epc *pci_epc,
+        int     (*set_msi)(struct pci_epc *epc, u8 func_no, u8 interrupts);
+        int     (*get_msi)(struct pci_epc *epc, u8 func_no);
+        int     (*raise_irq)(struct pci_epc *epc, u8 func_no,
                             enum pci_epc_irq_type type, u8 interrupt_num);
        int     (*start)(struct pci_epc *epc);
        void    (*stop)(struct pci_epc *epc);
@@ -124,17 +124,21 @@ void pci_epc_destroy(struct pci_epc *epc);
 int pci_epc_add_epf(struct pci_epc *epc, struct pci_epf *epf);
 void pci_epc_linkup(struct pci_epc *epc);
 void pci_epc_remove_epf(struct pci_epc *epc, struct pci_epf *epf);
-int pci_epc_write_header(struct pci_epc *epc, struct pci_epf_header *hdr);
+int pci_epc_write_header(struct pci_epc *epc, u8 func_no,
-int pci_epc_set_bar(struct pci_epc *epc, enum pci_barno bar,
+                         struct pci_epf_header *hdr);
+int pci_epc_set_bar(struct pci_epc *epc, u8 func_no,
+                    enum pci_barno bar,
                    dma_addr_t bar_phys, size_t size, int flags);
-void pci_epc_clear_bar(struct pci_epc *epc, int bar);
+void pci_epc_clear_bar(struct pci_epc *epc, u8 func_no, int bar);
-int pci_epc_map_addr(struct pci_epc *epc, phys_addr_t phys_addr,
+int pci_epc_map_addr(struct pci_epc *epc, u8 func_no,
+                     phys_addr_t phys_addr,
                     u64 pci_addr, size_t size);
-void pci_epc_unmap_addr(struct pci_epc *epc, phys_addr_t phys_addr);
+void pci_epc_unmap_addr(struct pci_epc *epc, u8 func_no,
-int pci_epc_set_msi(struct pci_epc *epc, u8 interrupts);
+                        phys_addr_t phys_addr);
-int pci_epc_get_msi(struct pci_epc *epc);
+int pci_epc_set_msi(struct pci_epc *epc, u8 func_no, u8 interrupts);
-int pci_epc_raise_irq(struct pci_epc *epc, enum pci_epc_irq_type type,
+int pci_epc_get_msi(struct pci_epc *epc, u8 func_no);
-                      u8 interrupt_num);
+int pci_epc_raise_irq(struct pci_epc *epc, u8 func_no,
+                      enum pci_epc_irq_type type, u8 interrupt_num);
 int pci_epc_start(struct pci_epc *epc);
 void pci_epc_stop(struct pci_epc *epc);
 struct pci_epc *pci_epc_get(const char *epc_name);
diff --git a/include/linux/pci-epf.h b/include/linux/pci-epf.h
index 60d551a9a1ba..e897bf076701 100644
--- a/include/linux/pci-epf.h
+++ b/include/linux/pci-epf.h
@@ -1,12 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0 */
 /**
 * PCI Endpoint *Function* (EPF) header file
 *
 * Copyright (C) 2017 Texas Instruments
 * Author: Kishon Vijay Abraham I <kishon@ti.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 of
- * the License as published by the Free Software Foundation.
 */
 #ifndef __LINUX_PCI_EPF_H
diff --git a/include/linux/pci.h b/include/linux/pci.h
index ad35aac87971..024a1beda008 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -48,17 +48,17 @@
 * In the interest of not exposing interfaces to user-space unnecessarily,
 * the following kernel-only defines are being added here.
 */
-#define PCI_DEVID(bus, devfn)  ((((u16)(bus)) << 8) | (devfn))
+#define PCI_DEVID(bus, devfn)   ((((u16)(bus)) << 8) | (devfn))
 /* return bus from PCI devid = ((u16)bus_number) << 8) | devfn */
 #define PCI_BUS_NUM(x) (((x) >> 8) & 0xff)
 /* pci_slot represents a physical slot */
 struct pci_slot {
-        struct pci_bus *bus;            /* The bus this slot is on */
+        struct pci_bus          *bus;           /* Bus this slot is on */
-        struct list_head list;          /* node in list of slots on this bus */
+        struct list_head        list;           /* Node in list of slots */
-        struct hotplug_slot *hotplug;   /* Hotplug info (migrate over time) */
+        struct hotplug_slot     *hotplug;       /* Hotplug info (move here) */
-        unsigned char number;           /* PCI_SLOT(pci_dev->devfn) */
+        unsigned char           number;         /* PCI_SLOT(pci_dev->devfn) */
-        struct kobject kobj;
+        struct kobject          kobj;
 };
 static inline const char *pci_slot_name(const struct pci_slot *slot)
@@ -72,9 +72,7 @@ enum pci_mmap_state {
        pci_mmap_mem
 };
-/*
+/* For PCI devices, the region numbers are assigned this way: */
- *  For PCI devices, the region numbers are assigned this way:
- */
 enum {
        /* #0-5: standard PCI resources */
        PCI_STD_RESOURCES,
@@ -83,23 +81,23 @@ enum {
        /* #6: expansion ROM resource */
        PCI_ROM_RESOURCE,
-        /* device specific resources */
+        /* Device-specific resources */
 #ifdef CONFIG_PCI_IOV
        PCI_IOV_RESOURCES,
        PCI_IOV_RESOURCE_END = PCI_IOV_RESOURCES + PCI_SRIOV_NUM_BARS - 1,
 #endif
-        /* resources assigned to buses behind the bridge */
+        /* Resources assigned to buses behind the bridge */
 #define PCI_BRIDGE_RESOURCE_NUM 4
        PCI_BRIDGE_RESOURCES,
        PCI_BRIDGE_RESOURCE_END = PCI_BRIDGE_RESOURCES +
                                  PCI_BRIDGE_RESOURCE_NUM - 1,
-        /* total resources associated with a PCI device */
+        /* Total resources associated with a PCI device */
        PCI_NUM_RESOURCES,
-        /* preserve this for compatibility */
+        /* Preserve this for compatibility */
        DEVICE_COUNT_RESOURCE = PCI_NUM_RESOURCES,
 };
@@ -152,9 +150,10 @@ static inline const char *pci_power_name(pci_power_t state)
 #define PCI_PM_D3COLD_WAIT      100
 #define PCI_PM_BUS_WAIT         50
-/** The pci_channel state describes connectivity between the CPU and
+/**
- *  the pci device.  If some PCI bus between here and the pci device
+ * The pci_channel state describes connectivity between the CPU and
- *  has crashed or locked up, this info is reflected here.
+ * the PCI device.  If some PCI bus between here and the PCI device
+ * has crashed or locked up, this info is reflected here.
 */
 typedef unsigned int __bitwise pci_channel_state_t;
@@ -184,9 +183,7 @@ enum pcie_reset_state {
 typedef unsigned short __bitwise pci_dev_flags_t;
 enum pci_dev_flags {
-        /* INTX_DISABLE in PCI_COMMAND register disables MSI
+        /* INTX_DISABLE in PCI_COMMAND register disables MSI too */
-         * generation too.
-         */
        PCI_DEV_FLAGS_MSI_INTX_DISABLE_BUG = (__force pci_dev_flags_t) (1 << 0),
        /* Device configuration is irrevocably lost if disabled into D3 */
        PCI_DEV_FLAGS_NO_D3 = (__force pci_dev_flags_t) (1 << 1),
@@ -202,7 +199,7 @@ enum pci_dev_flags {
        PCI_DEV_FLAGS_NO_PM_RESET = (__force pci_dev_flags_t) (1 << 7),
        /* Get VPD from function 0 VPD */
        PCI_DEV_FLAGS_VPD_REF_F0 = (__force pci_dev_flags_t) (1 << 8),
-        /* a non-root bridge where translation occurs, stop alias search here */
+        /* A non-root bridge where translation occurs, stop alias search here */
        PCI_DEV_FLAGS_BRIDGE_XLATE_ROOT = (__force pci_dev_flags_t) (1 << 9),
        /* Do not use FLR even if device advertises PCI_AF_CAP */
        PCI_DEV_FLAGS_NO_FLR_RESET = (__force pci_dev_flags_t) (1 << 10),
@@ -222,17 +219,17 @@ enum pci_bus_flags {
        PCI_BUS_FLAGS_NO_AERSID = (__force pci_bus_flags_t) 4,
 };
-/* These values come from the PCI Express Spec */
+/* Values from Link Status register, PCIe r3.1, sec 7.8.8 */
 enum pcie_link_width {
        PCIE_LNK_WIDTH_RESRV    = 0x00,
        PCIE_LNK_X1             = 0x01,
        PCIE_LNK_X2             = 0x02,
        PCIE_LNK_X4             = 0x04,
        PCIE_LNK_X8             = 0x08,
-        PCIE_LNK_X12            = 0x0C,
+        PCIE_LNK_X12            = 0x0c,
        PCIE_LNK_X16            = 0x10,
        PCIE_LNK_X32            = 0x20,
-        PCIE_LNK_WIDTH_UNKNOWN  = 0xFF,
+        PCIE_LNK_WIDTH_UNKNOWN  = 0xff,
 };
 /* Based on the PCI Hotplug Spec, but some values are made up by us */
@@ -263,15 +260,15 @@ enum pci_bus_speed {
 };
 struct pci_cap_saved_data {
-        u16 cap_nr;
+        u16             cap_nr;
-        bool cap_extended;
+        bool            cap_extended;
-        unsigned int size;
+        unsigned int    size;
-        u32 data[0];
+        u32             data[0];
 };
 struct pci_cap_saved_state {
-        struct hlist_node next;
+        struct hlist_node               next;
-        struct pci_cap_saved_data cap;
+        struct pci_cap_saved_data       cap;
 };
 struct irq_affinity;
@@ -280,19 +277,17 @@ struct pci_vpd;
 struct pci_sriov;
 struct pci_ats;
-/*
+/* The pci_dev structure describes PCI devices */
- * The pci_dev structure is used to describe PCI devices.
- */
 struct pci_dev {
-        struct list_head bus_list;      /* node in per-bus list */
+        struct list_head bus_list;      /* Node in per-bus list */
-        struct pci_bus  *bus;           /* bus this device is on */
+        struct pci_bus  *bus;           /* Bus this device is on */
-        struct pci_bus  *subordinate;   /* bus this device bridges to */
+        struct pci_bus  *subordinate;   /* Bus this device bridges to */
-        void            *sysdata;       /* hook for sys-specific extension */
+        void            *sysdata;       /* Hook for sys-specific extension */
-        struct proc_dir_entry *procent; /* device entry in /proc/bus/pci */
+        struct proc_dir_entry *procent; /* Device entry in /proc/bus/pci */
        struct pci_slot *slot;          /* Physical slot this device is in */
-        unsigned int    devfn;          /* encoded device & function index */
+        unsigned int    devfn;          /* Encoded device & function index */
        unsigned short  vendor;
        unsigned short  device;
        unsigned short  subsystem_vendor;
@@ -307,12 +302,12 @@ struct pci_dev {
        u8              msi_cap;        /* MSI capability offset */
        u8              msix_cap;       /* MSI-X capability offset */
        u8              pcie_mpss:3;    /* PCIe Max Payload Size Supported */
-        u8              rom_base_reg;   /* which config register controls the ROM */
+        u8              rom_base_reg;   /* Config register controlling ROM */
-        u8              pin;            /* which interrupt pin this device uses */
+        u8              pin;            /* Interrupt pin this device uses */
-        u16             pcie_flags_reg; /* cached PCIe Capabilities Register */
+        u16             pcie_flags_reg; /* Cached PCIe Capabilities Register */
-        unsigned long   *dma_alias_mask;/* mask of enabled devfn aliases */
+        unsigned long   *dma_alias_mask;/* Mask of enabled devfn aliases */
-        struct pci_driver *driver;      /* which driver has allocated this device */
+        struct pci_driver *driver;      /* Driver bound to this device */
        u64             dma_mask;       /* Mask of the bits of bus address this
                                           device implements.  Normally this is
                                           0xffffffff.  You only need to change
@@ -321,9 +316,9 @@ struct pci_dev {
        struct device_dma_parameters dma_parms;
-        pci_power_t     current_state;  /* Current operating state. In ACPI-speak,
+        pci_power_t     current_state;  /* Current operating state. In ACPI,
-                                           this is D0-D3, D0 being fully functional,
+                                           this is D0-D3, D0 being fully
-                                           and D3 being off. */
+                                           functional, and D3 being off. */
        u8              pm_cap;         /* PM capability offset */
        unsigned int    pme_support:5;  /* Bitmask of states from which PME#
                                           can be generated */
@@ -334,10 +329,10 @@ struct pci_dev {
        unsigned int    no_d3cold:1;    /* D3cold is forbidden */
        unsigned int    bridge_d3:1;    /* Allow D3 for bridge */
        unsigned int    d3cold_allowed:1;       /* D3cold is allowed by user */
-        unsigned int    mmio_always_on:1;       /* disallow turning off io/mem
+        unsigned int    mmio_always_on:1;       /* Disallow turning off io/mem
-                                                   decoding during bar sizing */
+                                                   decoding during BAR sizing */
        unsigned int    wakeup_prepared:1;
-        unsigned int    runtime_d3cold:1;       /* whether go through runtime
+        unsigned int    runtime_d3cold:1;       /* Whether go through runtime
                                                   D3cold, not set for devices
                                                   powered on/off by the
                                                   corresponding bridge */
@@ -350,12 +345,14 @@ struct pci_dev {
 #ifdef CONFIG_PCIEASPM
        struct pcie_link_state  *link_state;    /* ASPM link state */
+        unsigned int    ltr_path:1;     /* Latency Tolerance Reporting
+                                           supported from root to here */
 #endif
-        pci_channel_state_t error_state;        /* current connectivity state */
+        pci_channel_state_t error_state;        /* Current connectivity state */
-        struct  device  dev;            /* Generic device interface */
+        struct device   dev;                    /* Generic device interface */
-        int             cfg_size;       /* Size of configuration space */
+        int             cfg_size;               /* Size of config space */
        /*
         * Instead of touching interrupt line and base address registers
@@ -364,47 +361,47 @@ struct pci_dev {
        unsigned int    irq;
        struct resource resource[DEVICE_COUNT_RESOURCE]; /* I/O and memory regions + expansion ROMs */
-        bool match_driver;              /* Skip attaching driver */
+        bool            match_driver;           /* Skip attaching driver */
-        /* These fields are used by common fixups */
-        unsigned int    transparent:1;  /* Subtractive decode PCI bridge */
+        unsigned int    transparent:1;          /* Subtractive decode bridge */
-        unsigned int    multifunction:1;/* Part of multi-function device */
+        unsigned int    multifunction:1;        /* Multi-function device */
-        /* keep track of device state */
        unsigned int    is_added:1;
-        unsigned int    is_busmaster:1; /* device is busmaster */
+        unsigned int    is_busmaster:1;         /* Is busmaster */
-        unsigned int    no_msi:1;       /* device may not use msi */
+        unsigned int    no_msi:1;               /* May not use MSI */
-        unsigned int    no_64bit_msi:1; /* device may only use 32-bit MSIs */
+        unsigned int    no_64bit_msi:1;         /* May only use 32-bit MSIs */
-        unsigned int    block_cfg_access:1;     /* config space access is blocked */
+        unsigned int    block_cfg_access:1;     /* Config space access blocked */
-        unsigned int    broken_parity_status:1; /* Device generates false positive parity */
+        unsigned int    broken_parity_status:1; /* Generates false positive parity */
-        unsigned int    irq_reroute_variant:2;  /* device needs IRQ rerouting variant */
+        unsigned int    irq_reroute_variant:2;  /* Needs IRQ rerouting variant */
        unsigned int    msi_enabled:1;
        unsigned int    msix_enabled:1;
-        unsigned int    ari_enabled:1;  /* ARI forwarding */
+        unsigned int    ari_enabled:1;          /* ARI forwarding */
-        unsigned int    ats_enabled:1;  /* Address Translation Service */
+        unsigned int    ats_enabled:1;          /* Address Translation Svc */
        unsigned int    pasid_enabled:1;        /* Process Address Space ID */
        unsigned int    pri_enabled:1;          /* Page Request Interface */
        unsigned int    is_managed:1;
-        unsigned int    needs_freset:1; /* Dev requires fundamental reset */
+        unsigned int    needs_freset:1;         /* Requires fundamental reset */
        unsigned int    state_saved:1;
        unsigned int    is_physfn:1;
        unsigned int    is_virtfn:1;
        unsigned int    reset_fn:1;
-        unsigned int    is_hotplug_bridge:1;
+        unsigned int    is_hotplug_bridge:1;
-        unsigned int    is_thunderbolt:1; /* Thunderbolt controller */
+        unsigned int    is_thunderbolt:1;       /* Thunderbolt controller */
-        unsigned int    __aer_firmware_first_valid:1;
+        unsigned int    __aer_firmware_first_valid:1;
        unsigned int    __aer_firmware_first:1;
-        unsigned int    broken_intx_masking:1; /* INTx masking can't be used */
+        unsigned int    broken_intx_masking:1;  /* INTx masking can't be used */
-        unsigned int    io_window_1k:1; /* Intel P2P bridge 1K I/O windows */
+        unsigned int    io_window_1k:1;         /* Intel bridge 1K I/O windows */
        unsigned int    irq_managed:1;
        unsigned int    has_secondary_link:1;
-        unsigned int    non_compliant_bars:1;   /* broken BARs; ignore them */
+        unsigned int    non_compliant_bars:1;   /* Broken BARs; ignore them */
-        unsigned int    is_probed:1;            /* device probing in progress */
+        unsigned int    is_probed:1;            /* Device probing in progress */
        pci_dev_flags_t dev_flags;
        atomic_t        enable_cnt;     /* pci_enable_device has been called */
-        u32             saved_config_space[16]; /* config space saved at suspend time */
+        u32             saved_config_space[16]; /* Config space saved at suspend time */
        struct hlist_head saved_cap_space;
-        struct bin_attribute *rom_attr; /* attribute descriptor for sysfs ROM entry */
+        struct bin_attribute *rom_attr;         /* Attribute descriptor for sysfs ROM entry */
-        int rom_attr_enabled;           /* has display of the rom attribute been enabled? */
+        int             rom_attr_enabled;       /* Display of ROM attribute enabled? */
        struct bin_attribute *res_attr[DEVICE_COUNT_RESOURCE]; /* sysfs file for resources */
        struct bin_attribute *res_attr_wc[DEVICE_COUNT_RESOURCE]; /* sysfs file for WC mapping of resources */
@@ -419,12 +416,12 @@ struct pci_dev {
        struct pci_vpd *vpd;
 #ifdef CONFIG_PCI_ATS
        union {
-                struct pci_sriov *sriov;        /* SR-IOV capability related */
+                struct pci_sriov        *sriov;         /* PF: SR-IOV info */
-                struct pci_dev *physfn; /* the PF this VF is associated with */
+                struct pci_dev          *physfn;        /* VF: related PF */
        };
        u16             ats_cap;        /* ATS Capability offset */
        u8              ats_stu;        /* ATS Smallest Translation Unit */
-        atomic_t        ats_ref_cnt;    /* number of VFs with ATS enabled */
+        atomic_t        ats_ref_cnt;    /* Number of VFs with ATS enabled */
 #endif
 #ifdef CONFIG_PCI_PRI
        u32             pri_reqs_alloc; /* Number of PRI requests allocated */
@@ -432,11 +429,11 @@ struct pci_dev {
 #ifdef CONFIG_PCI_PASID
        u16             pasid_features;
 #endif
-        phys_addr_t rom; /* Physical address of ROM if it's not from the BAR */
+        phys_addr_t     rom;            /* Physical address if not from BAR */
-        size_t romlen; /* Length of ROM if it's not from the BAR */
+        size_t          romlen;         /* Length if not from BAR */
-        char *driver_override; /* Driver name to force a match */
+        char            *driver_override; /* Driver name to force a match */
-        unsigned long priv_flags; /* Private flags for the pci driver */
+        unsigned long   priv_flags;     /* Private flags for the PCI driver */
 };
 static inline struct pci_dev *pci_physfn(struct pci_dev *dev)
@@ -459,26 +456,26 @@ static inline int pci_channel_offline(struct pci_dev *pdev)
 }
 struct pci_host_bridge {
-        struct device dev;
+        struct device   dev;
-        struct pci_bus *bus;            /* root bus */
+        struct pci_bus  *bus;           /* Root bus */
-        struct pci_ops *ops;
+        struct pci_ops  *ops;
-        void *sysdata;
+        void            *sysdata;
-        int busnr;
+        int             busnr;
        struct list_head windows;       /* resource_entry */
-        u8 (*swizzle_irq)(struct pci_dev *, u8 *); /* platform IRQ swizzler */
+        u8 (*swizzle_irq)(struct pci_dev *, u8 *); /* Platform IRQ swizzler */
        int (*map_irq)(const struct pci_dev *, u8, u8);
        void (*release_fn)(struct pci_host_bridge *);
-        void *release_data;
+        void            *release_data;
        struct msi_controller *msi;
-        unsigned int ignore_reset_delay:1;      /* for entire hierarchy */
+        unsigned int    ignore_reset_delay:1;   /* For entire hierarchy */
-        unsigned int no_ext_tags:1;             /* no Extended Tags */
+        unsigned int    no_ext_tags:1;          /* No Extended Tags */
        /* Resource alignment requirements */
        resource_size_t (*align_resource)(struct pci_dev *dev,
                        const struct resource *res,
                        resource_size_t start,
                        resource_size_t size,
                        resource_size_t align);
-        unsigned long private[0] ____cacheline_aligned;
+        unsigned long   private[0] ____cacheline_aligned;
 };
 #define to_pci_host_bridge(n) container_of(n, struct pci_host_bridge, dev)
@@ -500,8 +497,8 @@ void pci_free_host_bridge(struct pci_host_bridge *bridge);
 struct pci_host_bridge *pci_find_host_bridge(struct pci_bus *bus);
 void pci_set_host_bridge_release(struct pci_host_bridge *bridge,
-                     void (*release_fn)(struct pci_host_bridge *),
+                                 void (*release_fn)(struct pci_host_bridge *),
-                     void *release_data);
+                                 void *release_data);
 int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge);
@@ -521,32 +518,32 @@ int pcibios_root_bridge_prepare(struct pci_host_bridge *bridge);
 #define PCI_SUBTRACTIVE_DECODE  0x1
 struct pci_bus_resource {
-        struct list_head list;
+        struct list_head        list;
-        struct resource *res;
+        struct resource         *res;
-        unsigned int flags;
+        unsigned int            flags;
 };
 #define PCI_REGION_FLAG_MASK    0x0fU   /* These bits of resource flags tell us the PCI region flags */
 struct pci_bus {
-        struct list_head node;          /* node in list of buses */
+        struct list_head node;          /* Node in list of buses */
-        struct pci_bus  *parent;        /* parent bus this bridge is on */
+        struct pci_bus  *parent;        /* Parent bus this bridge is on */
-        struct list_head children;      /* list of child buses */
+        struct list_head children;      /* List of child buses */
-        struct list_head devices;       /* list of devices on this bus */
+        struct list_head devices;       /* List of devices on this bus */
-        struct pci_dev  *self;          /* bridge device as seen by parent */
+        struct pci_dev  *self;          /* Bridge device as seen by parent */
-        struct list_head slots;         /* list of slots on this bus;
+        struct list_head slots;         /* List of slots on this bus;
                                           protected by pci_slot_mutex */
        struct resource *resource[PCI_BRIDGE_RESOURCE_NUM];
-        struct list_head resources;     /* address space routed to this bus */
+        struct list_head resources;     /* Address space routed to this bus */
-        struct resource busn_res;       /* bus numbers routed to this bus */
+        struct resource busn_res;       /* Bus numbers routed to this bus */
-        struct pci_ops  *ops;           /* configuration access functions */
+        struct pci_ops  *ops;           /* Configuration access functions */
        struct msi_controller *msi;     /* MSI controller */
-        void            *sysdata;       /* hook for sys-specific extension */
+        void            *sysdata;       /* Hook for sys-specific extension */
-        struct proc_dir_entry *procdir; /* directory entry in /proc/bus/pci */
+        struct proc_dir_entry *procdir; /* Directory entry in /proc/bus/pci */
-        unsigned char   number;         /* bus number */
+        unsigned char   number;         /* Bus number */
-        unsigned char   primary;        /* number of primary bridge */
+        unsigned char   primary;        /* Number of primary bridge */
        unsigned char   max_bus_speed;  /* enum pci_bus_speed */
        unsigned char   cur_bus_speed;  /* enum pci_bus_speed */
 #ifdef CONFIG_PCI_DOMAINS_GENERIC
@@ -555,12 +552,12 @@ struct pci_bus {
        char            name[48];
-        unsigned short  bridge_ctl;     /* manage NO_ISA/FBB/et al behaviors */
+        unsigned short  bridge_ctl;     /* Manage NO_ISA/FBB/et al behaviors */
-        pci_bus_flags_t bus_flags;      /* inherited by child buses */
+        pci_bus_flags_t bus_flags;      /* Inherited by child buses */
        struct device           *bridge;
        struct device           dev;
-        struct bin_attribute    *legacy_io; /* legacy I/O for this bus */
+        struct bin_attribute    *legacy_io;     /* Legacy I/O for this bus */
-        struct bin_attribute    *legacy_mem; /* legacy mem */
+        struct bin_attribute    *legacy_mem;    /* Legacy mem */
        unsigned int            is_added:1;
 };
@@ -617,9 +614,7 @@ static inline bool pci_dev_msi_enabled(struct pci_dev *pci_dev)
 static inline bool pci_dev_msi_enabled(struct pci_dev *pci_dev) { return false; }
 #endif
-/*
+/* Error values that may be returned by PCI functions */
- * Error values that may be returned by PCI functions.
- */
 #define PCIBIOS_SUCCESSFUL              0x00
 #define PCIBIOS_FUNC_NOT_SUPPORTED      0x81
 #define PCIBIOS_BAD_VENDOR_ID           0x83
@@ -628,9 +623,7 @@ static inline bool pci_dev_msi_enabled(struct pci_dev *pci_dev) { return false;
 #define PCIBIOS_SET_FAILED              0x88
 #define PCIBIOS_BUFFER_TOO_SMALL        0x89
-/*
+/* Translate above to generic errno for passing back through non-PCI code */
- * Translate above to generic errno for passing back through non-PCI code.
- */
 static inline int pcibios_err_to_errno(int err)
 {
        if (err <= PCIBIOS_SUCCESSFUL)
@@ -680,13 +673,13 @@ typedef u32 pci_bus_addr_t;
 #endif
 struct pci_bus_region {
-        pci_bus_addr_t start;
+        pci_bus_addr_t  start;
-        pci_bus_addr_t end;
+        pci_bus_addr_t  end;
 };
 struct pci_dynids {
-        spinlock_t lock;            /* protects list, index */
+        spinlock_t              lock;   /* Protects list, index */
-        struct list_head list;      /* for IDs added at runtime */
+        struct list_head        list;   /* For IDs added at runtime */
 };
@@ -700,13 +693,13 @@ struct pci_dynids {
 typedef unsigned int __bitwise pci_ers_result_t;
 enum pci_ers_result {
-        /* no result/none/not supported in device driver */
+        /* No result/none/not supported in device driver */
        PCI_ERS_RESULT_NONE = (__force pci_ers_result_t) 1,
        /* Device driver can recover without slot reset */
        PCI_ERS_RESULT_CAN_RECOVER = (__force pci_ers_result_t) 2,
-        /* Device driver wants slot to be reset. */
+        /* Device driver wants slot to be reset */
        PCI_ERS_RESULT_NEED_RESET = (__force pci_ers_result_t) 3,
        /* Device has completely failed, is unrecoverable */
@@ -742,27 +735,27 @@ struct pci_error_handlers {
 struct module;
 struct pci_driver {
-        struct list_head node;
+        struct list_head        node;
-        const char *name;
+        const char              *name;
-        const struct pci_device_id *id_table;   /* must be non-NULL for probe to be called */
+        const struct pci_device_id *id_table;   /* Must be non-NULL for probe to be called */
-        int  (*probe)  (struct pci_dev *dev, const struct pci_device_id *id);   /* New device inserted */
+        int  (*probe)(struct pci_dev *dev, const struct pci_device_id *id);     /* New device inserted */
-        void (*remove) (struct pci_dev *dev);   /* Device removed (NULL if not a hot-plug capable driver) */
+        void (*remove)(struct pci_dev *dev);    /* Device removed (NULL if not a hot-plug capable driver) */
-        int  (*suspend) (struct pci_dev *dev, pm_message_t state);      /* Device suspended */
+        int  (*suspend)(struct pci_dev *dev, pm_message_t state);       /* Device suspended */
-        int  (*suspend_late) (struct pci_dev *dev, pm_message_t state);
+        int  (*suspend_late)(struct pci_dev *dev, pm_message_t state);
-        int  (*resume_early) (struct pci_dev *dev);
+        int  (*resume_early)(struct pci_dev *dev);
-        int  (*resume) (struct pci_dev *dev);                   /* Device woken up */
+        int  (*resume) (struct pci_dev *dev);   /* Device woken up */
        void (*shutdown) (struct pci_dev *dev);
-        int (*sriov_configure) (struct pci_dev *dev, int num_vfs); /* PF pdev */
+        int  (*sriov_configure) (struct pci_dev *dev, int num_vfs); /* On PF */
        const struct pci_error_handlers *err_handler;
        const struct attribute_group **groups;
        struct device_driver    driver;
-        struct pci_dynids dynids;
+        struct pci_dynids       dynids;
 };
 #define to_pci_driver(drv) container_of(drv, struct pci_driver, driver)
 /**
- * PCI_DEVICE - macro used to describe a specific pci device
+ * PCI_DEVICE - macro used to describe a specific PCI device
 * @vend: the 16 bit PCI Vendor ID
 * @dev: the 16 bit PCI Device ID
 *
@@ -775,7 +768,7 @@ struct pci_driver {
        .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID
 /**
- * PCI_DEVICE_SUB - macro used to describe a specific pci device with subsystem
+ * PCI_DEVICE_SUB - macro used to describe a specific PCI device with subsystem
 * @vend: the 16 bit PCI Vendor ID
 * @dev: the 16 bit PCI Device ID
 * @subvend: the 16 bit PCI Subvendor ID
@@ -789,7 +782,7 @@ struct pci_driver {
        .subvendor = (subvend), .subdevice = (subdev)
 /**
- * PCI_DEVICE_CLASS - macro used to describe a specific pci device class
+ * PCI_DEVICE_CLASS - macro used to describe a specific PCI device class
 * @dev_class: the class, subclass, prog-if triple for this device
 * @dev_class_mask: the class mask for this device
 *
@@ -803,7 +796,7 @@ struct pci_driver {
        .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID
 /**
- * PCI_VDEVICE - macro used to describe a specific pci device in short form
+ * PCI_VDEVICE - macro used to describe a specific PCI device in short form
 * @vend: the vendor name
 * @dev: the 16 bit PCI Device ID
 *
@@ -812,22 +805,21 @@ struct pci_driver {
 * to PCI_ANY_ID. The macro allows the next field to follow as the device
 * private data.
 */
 #define PCI_VDEVICE(vend, dev) \
        .vendor = PCI_VENDOR_ID_##vend, .device = (dev), \
        .subvendor = PCI_ANY_ID, .subdevice = PCI_ANY_ID, 0, 0
 enum {
-        PCI_REASSIGN_ALL_RSRC   = 0x00000001,   /* ignore firmware setup */
+        PCI_REASSIGN_ALL_RSRC   = 0x00000001,   /* Ignore firmware setup */
-        PCI_REASSIGN_ALL_BUS    = 0x00000002,   /* reassign all bus numbers */
+        PCI_REASSIGN_ALL_BUS    = 0x00000002,   /* Reassign all bus numbers */
-        PCI_PROBE_ONLY          = 0x00000004,   /* use existing setup */
+        PCI_PROBE_ONLY          = 0x00000004,   /* Use existing setup */
-        PCI_CAN_SKIP_ISA_ALIGN  = 0x00000008,   /* don't do ISA alignment */
+        PCI_CAN_SKIP_ISA_ALIGN  = 0x00000008,   /* Don't do ISA alignment */
-        PCI_ENABLE_PROC_DOMAINS = 0x00000010,   /* enable domains in /proc */
+        PCI_ENABLE_PROC_DOMAINS = 0x00000010,   /* Enable domains in /proc */
        PCI_COMPAT_DOMAIN_0     = 0x00000020,   /* ... except domain 0 */
-        PCI_SCAN_ALL_PCIE_DEVS  = 0x00000040,   /* scan all, not just dev 0 */
+        PCI_SCAN_ALL_PCIE_DEVS  = 0x00000040,   /* Scan all, not just dev 0 */
 };
-/* these external functions are only available when PCI support is enabled */
+/* These external functions are only available when PCI support is enabled */
 #ifdef CONFIG_PCI
 extern unsigned int pci_flags;
@@ -840,11 +832,11 @@ static inline int pci_has_flag(int flag) { return pci_flags & flag; }
 void pcie_bus_configure_settings(struct pci_bus *bus);
 enum pcie_bus_config_types {
-        PCIE_BUS_TUNE_OFF,      /* don't touch MPS at all */
+        PCIE_BUS_TUNE_OFF,      /* Don't touch MPS at all */
-        PCIE_BUS_DEFAULT,       /* ensure MPS matches upstream bridge */
+        PCIE_BUS_DEFAULT,       /* Ensure MPS matches upstream bridge */
-        PCIE_BUS_SAFE,          /* use largest MPS boot-time devices support */
+        PCIE_BUS_SAFE,          /* Use largest MPS boot-time devices support */
-        PCIE_BUS_PERFORMANCE,   /* use MPS and MRRS for best performance */
+        PCIE_BUS_PERFORMANCE,   /* Use MPS and MRRS for best performance */
-        PCIE_BUS_PEER2PEER,     /* set MPS = 128 for all devices */
+        PCIE_BUS_PEER2PEER,     /* Set MPS = 128 for all devices */
 };
 extern enum pcie_bus_config_types pcie_bus_config;
@@ -853,7 +845,7 @@ extern struct bus_type pci_bus_type;
 /* Do NOT directly access these two variables, unless you are arch-specific PCI
 * code, or PCI core code. */
-extern struct list_head pci_root_buses; /* list of all known PCI buses */
+extern struct list_head pci_root_buses; /* List of all known PCI buses */
 /* Some device drivers need know if PCI is initiated */
 int no_pci_devices(void);
@@ -887,12 +879,13 @@ struct pci_bus *pci_scan_bus(int bus, struct pci_ops *ops, void *sysdata);
 struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
                                    struct pci_ops *ops, void *sysdata,
                                    struct list_head *resources);
+int pci_host_probe(struct pci_host_bridge *bridge);
 int pci_bus_insert_busn_res(struct pci_bus *b, int bus, int busmax);
 int pci_bus_update_busn_res_end(struct pci_bus *b, int busmax);
 void pci_bus_release_busn_res(struct pci_bus *b);
 struct pci_bus *pci_scan_root_bus(struct device *parent, int bus,
-                                             struct pci_ops *ops, void *sysdata,
+                                  struct pci_ops *ops, void *sysdata,
-                                             struct list_head *resources);
+                                  struct list_head *resources);
 int pci_scan_root_bus_bridge(struct pci_host_bridge *bridge);
 struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev,
                                int busnr);
@@ -949,10 +942,10 @@ int pci_find_next_ht_capability(struct pci_dev *dev, int pos, int ht_cap);
 struct pci_bus *pci_find_next_bus(const struct pci_bus *from);
 struct pci_dev *pci_get_device(unsigned int vendor, unsigned int device,
-                                struct pci_dev *from);
+                               struct pci_dev *from);
 struct pci_dev *pci_get_subsys(unsigned int vendor, unsigned int device,
-                                unsigned int ss_vendor, unsigned int ss_device,
+                               unsigned int ss_vendor, unsigned int ss_device,
-                                struct pci_dev *from);
+                               struct pci_dev *from);
 struct pci_dev *pci_get_slot(struct pci_bus *bus, unsigned int devfn);
 struct pci_dev *pci_get_domain_bus_and_slot(int domain, unsigned int bus,
                                            unsigned int devfn);
@@ -1028,7 +1021,7 @@ static inline int pcie_capability_clear_dword(struct pci_dev *dev, int pos,
        return pcie_capability_clear_and_set_dword(dev, pos, clear, 0);
 }
-/* user-space driven config access */
+/* User-space driven config access */
 int pci_user_read_config_byte(struct pci_dev *dev, int where, u8 *val);
 int pci_user_read_config_word(struct pci_dev *dev, int where, u16 *val);
 int pci_user_read_config_dword(struct pci_dev *dev, int where, u32 *val);
@@ -1171,7 +1164,7 @@ unsigned int pci_rescan_bus(struct pci_bus *bus);
 void pci_lock_rescan_remove(void);
 void pci_unlock_rescan_remove(void);
-/* Vital product data routines */
+/* Vital Product Data routines */
 ssize_t pci_read_vpd(struct pci_dev *dev, loff_t pos, size_t count, void *buf);
 ssize_t pci_write_vpd(struct pci_dev *dev, loff_t pos, size_t count, const void *buf);
 int pci_set_vpd_size(struct pci_dev *dev, size_t len);
@@ -1256,9 +1249,7 @@ static inline pci_bus_addr_t pci_bus_address(struct pci_dev *pdev, int bar)
 int __must_check __pci_register_driver(struct pci_driver *, struct module *,
                                       const char *mod_name);
-/*
+/* pci_register_driver() must be a macro so KBUILD_MODNAME can be expanded */
- * pci_register_driver must be a macro so that KBUILD_MODNAME can be expanded
- */
 #define pci_register_driver(driver)             \
        __pci_register_driver(driver, THIS_MODULE, KBUILD_MODNAME)
@@ -1273,8 +1264,7 @@ void pci_unregister_driver(struct pci_driver *dev);
 * use this macro once, and calling it replaces module_init() and module_exit()
 */
 #define module_pci_driver(__pci_driver) \
-        module_driver(__pci_driver, pci_register_driver, \
+        module_driver(__pci_driver, pci_register_driver, pci_unregister_driver)
-                       pci_unregister_driver)
 /**
 * builtin_pci_driver() - Helper macro for registering a PCI driver
@@ -1313,10 +1303,10 @@ resource_size_t pcibios_iov_resource_alignment(struct pci_dev *dev, int resno);
 int pci_set_vga_state(struct pci_dev *pdev, bool decode,
                      unsigned int command_bits, u32 flags);
-#define PCI_IRQ_LEGACY          (1 << 0) /* allow legacy interrupts */
+#define PCI_IRQ_LEGACY          (1 << 0) /* Allow legacy interrupts */
-#define PCI_IRQ_MSI             (1 << 1) /* allow MSI interrupts */
+#define PCI_IRQ_MSI             (1 << 1) /* Allow MSI interrupts */
-#define PCI_IRQ_MSIX            (1 << 2) /* allow MSI-X interrupts */
+#define PCI_IRQ_MSIX            (1 << 2) /* Allow MSI-X interrupts */
-#define PCI_IRQ_AFFINITY        (1 << 3) /* auto-assign affinity */
+#define PCI_IRQ_AFFINITY        (1 << 3) /* Auto-assign affinity */
 #define PCI_IRQ_ALL_TYPES \
        (PCI_IRQ_LEGACY | PCI_IRQ_MSI | PCI_IRQ_MSIX)
@@ -1335,8 +1325,8 @@ int pci_set_vga_state(struct pci_dev *pdev, bool decode,
 #define pci_pool_free(pool, vaddr, addr) dma_pool_free(pool, vaddr, addr)
 struct msix_entry {
-        u32     vector; /* kernel uses to write allocated vector */
+        u32     vector; /* Kernel uses to write allocated vector */
-        u16     entry;  /* driver uses to specify entry, OS writes */
+        u16     entry;  /* Driver uses to specify entry, OS writes */
 };
 #ifdef CONFIG_PCI_MSI
@@ -1376,10 +1366,10 @@ static inline int pci_msi_enabled(void) { return 0; }
 static inline int pci_enable_msi(struct pci_dev *dev)
 { return -ENOSYS; }
 static inline int pci_enable_msix_range(struct pci_dev *dev,
-                      struct msix_entry *entries, int minvec, int maxvec)
+                        struct msix_entry *entries, int minvec, int maxvec)
 { return -ENOSYS; }
 static inline int pci_enable_msix_exact(struct pci_dev *dev,
-                      struct msix_entry *entries, int nvec)
+                        struct msix_entry *entries, int nvec)
 { return -ENOSYS; }
 static inline int
@@ -1544,9 +1534,9 @@ static inline int acpi_pci_bus_find_domain_nr(struct pci_bus *bus)
 int pci_bus_find_domain_nr(struct pci_bus *bus, struct device *parent);
 #endif
-/* some architectures require additional setup to direct VGA traffic */
+/* Some architectures require additional setup to direct VGA traffic */
 typedef int (*arch_set_vga_state_t)(struct pci_dev *pdev, bool decode,
-                      unsigned int command_bits, u32 flags);
+                                    unsigned int command_bits, u32 flags);
 void pci_register_set_vga_state(arch_set_vga_state_t func);
 static inline int
@@ -1585,10 +1575,9 @@ static inline void pci_clear_flags(int flags) { }
 static inline int pci_has_flag(int flag) { return 0; }
 /*
- *  If the system does not have PCI, clearly these return errors.  Define
+ * If the system does not have PCI, clearly these return errors.  Define
- *  these as simple inline functions to avoid hair in drivers.
+ * these as simple inline functions to avoid hair in drivers.
 */
 #define _PCI_NOP(o, s, t) \
        static inline int pci_##o##_config_##s(struct pci_dev *dev, \
                                                int where, t val) \
@@ -1687,6 +1676,13 @@ static inline int pci_get_new_domain_nr(void) { return -ENOSYS; }
 #define dev_is_pf(d) (false)
 static inline bool pci_acs_enabled(struct pci_dev *pdev, u16 acs_flags)
 { return false; }
+static inline int pci_irqd_intx_xlate(struct irq_domain *d,
+                                      struct device_node *node,
+                                      const u32 *intspec,
+                                      unsigned int intsize,
+                                      unsigned long *out_hwirq,
+                                      unsigned int *out_type)
+{ return -EINVAL; }
 #endif /* CONFIG_PCI */
 /* Include architecture-dependent settings and functions */
@@ -1727,8 +1723,10 @@ int pci_iobar_pfn(struct pci_dev *pdev, int bar, struct vm_area_struct *vma);
 #define pci_root_bus_fwnode(bus)        NULL
 #endif
-/* these helpers provide future and backwards compatibility
+/*
- * for accessing popular PCI BAR info */
+ * These helpers provide future and backwards compatibility
+ * for accessing popular PCI BAR info
+ */
 #define pci_resource_start(dev, bar)    ((dev)->resource[(bar)].start)
 #define pci_resource_end(dev, bar)      ((dev)->resource[(bar)].end)
 #define pci_resource_flags(dev, bar)    ((dev)->resource[(bar)].flags)
@@ -1740,7 +1738,8 @@ int pci_iobar_pfn(struct pci_dev *pdev, int bar, struct vm_area_struct *vma);
         (pci_resource_end((dev), (bar)) -              \
          pci_resource_start((dev), (bar)) + 1))
-/* Similar to the helpers above, these manipulate per-pci_dev
+/*
+ * Similar to the helpers above, these manipulate per-pci_dev
 * driver-specific data.  They are really just a wrapper around
 * the generic device structure functions of these calls.
 */
@@ -1754,16 +1753,14 @@ static inline void pci_set_drvdata(struct pci_dev *pdev, void *data)
        dev_set_drvdata(&pdev->dev, data);
 }
-/* If you want to know what to call your pci_dev, ask this function.
- * Again, it's a wrapper around the generic device.
- */
 static inline const char *pci_name(const struct pci_dev *pdev)
 {
        return dev_name(&pdev->dev);
 }
-/* Some archs don't want to expose struct resource to userland as-is
+/*
+ * Some archs don't want to expose struct resource to userland as-is
 * in sysfs and /proc
 */
 #ifdef HAVE_ARCH_PCI_RESOURCE_TO_USER
@@ -1782,16 +1779,16 @@ static inline void pci_resource_to_user(const struct pci_dev *dev, int bar,
 /*
- *  The world is not perfect and supplies us with broken PCI devices.
+ * The world is not perfect and supplies us with broken PCI devices.
- *  For at least a part of these bugs we need a work-around, so both
+ * For at least a part of these bugs we need a work-around, so both
- *  generic (drivers/pci/quirks.c) and per-architecture code can define
+ * generic (drivers/pci/quirks.c) and per-architecture code can define
- *  fixup hooks to be called for particular buggy devices.
+ * fixup hooks to be called for particular buggy devices.
 */
 struct pci_fixup {
-        u16 vendor;             /* You can use PCI_ANY_ID here of course */
+        u16 vendor;                     /* Or PCI_ANY_ID */
-        u16 device;             /* You can use PCI_ANY_ID here of course */
+        u16 device;                     /* Or PCI_ANY_ID */
-        u32 class;              /* You can use PCI_ANY_ID here too */
+        u32 class;                      /* Or PCI_ANY_ID */
        unsigned int class_shift;       /* should be 0, 8, 16 */
        void (*hook)(struct pci_dev *dev);
 };
@@ -1833,23 +1830,19 @@ enum pci_fixup_pass {
 #define DECLARE_PCI_FIXUP_CLASS_RESUME(vendor, device, class,           \
                                         class_shift, hook)             \
        DECLARE_PCI_FIXUP_SECTION(.pci_fixup_resume,                    \
-                resume##hook, vendor, device, class,    \
+                resume##hook, vendor, device, class, class_shift, hook)
-                class_shift, hook)
 #define DECLARE_PCI_FIXUP_CLASS_RESUME_EARLY(vendor, device, class,     \
                                         class_shift, hook)             \
        DECLARE_PCI_FIXUP_SECTION(.pci_fixup_resume_early,              \
-                resume_early##hook, vendor, device,     \
+                resume_early##hook, vendor, device, class, class_shift, hook)
-                class, class_shift, hook)
 #define DECLARE_PCI_FIXUP_CLASS_SUSPEND(vendor, device, class,          \
                                         class_shift, hook)             \
        DECLARE_PCI_FIXUP_SECTION(.pci_fixup_suspend,                   \
-                suspend##hook, vendor, device, class,   \
+                suspend##hook, vendor, device, class, class_shift, hook)
-                class_shift, hook)
 #define DECLARE_PCI_FIXUP_CLASS_SUSPEND_LATE(vendor, device, class,     \
                                         class_shift, hook)             \
        DECLARE_PCI_FIXUP_SECTION(.pci_fixup_suspend_late,              \
-                suspend_late##hook, vendor, device,     \
+                suspend_late##hook, vendor, device, class, class_shift, hook)
-                class, class_shift, hook)
 #define DECLARE_PCI_FIXUP_EARLY(vendor, device, hook)                   \
        DECLARE_PCI_FIXUP_SECTION(.pci_fixup_early,                     \
@@ -1865,20 +1858,16 @@ enum pci_fixup_pass {
                hook, vendor, device, PCI_ANY_ID, 0, hook)
 #define DECLARE_PCI_FIXUP_RESUME(vendor, device, hook)                  \
        DECLARE_PCI_FIXUP_SECTION(.pci_fixup_resume,                    \
-                resume##hook, vendor, device,           \
+                resume##hook, vendor, device, PCI_ANY_ID, 0, hook)
-                PCI_ANY_ID, 0, hook)
 #define DECLARE_PCI_FIXUP_RESUME_EARLY(vendor, device, hook)            \
        DECLARE_PCI_FIXUP_SECTION(.pci_fixup_resume_early,              \
-                resume_early##hook, vendor, device,     \
+                resume_early##hook, vendor, device, PCI_ANY_ID, 0, hook)
-                PCI_ANY_ID, 0, hook)
 #define DECLARE_PCI_FIXUP_SUSPEND(vendor, device, hook)                 \
        DECLARE_PCI_FIXUP_SECTION(.pci_fixup_suspend,                   \
-                suspend##hook, vendor, device,          \
+                suspend##hook, vendor, device, PCI_ANY_ID, 0, hook)
-                PCI_ANY_ID, 0, hook)
 #define DECLARE_PCI_FIXUP_SUSPEND_LATE(vendor, device, hook)            \
        DECLARE_PCI_FIXUP_SECTION(.pci_fixup_suspend_late,              \
-                suspend_late##hook, vendor, device,     \
+                suspend_late##hook, vendor, device, PCI_ANY_ID, 0, hook)
-                PCI_ANY_ID, 0, hook)
 #ifdef CONFIG_PCI_QUIRKS
 void pci_fixup_device(enum pci_fixup_pass pass, struct pci_dev *dev);
@@ -2064,6 +2053,7 @@ void pci_request_acs(void);
 bool pci_acs_enabled(struct pci_dev *pdev, u16 acs_flags);
 bool pci_acs_path_enabled(struct pci_dev *start,
                          struct pci_dev *end, u16 acs_flags);
+int pci_enable_atomic_ops_to_root(struct pci_dev *dev, u32 cap_mask);
 #define PCI_VPD_LRDT                    0x80    /* Large Resource Data Type */
 #define PCI_VPD_LRDT_ID(x)              ((x) | PCI_VPD_LRDT)
@@ -2115,7 +2105,7 @@ static inline u16 pci_vpd_lrdt_size(const u8 *lrdt)
 */
 static inline u16 pci_vpd_lrdt_tag(const u8 *lrdt)
 {
-    return (u16)(lrdt[0] & PCI_VPD_LRDT_TIN_MASK);
+        return (u16)(lrdt[0] & PCI_VPD_LRDT_TIN_MASK);
 }
 /**
@@ -2185,6 +2175,9 @@ void pci_release_of_node(struct pci_dev *dev);
 void pci_set_bus_of_node(struct pci_bus *bus);
 void pci_release_bus_of_node(struct pci_bus *bus);
 struct irq_domain *pci_host_bridge_of_msi_domain(struct pci_bus *bus);
+int pci_parse_request_of_pci_ranges(struct device *dev,
+                                    struct list_head *resources,
+                                    struct resource **bus_range);
 /* Arch may override this (weak) */
 struct device_node *pcibios_get_phb_of_node(struct pci_bus *bus);
@@ -2200,7 +2193,7 @@ static inline struct device_node *pci_bus_to_OF_node(struct pci_bus *bus)
        return bus ? bus->dev.of_node : NULL;
 }
-#else /* CONFIG_OF */
+#else   /* CONFIG_OF */
 static inline void pci_set_of_node(struct pci_dev *dev) { }
 static inline void pci_release_of_node(struct pci_dev *dev) { }
 static inline void pci_set_bus_of_node(struct pci_bus *bus) { }
@@ -2209,6 +2202,12 @@ static inline struct device_node *
 pci_device_to_OF_node(const struct pci_dev *pdev) { return NULL; }
 static inline struct irq_domain *
 pci_host_bridge_of_msi_domain(struct pci_bus *bus) { return NULL; }
+static inline int pci_parse_request_of_pci_ranges(struct device *dev,
+                                                  struct list_head *resources,
+                                                  struct resource **bus_range)
+{
+        return -EINVAL;
+}
 #endif  /* CONFIG_OF */
 #ifdef CONFIG_ACPI
@@ -2234,7 +2233,7 @@ int pci_for_each_dma_alias(struct pci_dev *pdev,
                           int (*fn)(struct pci_dev *pdev,
                                     u16 alias, void *data), void *data);
-/* helper functions for operation of device flag */
+/* Helper functions for operation of device flag */
 static inline void pci_set_dev_assigned(struct pci_dev *pdev)
 {
        pdev->dev_flags |= PCI_DEV_FLAGS_ASSIGNED;
@@ -2317,7 +2316,19 @@ static inline void pci_uevent_ers(struct pci_dev *pdev,
        }
 }
-/* provide the legacy pci_dma_* API */
+/* Provide the legacy pci_dma_* API */
 #include <linux/pci-dma-compat.h>
+#define pci_printk(level, pdev, fmt, arg...) \
+        dev_printk(level, &(pdev)->dev, fmt, ##arg)
+#define pci_emerg(pdev, fmt, arg...)    dev_emerg(&(pdev)->dev, fmt, ##arg)
+#define pci_alert(pdev, fmt, arg...)    dev_alert(&(pdev)->dev, fmt, ##arg)
+#define pci_crit(pdev, fmt, arg...)     dev_crit(&(pdev)->dev, fmt, ##arg)
+#define pci_err(pdev, fmt, arg...)      dev_err(&(pdev)->dev, fmt, ##arg)
+#define pci_warn(pdev, fmt, arg...)     dev_warn(&(pdev)->dev, fmt, ##arg)
+#define pci_notice(pdev, fmt, arg...)   dev_notice(&(pdev)->dev, fmt, ##arg)
+#define pci_info(pdev, fmt, arg...)     dev_info(&(pdev)->dev, fmt, ##arg)
+#define pci_dbg(pdev, fmt, arg...)      dev_dbg(&(pdev)->dev, fmt, ##arg)
 #endif /* LINUX_PCI_H */
diff --git a/include/linux/pci_hotplug.h b/include/linux/pci_hotplug.h
index 2e855afa0212..26213024e81b 100644
--- a/include/linux/pci_hotplug.h
+++ b/include/linux/pci_hotplug.h
@@ -1,3 +1,4 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
 * PCI HotPlug Core Functions
 *
@@ -7,21 +8,6 @@
 *
 * 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.
- *
- * 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, GOOD TITLE or
- * NON INFRINGEMENT.  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., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
 * Send feedback to <kristen.c.accardi@intel.com>
 *
 */
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index ab20dc5db423..eb13e84e1fef 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -2381,6 +2381,8 @@
 #define PCI_VENDOR_ID_LENOVO            0x17aa
+#define PCI_VENDOR_ID_CDNS              0x17cd
 #define PCI_VENDOR_ID_ARECA             0x17d3
 #define PCI_DEVICE_ID_ARECA_1110        0x1110
 #define PCI_DEVICE_ID_ARECA_1120        0x1120
diff --git a/include/linux/pfn_t.h b/include/linux/pfn_t.h
index 43b1d7648e82..a03c2642a87c 100644
--- a/include/linux/pfn_t.h
+++ b/include/linux/pfn_t.h
@@ -15,8 +15,10 @@
 #define PFN_SG_LAST (1ULL << (BITS_PER_LONG_LONG - 2))
 #define PFN_DEV (1ULL << (BITS_PER_LONG_LONG - 3))
 #define PFN_MAP (1ULL << (BITS_PER_LONG_LONG - 4))
+#define PFN_SPECIAL (1ULL << (BITS_PER_LONG_LONG - 5))
 #define PFN_FLAGS_TRACE \
+        { PFN_SPECIAL,  "SPECIAL" }, \
        { PFN_SG_CHAIN, "SG_CHAIN" }, \
        { PFN_SG_LAST,  "SG_LAST" }, \
        { PFN_DEV,      "DEV" }, \
@@ -120,4 +122,15 @@ pud_t pud_mkdevmap(pud_t pud);
 #endif
 #endif /* __HAVE_ARCH_PTE_DEVMAP */
+#ifdef __HAVE_ARCH_PTE_SPECIAL
+static inline bool pfn_t_special(pfn_t pfn)
+{
+        return (pfn.val & PFN_SPECIAL) == PFN_SPECIAL;
+}
+#else
+static inline bool pfn_t_special(pfn_t pfn)
+{
+        return false;
+}
+#endif /* __HAVE_ARCH_PTE_SPECIAL */
 #endif /* _LINUX_PFN_T_H_ */
diff --git a/include/linux/platform_data/mlxcpld-hotplug.h b/include/linux/platform_data/mlxcpld-hotplug.h
deleted file mode 100644
index e4cfcffaa6f4..000000000000
--- a/include/linux/platform_data/mlxcpld-hotplug.h
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
- * include/linux/platform_data/mlxcpld-hotplug.h
- * Copyright (c) 2016 Mellanox Technologies. All rights reserved.
- * Copyright (c) 2016 Vadim Pasternak <vadimp@mellanox.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.
- * 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. Neither the names of the copyright holders nor the names of its
- *    contributors may 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.
- */
-#ifndef __LINUX_PLATFORM_DATA_MLXCPLD_HOTPLUG_H
-#define __LINUX_PLATFORM_DATA_MLXCPLD_HOTPLUG_H
-/**
- * struct mlxcpld_hotplug_device - I2C device data:
- * @adapter: I2C device adapter;
- * @client: I2C device client;
- * @brdinfo: device board information;
- * @bus: I2C bus, where device is attached;
- *
- * Structure represents I2C hotplug device static data (board topology) and
- * dynamic data (related kernel objects handles).
- */
-struct mlxcpld_hotplug_device {
-        struct i2c_adapter *adapter;
-        struct i2c_client *client;
-        struct i2c_board_info brdinfo;
-        u16 bus;
-};
-/**
- * struct mlxcpld_hotplug_platform_data - device platform data:
- * @top_aggr_offset: offset of top aggregation interrupt register;
- * @top_aggr_mask: top aggregation interrupt common mask;
- * @top_aggr_psu_mask: top aggregation interrupt PSU mask;
- * @psu_reg_offset: offset of PSU interrupt register;
- * @psu_mask: PSU interrupt mask;
- * @psu_count: number of equipped replaceable PSUs;
- * @psu: pointer to PSU devices data array;
- * @top_aggr_pwr_mask: top aggregation interrupt power mask;
- * @pwr_reg_offset: offset of power interrupt register
- * @pwr_mask: power interrupt mask;
- * @pwr_count: number of power sources;
- * @pwr: pointer to power devices data array;
- * @top_aggr_fan_mask: top aggregation interrupt FAN mask;
- * @fan_reg_offset: offset of FAN interrupt register;
- * @fan_mask: FAN interrupt mask;
- * @fan_count: number of equipped replaceable FANs;
- * @fan: pointer to FAN devices data array;
- *
- * Structure represents board platform data, related to system hotplug events,
- * like FAN, PSU, power cable insertion and removing. This data provides the
- * number of hot-pluggable devices and hardware description for event handling.
- */
-struct mlxcpld_hotplug_platform_data {
-        u16 top_aggr_offset;
-        u8 top_aggr_mask;
-        u8 top_aggr_psu_mask;
-        u16 psu_reg_offset;
-        u8 psu_mask;
-        u8 psu_count;
-        struct mlxcpld_hotplug_device *psu;
-        u8 top_aggr_pwr_mask;
-        u16 pwr_reg_offset;
-        u8 pwr_mask;
-        u8 pwr_count;
-        struct mlxcpld_hotplug_device *pwr;
-        u8 top_aggr_fan_mask;
-        u16 fan_reg_offset;
-        u8 fan_mask;
-        u8 fan_count;
-        struct mlxcpld_hotplug_device *fan;
-};
-#endif /* __LINUX_PLATFORM_DATA_MLXCPLD_HOTPLUG_H */
diff --git a/include/linux/platform_data/mlxreg.h b/include/linux/platform_data/mlxreg.h
new file mode 100644
index 000000000000..fcdc707eab99
--- /dev/null
+++ b/include/linux/platform_data/mlxreg.h
@@ -0,0 +1,144 @@
+/*
+ * Copyright (c) 2017 Mellanox Technologies. All rights reserved.
+ * Copyright (c) 2017 Vadim Pasternak <vadimp@mellanox.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.
+ * 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. Neither the names of the copyright holders nor the names of its
+ *    contributors may 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.
+ */
+#ifndef __LINUX_PLATFORM_DATA_MLXREG_H
+#define __LINUX_PLATFORM_DATA_MLXREG_H
+#define MLXREG_CORE_LABEL_MAX_SIZE      32
+/**
+ * struct mlxreg_hotplug_device - I2C device data:
+ *
+ * @adapter: I2C device adapter;
+ * @client: I2C device client;
+ * @brdinfo: device board information;
+ * @nr: I2C device adapter number, to which device is to be attached;
+ *
+ * Structure represents I2C hotplug device static data (board topology) and
+ * dynamic data (related kernel objects handles).
+ */
+struct mlxreg_hotplug_device {
+        struct i2c_adapter *adapter;
+        struct i2c_client *client;
+        struct i2c_board_info *brdinfo;
+        int nr;
+};
+/**
+ * struct mlxreg_core_data - attributes control data:
+ *
+ * @label: attribute label;
+ * @label: attribute register offset;
+ * @reg: attribute register;
+ * @mask: attribute access mask;
+ * @mode: access mode;
+ * @bit: attribute effective bit;
+ * @np - pointer to node platform associated with attribute;
+ * @hpdev - hotplug device data;
+ * @health_cntr: dynamic device health indication counter;
+ * @attached: true if device has been attached after good health indication;
+ */
+struct mlxreg_core_data {
+        char label[MLXREG_CORE_LABEL_MAX_SIZE];
+        u32 reg;
+        u32 mask;
+        u32 bit;
+        umode_t mode;
+        struct device_node *np;
+        struct mlxreg_hotplug_device hpdev;
+        u8 health_cntr;
+        bool attached;
+};
+/**
+ * struct mlxreg_core_item - same type components controlled by the driver:
+ *
+ * @data: component data;
+ * @aggr_mask: group aggregation mask;
+ * @reg: group interrupt status register;
+ * @mask: group interrupt mask;
+ * @cache: last status value for elements fro the same group;
+ * @count: number of available elements in the group;
+ * @ind: element's index inside the group;
+ * @inversed: if 0: 0 for signal status is OK, if 1 - 1 is OK;
+ * @health: true if device has health indication, false in other case;
+ */
+struct mlxreg_core_item {
+        struct mlxreg_core_data *data;
+        u32 aggr_mask;
+        u32 reg;
+        u32 mask;
+        u32 cache;
+        u8 count;
+        u8 ind;
+        u8 inversed;
+        u8 health;
+};
+/**
+ * struct mlxreg_core_platform_data - platform data:
+ *
+ * @led_data: led private data;
+ * @regmap: register map of parent device;
+ * @counter: number of led instances;
+ */
+struct mlxreg_core_platform_data {
+        struct mlxreg_core_data *data;
+        void *regmap;
+        int counter;
+};
+/**
+ * struct mlxreg_core_hotplug_platform_data - hotplug platform data:
+ *
+ * @items: same type components with the hotplug capability;
+ * @irq: platform interrupt number;
+ * @regmap: register map of parent device;
+ * @counter: number of the components with the hotplug capability;
+ * @cell: location of top aggregation interrupt register;
+ * @mask: top aggregation interrupt common mask;
+ * @cell_low: location of low aggregation interrupt register;
+ * @mask_low: low aggregation interrupt common mask;
+ */
+struct mlxreg_core_hotplug_platform_data {
+        struct mlxreg_core_item *items;
+        int irq;
+        void *regmap;
+        int counter;
+        u32 cell;
+        u32 mask;
+        u32 cell_low;
+        u32 mask_low;
+};
+#endif /* __LINUX_PLATFORM_DATA_MLXREG_H */
diff --git a/include/linux/remoteproc.h b/include/linux/remoteproc.h
index 44e630eb3d94..728d421fffe9 100644
--- a/include/linux/remoteproc.h
+++ b/include/linux/remoteproc.h
@@ -324,6 +324,7 @@ struct rproc_mem_entry {
 };
 struct rproc;
+struct firmware;
 /**
 * struct rproc_ops - platform-specific device handlers
@@ -331,12 +332,24 @@ struct rproc;
 * @stop:       power off the device
 * @kick:       kick a virtqueue (virtqueue id given as a parameter)
 * @da_to_va:   optional platform hook to perform address translations
+ * @load_rsc_table:     load resource table from firmware image
+ * @find_loaded_rsc_table: find the loaded resouce table
+ * @load:               load firmeware to memory, where the remote processor
+ *                      expects to find it
+ * @sanity_check:       sanity check the fw image
+ * @get_boot_addr:      get boot address to entry point specified in firmware
 */
 struct rproc_ops {
        int (*start)(struct rproc *rproc);
        int (*stop)(struct rproc *rproc);
        void (*kick)(struct rproc *rproc, int vqid);
        void * (*da_to_va)(struct rproc *rproc, u64 da, int len);
+        int (*load_rsc_table)(struct rproc *rproc, const struct firmware *fw);
+        struct resource_table *(*find_loaded_rsc_table)(
+                                struct rproc *rproc, const struct firmware *fw);
+        int (*load)(struct rproc *rproc, const struct firmware *fw);
+        int (*sanity_check)(struct rproc *rproc, const struct firmware *fw);
+        u32 (*get_boot_addr)(struct rproc *rproc, const struct firmware *fw);
 };
 /**
@@ -390,7 +403,6 @@ enum rproc_crash_type {
 * @priv: private data which belongs to the platform-specific rproc module
 * @ops: platform-specific start/stop rproc handlers
 * @dev: virtual device for refcounting and common remoteproc behavior
- * @fw_ops: firmware-specific handlers
 * @power: refcount of users who need this rproc powered up
 * @state: state of the device
 * @lock: lock which protects concurrent manipulations of the rproc
@@ -406,11 +418,11 @@ enum rproc_crash_type {
 * @index: index of this rproc device
 * @crash_handler: workqueue for handling a crash
 * @crash_cnt: crash counter
- * @crash_comp: completion used to sync crash handler and the rproc reload
 * @recovery_disabled: flag that state if recovery was disabled
 * @max_notifyid: largest allocated notify id.
 * @table_ptr: pointer to the resource table in effect
 * @cached_table: copy of the resource table
+ * @table_sz: size of @cached_table
 * @has_iommu: flag to indicate if remote processor is behind an MMU
 */
 struct rproc {
@@ -419,9 +431,8 @@ struct rproc {
        const char *name;
        char *firmware;
        void *priv;
-        const struct rproc_ops *ops;
+        struct rproc_ops *ops;
        struct device dev;
-        const struct rproc_fw_ops *fw_ops;
        atomic_t power;
        unsigned int state;
        struct mutex lock;
@@ -437,11 +448,11 @@ struct rproc {
        int index;
        struct work_struct crash_handler;
        unsigned int crash_cnt;
-        struct completion crash_comp;
        bool recovery_disabled;
        int max_notifyid;
        struct resource_table *table_ptr;
        struct resource_table *cached_table;
+        size_t table_sz;
        bool has_iommu;
        bool auto_boot;
 };
diff --git a/include/linux/switchtec.h b/include/linux/switchtec.h
index 6d325a7a0c19..ec93e93371fa 100644
--- a/include/linux/switchtec.h
+++ b/include/linux/switchtec.h
@@ -100,6 +100,9 @@ struct sw_event_regs {
        u32 gpio_interrupt_hdr;
        u32 gpio_interrupt_data;
        u32 reserved16[4];
+        u32 gfms_event_hdr;
+        u32 gfms_event_data;
+        u32 reserved17[4];
 } __packed;
 enum {
diff --git a/include/media/cec.h b/include/media/cec.h
index 16341210d3ba..7cdf71d7125a 100644
--- a/include/media/cec.h
+++ b/include/media/cec.h
@@ -122,6 +122,7 @@ struct cec_adap_ops {
        /* Low-level callbacks */
        int (*adap_enable)(struct cec_adapter *adap, bool enable);
        int (*adap_monitor_all_enable)(struct cec_adapter *adap, bool enable);
+        int (*adap_monitor_pin_enable)(struct cec_adapter *adap, bool enable);
        int (*adap_log_addr)(struct cec_adapter *adap, u8 logical_addr);
        int (*adap_transmit)(struct cec_adapter *adap, u8 attempts,
                             u32 signal_free_time, struct cec_msg *msg);
@@ -191,11 +192,6 @@ struct cec_adapter {
        u32 tx_timeouts;
-#ifdef CONFIG_MEDIA_CEC_RC
-        bool rc_repeating;
-        int rc_last_scancode;
-        u64 rc_last_keypress;
-#endif
 #ifdef CONFIG_CEC_NOTIFIER
        struct cec_notifier *notifier;
 #endif
@@ -229,6 +225,18 @@ static inline bool cec_is_sink(const struct cec_adapter *adap)
        return adap->phys_addr == 0;
 }
+/**
+ * cec_is_registered() - is the CEC adapter registered?
+ *
+ * @adap:       the CEC adapter, may be NULL.
+ *
+ * Return: true if the adapter is registered, false otherwise.
+ */
+static inline bool cec_is_registered(const struct cec_adapter *adap)
+{
+        return adap && adap->devnode.registered;
+}
 #define cec_phys_addr_exp(pa) \
        ((pa) >> 12), ((pa) >> 8) & 0xf, ((pa) >> 4) & 0xf, (pa) & 0xf
diff --git a/include/media/demux.h b/include/media/demux.h
new file mode 100644
index 000000000000..c4df6cee48e6
--- /dev/null
+++ b/include/media/demux.h
@@ -0,0 +1,589 @@
+/*
+ * demux.h
+ *
+ * The Kernel Digital TV Demux kABI defines a driver-internal interface for
+ * registering low-level, hardware specific driver to a hardware independent
+ * demux layer.
+ *
+ * Copyright (c) 2002 Convergence GmbH
+ *
+ * based on code:
+ * Copyright (c) 2000 Nokia Research Center
+ *                    Tampere, FINLAND
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * 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.
+ *
+ */
+#ifndef __DEMUX_H
+#define __DEMUX_H
+#include <linux/types.h>
+#include <linux/errno.h>
+#include <linux/list.h>
+#include <linux/time.h>
+#include <linux/dvb/dmx.h>
+/*
+ * Common definitions
+ */
+/*
+ * DMX_MAX_FILTER_SIZE: Maximum length (in bytes) of a section/PES filter.
+ */
+#ifndef DMX_MAX_FILTER_SIZE
+#define DMX_MAX_FILTER_SIZE 18
+#endif
+/*
+ * DMX_MAX_SECFEED_SIZE: Maximum length (in bytes) of a private section feed
+ * filter.
+ */
+#ifndef DMX_MAX_SECTION_SIZE
+#define DMX_MAX_SECTION_SIZE 4096
+#endif
+#ifndef DMX_MAX_SECFEED_SIZE
+#define DMX_MAX_SECFEED_SIZE (DMX_MAX_SECTION_SIZE + 188)
+#endif
+/*
+ * TS packet reception
+ */
+/**
+ * enum ts_filter_type - filter type bitmap for dmx_ts_feed.set\(\)
+ *
+ * @TS_PACKET:          Send TS packets (188 bytes) to callback (default).
+ * @TS_PAYLOAD_ONLY:    In case TS_PACKET is set, only send the TS payload
+ *                      (<=184 bytes per packet) to callback
+ * @TS_DECODER:         Send stream to built-in decoder (if present).
+ * @TS_DEMUX:           In case TS_PACKET is set, send the TS to the demux
+ *                      device, not to the dvr device
+ */
+enum ts_filter_type {
+        TS_PACKET = 1,
+        TS_PAYLOAD_ONLY = 2,
+        TS_DECODER = 4,
+        TS_DEMUX = 8,
+};
+/**
+ * struct dmx_ts_feed - Structure that contains a TS feed filter
+ *
+ * @is_filtering:       Set to non-zero when filtering in progress
+ * @parent:             pointer to struct dmx_demux
+ * @priv:               pointer to private data of the API client
+ * @set:                sets the TS filter
+ * @start_filtering:    starts TS filtering
+ * @stop_filtering:     stops TS filtering
+ *
+ * A TS feed is typically mapped to a hardware PID filter on the demux chip.
+ * Using this API, the client can set the filtering properties to start/stop
+ * filtering TS packets on a particular TS feed.
+ */
+struct dmx_ts_feed {
+        int is_filtering;
+        struct dmx_demux *parent;
+        void *priv;
+        int (*set)(struct dmx_ts_feed *feed,
+                   u16 pid,
+                   int type,
+                   enum dmx_ts_pes pes_type,
+                   ktime_t timeout);
+        int (*start_filtering)(struct dmx_ts_feed *feed);
+        int (*stop_filtering)(struct dmx_ts_feed *feed);
+};
+/*
+ * Section reception
+ */
+/**
+ * struct dmx_section_filter - Structure that describes a section filter
+ *
+ * @filter_value: Contains up to 16 bytes (128 bits) of the TS section header
+ *                that will be matched by the section filter
+ * @filter_mask:  Contains a 16 bytes (128 bits) filter mask with the bits
+ *                specified by @filter_value that will be used on the filter
+ *                match logic.
+ * @filter_mode:  Contains a 16 bytes (128 bits) filter mode.
+ * @parent:       Pointer to struct dmx_section_feed.
+ * @priv:         Pointer to private data of the API client.
+ *
+ *
+ * The @filter_mask controls which bits of @filter_value are compared with
+ * the section headers/payload. On a binary value of 1 in filter_mask, the
+ * corresponding bits are compared. The filter only accepts sections that are
+ * equal to filter_value in all the tested bit positions.
+ */
+struct dmx_section_filter {
+        u8 filter_value[DMX_MAX_FILTER_SIZE];
+        u8 filter_mask[DMX_MAX_FILTER_SIZE];
+        u8 filter_mode[DMX_MAX_FILTER_SIZE];
+        struct dmx_section_feed *parent; /* Back-pointer */
+        void *priv; /* Pointer to private data of the API client */
+};
+/**
+ * struct dmx_section_feed - Structure that contains a section feed filter
+ *
+ * @is_filtering:       Set to non-zero when filtering in progress
+ * @parent:             pointer to struct dmx_demux
+ * @priv:               pointer to private data of the API client
+ * @check_crc:          If non-zero, check the CRC values of filtered sections.
+ * @set:                sets the section filter
+ * @allocate_filter:    This function is used to allocate a section filter on
+ *                      the demux. It should only be called when no filtering
+ *                      is in progress on this section feed. If a filter cannot
+ *                      be allocated, the function fails with -ENOSPC.
+ * @release_filter:     This function releases all the resources of a
+ *                      previously allocated section filter. The function
+ *                      should not be called while filtering is in progress
+ *                      on this section feed. After calling this function,
+ *                      the caller should not try to dereference the filter
+ *                      pointer.
+ * @start_filtering:    starts section filtering
+ * @stop_filtering:     stops section filtering
+ *
+ * A TS feed is typically mapped to a hardware PID filter on the demux chip.
+ * Using this API, the client can set the filtering properties to start/stop
+ * filtering TS packets on a particular TS feed.
+ */
+struct dmx_section_feed {
+        int is_filtering;
+        struct dmx_demux *parent;
+        void *priv;
+        int check_crc;
+        /* private: Used internally at dvb_demux.c */
+        u32 crc_val;
+        u8 *secbuf;
+        u8 secbuf_base[DMX_MAX_SECFEED_SIZE];
+        u16 secbufp, seclen, tsfeedp;
+        /* public: */
+        int (*set)(struct dmx_section_feed *feed,
+                   u16 pid,
+                   int check_crc);
+        int (*allocate_filter)(struct dmx_section_feed *feed,
+                               struct dmx_section_filter **filter);
+        int (*release_filter)(struct dmx_section_feed *feed,
+                              struct dmx_section_filter *filter);
+        int (*start_filtering)(struct dmx_section_feed *feed);
+        int (*stop_filtering)(struct dmx_section_feed *feed);
+};
+/**
+ * typedef dmx_ts_cb - DVB demux TS filter callback function prototype
+ *
+ * @buffer1:            Pointer to the start of the filtered TS packets.
+ * @buffer1_length:     Length of the TS data in buffer1.
+ * @buffer2:            Pointer to the tail of the filtered TS packets, or NULL.
+ * @buffer2_length:     Length of the TS data in buffer2.
+ * @source:             Indicates which TS feed is the source of the callback.
+ *
+ * This function callback prototype, provided by the client of the demux API,
+ * is called from the demux code. The function is only called when filtering
+ * on a TS feed has been enabled using the start_filtering\(\) function at
+ * the &dmx_demux.
+ * Any TS packets that match the filter settings are copied to a circular
+ * buffer. The filtered TS packets are delivered to the client using this
+ * callback function.
+ * It is expected that the @buffer1 and @buffer2 callback parameters point to
+ * addresses within the circular buffer, but other implementations are also
+ * possible. Note that the called party should not try to free the memory
+ * the @buffer1 and @buffer2 parameters point to.
+ *
+ * When this function is called, the @buffer1 parameter typically points to
+ * the start of the first undelivered TS packet within a circular buffer.
+ * The @buffer2 buffer parameter is normally NULL, except when the received
+ * TS packets have crossed the last address of the circular buffer and
+ * "wrapped" to the beginning of the buffer. In the latter case the @buffer1
+ * parameter would contain an address within the circular buffer, while the
+ * @buffer2 parameter would contain the first address of the circular buffer.
+ * The number of bytes delivered with this function (i.e. @buffer1_length +
+ * @buffer2_length) is usually equal to the value of callback_length parameter
+ * given in the set() function, with one exception: if a timeout occurs before
+ * receiving callback_length bytes of TS data, any undelivered packets are
+ * immediately delivered to the client by calling this function. The timeout
+ * duration is controlled by the set() function in the TS Feed API.
+ *
+ * If a TS packet is received with errors that could not be fixed by the
+ * TS-level forward error correction (FEC), the Transport_error_indicator
+ * flag of the TS packet header should be set. The TS packet should not be
+ * discarded, as the error can possibly be corrected by a higher layer
+ * protocol. If the called party is slow in processing the callback, it
+ * is possible that the circular buffer eventually fills up. If this happens,
+ * the demux driver should discard any TS packets received while the buffer
+ * is full and return -EOVERFLOW.
+ *
+ * The type of data returned to the callback can be selected by the
+ * &dmx_ts_feed.@set function. The type parameter decides if the raw
+ * TS packet (TS_PACKET) or just the payload (TS_PACKET|TS_PAYLOAD_ONLY)
+ * should be returned. If additionally the TS_DECODER bit is set the stream
+ * will also be sent to the hardware MPEG decoder.
+ *
+ * Return:
+ *
+ * - 0, on success;
+ *
+ * - -EOVERFLOW, on buffer overflow.
+ */
+typedef int (*dmx_ts_cb)(const u8 *buffer1,
+                         size_t buffer1_length,
+                         const u8 *buffer2,
+                         size_t buffer2_length,
+                         struct dmx_ts_feed *source);
+/**
+ * typedef dmx_section_cb - DVB demux TS filter callback function prototype
+ *
+ * @buffer1:            Pointer to the start of the filtered section, e.g.
+ *                      within the circular buffer of the demux driver.
+ * @buffer1_len:        Length of the filtered section data in @buffer1,
+ *                      including headers and CRC.
+ * @buffer2:            Pointer to the tail of the filtered section data,
+ *                      or NULL. Useful to handle the wrapping of a
+ *                      circular buffer.
+ * @buffer2_len:        Length of the filtered section data in @buffer2,
+ *                      including headers and CRC.
+ * @source:             Indicates which section feed is the source of the
+ *                      callback.
+ *
+ * This function callback prototype, provided by the client of the demux API,
+ * is called from the demux code. The function is only called when
+ * filtering of sections has been enabled using the function
+ * &dmx_ts_feed.@start_filtering. When the demux driver has received a
+ * complete section that matches at least one section filter, the client
+ * is notified via this callback function. Normally this function is called
+ * for each received section; however, it is also possible to deliver
+ * multiple sections with one callback, for example when the system load
+ * is high. If an error occurs while receiving a section, this
+ * function should be called with the corresponding error type set in the
+ * success field, whether or not there is data to deliver. The Section Feed
+ * implementation should maintain a circular buffer for received sections.
+ * However, this is not necessary if the Section Feed API is implemented as
+ * a client of the TS Feed API, because the TS Feed implementation then
+ * buffers the received data. The size of the circular buffer can be
+ * configured using the &dmx_ts_feed.@set function in the Section Feed API.
+ * If there is no room in the circular buffer when a new section is received,
+ * the section must be discarded. If this happens, the value of the success
+ * parameter should be DMX_OVERRUN_ERROR on the next callback.
+ */
+typedef int (*dmx_section_cb)(const u8 *buffer1,
+                              size_t buffer1_len,
+                              const u8 *buffer2,
+                              size_t buffer2_len,
+                              struct dmx_section_filter *source);
+/*
+ * DVB Front-End
+ */
+/**
+ * enum dmx_frontend_source - Used to identify the type of frontend
+ *
+ * @DMX_MEMORY_FE:      The source of the demux is memory. It means that
+ *                      the MPEG-TS to be filtered comes from userspace,
+ *                      via write() syscall.
+ *
+ * @DMX_FRONTEND_0:     The source of the demux is a frontend connected
+ *                      to the demux.
+ */
+enum dmx_frontend_source {
+        DMX_MEMORY_FE,
+        DMX_FRONTEND_0,
+};
+/**
+ * struct dmx_frontend - Structure that lists the frontends associated with
+ *                       a demux
+ *
+ * @connectivity_list:  List of front-ends that can be connected to a
+ *                      particular demux;
+ * @source:             Type of the frontend.
+ *
+ * FIXME: this structure should likely be replaced soon by some
+ *      media-controller based logic.
+ */
+struct dmx_frontend {
+        struct list_head connectivity_list;
+        enum dmx_frontend_source source;
+};
+/*
+ * MPEG-2 TS Demux
+ */
+/**
+ * enum dmx_demux_caps - MPEG-2 TS Demux capabilities bitmap
+ *
+ * @DMX_TS_FILTERING:           set if TS filtering is supported;
+ * @DMX_SECTION_FILTERING:      set if section filtering is supported;
+ * @DMX_MEMORY_BASED_FILTERING: set if write() available.
+ *
+ * Those flags are OR'ed in the &dmx_demux.capabilities field
+ */
+enum dmx_demux_caps {
+        DMX_TS_FILTERING = 1,
+        DMX_SECTION_FILTERING = 4,
+        DMX_MEMORY_BASED_FILTERING = 8,
+};
+/*
+ * Demux resource type identifier.
+ */
+/**
+ * DMX_FE_ENTRY - Casts elements in the list of registered
+ *                front-ends from the generic type struct list_head
+ *                to the type * struct dmx_frontend
+ *
+ * @list: list of struct dmx_frontend
+ */
+#define DMX_FE_ENTRY(list) \
+        list_entry(list, struct dmx_frontend, connectivity_list)
+/**
+ * struct dmx_demux - Structure that contains the demux capabilities and
+ *                    callbacks.
+ *
+ * @capabilities: Bitfield of capability flags.
+ *
+ * @frontend: Front-end connected to the demux
+ *
+ * @priv: Pointer to private data of the API client
+ *
+ * @open: This function reserves the demux for use by the caller and, if
+ *      necessary, initializes the demux. When the demux is no longer needed,
+ *      the function @close should be called. It should be possible for
+ *      multiple clients to access the demux at the same time. Thus, the
+ *      function implementation should increment the demux usage count when
+ *      @open is called and decrement it when @close is called.
+ *      The @demux function parameter contains a pointer to the demux API and
+ *      instance data.
+ *      It returns:
+ *      0 on success;
+ *      -EUSERS, if maximum usage count was reached;
+ *      -EINVAL, on bad parameter.
+ *
+ * @close: This function reserves the demux for use by the caller and, if
+ *      necessary, initializes the demux. When the demux is no longer needed,
+ *      the function @close should be called. It should be possible for
+ *      multiple clients to access the demux at the same time. Thus, the
+ *      function implementation should increment the demux usage count when
+ *      @open is called and decrement it when @close is called.
+ *      The @demux function parameter contains a pointer to the demux API and
+ *      instance data.
+ *      It returns:
+ *      0 on success;
+ *      -ENODEV, if demux was not in use (e. g. no users);
+ *      -EINVAL, on bad parameter.
+ *
+ * @write: This function provides the demux driver with a memory buffer
+ *      containing TS packets. Instead of receiving TS packets from the DVB
+ *      front-end, the demux driver software will read packets from memory.
+ *      Any clients of this demux with active TS, PES or Section filters will
+ *      receive filtered data via the Demux callback API (see 0). The function
+ *      returns when all the data in the buffer has been consumed by the demux.
+ *      Demux hardware typically cannot read TS from memory. If this is the
+ *      case, memory-based filtering has to be implemented entirely in software.
+ *      The @demux function parameter contains a pointer to the demux API and
+ *      instance data.
+ *      The @buf function parameter contains a pointer to the TS data in
+ *      kernel-space memory.
+ *      The @count function parameter contains the length of the TS data.
+ *      It returns:
+ *      0 on success;
+ *      -ERESTARTSYS, if mutex lock was interrupted;
+ *      -EINTR, if a signal handling is pending;
+ *      -ENODEV, if demux was removed;
+ *      -EINVAL, on bad parameter.
+ *
+ * @allocate_ts_feed: Allocates a new TS feed, which is used to filter the TS
+ *      packets carrying a certain PID. The TS feed normally corresponds to a
+ *      hardware PID filter on the demux chip.
+ *      The @demux function parameter contains a pointer to the demux API and
+ *      instance data.
+ *      The @feed function parameter contains a pointer to the TS feed API and
+ *      instance data.
+ *      The @callback function parameter contains a pointer to the callback
+ *      function for passing received TS packet.
+ *      It returns:
+ *      0 on success;
+ *      -ERESTARTSYS, if mutex lock was interrupted;
+ *      -EBUSY, if no more TS feeds is available;
+ *      -EINVAL, on bad parameter.
+ *
+ * @release_ts_feed: Releases the resources allocated with @allocate_ts_feed.
+ *      Any filtering in progress on the TS feed should be stopped before
+ *      calling this function.
+ *      The @demux function parameter contains a pointer to the demux API and
+ *      instance data.
+ *      The @feed function parameter contains a pointer to the TS feed API and
+ *      instance data.
+ *      It returns:
+ *      0 on success;
+ *      -EINVAL on bad parameter.
+ *
+ * @allocate_section_feed: Allocates a new section feed, i.e. a demux resource
+ *      for filtering and receiving sections. On platforms with hardware
+ *      support for section filtering, a section feed is directly mapped to
+ *      the demux HW. On other platforms, TS packets are first PID filtered in
+ *      hardware and a hardware section filter then emulated in software. The
+ *      caller obtains an API pointer of type dmx_section_feed_t as an out
+ *      parameter. Using this API the caller can set filtering parameters and
+ *      start receiving sections.
+ *      The @demux function parameter contains a pointer to the demux API and
+ *      instance data.
+ *      The @feed function parameter contains a pointer to the TS feed API and
+ *      instance data.
+ *      The @callback function parameter contains a pointer to the callback
+ *      function for passing received TS packet.
+ *      It returns:
+ *      0 on success;
+ *      -EBUSY, if no more TS feeds is available;
+ *      -EINVAL, on bad parameter.
+ *
+ * @release_section_feed: Releases the resources allocated with
+ *      @allocate_section_feed, including allocated filters. Any filtering in
+ *      progress on the section feed should be stopped before calling this
+ *      function.
+ *      The @demux function parameter contains a pointer to the demux API and
+ *      instance data.
+ *      The @feed function parameter contains a pointer to the TS feed API and
+ *      instance data.
+ *      It returns:
+ *      0 on success;
+ *      -EINVAL, on bad parameter.
+ *
+ * @add_frontend: Registers a connectivity between a demux and a front-end,
+ *      i.e., indicates that the demux can be connected via a call to
+ *      @connect_frontend to use the given front-end as a TS source. The
+ *      client of this function has to allocate dynamic or static memory for
+ *      the frontend structure and initialize its fields before calling this
+ *      function. This function is normally called during the driver
+ *      initialization. The caller must not free the memory of the frontend
+ *      struct before successfully calling @remove_frontend.
+ *      The @demux function parameter contains a pointer to the demux API and
+ *      instance data.
+ *      The @frontend function parameter contains a pointer to the front-end
+ *      instance data.
+ *      It returns:
+ *      0 on success;
+ *      -EINVAL, on bad parameter.
+ *
+ * @remove_frontend: Indicates that the given front-end, registered by a call
+ *      to @add_frontend, can no longer be connected as a TS source by this
+ *      demux. The function should be called when a front-end driver or a demux
+ *      driver is removed from the system. If the front-end is in use, the
+ *      function fails with the return value of -EBUSY. After successfully
+ *      calling this function, the caller can free the memory of the frontend
+ *      struct if it was dynamically allocated before the @add_frontend
+ *      operation.
+ *      The @demux function parameter contains a pointer to the demux API and
+ *      instance data.
+ *      The @frontend function parameter contains a pointer to the front-end
+ *      instance data.
+ *      It returns:
+ *      0 on success;
+ *      -ENODEV, if the front-end was not found,
+ *      -EINVAL, on bad parameter.
+ *
+ * @get_frontends: Provides the APIs of the front-ends that have been
+ *      registered for this demux. Any of the front-ends obtained with this
+ *      call can be used as a parameter for @connect_frontend. The include
+ *      file demux.h contains the macro DMX_FE_ENTRY() for converting an
+ *      element of the generic type struct &list_head * to the type
+ *      struct &dmx_frontend *. The caller must not free the memory of any of
+ *      the elements obtained via this function call.
+ *      The @demux function parameter contains a pointer to the demux API and
+ *      instance data.
+ *      It returns a struct list_head pointer to the list of front-end
+ *      interfaces, or NULL in the case of an empty list.
+ *
+ * @connect_frontend: Connects the TS output of the front-end to the input of
+ *      the demux. A demux can only be connected to a front-end registered to
+ *      the demux with the function @add_frontend. It may or may not be
+ *      possible to connect multiple demuxes to the same front-end, depending
+ *      on the capabilities of the HW platform. When not used, the front-end
+ *      should be released by calling @disconnect_frontend.
+ *      The @demux function parameter contains a pointer to the demux API and
+ *      instance data.
+ *      The @frontend function parameter contains a pointer to the front-end
+ *      instance data.
+ *      It returns:
+ *      0 on success;
+ *      -EINVAL, on bad parameter.
+ *
+ * @disconnect_frontend: Disconnects the demux and a front-end previously
+ *      connected by a @connect_frontend call.
+ *      The @demux function parameter contains a pointer to the demux API and
+ *      instance data.
+ *      It returns:
+ *      0 on success;
+ *      -EINVAL on bad parameter.
+ *
+ * @get_pes_pids: Get the PIDs for DMX_PES_AUDIO0, DMX_PES_VIDEO0,
+ *      DMX_PES_TELETEXT0, DMX_PES_SUBTITLE0 and DMX_PES_PCR0.
+ *      The @demux function parameter contains a pointer to the demux API and
+ *      instance data.
+ *      The @pids function parameter contains an array with five u16 elements
+ *      where the PIDs will be stored.
+ *      It returns:
+ *      0 on success;
+ *      -EINVAL on bad parameter.
+ */
+struct dmx_demux {
+        enum dmx_demux_caps capabilities;
+        struct dmx_frontend *frontend;
+        void *priv;
+        int (*open)(struct dmx_demux *demux);
+        int (*close)(struct dmx_demux *demux);
+        int (*write)(struct dmx_demux *demux, const char __user *buf,
+                     size_t count);
+        int (*allocate_ts_feed)(struct dmx_demux *demux,
+                                struct dmx_ts_feed **feed,
+                                dmx_ts_cb callback);
+        int (*release_ts_feed)(struct dmx_demux *demux,
+                               struct dmx_ts_feed *feed);
+        int (*allocate_section_feed)(struct dmx_demux *demux,
+                                     struct dmx_section_feed **feed,
+                                     dmx_section_cb callback);
+        int (*release_section_feed)(struct dmx_demux *demux,
+                                    struct dmx_section_feed *feed);
+        int (*add_frontend)(struct dmx_demux *demux,
+                            struct dmx_frontend *frontend);
+        int (*remove_frontend)(struct dmx_demux *demux,
+                               struct dmx_frontend *frontend);
+        struct list_head *(*get_frontends)(struct dmx_demux *demux);
+        int (*connect_frontend)(struct dmx_demux *demux,
+                                struct dmx_frontend *frontend);
+        int (*disconnect_frontend)(struct dmx_demux *demux);
+        int (*get_pes_pids)(struct dmx_demux *demux, u16 *pids);
+        /* private: */
+        /*
+         * Only used at av7110, to read some data from firmware.
+         * As this was never documented, we have no clue about what's
+         * there, and its usage on other drivers aren't encouraged.
+         */
+        int (*get_stc)(struct dmx_demux *demux, unsigned int num,
+                       u64 *stc, unsigned int *base);
+};
+#endif /* #ifndef __DEMUX_H */
diff --git a/include/media/dmxdev.h b/include/media/dmxdev.h
new file mode 100644
index 000000000000..2f5cb2c7b6a7
--- /dev/null
+++ b/include/media/dmxdev.h
@@ -0,0 +1,212 @@
+/*
+ * dmxdev.h
+ *
+ * Copyright (C) 2000 Ralph Metzler & Marcus Metzler
+ *                    for convergence integrated media GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * 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.
+ *
+ */
+#ifndef _DMXDEV_H_
+#define _DMXDEV_H_
+#include <linux/types.h>
+#include <linux/spinlock.h>
+#include <linux/kernel.h>
+#include <linux/time.h>
+#include <linux/timer.h>
+#include <linux/wait.h>
+#include <linux/fs.h>
+#include <linux/string.h>
+#include <linux/mutex.h>
+#include <linux/slab.h>
+#include <linux/dvb/dmx.h>
+#include <media/dvbdev.h>
+#include <media/demux.h>
+#include <media/dvb_ringbuffer.h>
+#include <media/dvb_vb2.h>
+/**
+ * enum dmxdev_type - type of demux filter type.
+ *
+ * @DMXDEV_TYPE_NONE:   no filter set.
+ * @DMXDEV_TYPE_SEC:    section filter.
+ * @DMXDEV_TYPE_PES:    Program Elementary Stream (PES) filter.
+ */
+enum dmxdev_type {
+        DMXDEV_TYPE_NONE,
+        DMXDEV_TYPE_SEC,
+        DMXDEV_TYPE_PES,
+};
+/**
+ * enum dmxdev_state - state machine for the dmxdev.
+ *
+ * @DMXDEV_STATE_FREE:          indicates that the filter is freed.
+ * @DMXDEV_STATE_ALLOCATED:     indicates that the filter was allocated
+ *                              to be used.
+ * @DMXDEV_STATE_SET:           indicates that the filter parameters are set.
+ * @DMXDEV_STATE_GO:            indicates that the filter is running.
+ * @DMXDEV_STATE_DONE:          indicates that a packet was already filtered
+ *                              and the filter is now disabled.
+ *                              Set only if %DMX_ONESHOT. See
+ *                              &dmx_sct_filter_params.
+ * @DMXDEV_STATE_TIMEDOUT:      Indicates a timeout condition.
+ */
+enum dmxdev_state {
+        DMXDEV_STATE_FREE,
+        DMXDEV_STATE_ALLOCATED,
+        DMXDEV_STATE_SET,
+        DMXDEV_STATE_GO,
+        DMXDEV_STATE_DONE,
+        DMXDEV_STATE_TIMEDOUT
+};
+/**
+ * struct dmxdev_feed - digital TV dmxdev feed
+ *
+ * @pid:        Program ID to be filtered
+ * @ts:         pointer to &struct dmx_ts_feed
+ * @next:       &struct list_head pointing to the next feed.
+ */
+struct dmxdev_feed {
+        u16 pid;
+        struct dmx_ts_feed *ts;
+        struct list_head next;
+};
+/**
+ * struct dmxdev_filter - digital TV dmxdev filter
+ *
+ * @filter:     a union describing a dmxdev filter.
+ *              Currently used only for section filters.
+ * @filter.sec: a &struct dmx_section_filter pointer.
+ *              For section filter only.
+ * @feed:       a union describing a dmxdev feed.
+ *              Depending on the filter type, it can be either
+ *              @feed.ts or @feed.sec.
+ * @feed.ts:    a &struct list_head list.
+ *              For TS and PES feeds.
+ * @feed.sec:   a &struct dmx_section_feed pointer.
+ *              For section feed only.
+ * @params:     a union describing dmxdev filter parameters.
+ *              Depending on the filter type, it can be either
+ *              @params.sec or @params.pes.
+ * @params.sec: a &struct dmx_sct_filter_params embedded struct.
+ *              For section filter only.
+ * @params.pes: a &struct dmx_pes_filter_params embedded struct.
+ *              For PES filter only.
+ * @type:       type of the dmxdev filter, as defined by &enum dmxdev_type.
+ * @state:      state of the dmxdev filter, as defined by &enum dmxdev_state.
+ * @dev:        pointer to &struct dmxdev.
+ * @buffer:     an embedded &struct dvb_ringbuffer buffer.
+ * @vb2_ctx:    control struct for VB2 handler
+ * @mutex:      protects the access to &struct dmxdev_filter.
+ * @timer:      &struct timer_list embedded timer, used to check for
+ *              feed timeouts.
+ *              Only for section filter.
+ * @todo:       index for the @secheader.
+ *              Only for section filter.
+ * @secheader:  buffer cache to parse the section header.
+ *              Only for section filter.
+ */
+struct dmxdev_filter {
+        union {
+                struct dmx_section_filter *sec;
+        } filter;
+        union {
+                /* list of TS and PES feeds (struct dmxdev_feed) */
+                struct list_head ts;
+                struct dmx_section_feed *sec;
+        } feed;
+        union {
+                struct dmx_sct_filter_params sec;
+                struct dmx_pes_filter_params pes;
+        } params;
+        enum dmxdev_type type;
+        enum dmxdev_state state;
+        struct dmxdev *dev;
+        struct dvb_ringbuffer buffer;
+        struct dvb_vb2_ctx vb2_ctx;
+        struct mutex mutex;
+        /* only for sections */
+        struct timer_list timer;
+        int todo;
+        u8 secheader[3];
+};
+/**
+ * struct dmxdev - Describes a digital TV demux device.
+ *
+ * @dvbdev:             pointer to &struct dvb_device associated with
+ *                      the demux device node.
+ * @dvr_dvbdev:         pointer to &struct dvb_device associated with
+ *                      the dvr device node.
+ * @filter:             pointer to &struct dmxdev_filter.
+ * @demux:              pointer to &struct dmx_demux.
+ * @filternum:          number of filters.
+ * @capabilities:       demux capabilities as defined by &enum dmx_demux_caps.
+ * @exit:               flag to indicate that the demux is being released.
+ * @dvr_orig_fe:        pointer to &struct dmx_frontend.
+ * @dvr_buffer:         embedded &struct dvb_ringbuffer for DVB output.
+ * @dvr_vb2_ctx:        control struct for VB2 handler
+ * @mutex:              protects the usage of this structure.
+ * @lock:               protects access to &dmxdev->filter->data.
+ */
+struct dmxdev {
+        struct dvb_device *dvbdev;
+        struct dvb_device *dvr_dvbdev;
+        struct dmxdev_filter *filter;
+        struct dmx_demux *demux;
+        int filternum;
+        int capabilities;
+        unsigned int exit:1;
+#define DMXDEV_CAP_DUPLEX 1
+        struct dmx_frontend *dvr_orig_fe;
+        struct dvb_ringbuffer dvr_buffer;
+#define DVR_BUFFER_SIZE (10*188*1024)
+        struct dvb_vb2_ctx dvr_vb2_ctx;
+        struct mutex mutex;
+        spinlock_t lock;
+};
+/**
+ * dvb_dmxdev_init - initializes a digital TV demux and registers both demux
+ *      and DVR devices.
+ *
+ * @dmxdev: pointer to &struct dmxdev.
+ * @adap: pointer to &struct dvb_adapter.
+ */
+int dvb_dmxdev_init(struct dmxdev *dmxdev, struct dvb_adapter *adap);
+/**
+ * dvb_dmxdev_release - releases a digital TV demux and unregisters it.
+ *
+ * @dmxdev: pointer to &struct dmxdev.
+ */
+void dvb_dmxdev_release(struct dmxdev *dmxdev);
+#endif /* _DMXDEV_H_ */
diff --git a/include/media/drv-intf/cx2341x.h b/include/media/drv-intf/cx2341x.h
index 9635eebaab09..33a97bfcea58 100644
--- a/include/media/drv-intf/cx2341x.h
+++ b/include/media/drv-intf/cx2341x.h
@@ -29,8 +29,8 @@ enum cx2341x_port {
 enum cx2341x_cap {
        CX2341X_CAP_HAS_SLICED_VBI = 1 << 0,
-        CX2341X_CAP_HAS_TS         = 1 << 1,
+        CX2341X_CAP_HAS_TS         = 1 << 1,
-        CX2341X_CAP_HAS_AC3        = 1 << 2,
+        CX2341X_CAP_HAS_AC3        = 1 << 2,
 };
 struct cx2341x_mpeg_params {
@@ -204,92 +204,92 @@ void cx2341x_handler_set_busy(struct cx2341x_handler *cxhdl, int busy);
 /* Firmware API commands */
 /* MPEG decoder API, specific to the cx23415 */
-#define CX2341X_DEC_PING_FW                     0x00
+#define CX2341X_DEC_PING_FW                     0x00
-#define CX2341X_DEC_START_PLAYBACK              0x01
+#define CX2341X_DEC_START_PLAYBACK              0x01
-#define CX2341X_DEC_STOP_PLAYBACK               0x02
+#define CX2341X_DEC_STOP_PLAYBACK               0x02
-#define CX2341X_DEC_SET_PLAYBACK_SPEED          0x03
+#define CX2341X_DEC_SET_PLAYBACK_SPEED          0x03
-#define CX2341X_DEC_STEP_VIDEO                  0x05
+#define CX2341X_DEC_STEP_VIDEO                  0x05
-#define CX2341X_DEC_SET_DMA_BLOCK_SIZE          0x08
+#define CX2341X_DEC_SET_DMA_BLOCK_SIZE          0x08
 #define CX2341X_DEC_GET_XFER_INFO               0x09
 #define CX2341X_DEC_GET_DMA_STATUS              0x0a
 #define CX2341X_DEC_SCHED_DMA_FROM_HOST         0x0b
-#define CX2341X_DEC_PAUSE_PLAYBACK              0x0d
+#define CX2341X_DEC_PAUSE_PLAYBACK              0x0d
-#define CX2341X_DEC_HALT_FW                     0x0e
+#define CX2341X_DEC_HALT_FW                     0x0e
-#define CX2341X_DEC_SET_STANDARD                0x10
+#define CX2341X_DEC_SET_STANDARD                0x10
 #define CX2341X_DEC_GET_VERSION                 0x11
-#define CX2341X_DEC_SET_STREAM_INPUT            0x14
+#define CX2341X_DEC_SET_STREAM_INPUT            0x14
-#define CX2341X_DEC_GET_TIMING_INFO             0x15
+#define CX2341X_DEC_GET_TIMING_INFO             0x15
-#define CX2341X_DEC_SET_AUDIO_MODE              0x16
+#define CX2341X_DEC_SET_AUDIO_MODE              0x16
 #define CX2341X_DEC_SET_EVENT_NOTIFICATION      0x17
 #define CX2341X_DEC_SET_DISPLAY_BUFFERS         0x18
-#define CX2341X_DEC_EXTRACT_VBI                 0x19
+#define CX2341X_DEC_EXTRACT_VBI                 0x19
-#define CX2341X_DEC_SET_DECODER_SOURCE          0x1a
+#define CX2341X_DEC_SET_DECODER_SOURCE          0x1a
 #define CX2341X_DEC_SET_PREBUFFERING            0x1e
 /* MPEG encoder API */
-#define CX2341X_ENC_PING_FW                     0x80
+#define CX2341X_ENC_PING_FW                     0x80
-#define CX2341X_ENC_START_CAPTURE               0x81
+#define CX2341X_ENC_START_CAPTURE               0x81
-#define CX2341X_ENC_STOP_CAPTURE                0x82
+#define CX2341X_ENC_STOP_CAPTURE                0x82
-#define CX2341X_ENC_SET_AUDIO_ID                0x89
+#define CX2341X_ENC_SET_AUDIO_ID                0x89
-#define CX2341X_ENC_SET_VIDEO_ID                0x8b
+#define CX2341X_ENC_SET_VIDEO_ID                0x8b
-#define CX2341X_ENC_SET_PCR_ID                  0x8d
+#define CX2341X_ENC_SET_PCR_ID                  0x8d
-#define CX2341X_ENC_SET_FRAME_RATE              0x8f
+#define CX2341X_ENC_SET_FRAME_RATE              0x8f
-#define CX2341X_ENC_SET_FRAME_SIZE              0x91
+#define CX2341X_ENC_SET_FRAME_SIZE              0x91
-#define CX2341X_ENC_SET_BIT_RATE                0x95
+#define CX2341X_ENC_SET_BIT_RATE                0x95
-#define CX2341X_ENC_SET_GOP_PROPERTIES          0x97
+#define CX2341X_ENC_SET_GOP_PROPERTIES          0x97
-#define CX2341X_ENC_SET_ASPECT_RATIO            0x99
+#define CX2341X_ENC_SET_ASPECT_RATIO            0x99
-#define CX2341X_ENC_SET_DNR_FILTER_MODE         0x9b
+#define CX2341X_ENC_SET_DNR_FILTER_MODE         0x9b
-#define CX2341X_ENC_SET_DNR_FILTER_PROPS        0x9d
+#define CX2341X_ENC_SET_DNR_FILTER_PROPS        0x9d
-#define CX2341X_ENC_SET_CORING_LEVELS           0x9f
+#define CX2341X_ENC_SET_CORING_LEVELS           0x9f
-#define CX2341X_ENC_SET_SPATIAL_FILTER_TYPE     0xa1
+#define CX2341X_ENC_SET_SPATIAL_FILTER_TYPE     0xa1
-#define CX2341X_ENC_SET_VBI_LINE                0xb7
+#define CX2341X_ENC_SET_VBI_LINE                0xb7
-#define CX2341X_ENC_SET_STREAM_TYPE             0xb9
+#define CX2341X_ENC_SET_STREAM_TYPE             0xb9
-#define CX2341X_ENC_SET_OUTPUT_PORT             0xbb
+#define CX2341X_ENC_SET_OUTPUT_PORT             0xbb
-#define CX2341X_ENC_SET_AUDIO_PROPERTIES        0xbd
+#define CX2341X_ENC_SET_AUDIO_PROPERTIES        0xbd
-#define CX2341X_ENC_HALT_FW                     0xc3
+#define CX2341X_ENC_HALT_FW                     0xc3
 #define CX2341X_ENC_GET_VERSION                 0xc4
-#define CX2341X_ENC_SET_GOP_CLOSURE             0xc5
+#define CX2341X_ENC_SET_GOP_CLOSURE             0xc5
-#define CX2341X_ENC_GET_SEQ_END                 0xc6
+#define CX2341X_ENC_GET_SEQ_END                 0xc6
-#define CX2341X_ENC_SET_PGM_INDEX_INFO          0xc7
+#define CX2341X_ENC_SET_PGM_INDEX_INFO          0xc7
 #define CX2341X_ENC_SET_VBI_CONFIG              0xc8
-#define CX2341X_ENC_SET_DMA_BLOCK_SIZE          0xc9
+#define CX2341X_ENC_SET_DMA_BLOCK_SIZE          0xc9
 #define CX2341X_ENC_GET_PREV_DMA_INFO_MB_10     0xca
 #define CX2341X_ENC_GET_PREV_DMA_INFO_MB_9      0xcb
-#define CX2341X_ENC_SCHED_DMA_TO_HOST           0xcc
+#define CX2341X_ENC_SCHED_DMA_TO_HOST           0xcc
-#define CX2341X_ENC_INITIALIZE_INPUT            0xcd
+#define CX2341X_ENC_INITIALIZE_INPUT            0xcd
-#define CX2341X_ENC_SET_FRAME_DROP_RATE         0xd0
+#define CX2341X_ENC_SET_FRAME_DROP_RATE         0xd0
-#define CX2341X_ENC_PAUSE_ENCODER               0xd2
+#define CX2341X_ENC_PAUSE_ENCODER               0xd2
-#define CX2341X_ENC_REFRESH_INPUT               0xd3
+#define CX2341X_ENC_REFRESH_INPUT               0xd3
 #define CX2341X_ENC_SET_COPYRIGHT               0xd4
-#define CX2341X_ENC_SET_EVENT_NOTIFICATION      0xd5
+#define CX2341X_ENC_SET_EVENT_NOTIFICATION      0xd5
-#define CX2341X_ENC_SET_NUM_VSYNC_LINES         0xd6
+#define CX2341X_ENC_SET_NUM_VSYNC_LINES         0xd6
-#define CX2341X_ENC_SET_PLACEHOLDER             0xd7
+#define CX2341X_ENC_SET_PLACEHOLDER             0xd7
-#define CX2341X_ENC_MUTE_VIDEO                  0xd9
+#define CX2341X_ENC_MUTE_VIDEO                  0xd9
-#define CX2341X_ENC_MUTE_AUDIO                  0xda
+#define CX2341X_ENC_MUTE_AUDIO                  0xda
 #define CX2341X_ENC_SET_VERT_CROP_LINE          0xdb
-#define CX2341X_ENC_MISC                        0xdc
+#define CX2341X_ENC_MISC                        0xdc
 /* OSD API, specific to the cx23415 */
-#define CX2341X_OSD_GET_FRAMEBUFFER             0x41
+#define CX2341X_OSD_GET_FRAMEBUFFER             0x41
-#define CX2341X_OSD_GET_PIXEL_FORMAT            0x42
+#define CX2341X_OSD_GET_PIXEL_FORMAT            0x42
-#define CX2341X_OSD_SET_PIXEL_FORMAT            0x43
+#define CX2341X_OSD_SET_PIXEL_FORMAT            0x43
-#define CX2341X_OSD_GET_STATE                   0x44
+#define CX2341X_OSD_GET_STATE                   0x44
-#define CX2341X_OSD_SET_STATE                   0x45
+#define CX2341X_OSD_SET_STATE                   0x45
-#define CX2341X_OSD_GET_OSD_COORDS              0x46
+#define CX2341X_OSD_GET_OSD_COORDS              0x46
-#define CX2341X_OSD_SET_OSD_COORDS              0x47
+#define CX2341X_OSD_SET_OSD_COORDS              0x47
-#define CX2341X_OSD_GET_SCREEN_COORDS           0x48
+#define CX2341X_OSD_GET_SCREEN_COORDS           0x48
-#define CX2341X_OSD_SET_SCREEN_COORDS           0x49
+#define CX2341X_OSD_SET_SCREEN_COORDS           0x49
-#define CX2341X_OSD_GET_GLOBAL_ALPHA            0x4a
+#define CX2341X_OSD_GET_GLOBAL_ALPHA            0x4a
-#define CX2341X_OSD_SET_GLOBAL_ALPHA            0x4b
+#define CX2341X_OSD_SET_GLOBAL_ALPHA            0x4b
-#define CX2341X_OSD_SET_BLEND_COORDS            0x4c
+#define CX2341X_OSD_SET_BLEND_COORDS            0x4c
-#define CX2341X_OSD_GET_FLICKER_STATE           0x4f
+#define CX2341X_OSD_GET_FLICKER_STATE           0x4f
-#define CX2341X_OSD_SET_FLICKER_STATE           0x50
+#define CX2341X_OSD_SET_FLICKER_STATE           0x50
-#define CX2341X_OSD_BLT_COPY                    0x52
+#define CX2341X_OSD_BLT_COPY                    0x52
-#define CX2341X_OSD_BLT_FILL                    0x53
+#define CX2341X_OSD_BLT_FILL                    0x53
-#define CX2341X_OSD_BLT_TEXT                    0x54
+#define CX2341X_OSD_BLT_TEXT                    0x54
-#define CX2341X_OSD_SET_FRAMEBUFFER_WINDOW      0x56
+#define CX2341X_OSD_SET_FRAMEBUFFER_WINDOW      0x56
-#define CX2341X_OSD_SET_CHROMA_KEY              0x60
+#define CX2341X_OSD_SET_CHROMA_KEY              0x60
-#define CX2341X_OSD_GET_ALPHA_CONTENT_INDEX     0x61
+#define CX2341X_OSD_GET_ALPHA_CONTENT_INDEX     0x61
-#define CX2341X_OSD_SET_ALPHA_CONTENT_INDEX     0x62
+#define CX2341X_OSD_SET_ALPHA_CONTENT_INDEX     0x62
 #endif /* CX2341X_H */
diff --git a/include/media/drv-intf/exynos-fimc.h b/include/media/drv-intf/exynos-fimc.h
index 69bcd2a07d5c..f9c64338841f 100644
--- a/include/media/drv-intf/exynos-fimc.h
+++ b/include/media/drv-intf/exynos-fimc.h
@@ -155,7 +155,8 @@ static inline struct exynos_video_entity *vdev_to_exynos_video_entity(
 }
 #define fimc_pipeline_call(ent, op, args...)                              \
-        (!(ent) ? -ENOENT : (((ent)->pipe->ops && (ent)->pipe->ops->op) ? \
+        ((!(ent) || !(ent)->pipe) ? -ENOENT : \
+        (((ent)->pipe->ops && (ent)->pipe->ops->op) ? \
        (ent)->pipe->ops->op(((ent)->pipe), ##args) : -ENOIOCTLCMD))      \
 #endif /* S5P_FIMC_H_ */
diff --git a/include/media/drv-intf/msp3400.h b/include/media/drv-intf/msp3400.h
index 1e6e80213a77..db98ce49e17b 100644
--- a/include/media/drv-intf/msp3400.h
+++ b/include/media/drv-intf/msp3400.h
@@ -80,17 +80,17 @@
 */
 /* SCART input to DSP selection */
-#define MSP_IN_SCART1           0  /* Pin SC1_IN */
+#define MSP_IN_SCART1           0  /* Pin SC1_IN */
-#define MSP_IN_SCART2           1  /* Pin SC2_IN */
+#define MSP_IN_SCART2           1  /* Pin SC2_IN */
-#define MSP_IN_SCART3           2  /* Pin SC3_IN */
+#define MSP_IN_SCART3           2  /* Pin SC3_IN */
-#define MSP_IN_SCART4           3  /* Pin SC4_IN */
+#define MSP_IN_SCART4           3  /* Pin SC4_IN */
-#define MSP_IN_MONO             6  /* Pin MONO_IN */
+#define MSP_IN_MONO             6  /* Pin MONO_IN */
-#define MSP_IN_MUTE             7  /* Mute DSP input */
+#define MSP_IN_MUTE             7  /* Mute DSP input */
-#define MSP_SCART_TO_DSP(in)    (in)
+#define MSP_SCART_TO_DSP(in)    (in)
 /* Tuner input to demodulator and DSP selection */
-#define MSP_IN_TUNER1           0  /* Analog Sound IF input pin ANA_IN1 */
+#define MSP_IN_TUNER1           0  /* Analog Sound IF input pin ANA_IN1 */
-#define MSP_IN_TUNER2           1  /* Analog Sound IF input pin ANA_IN2 */
+#define MSP_IN_TUNER2           1  /* Analog Sound IF input pin ANA_IN2 */
-#define MSP_TUNER_TO_DSP(in)    ((in) << 3)
+#define MSP_TUNER_TO_DSP(in)    ((in) << 3)
 /* The msp has up to 5 DSP outputs, each output can independently select
   a DSP input.
@@ -109,30 +109,30 @@
   DSP. This is currently not implemented. Also not implemented is the
   multi-channel capable I2S3 input of the 44x0G. If someone can demonstrate
   a need for one of those features then additional support can be added. */
-#define MSP_DSP_IN_TUNER        0  /* Tuner DSP input */
+#define MSP_DSP_IN_TUNER        0  /* Tuner DSP input */
-#define MSP_DSP_IN_SCART        2  /* SCART DSP input */
+#define MSP_DSP_IN_SCART        2  /* SCART DSP input */
-#define MSP_DSP_IN_I2S1         5  /* I2S1 DSP input */
+#define MSP_DSP_IN_I2S1         5  /* I2S1 DSP input */
-#define MSP_DSP_IN_I2S2         6  /* I2S2 DSP input */
+#define MSP_DSP_IN_I2S2         6  /* I2S2 DSP input */
-#define MSP_DSP_IN_I2S3         7  /* I2S3 DSP input */
+#define MSP_DSP_IN_I2S3         7  /* I2S3 DSP input */
-#define MSP_DSP_IN_MAIN_AVC     11 /* MAIN AVC processed DSP input */
+#define MSP_DSP_IN_MAIN_AVC     11 /* MAIN AVC processed DSP input */
-#define MSP_DSP_IN_MAIN         12 /* MAIN DSP input */
+#define MSP_DSP_IN_MAIN         12 /* MAIN DSP input */
-#define MSP_DSP_IN_AUX          13 /* AUX DSP input */
+#define MSP_DSP_IN_AUX          13 /* AUX DSP input */
-#define MSP_DSP_TO_MAIN(in)     ((in) << 4)
+#define MSP_DSP_TO_MAIN(in)     ((in) << 4)
-#define MSP_DSP_TO_AUX(in)      ((in) << 8)
+#define MSP_DSP_TO_AUX(in)      ((in) << 8)
-#define MSP_DSP_TO_SCART1(in)   ((in) << 12)
+#define MSP_DSP_TO_SCART1(in)   ((in) << 12)
-#define MSP_DSP_TO_SCART2(in)   ((in) << 16)
+#define MSP_DSP_TO_SCART2(in)   ((in) << 16)
-#define MSP_DSP_TO_I2S(in)      ((in) << 20)
+#define MSP_DSP_TO_I2S(in)      ((in) << 20)
 /* Output SCART select: the SCART outputs can select which input
   to use. */
-#define MSP_SC_IN_SCART1        0  /* SCART1 input, bypassing the DSP */
+#define MSP_SC_IN_SCART1        0  /* SCART1 input, bypassing the DSP */
-#define MSP_SC_IN_SCART2        1  /* SCART2 input, bypassing the DSP */
+#define MSP_SC_IN_SCART2        1  /* SCART2 input, bypassing the DSP */
-#define MSP_SC_IN_SCART3        2  /* SCART3 input, bypassing the DSP */
+#define MSP_SC_IN_SCART3        2  /* SCART3 input, bypassing the DSP */
-#define MSP_SC_IN_SCART4        3  /* SCART4 input, bypassing the DSP */
+#define MSP_SC_IN_SCART4        3  /* SCART4 input, bypassing the DSP */
-#define MSP_SC_IN_DSP_SCART1    4  /* DSP SCART1 input */
+#define MSP_SC_IN_DSP_SCART1    4  /* DSP SCART1 input */
-#define MSP_SC_IN_DSP_SCART2    5  /* DSP SCART2 input */
+#define MSP_SC_IN_DSP_SCART2    5  /* DSP SCART2 input */
-#define MSP_SC_IN_MONO          6  /* MONO input, bypassing the DSP */
+#define MSP_SC_IN_MONO          6  /* MONO input, bypassing the DSP */
-#define MSP_SC_IN_MUTE          7  /* MUTE output */
+#define MSP_SC_IN_MUTE          7  /* MUTE output */
 #define MSP_SC_TO_SCART1(in)    (in)
 #define MSP_SC_TO_SCART2(in)    ((in) << 4)
diff --git a/include/media/drv-intf/saa7146.h b/include/media/drv-intf/saa7146.h
index 769c6cf7eb4c..a7bf2c4a2e4d 100644
--- a/include/media/drv-intf/saa7146.h
+++ b/include/media/drv-intf/saa7146.h
@@ -118,7 +118,7 @@ struct saa7146_dev
 {
        struct module                   *module;
-        struct v4l2_device              v4l2_dev;
+        struct v4l2_device              v4l2_dev;
        struct v4l2_ctrl_handler        ctrl_handler;
        /* different device locks */
diff --git a/include/media/dvb-usb-ids.h b/include/media/dvb-usb-ids.h
new file mode 100644
index 000000000000..28e2be5c8a98
--- /dev/null
+++ b/include/media/dvb-usb-ids.h
@@ -0,0 +1,424 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+/* dvb-usb-ids.h is part of the DVB USB library.
+ *
+ * Copyright (C) 2004-5 Patrick Boettcher (patrick.boettcher@posteo.de) see
+ * dvb-usb-init.c for copyright information.
+ *
+ * a header file containing define's for the USB device supported by the
+ * various drivers.
+ */
+#ifndef _DVB_USB_IDS_H_
+#define _DVB_USB_IDS_H_
+/* Vendor IDs */
+#define USB_VID_ADSTECH                         0x06e1
+#define USB_VID_AFATECH                         0x15a4
+#define USB_VID_ALCOR_MICRO                     0x058f
+#define USB_VID_ALINK                           0x05e3
+#define USB_VID_AMT                             0x1c73
+#define USB_VID_ANCHOR                          0x0547
+#define USB_VID_ANSONIC                         0x10b9
+#define USB_VID_ANUBIS_ELECTRONIC               0x10fd
+#define USB_VID_ASUS                            0x0b05
+#define USB_VID_AVERMEDIA                       0x07ca
+#define USB_VID_COMPRO                          0x185b
+#define USB_VID_COMPRO_UNK                      0x145f
+#define USB_VID_CONEXANT                        0x0572
+#define USB_VID_CYPRESS                         0x04b4
+#define USB_VID_DEXATEK                         0x1d19
+#define USB_VID_DIBCOM                          0x10b8
+#define USB_VID_DPOSH                           0x1498
+#define USB_VID_DVICO                           0x0fe9
+#define USB_VID_E3C                             0x18b4
+#define USB_VID_ELGATO                          0x0fd9
+#define USB_VID_EMPIA                           0xeb1a
+#define USB_VID_GENPIX                          0x09c0
+#define USB_VID_GRANDTEC                        0x5032
+#define USB_VID_GTEK                            0x1f4d
+#define USB_VID_HANFTEK                         0x15f4
+#define USB_VID_HAUPPAUGE                       0x2040
+#define USB_VID_HYPER_PALTEK                    0x1025
+#define USB_VID_INTEL                           0x8086
+#define USB_VID_ITETECH                         0x048d
+#define USB_VID_KWORLD                          0xeb2a
+#define USB_VID_KWORLD_2                        0x1b80
+#define USB_VID_KYE                             0x0458
+#define USB_VID_LEADTEK                         0x0413
+#define USB_VID_LITEON                          0x04ca
+#define USB_VID_MEDION                          0x1660
+#define USB_VID_MIGLIA                          0x18f3
+#define USB_VID_MSI                             0x0db0
+#define USB_VID_MSI_2                           0x1462
+#define USB_VID_OPERA1                          0x695c
+#define USB_VID_PINNACLE                        0x2304
+#define USB_VID_PCTV                            0x2013
+#define USB_VID_PIXELVIEW                       0x1554
+#define USB_VID_REALTEK                         0x0bda
+#define USB_VID_TECHNOTREND                     0x0b48
+#define USB_VID_TERRATEC                        0x0ccd
+#define USB_VID_TELESTAR                        0x10b9
+#define USB_VID_VISIONPLUS                      0x13d3
+#define USB_VID_SONY                            0x1415
+#define USB_PID_TEVII_S421                      0xd421
+#define USB_PID_TEVII_S480_1                    0xd481
+#define USB_PID_TEVII_S480_2                    0xd482
+#define USB_PID_TEVII_S630                      0xd630
+#define USB_PID_TEVII_S632                      0xd632
+#define USB_PID_TEVII_S650                      0xd650
+#define USB_PID_TEVII_S660                      0xd660
+#define USB_PID_TEVII_S662                      0xd662
+#define USB_VID_TWINHAN                         0x1822
+#define USB_VID_ULTIMA_ELECTRONIC               0x05d8
+#define USB_VID_UNIWILL                         0x1584
+#define USB_VID_WIDEVIEW                        0x14aa
+#define USB_VID_GIGABYTE                        0x1044
+#define USB_VID_YUAN                            0x1164
+#define USB_VID_XTENSIONS                       0x1ae7
+#define USB_VID_ZYDAS                           0x0ace
+#define USB_VID_HUMAX_COEX                      0x10b9
+#define USB_VID_774                             0x7a69
+#define USB_VID_EVOLUTEPC                       0x1e59
+#define USB_VID_AZUREWAVE                       0x13d3
+#define USB_VID_TECHNISAT                       0x14f7
+#define USB_VID_HAMA                            0x147f
+#define USB_VID_MICROSOFT                       0x045e
+/* Product IDs */
+#define USB_PID_ADSTECH_USB2_COLD                       0xa333
+#define USB_PID_ADSTECH_USB2_WARM                       0xa334
+#define USB_PID_AFATECH_AF9005                          0x9020
+#define USB_PID_AFATECH_AF9015_9015                     0x9015
+#define USB_PID_AFATECH_AF9015_9016                     0x9016
+#define USB_PID_AFATECH_AF9035_1000                     0x1000
+#define USB_PID_AFATECH_AF9035_1001                     0x1001
+#define USB_PID_AFATECH_AF9035_1002                     0x1002
+#define USB_PID_AFATECH_AF9035_1003                     0x1003
+#define USB_PID_AFATECH_AF9035_9035                     0x9035
+#define USB_PID_TREKSTOR_DVBT                           0x901b
+#define USB_PID_TREKSTOR_TERRES_2_0                     0xC803
+#define USB_VID_ALINK_DTU                               0xf170
+#define USB_PID_ANSONIC_DVBT_USB                        0x6000
+#define USB_PID_ANYSEE                                  0x861f
+#define USB_PID_AZUREWAVE_AD_TU700                      0x3237
+#define USB_PID_AZUREWAVE_6007                          0x0ccd
+#define USB_PID_AVERMEDIA_DVBT_USB_COLD                 0x0001
+#define USB_PID_AVERMEDIA_DVBT_USB_WARM                 0x0002
+#define USB_PID_AVERMEDIA_DVBT_USB2_COLD                0xa800
+#define USB_PID_AVERMEDIA_DVBT_USB2_WARM                0xa801
+#define USB_PID_COMPRO_DVBU2000_COLD                    0xd000
+#define USB_PID_COMPRO_DVBU2000_WARM                    0xd001
+#define USB_PID_COMPRO_DVBU2000_UNK_COLD                0x010c
+#define USB_PID_COMPRO_DVBU2000_UNK_WARM                0x010d
+#define USB_PID_COMPRO_VIDEOMATE_U500                   0x1e78
+#define USB_PID_COMPRO_VIDEOMATE_U500_PC                0x1e80
+#define USB_PID_CONCEPTRONIC_CTVDIGRCU                  0xe397
+#define USB_PID_CONEXANT_D680_DMB                       0x86d6
+#define USB_PID_CREATIX_CTX1921                         0x1921
+#define USB_PID_DELOCK_USB2_DVBT                        0xb803
+#define USB_PID_DIBCOM_HOOK_DEFAULT                     0x0064
+#define USB_PID_DIBCOM_HOOK_DEFAULT_REENUM              0x0065
+#define USB_PID_DIBCOM_MOD3000_COLD                     0x0bb8
+#define USB_PID_DIBCOM_MOD3000_WARM                     0x0bb9
+#define USB_PID_DIBCOM_MOD3001_COLD                     0x0bc6
+#define USB_PID_DIBCOM_MOD3001_WARM                     0x0bc7
+#define USB_PID_DIBCOM_STK7700P                         0x1e14
+#define USB_PID_DIBCOM_STK7700P_PC                      0x1e78
+#define USB_PID_DIBCOM_STK7700D                         0x1ef0
+#define USB_PID_DIBCOM_STK7700_U7000                    0x7001
+#define USB_PID_DIBCOM_STK7070P                         0x1ebc
+#define USB_PID_DIBCOM_STK7070PD                        0x1ebe
+#define USB_PID_DIBCOM_STK807XP                         0x1f90
+#define USB_PID_DIBCOM_STK807XPVR                       0x1f98
+#define USB_PID_DIBCOM_STK8096GP                        0x1fa0
+#define USB_PID_DIBCOM_STK8096PVR                       0x1faa
+#define USB_PID_DIBCOM_NIM8096MD                        0x1fa8
+#define USB_PID_DIBCOM_TFE8096P                         0x1f9C
+#define USB_PID_DIBCOM_ANCHOR_2135_COLD                 0x2131
+#define USB_PID_DIBCOM_STK7770P                         0x1e80
+#define USB_PID_DIBCOM_NIM7090                          0x1bb2
+#define USB_PID_DIBCOM_TFE7090PVR                       0x1bb4
+#define USB_PID_DIBCOM_TFE7790P                         0x1e6e
+#define USB_PID_DIBCOM_NIM9090M                         0x2383
+#define USB_PID_DIBCOM_NIM9090MD                        0x2384
+#define USB_PID_DPOSH_M9206_COLD                        0x9206
+#define USB_PID_DPOSH_M9206_WARM                        0xa090
+#define USB_PID_E3C_EC168                               0x1689
+#define USB_PID_E3C_EC168_2                             0xfffa
+#define USB_PID_E3C_EC168_3                             0xfffb
+#define USB_PID_E3C_EC168_4                             0x1001
+#define USB_PID_E3C_EC168_5                             0x1002
+#define USB_PID_FREECOM_DVBT                            0x0160
+#define USB_PID_FREECOM_DVBT_2                          0x0161
+#define USB_PID_UNIWILL_STK7700P                        0x6003
+#define USB_PID_GENIUS_TVGO_DVB_T03                     0x4012
+#define USB_PID_GRANDTEC_DVBT_USB_COLD                  0x0fa0
+#define USB_PID_GRANDTEC_DVBT_USB_WARM                  0x0fa1
+#define USB_PID_GOTVIEW_SAT_HD                          0x5456
+#define USB_PID_INTEL_CE9500                            0x9500
+#define USB_PID_ITETECH_IT9135                          0x9135
+#define USB_PID_ITETECH_IT9135_9005                     0x9005
+#define USB_PID_ITETECH_IT9135_9006                     0x9006
+#define USB_PID_ITETECH_IT9303                          0x9306
+#define USB_PID_KWORLD_399U                             0xe399
+#define USB_PID_KWORLD_399U_2                           0xe400
+#define USB_PID_KWORLD_395U                             0xe396
+#define USB_PID_KWORLD_395U_2                           0xe39b
+#define USB_PID_KWORLD_395U_3                           0xe395
+#define USB_PID_KWORLD_395U_4                           0xe39a
+#define USB_PID_KWORLD_MC810                            0xc810
+#define USB_PID_KWORLD_PC160_2T                         0xc160
+#define USB_PID_KWORLD_PC160_T                          0xc161
+#define USB_PID_KWORLD_UB383_T                          0xe383
+#define USB_PID_KWORLD_UB499_2T_T09                     0xe409
+#define USB_PID_KWORLD_VSTREAM_COLD                     0x17de
+#define USB_PID_KWORLD_VSTREAM_WARM                     0x17df
+#define USB_PID_PROF_1100                               0xb012
+#define USB_PID_TERRATEC_CINERGY_S                      0x0064
+#define USB_PID_TERRATEC_CINERGY_T_USB_XE               0x0055
+#define USB_PID_TERRATEC_CINERGY_T_USB_XE_REV2          0x0069
+#define USB_PID_TERRATEC_CINERGY_T_STICK                0x0093
+#define USB_PID_TERRATEC_CINERGY_T_STICK_RC             0x0097
+#define USB_PID_TERRATEC_CINERGY_T_STICK_DUAL_RC        0x0099
+#define USB_PID_TERRATEC_CINERGY_T_STICK_BLACK_REV1     0x00a9
+#define USB_PID_TWINHAN_VP7041_COLD                     0x3201
+#define USB_PID_TWINHAN_VP7041_WARM                     0x3202
+#define USB_PID_TWINHAN_VP7020_COLD                     0x3203
+#define USB_PID_TWINHAN_VP7020_WARM                     0x3204
+#define USB_PID_TWINHAN_VP7045_COLD                     0x3205
+#define USB_PID_TWINHAN_VP7045_WARM                     0x3206
+#define USB_PID_TWINHAN_VP7021_COLD                     0x3207
+#define USB_PID_TWINHAN_VP7021_WARM                     0x3208
+#define USB_PID_TWINHAN_VP7049                          0x3219
+#define USB_PID_TINYTWIN                                0x3226
+#define USB_PID_TINYTWIN_2                              0xe402
+#define USB_PID_TINYTWIN_3                              0x9016
+#define USB_PID_DNTV_TINYUSB2_COLD                      0x3223
+#define USB_PID_DNTV_TINYUSB2_WARM                      0x3224
+#define USB_PID_ULTIMA_TVBOX_COLD                       0x8105
+#define USB_PID_ULTIMA_TVBOX_WARM                       0x8106
+#define USB_PID_ULTIMA_TVBOX_AN2235_COLD                0x8107
+#define USB_PID_ULTIMA_TVBOX_AN2235_WARM                0x8108
+#define USB_PID_ULTIMA_TVBOX_ANCHOR_COLD                0x2235
+#define USB_PID_ULTIMA_TVBOX_USB2_COLD                  0x8109
+#define USB_PID_ULTIMA_TVBOX_USB2_WARM                  0x810a
+#define USB_PID_ARTEC_T14_COLD                          0x810b
+#define USB_PID_ARTEC_T14_WARM                          0x810c
+#define USB_PID_ARTEC_T14BR                             0x810f
+#define USB_PID_ULTIMA_TVBOX_USB2_FX_COLD               0x8613
+#define USB_PID_ULTIMA_TVBOX_USB2_FX_WARM               0x1002
+#define USB_PID_UNK_HYPER_PALTEK_COLD                   0x005e
+#define USB_PID_UNK_HYPER_PALTEK_WARM                   0x005f
+#define USB_PID_HANFTEK_UMT_010_COLD                    0x0001
+#define USB_PID_HANFTEK_UMT_010_WARM                    0x0015
+#define USB_PID_DTT200U_COLD                            0x0201
+#define USB_PID_DTT200U_WARM                            0x0301
+#define USB_PID_WT220U_ZAP250_COLD                      0x0220
+#define USB_PID_WT220U_COLD                             0x0222
+#define USB_PID_WT220U_WARM                             0x0221
+#define USB_PID_WT220U_FC_COLD                          0x0225
+#define USB_PID_WT220U_FC_WARM                          0x0226
+#define USB_PID_WT220U_ZL0353_COLD                      0x022a
+#define USB_PID_WT220U_ZL0353_WARM                      0x022b
+#define USB_PID_WINTV_NOVA_T_USB2_COLD                  0x9300
+#define USB_PID_WINTV_NOVA_T_USB2_WARM                  0x9301
+#define USB_PID_HAUPPAUGE_NOVA_T_500                    0x9941
+#define USB_PID_HAUPPAUGE_NOVA_T_500_2                  0x9950
+#define USB_PID_HAUPPAUGE_NOVA_T_500_3                  0x8400
+#define USB_PID_HAUPPAUGE_NOVA_T_STICK                  0x7050
+#define USB_PID_HAUPPAUGE_NOVA_T_STICK_2                0x7060
+#define USB_PID_HAUPPAUGE_NOVA_T_STICK_3                0x7070
+#define USB_PID_HAUPPAUGE_MYTV_T                        0x7080
+#define USB_PID_HAUPPAUGE_NOVA_TD_STICK                 0x9580
+#define USB_PID_HAUPPAUGE_NOVA_TD_STICK_52009           0x5200
+#define USB_PID_HAUPPAUGE_TIGER_ATSC                    0xb200
+#define USB_PID_HAUPPAUGE_TIGER_ATSC_B210               0xb210
+#define USB_PID_AVERMEDIA_EXPRESS                       0xb568
+#define USB_PID_AVERMEDIA_VOLAR                         0xa807
+#define USB_PID_AVERMEDIA_VOLAR_2                       0xb808
+#define USB_PID_AVERMEDIA_VOLAR_A868R                   0xa868
+#define USB_PID_AVERMEDIA_MCE_USB_M038                  0x1228
+#define USB_PID_AVERMEDIA_HYBRID_ULTRA_USB_M039R        0x0039
+#define USB_PID_AVERMEDIA_HYBRID_ULTRA_USB_M039R_ATSC   0x1039
+#define USB_PID_AVERMEDIA_HYBRID_ULTRA_USB_M039R_DVBT   0x2039
+#define USB_PID_AVERMEDIA_VOLAR_X                       0xa815
+#define USB_PID_AVERMEDIA_VOLAR_X_2                     0x8150
+#define USB_PID_AVERMEDIA_A309                          0xa309
+#define USB_PID_AVERMEDIA_A310                          0xa310
+#define USB_PID_AVERMEDIA_A850                          0x850a
+#define USB_PID_AVERMEDIA_A850T                         0x850b
+#define USB_PID_AVERMEDIA_A805                          0xa805
+#define USB_PID_AVERMEDIA_A815M                         0x815a
+#define USB_PID_AVERMEDIA_A835                          0xa835
+#define USB_PID_AVERMEDIA_B835                          0xb835
+#define USB_PID_AVERMEDIA_A835B_1835                    0x1835
+#define USB_PID_AVERMEDIA_A835B_2835                    0x2835
+#define USB_PID_AVERMEDIA_A835B_3835                    0x3835
+#define USB_PID_AVERMEDIA_A835B_4835                    0x4835
+#define USB_PID_AVERMEDIA_1867                          0x1867
+#define USB_PID_AVERMEDIA_A867                          0xa867
+#define USB_PID_AVERMEDIA_H335                          0x0335
+#define USB_PID_AVERMEDIA_TD110                         0xa110
+#define USB_PID_AVERMEDIA_TWINSTAR                      0x0825
+#define USB_PID_TECHNOTREND_CONNECT_S2400               0x3006
+#define USB_PID_TECHNOTREND_CONNECT_S2400_8KEEPROM      0x3009
+#define USB_PID_TECHNOTREND_CONNECT_CT3650              0x300d
+#define USB_PID_TECHNOTREND_CONNECT_S2_4600             0x3011
+#define USB_PID_TECHNOTREND_CONNECT_CT2_4650_CI         0x3012
+#define USB_PID_TECHNOTREND_CONNECT_CT2_4650_CI_2       0x3015
+#define USB_PID_TECHNOTREND_TVSTICK_CT2_4400            0x3014
+#define USB_PID_TECHNOTREND_CONNECT_S2_4650_CI          0x3017
+#define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY        0x005a
+#define USB_PID_TERRATEC_CINERGY_DT_XS_DIVERSITY_2      0x0081
+#define USB_PID_TERRATEC_CINERGY_HT_USB_XE              0x0058
+#define USB_PID_TERRATEC_CINERGY_HT_EXPRESS             0x0060
+#define USB_PID_TERRATEC_CINERGY_T_EXPRESS              0x0062
+#define USB_PID_TERRATEC_CINERGY_T_XXS                  0x0078
+#define USB_PID_TERRATEC_CINERGY_T_XXS_2                0x00ab
+#define USB_PID_TERRATEC_CINERGY_S2_R1                  0x00a8
+#define USB_PID_TERRATEC_CINERGY_S2_R2                  0x00b0
+#define USB_PID_TERRATEC_CINERGY_S2_R3                  0x0102
+#define USB_PID_TERRATEC_CINERGY_S2_R4                  0x0105
+#define USB_PID_TERRATEC_H7                             0x10b4
+#define USB_PID_TERRATEC_H7_2                           0x10a3
+#define USB_PID_TERRATEC_H7_3                           0x10a5
+#define USB_PID_TERRATEC_T1                             0x10ae
+#define USB_PID_TERRATEC_T3                             0x10a0
+#define USB_PID_TERRATEC_T5                             0x10a1
+#define USB_PID_NOXON_DAB_STICK                         0x00b3
+#define USB_PID_NOXON_DAB_STICK_REV2                    0x00e0
+#define USB_PID_NOXON_DAB_STICK_REV3                    0x00b4
+#define USB_PID_PINNACLE_EXPRESSCARD_320CX              0x022e
+#define USB_PID_PINNACLE_PCTV2000E                      0x022c
+#define USB_PID_PINNACLE_PCTV_DVB_T_FLASH               0x0228
+#define USB_PID_PINNACLE_PCTV_DUAL_DIVERSITY_DVB_T      0x0229
+#define USB_PID_PINNACLE_PCTV71E                        0x022b
+#define USB_PID_PINNACLE_PCTV72E                        0x0236
+#define USB_PID_PINNACLE_PCTV73E                        0x0237
+#define USB_PID_PINNACLE_PCTV310E                       0x3211
+#define USB_PID_PINNACLE_PCTV801E                       0x023a
+#define USB_PID_PINNACLE_PCTV801E_SE                    0x023b
+#define USB_PID_PINNACLE_PCTV340E                       0x023d
+#define USB_PID_PINNACLE_PCTV340E_SE                    0x023e
+#define USB_PID_PINNACLE_PCTV73A                        0x0243
+#define USB_PID_PINNACLE_PCTV73ESE                      0x0245
+#define USB_PID_PINNACLE_PCTV74E                        0x0246
+#define USB_PID_PINNACLE_PCTV282E                       0x0248
+#define USB_PID_PIXELVIEW_SBTVD                         0x5010
+#define USB_PID_PCTV_200E                               0x020e
+#define USB_PID_PCTV_400E                               0x020f
+#define USB_PID_PCTV_450E                               0x0222
+#define USB_PID_PCTV_452E                               0x021f
+#define USB_PID_PCTV_78E                                0x025a
+#define USB_PID_PCTV_79E                                0x0262
+#define USB_PID_REALTEK_RTL2831U                        0x2831
+#define USB_PID_REALTEK_RTL2832U                        0x2832
+#define USB_PID_TECHNOTREND_CONNECT_S2_3600             0x3007
+#define USB_PID_TECHNOTREND_CONNECT_S2_3650_CI          0x300a
+#define USB_PID_NEBULA_DIGITV                           0x0201
+#define USB_PID_DVICO_BLUEBIRD_LGDT                     0xd820
+#define USB_PID_DVICO_BLUEBIRD_LG064F_COLD              0xd500
+#define USB_PID_DVICO_BLUEBIRD_LG064F_WARM              0xd501
+#define USB_PID_DVICO_BLUEBIRD_LGZ201_COLD              0xdb00
+#define USB_PID_DVICO_BLUEBIRD_LGZ201_WARM              0xdb01
+#define USB_PID_DVICO_BLUEBIRD_TH7579_COLD              0xdb10
+#define USB_PID_DVICO_BLUEBIRD_TH7579_WARM              0xdb11
+#define USB_PID_DVICO_BLUEBIRD_DUAL_1_COLD              0xdb50
+#define USB_PID_DVICO_BLUEBIRD_DUAL_1_WARM              0xdb51
+#define USB_PID_DVICO_BLUEBIRD_DUAL_2_COLD              0xdb58
+#define USB_PID_DVICO_BLUEBIRD_DUAL_2_WARM              0xdb59
+#define USB_PID_DVICO_BLUEBIRD_DUAL_4                   0xdb78
+#define USB_PID_DVICO_BLUEBIRD_DUAL_4_REV_2             0xdb98
+#define USB_PID_DVICO_BLUEBIRD_DVB_T_NANO_2             0xdb70
+#define USB_PID_DVICO_BLUEBIRD_DVB_T_NANO_2_NFW_WARM    0xdb71
+#define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_COLD         0xdb54
+#define USB_PID_DIGITALNOW_BLUEBIRD_DUAL_1_WARM         0xdb55
+#define USB_PID_MEDION_MD95700                          0x0932
+#define USB_PID_MSI_MEGASKY580                          0x5580
+#define USB_PID_MSI_MEGASKY580_55801                    0x5581
+#define USB_PID_KYE_DVB_T_COLD                          0x701e
+#define USB_PID_KYE_DVB_T_WARM                          0x701f
+#define USB_PID_LITEON_DVB_T_COLD                       0xf000
+#define USB_PID_LITEON_DVB_T_WARM                       0xf001
+#define USB_PID_DIGIVOX_MINI_SL_COLD                    0xe360
+#define USB_PID_DIGIVOX_MINI_SL_WARM                    0xe361
+#define USB_PID_GRANDTEC_DVBT_USB2_COLD                 0x0bc6
+#define USB_PID_GRANDTEC_DVBT_USB2_WARM                 0x0bc7
+#define USB_PID_WINFAST_DTV2000DS                       0x6a04
+#define USB_PID_WINFAST_DTV2000DS_PLUS                  0x6f12
+#define USB_PID_WINFAST_DTV_DONGLE_COLD                 0x6025
+#define USB_PID_WINFAST_DTV_DONGLE_WARM                 0x6026
+#define USB_PID_WINFAST_DTV_DONGLE_STK7700P             0x6f00
+#define USB_PID_WINFAST_DTV_DONGLE_H                    0x60f6
+#define USB_PID_WINFAST_DTV_DONGLE_STK7700P_2           0x6f01
+#define USB_PID_WINFAST_DTV_DONGLE_GOLD                 0x6029
+#define USB_PID_WINFAST_DTV_DONGLE_MINID                0x6f0f
+#define USB_PID_GENPIX_8PSK_REV_1_COLD                  0x0200
+#define USB_PID_GENPIX_8PSK_REV_1_WARM                  0x0201
+#define USB_PID_GENPIX_8PSK_REV_2                       0x0202
+#define USB_PID_GENPIX_SKYWALKER_1                      0x0203
+#define USB_PID_GENPIX_SKYWALKER_CW3K                   0x0204
+#define USB_PID_GENPIX_SKYWALKER_2                      0x0206
+#define USB_PID_SIGMATEK_DVB_110                        0x6610
+#define USB_PID_MSI_DIGI_VOX_MINI_II                    0x1513
+#define USB_PID_MSI_DIGIVOX_DUO                         0x8801
+#define USB_PID_OPERA1_COLD                             0x2830
+#define USB_PID_OPERA1_WARM                             0x3829
+#define USB_PID_LIFEVIEW_TV_WALKER_TWIN_COLD            0x0514
+#define USB_PID_LIFEVIEW_TV_WALKER_TWIN_WARM            0x0513
+#define USB_PID_GIGABYTE_U7000                          0x7001
+#define USB_PID_GIGABYTE_U8000                          0x7002
+#define USB_PID_ASUS_U3000                              0x171f
+#define USB_PID_ASUS_U3000H                             0x1736
+#define USB_PID_ASUS_U3100                              0x173f
+#define USB_PID_ASUS_U3100MINI_PLUS                     0x1779
+#define USB_PID_YUAN_EC372S                             0x1edc
+#define USB_PID_YUAN_STK7700PH                          0x1f08
+#define USB_PID_YUAN_PD378S                             0x2edc
+#define USB_PID_YUAN_MC770                              0x0871
+#define USB_PID_YUAN_STK7700D                           0x1efc
+#define USB_PID_YUAN_STK7700D_2                         0x1e8c
+#define USB_PID_DW2102                                  0x2102
+#define USB_PID_DW2104                                  0x2104
+#define USB_PID_DW3101                                  0x3101
+#define USB_PID_XTENSIONS_XD_380                        0x0381
+#define USB_PID_TELESTAR_STARSTICK_2                    0x8000
+#define USB_PID_MSI_DIGI_VOX_MINI_III                   0x8807
+#define USB_PID_SONY_PLAYTV                             0x0003
+#define USB_PID_MYGICA_D689                             0xd811
+#define USB_PID_MYGICA_T230                             0xc688
+#define USB_PID_MYGICA_T230C                            0xc689
+#define USB_PID_ELGATO_EYETV_DIVERSITY                  0x0011
+#define USB_PID_ELGATO_EYETV_DTT                        0x0021
+#define USB_PID_ELGATO_EYETV_DTT_2                      0x003f
+#define USB_PID_ELGATO_EYETV_DTT_Dlx                    0x0020
+#define USB_PID_ELGATO_EYETV_SAT                        0x002a
+#define USB_PID_ELGATO_EYETV_SAT_V2                     0x0025
+#define USB_PID_ELGATO_EYETV_SAT_V3                     0x0036
+#define USB_PID_DVB_T_USB_STICK_HIGH_SPEED_COLD         0x5000
+#define USB_PID_DVB_T_USB_STICK_HIGH_SPEED_WARM         0x5001
+#define USB_PID_FRIIO_WHITE                             0x0001
+#define USB_PID_TVWAY_PLUS                              0x0002
+#define USB_PID_SVEON_STV20                             0xe39d
+#define USB_PID_SVEON_STV20_RTL2832U                    0xd39d
+#define USB_PID_SVEON_STV21                             0xd3b0
+#define USB_PID_SVEON_STV22                             0xe401
+#define USB_PID_SVEON_STV22_IT9137                      0xe411
+#define USB_PID_AZUREWAVE_AZ6027                        0x3275
+#define USB_PID_TERRATEC_DVBS2CI_V1                     0x10a4
+#define USB_PID_TERRATEC_DVBS2CI_V2                     0x10ac
+#define USB_PID_TECHNISAT_USB2_HDCI_V1                  0x0001
+#define USB_PID_TECHNISAT_USB2_HDCI_V2                  0x0002
+#define USB_PID_TECHNISAT_USB2_CABLESTAR_HDCI           0x0003
+#define USB_PID_TECHNISAT_AIRSTAR_TELESTICK_2           0x0004
+#define USB_PID_TECHNISAT_USB2_DVB_S2                   0x0500
+#define USB_PID_CPYTO_REDI_PC50A                        0xa803
+#define USB_PID_CTVDIGDUAL_V2                           0xe410
+#define USB_PID_PCTV_2002E                              0x025c
+#define USB_PID_PCTV_2002E_SE                           0x025d
+#define USB_PID_SVEON_STV27                             0xd3af
+#define USB_PID_TURBOX_DTT_2000                         0xd3a4
+#define USB_PID_WINTV_SOLOHD                            0x0264
+#define USB_PID_EVOLVEO_XTRATV_STICK                    0xa115
+#define USB_PID_HAMA_DVBT_HYBRID                        0x2758
+#define USB_PID_XBOX_ONE_TUNER                          0x02d5
+#endif
diff --git a/include/media/dvb_ca_en50221.h b/include/media/dvb_ca_en50221.h
new file mode 100644
index 000000000000..a1c014b0a837
--- /dev/null
+++ b/include/media/dvb_ca_en50221.h
@@ -0,0 +1,142 @@
+/*
+ * dvb_ca.h: generic DVB functions for EN50221 CA interfaces
+ *
+ * Copyright (C) 2004 Andrew de Quincey
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * 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.
+ */
+#ifndef _DVB_CA_EN50221_H_
+#define _DVB_CA_EN50221_H_
+#include <linux/list.h>
+#include <linux/dvb/ca.h>
+#include <media/dvbdev.h>
+#define DVB_CA_EN50221_POLL_CAM_PRESENT 1
+#define DVB_CA_EN50221_POLL_CAM_CHANGED 2
+#define DVB_CA_EN50221_POLL_CAM_READY           4
+#define DVB_CA_EN50221_FLAG_IRQ_CAMCHANGE       1
+#define DVB_CA_EN50221_FLAG_IRQ_FR              2
+#define DVB_CA_EN50221_FLAG_IRQ_DA              4
+#define DVB_CA_EN50221_CAMCHANGE_REMOVED                0
+#define DVB_CA_EN50221_CAMCHANGE_INSERTED               1
+/**
+ * struct dvb_ca_en50221- Structure describing a CA interface
+ *
+ * @owner:              the module owning this structure
+ * @read_attribute_mem: function for reading attribute memory on the CAM
+ * @write_attribute_mem: function for writing attribute memory on the CAM
+ * @read_cam_control:   function for reading the control interface on the CAM
+ * @write_cam_control:  function for reading the control interface on the CAM
+ * @read_data:          function for reading data (block mode)
+ * @write_data:         function for writing data (block mode)
+ * @slot_reset:         function to reset the CAM slot
+ * @slot_shutdown:      function to shutdown a CAM slot
+ * @slot_ts_enable:     function to enable the Transport Stream on a CAM slot
+ * @poll_slot_status:   function to poll slot status. Only necessary if
+ *                      DVB_CA_FLAG_EN50221_IRQ_CAMCHANGE is not set.
+ * @data:               private data, used by caller.
+ * @private:            Opaque data used by the dvb_ca core. Do not modify!
+ *
+ * NOTE: the read_*, write_* and poll_slot_status functions will be
+ * called for different slots concurrently and need to use locks where
+ * and if appropriate. There will be no concurrent access to one slot.
+ */
+struct dvb_ca_en50221 {
+        struct module *owner;
+        int (*read_attribute_mem)(struct dvb_ca_en50221 *ca,
+                                  int slot, int address);
+        int (*write_attribute_mem)(struct dvb_ca_en50221 *ca,
+                                   int slot, int address, u8 value);
+        int (*read_cam_control)(struct dvb_ca_en50221 *ca,
+                                int slot, u8 address);
+        int (*write_cam_control)(struct dvb_ca_en50221 *ca,
+                                 int slot, u8 address, u8 value);
+        int (*read_data)(struct dvb_ca_en50221 *ca,
+                         int slot, u8 *ebuf, int ecount);
+        int (*write_data)(struct dvb_ca_en50221 *ca,
+                          int slot, u8 *ebuf, int ecount);
+        int (*slot_reset)(struct dvb_ca_en50221 *ca, int slot);
+        int (*slot_shutdown)(struct dvb_ca_en50221 *ca, int slot);
+        int (*slot_ts_enable)(struct dvb_ca_en50221 *ca, int slot);
+        int (*poll_slot_status)(struct dvb_ca_en50221 *ca, int slot, int open);
+        void *data;
+        void *private;
+};
+/*
+ * Functions for reporting IRQ events
+ */
+/**
+ * dvb_ca_en50221_camchange_irq - A CAMCHANGE IRQ has occurred.
+ *
+ * @pubca: CA instance.
+ * @slot: Slot concerned.
+ * @change_type: One of the DVB_CA_CAMCHANGE_* values
+ */
+void dvb_ca_en50221_camchange_irq(struct dvb_ca_en50221 *pubca, int slot,
+                                  int change_type);
+/**
+ * dvb_ca_en50221_camready_irq - A CAMREADY IRQ has occurred.
+ *
+ * @pubca: CA instance.
+ * @slot: Slot concerned.
+ */
+void dvb_ca_en50221_camready_irq(struct dvb_ca_en50221 *pubca, int slot);
+/**
+ * dvb_ca_en50221_frda_irq - An FR or a DA IRQ has occurred.
+ *
+ * @ca: CA instance.
+ * @slot: Slot concerned.
+ */
+void dvb_ca_en50221_frda_irq(struct dvb_ca_en50221 *ca, int slot);
+/*
+ * Initialisation/shutdown functions
+ */
+/**
+ * dvb_ca_en50221_init - Initialise a new DVB CA device.
+ *
+ * @dvb_adapter: DVB adapter to attach the new CA device to.
+ * @ca: The dvb_ca instance.
+ * @flags: Flags describing the CA device (DVB_CA_EN50221_FLAG_*).
+ * @slot_count: Number of slots supported.
+ *
+ * @return 0 on success, nonzero on failure
+ */
+int dvb_ca_en50221_init(struct dvb_adapter *dvb_adapter,
+                        struct dvb_ca_en50221 *ca, int flags,
+                               int slot_count);
+/**
+ * dvb_ca_en50221_release - Release a DVB CA device.
+ *
+ * @ca: The associated dvb_ca instance.
+ */
+void dvb_ca_en50221_release(struct dvb_ca_en50221 *ca);
+#endif
diff --git a/include/media/dvb_demux.h b/include/media/dvb_demux.h
new file mode 100644
index 000000000000..b07092038f4b
--- /dev/null
+++ b/include/media/dvb_demux.h
@@ -0,0 +1,350 @@
+/*
+ * dvb_demux.h: DVB kernel demux API
+ *
+ * Copyright (C) 2000-2001 Marcus Metzler & Ralph Metzler
+ *                         for convergence integrated media GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * 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.
+ *
+ */
+#ifndef _DVB_DEMUX_H_
+#define _DVB_DEMUX_H_
+#include <linux/time.h>
+#include <linux/timer.h>
+#include <linux/spinlock.h>
+#include <linux/mutex.h>
+#include <media/demux.h>
+/**
+ * enum dvb_dmx_filter_type - type of demux feed.
+ *
+ * @DMX_TYPE_TS:        feed is in TS mode.
+ * @DMX_TYPE_SEC:       feed is in Section mode.
+ */
+enum dvb_dmx_filter_type {
+        DMX_TYPE_TS,
+        DMX_TYPE_SEC,
+};
+/**
+ * enum dvb_dmx_state - state machine for a demux filter.
+ *
+ * @DMX_STATE_FREE:             indicates that the filter is freed.
+ * @DMX_STATE_ALLOCATED:        indicates that the filter was allocated
+ *                              to be used.
+ * @DMX_STATE_READY:            indicates that the filter is ready
+ *                              to be used.
+ * @DMX_STATE_GO:               indicates that the filter is running.
+ */
+enum dvb_dmx_state {
+        DMX_STATE_FREE,
+        DMX_STATE_ALLOCATED,
+        DMX_STATE_READY,
+        DMX_STATE_GO,
+};
+#define DVB_DEMUX_MASK_MAX 18
+#define MAX_PID 0x1fff
+#define SPEED_PKTS_INTERVAL 50000
+/**
+ * struct dvb_demux_filter - Describes a DVB demux section filter.
+ *
+ * @filter:             Section filter as defined by &struct dmx_section_filter.
+ * @maskandmode:        logical ``and`` bit mask.
+ * @maskandnotmode:     logical ``and not`` bit mask.
+ * @doneq:              flag that indicates when a filter is ready.
+ * @next:               pointer to the next section filter.
+ * @feed:               &struct dvb_demux_feed pointer.
+ * @index:              index of the used demux filter.
+ * @state:              state of the filter as described by &enum dvb_dmx_state.
+ * @type:               type of the filter as described
+ *                      by &enum dvb_dmx_filter_type.
+ */
+struct dvb_demux_filter {
+        struct dmx_section_filter filter;
+        u8 maskandmode[DMX_MAX_FILTER_SIZE];
+        u8 maskandnotmode[DMX_MAX_FILTER_SIZE];
+        bool doneq;
+        struct dvb_demux_filter *next;
+        struct dvb_demux_feed *feed;
+        int index;
+        enum dvb_dmx_state state;
+        enum dvb_dmx_filter_type type;
+        /* private: used only by av7110 */
+        u16 hw_handle;
+};
+/**
+ * struct dvb_demux_feed - describes a DVB field
+ *
+ * @feed:       a union describing a digital TV feed.
+ *              Depending on the feed type, it can be either
+ *              @feed.ts or @feed.sec.
+ * @feed.ts:    a &struct dmx_ts_feed pointer.
+ *              For TS feed only.
+ * @feed.sec:   a &struct dmx_section_feed pointer.
+ *              For section feed only.
+ * @cb:         a union describing digital TV callbacks.
+ *              Depending on the feed type, it can be either
+ *              @cb.ts or @cb.sec.
+ * @cb.ts:      a dmx_ts_cb() calback function pointer.
+ *              For TS feed only.
+ * @cb.sec:     a dmx_section_cb() callback function pointer.
+ *              For section feed only.
+ * @demux:      pointer to &struct dvb_demux.
+ * @priv:       private data that can optionally be used by a DVB driver.
+ * @type:       type of the filter, as defined by &enum dvb_dmx_filter_type.
+ * @state:      state of the filter as defined by &enum dvb_dmx_state.
+ * @pid:        PID to be filtered.
+ * @timeout:    feed timeout.
+ * @filter:     pointer to &struct dvb_demux_filter.
+ * @ts_type:    type of TS, as defined by &enum ts_filter_type.
+ * @pes_type:   type of PES, as defined by &enum dmx_ts_pes.
+ * @cc:         MPEG-TS packet continuity counter
+ * @pusi_seen:  if true, indicates that a discontinuity was detected.
+ *              it is used to prevent feeding of garbage from previous section.
+ * @peslen:     length of the PES (Packet Elementary Stream).
+ * @list_head:  head for the list of digital TV demux feeds.
+ * @index:      a unique index for each feed. Can be used as hardware
+ *              pid filter index.
+ */
+struct dvb_demux_feed {
+        union {
+                struct dmx_ts_feed ts;
+                struct dmx_section_feed sec;
+        } feed;
+        union {
+                dmx_ts_cb ts;
+                dmx_section_cb sec;
+        } cb;
+        struct dvb_demux *demux;
+        void *priv;
+        enum dvb_dmx_filter_type type;
+        enum dvb_dmx_state state;
+        u16 pid;
+        ktime_t timeout;
+        struct dvb_demux_filter *filter;
+        enum ts_filter_type ts_type;
+        enum dmx_ts_pes pes_type;
+        int cc;
+        bool pusi_seen;
+        u16 peslen;
+        struct list_head list_head;
+        unsigned int index;
+};
+/**
+ * struct dvb_demux - represents a digital TV demux
+ * @dmx:                embedded &struct dmx_demux with demux capabilities
+ *                      and callbacks.
+ * @priv:               private data that can optionally be used by
+ *                      a DVB driver.
+ * @filternum:          maximum amount of DVB filters.
+ * @feednum:            maximum amount of DVB feeds.
+ * @start_feed:         callback routine to be called in order to start
+ *                      a DVB feed.
+ * @stop_feed:          callback routine to be called in order to stop
+ *                      a DVB feed.
+ * @write_to_decoder:   callback routine to be called if the feed is TS and
+ *                      it is routed to an A/V decoder, when a new TS packet
+ *                      is received.
+ *                      Used only on av7110-av.c.
+ * @check_crc32:        callback routine to check CRC. If not initialized,
+ *                      dvb_demux will use an internal one.
+ * @memcopy:            callback routine to memcopy received data.
+ *                      If not initialized, dvb_demux will default to memcpy().
+ * @users:              counter for the number of demux opened file descriptors.
+ *                      Currently, it is limited to 10 users.
+ * @filter:             pointer to &struct dvb_demux_filter.
+ * @feed:               pointer to &struct dvb_demux_feed.
+ * @frontend_list:      &struct list_head with frontends used by the demux.
+ * @pesfilter:          array of &struct dvb_demux_feed with the PES types
+ *                      that will be filtered.
+ * @pids:               list of filtered program IDs.
+ * @feed_list:          &struct list_head with feeds.
+ * @tsbuf:              temporary buffer used internally to store TS packets.
+ * @tsbufp:             temporary buffer index used internally.
+ * @mutex:              pointer to &struct mutex used to protect feed set
+ *                      logic.
+ * @lock:               pointer to &spinlock_t, used to protect buffer handling.
+ * @cnt_storage:        buffer used for TS/TEI continuity check.
+ * @speed_last_time:    &ktime_t used for TS speed check.
+ * @speed_pkts_cnt:     packets count used for TS speed check.
+ */
+struct dvb_demux {
+        struct dmx_demux dmx;
+        void *priv;
+        int filternum;
+        int feednum;
+        int (*start_feed)(struct dvb_demux_feed *feed);
+        int (*stop_feed)(struct dvb_demux_feed *feed);
+        int (*write_to_decoder)(struct dvb_demux_feed *feed,
+                                 const u8 *buf, size_t len);
+        u32 (*check_crc32)(struct dvb_demux_feed *feed,
+                            const u8 *buf, size_t len);
+        void (*memcopy)(struct dvb_demux_feed *feed, u8 *dst,
+                         const u8 *src, size_t len);
+        int users;
+#define MAX_DVB_DEMUX_USERS 10
+        struct dvb_demux_filter *filter;
+        struct dvb_demux_feed *feed;
+        struct list_head frontend_list;
+        struct dvb_demux_feed *pesfilter[DMX_PES_OTHER];
+        u16 pids[DMX_PES_OTHER];
+#define DMX_MAX_PID 0x2000
+        struct list_head feed_list;
+        u8 tsbuf[204];
+        int tsbufp;
+        struct mutex mutex;
+        spinlock_t lock;
+        uint8_t *cnt_storage; /* for TS continuity check */
+        ktime_t speed_last_time; /* for TS speed check */
+        uint32_t speed_pkts_cnt; /* for TS speed check */
+        /* private: used only on av7110 */
+        int playing;
+        int recording;
+};
+/**
+ * dvb_dmx_init - initialize a digital TV demux struct.
+ *
+ * @demux: &struct dvb_demux to be initialized.
+ *
+ * Before being able to register a digital TV demux struct, drivers
+ * should call this routine. On its typical usage, some fields should
+ * be initialized at the driver before calling it.
+ *
+ * A typical usecase is::
+ *
+ *      dvb->demux.dmx.capabilities =
+ *              DMX_TS_FILTERING | DMX_SECTION_FILTERING |
+ *              DMX_MEMORY_BASED_FILTERING;
+ *      dvb->demux.priv       = dvb;
+ *      dvb->demux.filternum  = 256;
+ *      dvb->demux.feednum    = 256;
+ *      dvb->demux.start_feed = driver_start_feed;
+ *      dvb->demux.stop_feed  = driver_stop_feed;
+ *      ret = dvb_dmx_init(&dvb->demux);
+ *      if (ret < 0)
+ *              return ret;
+ */
+int dvb_dmx_init(struct dvb_demux *demux);
+/**
+ * dvb_dmx_release - releases a digital TV demux internal buffers.
+ *
+ * @demux: &struct dvb_demux to be released.
+ *
+ * The DVB core internally allocates data at @demux. This routine
+ * releases those data. Please notice that the struct itelf is not
+ * released, as it can be embedded on other structs.
+ */
+void dvb_dmx_release(struct dvb_demux *demux);
+/**
+ * dvb_dmx_swfilter_packets - use dvb software filter for a buffer with
+ *      multiple MPEG-TS packets with 188 bytes each.
+ *
+ * @demux: pointer to &struct dvb_demux
+ * @buf: buffer with data to be filtered
+ * @count: number of MPEG-TS packets with size of 188.
+ *
+ * The routine will discard a DVB packet that don't start with 0x47.
+ *
+ * Use this routine if the DVB demux fills MPEG-TS buffers that are
+ * already aligned.
+ *
+ * NOTE: The @buf size should have size equal to ``count * 188``.
+ */
+void dvb_dmx_swfilter_packets(struct dvb_demux *demux, const u8 *buf,
+                              size_t count);
+/**
+ * dvb_dmx_swfilter -  use dvb software filter for a buffer with
+ *      multiple MPEG-TS packets with 188 bytes each.
+ *
+ * @demux: pointer to &struct dvb_demux
+ * @buf: buffer with data to be filtered
+ * @count: number of MPEG-TS packets with size of 188.
+ *
+ * If a DVB packet doesn't start with 0x47, it will seek for the first
+ * byte that starts with 0x47.
+ *
+ * Use this routine if the DVB demux fill buffers that may not start with
+ * a packet start mark (0x47).
+ *
+ * NOTE: The @buf size should have size equal to ``count * 188``.
+ */
+void dvb_dmx_swfilter(struct dvb_demux *demux, const u8 *buf, size_t count);
+/**
+ * dvb_dmx_swfilter_204 -  use dvb software filter for a buffer with
+ *      multiple MPEG-TS packets with 204 bytes each.
+ *
+ * @demux: pointer to &struct dvb_demux
+ * @buf: buffer with data to be filtered
+ * @count: number of MPEG-TS packets with size of 204.
+ *
+ * If a DVB packet doesn't start with 0x47, it will seek for the first
+ * byte that starts with 0x47.
+ *
+ * Use this routine if the DVB demux fill buffers that may not start with
+ * a packet start mark (0x47).
+ *
+ * NOTE: The @buf size should have size equal to ``count * 204``.
+ */
+void dvb_dmx_swfilter_204(struct dvb_demux *demux, const u8 *buf,
+                          size_t count);
+/**
+ * dvb_dmx_swfilter_raw -  make the raw data available to userspace without
+ *      filtering
+ *
+ * @demux: pointer to &struct dvb_demux
+ * @buf: buffer with data
+ * @count: number of packets to be passed. The actual size of each packet
+ *      depends on the &dvb_demux->feed->cb.ts logic.
+ *
+ * Use it if the driver needs to deliver the raw payload to userspace without
+ * passing through the kernel demux. That is meant to support some
+ * delivery systems that aren't based on MPEG-TS.
+ *
+ * This function relies on &dvb_demux->feed->cb.ts to actually handle the
+ * buffer.
+ */
+void dvb_dmx_swfilter_raw(struct dvb_demux *demux, const u8 *buf,
+                          size_t count);
+#endif /* _DVB_DEMUX_H_ */
diff --git a/include/media/dvb_frontend.h b/include/media/dvb_frontend.h
new file mode 100644
index 000000000000..331c8269c00e
--- /dev/null
+++ b/include/media/dvb_frontend.h
@@ -0,0 +1,795 @@
+/*
+ * dvb_frontend.h
+ *
+ * The Digital TV Frontend kABI defines a driver-internal interface for
+ * registering low-level, hardware specific driver to a hardware independent
+ * frontend layer.
+ *
+ * Copyright (C) 2001 convergence integrated media GmbH
+ * Copyright (C) 2004 convergence GmbH
+ *
+ * Written by Ralph Metzler
+ * Overhauled by Holger Waechtler
+ * Kernel I2C stuff by Michael Hunold <hunold@convergence.de>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * 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 Lesser 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 _DVB_FRONTEND_H_
+#define _DVB_FRONTEND_H_
+#include <linux/types.h>
+#include <linux/sched.h>
+#include <linux/ioctl.h>
+#include <linux/i2c.h>
+#include <linux/module.h>
+#include <linux/errno.h>
+#include <linux/delay.h>
+#include <linux/mutex.h>
+#include <linux/slab.h>
+#include <linux/dvb/frontend.h>
+#include <media/dvbdev.h>
+/*
+ * Maximum number of Delivery systems per frontend. It
+ * should be smaller or equal to 32
+ */
+#define MAX_DELSYS      8
+/**
+ * struct dvb_frontend_tune_settings - parameters to adjust frontend tuning
+ *
+ * @min_delay_ms:       minimum delay for tuning, in ms
+ * @step_size:          step size between two consecutive frequencies
+ * @max_drift:          maximum drift
+ *
+ * NOTE: step_size is in Hz, for terrestrial/cable or kHz for satellite
+ */
+struct dvb_frontend_tune_settings {
+        int min_delay_ms;
+        int step_size;
+        int max_drift;
+};
+struct dvb_frontend;
+/**
+ * struct dvb_tuner_info - Frontend name and min/max ranges/bandwidths
+ *
+ * @name:               name of the Frontend
+ * @frequency_min:      minimal frequency supported
+ * @frequency_max:      maximum frequency supported
+ * @frequency_step:     frequency step
+ * @bandwidth_min:      minimal frontend bandwidth supported
+ * @bandwidth_max:      maximum frontend bandwidth supported
+ * @bandwidth_step:     frontend bandwidth step
+ *
+ * NOTE: frequency parameters are in Hz, for terrestrial/cable or kHz for
+ * satellite.
+ */
+struct dvb_tuner_info {
+        char name[128];
+        u32 frequency_min;
+        u32 frequency_max;
+        u32 frequency_step;
+        u32 bandwidth_min;
+        u32 bandwidth_max;
+        u32 bandwidth_step;
+};
+/**
+ * struct analog_parameters - Parameters to tune into an analog/radio channel
+ *
+ * @frequency:  Frequency used by analog TV tuner (either in 62.5 kHz step,
+ *              for TV, or 62.5 Hz for radio)
+ * @mode:       Tuner mode, as defined on enum v4l2_tuner_type
+ * @audmode:    Audio mode as defined for the rxsubchans field at videodev2.h,
+ *              e. g. V4L2_TUNER_MODE_*
+ * @std:        TV standard bitmap as defined at videodev2.h, e. g. V4L2_STD_*
+ *
+ * Hybrid tuners should be supported by both V4L2 and DVB APIs. This
+ * struct contains the data that are used by the V4L2 side. To avoid
+ * dependencies from V4L2 headers, all enums here are declared as integers.
+ */
+struct analog_parameters {
+        unsigned int frequency;
+        unsigned int mode;
+        unsigned int audmode;
+        u64 std;
+};
+/**
+ * enum dvbfe_algo - defines the algorithm used to tune into a channel
+ *
+ * @DVBFE_ALGO_HW: Hardware Algorithm -
+ *      Devices that support this algorithm do everything in hardware
+ *      and no software support is needed to handle them.
+ *      Requesting these devices to LOCK is the only thing required,
+ *      device is supposed to do everything in the hardware.
+ *
+ * @DVBFE_ALGO_SW: Software Algorithm -
+ * These are dumb devices, that require software to do everything
+ *
+ * @DVBFE_ALGO_CUSTOM: Customizable Agorithm -
+ *      Devices having this algorithm can be customized to have specific
+ *      algorithms in the frontend driver, rather than simply doing a
+ *      software zig-zag. In this case the zigzag maybe hardware assisted
+ *      or it maybe completely done in hardware. In all cases, usage of
+ *      this algorithm, in conjunction with the search and track
+ *      callbacks, utilizes the driver specific algorithm.
+ *
+ * @DVBFE_ALGO_RECOVERY: Recovery Algorithm -
+ *      These devices have AUTO recovery capabilities from LOCK failure
+ */
+enum dvbfe_algo {
+        DVBFE_ALGO_HW                   = (1 <<  0),
+        DVBFE_ALGO_SW                   = (1 <<  1),
+        DVBFE_ALGO_CUSTOM               = (1 <<  2),
+        DVBFE_ALGO_RECOVERY             = (1 << 31)
+};
+/**
+ * enum dvbfe_search - search callback possible return status
+ *
+ * @DVBFE_ALGO_SEARCH_SUCCESS:
+ *      The frontend search algorithm completed and returned successfully
+ *
+ * @DVBFE_ALGO_SEARCH_ASLEEP:
+ *      The frontend search algorithm is sleeping
+ *
+ * @DVBFE_ALGO_SEARCH_FAILED:
+ *      The frontend search for a signal failed
+ *
+ * @DVBFE_ALGO_SEARCH_INVALID:
+ *      The frontend search algorith was probably supplied with invalid
+ *      parameters and the search is an invalid one
+ *
+ * @DVBFE_ALGO_SEARCH_ERROR:
+ *      The frontend search algorithm failed due to some error
+ *
+ * @DVBFE_ALGO_SEARCH_AGAIN:
+ *      The frontend search algorithm was requested to search again
+ */
+enum dvbfe_search {
+        DVBFE_ALGO_SEARCH_SUCCESS       = (1 <<  0),
+        DVBFE_ALGO_SEARCH_ASLEEP        = (1 <<  1),
+        DVBFE_ALGO_SEARCH_FAILED        = (1 <<  2),
+        DVBFE_ALGO_SEARCH_INVALID       = (1 <<  3),
+        DVBFE_ALGO_SEARCH_AGAIN         = (1 <<  4),
+        DVBFE_ALGO_SEARCH_ERROR         = (1 << 31),
+};
+/**
+ * struct dvb_tuner_ops - Tuner information and callbacks
+ *
+ * @info:               embedded &struct dvb_tuner_info with tuner properties
+ * @release:            callback function called when frontend is detached.
+ *                      drivers should free any allocated memory.
+ * @init:               callback function used to initialize the tuner device.
+ * @sleep:              callback function used to put the tuner to sleep.
+ * @suspend:            callback function used to inform that the Kernel will
+ *                      suspend.
+ * @resume:             callback function used to inform that the Kernel is
+ *                      resuming from suspend.
+ * @set_params:         callback function used to inform the tuner to tune
+ *                      into a digital TV channel. The properties to be used
+ *                      are stored at &struct dvb_frontend.dtv_property_cache.
+ *                      The tuner demod can change the parameters to reflect
+ *                      the changes needed for the channel to be tuned, and
+ *                      update statistics. This is the recommended way to set
+ *                      the tuner parameters and should be used on newer
+ *                      drivers.
+ * @set_analog_params:  callback function used to tune into an analog TV
+ *                      channel on hybrid tuners. It passes @analog_parameters
+ *                      to the driver.
+ * @set_config:         callback function used to send some tuner-specific
+ *                      parameters.
+ * @get_frequency:      get the actual tuned frequency
+ * @get_bandwidth:      get the bandwitdh used by the low pass filters
+ * @get_if_frequency:   get the Intermediate Frequency, in Hz. For baseband,
+ *                      should return 0.
+ * @get_status:         returns the frontend lock status
+ * @get_rf_strength:    returns the RF signal strength. Used mostly to support
+ *                      analog TV and radio. Digital TV should report, instead,
+ *                      via DVBv5 API (&struct dvb_frontend.dtv_property_cache).
+ * @get_afc:            Used only by analog TV core. Reports the frequency
+ *                      drift due to AFC.
+ * @calc_regs:          callback function used to pass register data settings
+ *                      for simple tuners.  Shouldn't be used on newer drivers.
+ * @set_frequency:      Set a new frequency. Shouldn't be used on newer drivers.
+ * @set_bandwidth:      Set a new frequency. Shouldn't be used on newer drivers.
+ *
+ * NOTE: frequencies used on @get_frequency and @set_frequency are in Hz for
+ * terrestrial/cable or kHz for satellite.
+ *
+ */
+struct dvb_tuner_ops {
+        struct dvb_tuner_info info;
+        void (*release)(struct dvb_frontend *fe);
+        int (*init)(struct dvb_frontend *fe);
+        int (*sleep)(struct dvb_frontend *fe);
+        int (*suspend)(struct dvb_frontend *fe);
+        int (*resume)(struct dvb_frontend *fe);
+        /* This is the recomended way to set the tuner */
+        int (*set_params)(struct dvb_frontend *fe);
+        int (*set_analog_params)(struct dvb_frontend *fe, struct analog_parameters *p);
+        int (*set_config)(struct dvb_frontend *fe, void *priv_cfg);
+        int (*get_frequency)(struct dvb_frontend *fe, u32 *frequency);
+        int (*get_bandwidth)(struct dvb_frontend *fe, u32 *bandwidth);
+        int (*get_if_frequency)(struct dvb_frontend *fe, u32 *frequency);
+#define TUNER_STATUS_LOCKED 1
+#define TUNER_STATUS_STEREO 2
+        int (*get_status)(struct dvb_frontend *fe, u32 *status);
+        int (*get_rf_strength)(struct dvb_frontend *fe, u16 *strength);
+        int (*get_afc)(struct dvb_frontend *fe, s32 *afc);
+        /*
+         * This is support for demods like the mt352 - fills out the supplied
+         * buffer with what to write.
+         *
+         * Don't use on newer drivers.
+         */
+        int (*calc_regs)(struct dvb_frontend *fe, u8 *buf, int buf_len);
+        /*
+         * These are provided separately from set_params in order to
+         * facilitate silicon tuners which require sophisticated tuning loops,
+         * controlling each parameter separately.
+         *
+         * Don't use on newer drivers.
+         */
+        int (*set_frequency)(struct dvb_frontend *fe, u32 frequency);
+        int (*set_bandwidth)(struct dvb_frontend *fe, u32 bandwidth);
+};
+/**
+ * struct analog_demod_info - Information struct for analog TV part of the demod
+ *
+ * @name:       Name of the analog TV demodulator
+ */
+struct analog_demod_info {
+        char *name;
+};
+/**
+ * struct analog_demod_ops  - Demodulation information and callbacks for
+ *                            analog TV and radio
+ *
+ * @info:               pointer to struct analog_demod_info
+ * @set_params:         callback function used to inform the demod to set the
+ *                      demodulator parameters needed to decode an analog or
+ *                      radio channel. The properties are passed via
+ *                      &struct analog_params.
+ * @has_signal:         returns 0xffff if has signal, or 0 if it doesn't.
+ * @get_afc:            Used only by analog TV core. Reports the frequency
+ *                      drift due to AFC.
+ * @tuner_status:       callback function that returns tuner status bits, e. g.
+ *                      %TUNER_STATUS_LOCKED and %TUNER_STATUS_STEREO.
+ * @standby:            set the tuner to standby mode.
+ * @release:            callback function called when frontend is detached.
+ *                      drivers should free any allocated memory.
+ * @i2c_gate_ctrl:      controls the I2C gate. Newer drivers should use I2C
+ *                      mux support instead.
+ * @set_config:         callback function used to send some tuner-specific
+ *                      parameters.
+ */
+struct analog_demod_ops {
+        struct analog_demod_info info;
+        void (*set_params)(struct dvb_frontend *fe,
+                           struct analog_parameters *params);
+        int  (*has_signal)(struct dvb_frontend *fe, u16 *signal);
+        int  (*get_afc)(struct dvb_frontend *fe, s32 *afc);
+        void (*tuner_status)(struct dvb_frontend *fe);
+        void (*standby)(struct dvb_frontend *fe);
+        void (*release)(struct dvb_frontend *fe);
+        int  (*i2c_gate_ctrl)(struct dvb_frontend *fe, int enable);
+        /** This is to allow setting tuner-specific configuration */
+        int (*set_config)(struct dvb_frontend *fe, void *priv_cfg);
+};
+struct dtv_frontend_properties;
+/**
+ * struct dvb_frontend_ops - Demodulation information and callbacks for
+ *                            ditialt TV
+ *
+ * @info:               embedded &struct dvb_tuner_info with tuner properties
+ * @delsys:             Delivery systems supported by the frontend
+ * @detach:             callback function called when frontend is detached.
+ *                      drivers should clean up, but not yet free the &struct
+ *                      dvb_frontend allocation.
+ * @release:            callback function called when frontend is ready to be
+ *                      freed.
+ *                      drivers should free any allocated memory.
+ * @release_sec:        callback function requesting that the Satelite Equipment
+ *                      Control (SEC) driver to release and free any memory
+ *                      allocated by the driver.
+ * @init:               callback function used to initialize the tuner device.
+ * @sleep:              callback function used to put the tuner to sleep.
+ * @write:              callback function used by some demod legacy drivers to
+ *                      allow other drivers to write data into their registers.
+ *                      Should not be used on new drivers.
+ * @tune:               callback function used by demod drivers that use
+ *                      @DVBFE_ALGO_HW to tune into a frequency.
+ * @get_frontend_algo:  returns the desired hardware algorithm.
+ * @set_frontend:       callback function used to inform the demod to set the
+ *                      parameters for demodulating a digital TV channel.
+ *                      The properties to be used are stored at &struct
+ *                      dvb_frontend.dtv_property_cache. The demod can change
+ *                      the parameters to reflect the changes needed for the
+ *                      channel to be decoded, and update statistics.
+ * @get_tune_settings:  callback function
+ * @get_frontend:       callback function used to inform the parameters
+ *                      actuall in use. The properties to be used are stored at
+ *                      &struct dvb_frontend.dtv_property_cache and update
+ *                      statistics. Please notice that it should not return
+ *                      an error code if the statistics are not available
+ *                      because the demog is not locked.
+ * @read_status:        returns the locking status of the frontend.
+ * @read_ber:           legacy callback function to return the bit error rate.
+ *                      Newer drivers should provide such info via DVBv5 API,
+ *                      e. g. @set_frontend;/@get_frontend, implementing this
+ *                      callback only if DVBv3 API compatibility is wanted.
+ * @read_signal_strength: legacy callback function to return the signal
+ *                      strength. Newer drivers should provide such info via
+ *                      DVBv5 API, e. g. @set_frontend/@get_frontend,
+ *                      implementing this callback only if DVBv3 API
+ *                      compatibility is wanted.
+ * @read_snr:           legacy callback function to return the Signal/Noise
+ *                      rate. Newer drivers should provide such info via
+ *                      DVBv5 API, e. g. @set_frontend/@get_frontend,
+ *                      implementing this callback only if DVBv3 API
+ *                      compatibility is wanted.
+ * @read_ucblocks:      legacy callback function to return the Uncorrected Error
+ *                      Blocks. Newer drivers should provide such info via
+ *                      DVBv5 API, e. g. @set_frontend/@get_frontend,
+ *                      implementing this callback only if DVBv3 API
+ *                      compatibility is wanted.
+ * @diseqc_reset_overload: callback function to implement the
+ *                      FE_DISEQC_RESET_OVERLOAD() ioctl (only Satellite)
+ * @diseqc_send_master_cmd: callback function to implement the
+ *                      FE_DISEQC_SEND_MASTER_CMD() ioctl (only Satellite).
+ * @diseqc_recv_slave_reply: callback function to implement the
+ *                      FE_DISEQC_RECV_SLAVE_REPLY() ioctl (only Satellite)
+ * @diseqc_send_burst:  callback function to implement the
+ *                      FE_DISEQC_SEND_BURST() ioctl (only Satellite).
+ * @set_tone:           callback function to implement the
+ *                      FE_SET_TONE() ioctl (only Satellite).
+ * @set_voltage:        callback function to implement the
+ *                      FE_SET_VOLTAGE() ioctl (only Satellite).
+ * @enable_high_lnb_voltage: callback function to implement the
+ *                      FE_ENABLE_HIGH_LNB_VOLTAGE() ioctl (only Satellite).
+ * @dishnetwork_send_legacy_command: callback function to implement the
+ *                      FE_DISHNETWORK_SEND_LEGACY_CMD() ioctl (only Satellite).
+ *                      Drivers should not use this, except when the DVB
+ *                      core emulation fails to provide proper support (e.g.
+ *                      if @set_voltage takes more than 8ms to work), and
+ *                      when backward compatibility with this legacy API is
+ *                      required.
+ * @i2c_gate_ctrl:      controls the I2C gate. Newer drivers should use I2C
+ *                      mux support instead.
+ * @ts_bus_ctrl:        callback function used to take control of the TS bus.
+ * @set_lna:            callback function to power on/off/auto the LNA.
+ * @search:             callback function used on some custom algo search algos.
+ * @tuner_ops:          pointer to &struct dvb_tuner_ops
+ * @analog_ops:         pointer to &struct analog_demod_ops
+ */
+struct dvb_frontend_ops {
+        struct dvb_frontend_info info;
+        u8 delsys[MAX_DELSYS];
+        void (*detach)(struct dvb_frontend *fe);
+        void (*release)(struct dvb_frontend* fe);
+        void (*release_sec)(struct dvb_frontend* fe);
+        int (*init)(struct dvb_frontend* fe);
+        int (*sleep)(struct dvb_frontend* fe);
+        int (*write)(struct dvb_frontend* fe, const u8 buf[], int len);
+        /* if this is set, it overrides the default swzigzag */
+        int (*tune)(struct dvb_frontend* fe,
+                    bool re_tune,
+                    unsigned int mode_flags,
+                    unsigned int *delay,
+                    enum fe_status *status);
+        /* get frontend tuning algorithm from the module */
+        enum dvbfe_algo (*get_frontend_algo)(struct dvb_frontend *fe);
+        /* these two are only used for the swzigzag code */
+        int (*set_frontend)(struct dvb_frontend *fe);
+        int (*get_tune_settings)(struct dvb_frontend* fe, struct dvb_frontend_tune_settings* settings);
+        int (*get_frontend)(struct dvb_frontend *fe,
+                            struct dtv_frontend_properties *props);
+        int (*read_status)(struct dvb_frontend *fe, enum fe_status *status);
+        int (*read_ber)(struct dvb_frontend* fe, u32* ber);
+        int (*read_signal_strength)(struct dvb_frontend* fe, u16* strength);
+        int (*read_snr)(struct dvb_frontend* fe, u16* snr);
+        int (*read_ucblocks)(struct dvb_frontend* fe, u32* ucblocks);
+        int (*diseqc_reset_overload)(struct dvb_frontend* fe);
+        int (*diseqc_send_master_cmd)(struct dvb_frontend* fe, struct dvb_diseqc_master_cmd* cmd);
+        int (*diseqc_recv_slave_reply)(struct dvb_frontend* fe, struct dvb_diseqc_slave_reply* reply);
+        int (*diseqc_send_burst)(struct dvb_frontend *fe,
+                                 enum fe_sec_mini_cmd minicmd);
+        int (*set_tone)(struct dvb_frontend *fe, enum fe_sec_tone_mode tone);
+        int (*set_voltage)(struct dvb_frontend *fe,
+                           enum fe_sec_voltage voltage);
+        int (*enable_high_lnb_voltage)(struct dvb_frontend* fe, long arg);
+        int (*dishnetwork_send_legacy_command)(struct dvb_frontend* fe, unsigned long cmd);
+        int (*i2c_gate_ctrl)(struct dvb_frontend* fe, int enable);
+        int (*ts_bus_ctrl)(struct dvb_frontend* fe, int acquire);
+        int (*set_lna)(struct dvb_frontend *);
+        /*
+         * These callbacks are for devices that implement their own
+         * tuning algorithms, rather than a simple swzigzag
+         */
+        enum dvbfe_search (*search)(struct dvb_frontend *fe);
+        struct dvb_tuner_ops tuner_ops;
+        struct analog_demod_ops analog_ops;
+};
+#ifdef __DVB_CORE__
+#define MAX_EVENT 8
+/* Used only internally at dvb_frontend.c */
+struct dvb_fe_events {
+        struct dvb_frontend_event events[MAX_EVENT];
+        int                       eventw;
+        int                       eventr;
+        int                       overflow;
+        wait_queue_head_t         wait_queue;
+        struct mutex              mtx;
+};
+#endif
+/**
+ * struct dtv_frontend_properties - contains a list of properties that are
+ *                                  specific to a digital TV standard.
+ *
+ * @frequency:          frequency in Hz for terrestrial/cable or in kHz for
+ *                      Satellite
+ * @modulation:         Frontend modulation type
+ * @voltage:            SEC voltage (only Satellite)
+ * @sectone:            SEC tone mode (only Satellite)
+ * @inversion:          Spectral inversion
+ * @fec_inner:          Forward error correction inner Code Rate
+ * @transmission_mode:  Transmission Mode
+ * @bandwidth_hz:       Bandwidth, in Hz. A zero value means that userspace
+ *                      wants to autodetect.
+ * @guard_interval:     Guard Interval
+ * @hierarchy:          Hierarchy
+ * @symbol_rate:        Symbol Rate
+ * @code_rate_HP:       high priority stream code rate
+ * @code_rate_LP:       low priority stream code rate
+ * @pilot:              Enable/disable/autodetect pilot tones
+ * @rolloff:            Rolloff factor (alpha)
+ * @delivery_system:    FE delivery system (e. g. digital TV standard)
+ * @interleaving:       interleaving
+ * @isdbt_partial_reception: ISDB-T partial reception (only ISDB standard)
+ * @isdbt_sb_mode:      ISDB-T Sound Broadcast (SB) mode (only ISDB standard)
+ * @isdbt_sb_subchannel:        ISDB-T SB subchannel (only ISDB standard)
+ * @isdbt_sb_segment_idx:       ISDB-T SB segment index (only ISDB standard)
+ * @isdbt_sb_segment_count:     ISDB-T SB segment count (only ISDB standard)
+ * @isdbt_layer_enabled:        ISDB Layer enabled (only ISDB standard)
+ * @layer:              ISDB per-layer data (only ISDB standard)
+ * @layer.segment_count: Segment Count;
+ * @layer.fec:          per layer code rate;
+ * @layer.modulation:   per layer modulation;
+ * @layer.interleaving:  per layer interleaving.
+ * @stream_id:          If different than zero, enable substream filtering, if
+ *                      hardware supports (DVB-S2 and DVB-T2).
+ * @scrambling_sequence_index:  Carries the index of the DVB-S2 physical layer
+ *                              scrambling sequence.
+ * @atscmh_fic_ver:     Version number of the FIC (Fast Information Channel)
+ *                      signaling data (only ATSC-M/H)
+ * @atscmh_parade_id:   Parade identification number (only ATSC-M/H)
+ * @atscmh_nog:         Number of MH groups per MH subframe for a designated
+ *                      parade (only ATSC-M/H)
+ * @atscmh_tnog:        Total number of MH groups including all MH groups
+ *                      belonging to all MH parades in one MH subframe
+ *                      (only ATSC-M/H)
+ * @atscmh_sgn:         Start group number (only ATSC-M/H)
+ * @atscmh_prc:         Parade repetition cycle (only ATSC-M/H)
+ * @atscmh_rs_frame_mode:       Reed Solomon (RS) frame mode (only ATSC-M/H)
+ * @atscmh_rs_frame_ensemble:   RS frame ensemble (only ATSC-M/H)
+ * @atscmh_rs_code_mode_pri:    RS code mode pri (only ATSC-M/H)
+ * @atscmh_rs_code_mode_sec:    RS code mode sec (only ATSC-M/H)
+ * @atscmh_sccc_block_mode:     Series Concatenated Convolutional Code (SCCC)
+ *                              Block Mode (only ATSC-M/H)
+ * @atscmh_sccc_code_mode_a:    SCCC code mode A (only ATSC-M/H)
+ * @atscmh_sccc_code_mode_b:    SCCC code mode B (only ATSC-M/H)
+ * @atscmh_sccc_code_mode_c:    SCCC code mode C (only ATSC-M/H)
+ * @atscmh_sccc_code_mode_d:    SCCC code mode D (only ATSC-M/H)
+ * @lna:                Power ON/OFF/AUTO the Linear Now-noise Amplifier (LNA)
+ * @strength:           DVBv5 API statistics: Signal Strength
+ * @cnr:                DVBv5 API statistics: Signal to Noise ratio of the
+ *                      (main) carrier
+ * @pre_bit_error:      DVBv5 API statistics: pre-Viterbi bit error count
+ * @pre_bit_count:      DVBv5 API statistics: pre-Viterbi bit count
+ * @post_bit_error:     DVBv5 API statistics: post-Viterbi bit error count
+ * @post_bit_count:     DVBv5 API statistics: post-Viterbi bit count
+ * @block_error:        DVBv5 API statistics: block error count
+ * @block_count:        DVBv5 API statistics: block count
+ *
+ * NOTE: derivated statistics like Uncorrected Error blocks (UCE) are
+ * calculated on userspace.
+ *
+ * Only a subset of the properties are needed for a given delivery system.
+ * For more info, consult the media_api.html with the documentation of the
+ * Userspace API.
+ */
+struct dtv_frontend_properties {
+        u32                     frequency;
+        enum fe_modulation      modulation;
+        enum fe_sec_voltage     voltage;
+        enum fe_sec_tone_mode   sectone;
+        enum fe_spectral_inversion inversion;
+        enum fe_code_rate       fec_inner;
+        enum fe_transmit_mode   transmission_mode;
+        u32                     bandwidth_hz;   /* 0 = AUTO */
+        enum fe_guard_interval  guard_interval;
+        enum fe_hierarchy       hierarchy;
+        u32                     symbol_rate;
+        enum fe_code_rate       code_rate_HP;
+        enum fe_code_rate       code_rate_LP;
+        enum fe_pilot           pilot;
+        enum fe_rolloff         rolloff;
+        enum fe_delivery_system delivery_system;
+        enum fe_interleaving    interleaving;
+        /* ISDB-T specifics */
+        u8                      isdbt_partial_reception;
+        u8                      isdbt_sb_mode;
+        u8                      isdbt_sb_subchannel;
+        u32                     isdbt_sb_segment_idx;
+        u32                     isdbt_sb_segment_count;
+        u8                      isdbt_layer_enabled;
+        struct {
+            u8                  segment_count;
+            enum fe_code_rate   fec;
+            enum fe_modulation  modulation;
+            u8                  interleaving;
+        } layer[3];
+        /* Multistream specifics */
+        u32                     stream_id;
+        /* Physical Layer Scrambling specifics */
+        u32                     scrambling_sequence_index;
+        /* ATSC-MH specifics */
+        u8                      atscmh_fic_ver;
+        u8                      atscmh_parade_id;
+        u8                      atscmh_nog;
+        u8                      atscmh_tnog;
+        u8                      atscmh_sgn;
+        u8                      atscmh_prc;
+        u8                      atscmh_rs_frame_mode;
+        u8                      atscmh_rs_frame_ensemble;
+        u8                      atscmh_rs_code_mode_pri;
+        u8                      atscmh_rs_code_mode_sec;
+        u8                      atscmh_sccc_block_mode;
+        u8                      atscmh_sccc_code_mode_a;
+        u8                      atscmh_sccc_code_mode_b;
+        u8                      atscmh_sccc_code_mode_c;
+        u8                      atscmh_sccc_code_mode_d;
+        u32                     lna;
+        /* statistics data */
+        struct dtv_fe_stats     strength;
+        struct dtv_fe_stats     cnr;
+        struct dtv_fe_stats     pre_bit_error;
+        struct dtv_fe_stats     pre_bit_count;
+        struct dtv_fe_stats     post_bit_error;
+        struct dtv_fe_stats     post_bit_count;
+        struct dtv_fe_stats     block_error;
+        struct dtv_fe_stats     block_count;
+};
+#define DVB_FE_NO_EXIT  0
+#define DVB_FE_NORMAL_EXIT      1
+#define DVB_FE_DEVICE_REMOVED   2
+#define DVB_FE_DEVICE_RESUME    3
+/**
+ * struct dvb_frontend - Frontend structure to be used on drivers.
+ *
+ * @refcount:           refcount to keep track of &struct dvb_frontend
+ *                      references
+ * @ops:                embedded &struct dvb_frontend_ops
+ * @dvb:                pointer to &struct dvb_adapter
+ * @demodulator_priv:   demod private data
+ * @tuner_priv:         tuner private data
+ * @frontend_priv:      frontend private data
+ * @sec_priv:           SEC private data
+ * @analog_demod_priv:  Analog demod private data
+ * @dtv_property_cache: embedded &struct dtv_frontend_properties
+ * @callback:           callback function used on some drivers to call
+ *                      either the tuner or the demodulator.
+ * @id:                 Frontend ID
+ * @exit:               Used to inform the DVB core that the frontend
+ *                      thread should exit (usually, means that the hardware
+ *                      got disconnected.
+ */
+struct dvb_frontend {
+        struct kref refcount;
+        struct dvb_frontend_ops ops;
+        struct dvb_adapter *dvb;
+        void *demodulator_priv;
+        void *tuner_priv;
+        void *frontend_priv;
+        void *sec_priv;
+        void *analog_demod_priv;
+        struct dtv_frontend_properties dtv_property_cache;
+#define DVB_FRONTEND_COMPONENT_TUNER 0
+#define DVB_FRONTEND_COMPONENT_DEMOD 1
+        int (*callback)(void *adapter_priv, int component, int cmd, int arg);
+        int id;
+        unsigned int exit;
+};
+/**
+ * dvb_register_frontend() - Registers a DVB frontend at the adapter
+ *
+ * @dvb: pointer to &struct dvb_adapter
+ * @fe: pointer to &struct dvb_frontend
+ *
+ * Allocate and initialize the private data needed by the frontend core to
+ * manage the frontend and calls dvb_register_device() to register a new
+ * frontend. It also cleans the property cache that stores the frontend
+ * parameters and selects the first available delivery system.
+ */
+int dvb_register_frontend(struct dvb_adapter *dvb,
+                                 struct dvb_frontend *fe);
+/**
+ * dvb_unregister_frontend() - Unregisters a DVB frontend
+ *
+ * @fe: pointer to &struct dvb_frontend
+ *
+ * Stops the frontend kthread, calls dvb_unregister_device() and frees the
+ * private frontend data allocated by dvb_register_frontend().
+ *
+ * NOTE: This function doesn't frees the memory allocated by the demod,
+ * by the SEC driver and by the tuner. In order to free it, an explicit call to
+ * dvb_frontend_detach() is needed, after calling this function.
+ */
+int dvb_unregister_frontend(struct dvb_frontend *fe);
+/**
+ * dvb_frontend_detach() - Detaches and frees frontend specific data
+ *
+ * @fe: pointer to &struct dvb_frontend
+ *
+ * This function should be called after dvb_unregister_frontend(). It
+ * calls the SEC, tuner and demod release functions:
+ * &dvb_frontend_ops.release_sec, &dvb_frontend_ops.tuner_ops.release,
+ * &dvb_frontend_ops.analog_ops.release and &dvb_frontend_ops.release.
+ *
+ * If the driver is compiled with %CONFIG_MEDIA_ATTACH, it also decreases
+ * the module reference count, needed to allow userspace to remove the
+ * previously used DVB frontend modules.
+ */
+void dvb_frontend_detach(struct dvb_frontend *fe);
+/**
+ * dvb_frontend_suspend() - Suspends a Digital TV frontend
+ *
+ * @fe: pointer to &struct dvb_frontend
+ *
+ * This function prepares a Digital TV frontend to suspend.
+ *
+ * In order to prepare the tuner to suspend, if
+ * &dvb_frontend_ops.tuner_ops.suspend\(\) is available, it calls it. Otherwise,
+ * it will call &dvb_frontend_ops.tuner_ops.sleep\(\), if available.
+ *
+ * It will also call &dvb_frontend_ops.sleep\(\) to put the demod to suspend.
+ *
+ * The drivers should also call dvb_frontend_suspend\(\) as part of their
+ * handler for the &device_driver.suspend\(\).
+ */
+int dvb_frontend_suspend(struct dvb_frontend *fe);
+/**
+ * dvb_frontend_resume() - Resumes a Digital TV frontend
+ *
+ * @fe: pointer to &struct dvb_frontend
+ *
+ * This function resumes the usual operation of the tuner after resume.
+ *
+ * In order to resume the frontend, it calls the demod &dvb_frontend_ops.init\(\).
+ *
+ * If &dvb_frontend_ops.tuner_ops.resume\(\) is available, It, it calls it.
+ * Otherwise,t will call &dvb_frontend_ops.tuner_ops.init\(\), if available.
+ *
+ * Once tuner and demods are resumed, it will enforce that the SEC voltage and
+ * tone are restored to their previous values and wake up the frontend's
+ * kthread in order to retune the frontend.
+ *
+ * The drivers should also call dvb_frontend_resume() as part of their
+ * handler for the &device_driver.resume\(\).
+ */
+int dvb_frontend_resume(struct dvb_frontend *fe);
+/**
+ * dvb_frontend_reinitialise() - forces a reinitialisation at the frontend
+ *
+ * @fe: pointer to &struct dvb_frontend
+ *
+ * Calls &dvb_frontend_ops.init\(\) and &dvb_frontend_ops.tuner_ops.init\(\),
+ * and resets SEC tone and voltage (for Satellite systems).
+ *
+ * NOTE: Currently, this function is used only by one driver (budget-av).
+ * It seems to be due to address some special issue with that specific
+ * frontend.
+ */
+void dvb_frontend_reinitialise(struct dvb_frontend *fe);
+/**
+ * dvb_frontend_sleep_until() - Sleep for the amount of time given by
+ *                      add_usec parameter
+ *
+ * @waketime: pointer to &struct ktime_t
+ * @add_usec: time to sleep, in microseconds
+ *
+ * This function is used to measure the time required for the
+ * FE_DISHNETWORK_SEND_LEGACY_CMD() ioctl to work. It needs to be as precise
+ * as possible, as it affects the detection of the dish tone command at the
+ * satellite subsystem.
+ *
+ * Its used internally by the DVB frontend core, in order to emulate
+ * FE_DISHNETWORK_SEND_LEGACY_CMD() using the &dvb_frontend_ops.set_voltage\(\)
+ * callback.
+ *
+ * NOTE: it should not be used at the drivers, as the emulation for the
+ * legacy callback is provided by the Kernel. The only situation where this
+ * should be at the drivers is when there are some bugs at the hardware that
+ * would prevent the core emulation to work. On such cases, the driver would
+ * be writing a &dvb_frontend_ops.dishnetwork_send_legacy_command\(\) and
+ * calling this function directly.
+ */
+void dvb_frontend_sleep_until(ktime_t *waketime, u32 add_usec);
+#endif
diff --git a/include/media/dvb_math.h b/include/media/dvb_math.h
new file mode 100644
index 000000000000..8690ec42954d
--- /dev/null
+++ b/include/media/dvb_math.h
@@ -0,0 +1,66 @@
+/*
+ * dvb-math provides some complex fixed-point math
+ * operations shared between the dvb related stuff
+ *
+ * Copyright (C) 2006 Christoph Pfister (christophpfister@gmail.com)
+ *
+ * This library is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 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 Lesser General Public License for more details.
+ */
+#ifndef __DVB_MATH_H
+#define __DVB_MATH_H
+#include <linux/types.h>
+/**
+ * intlog2 - computes log2 of a value; the result is shifted left by 24 bits
+ *
+ * @value: The value (must be != 0)
+ *
+ * to use rational values you can use the following method:
+ *
+ *   intlog2(value) = intlog2(value * 2^x) - x * 2^24
+ *
+ * Some usecase examples:
+ *
+ *      intlog2(8) will give 3 << 24 = 3 * 2^24
+ *
+ *      intlog2(9) will give 3 << 24 + ... = 3.16... * 2^24
+ *
+ *      intlog2(1.5) = intlog2(3) - 2^24 = 0.584... * 2^24
+ *
+ *
+ * return: log2(value) * 2^24
+ */
+extern unsigned int intlog2(u32 value);
+/**
+ * intlog10 - computes log10 of a value; the result is shifted left by 24 bits
+ *
+ * @value: The value (must be != 0)
+ *
+ * to use rational values you can use the following method:
+ *
+ *   intlog10(value) = intlog10(value * 10^x) - x * 2^24
+ *
+ * An usecase example:
+ *
+ *      intlog10(1000) will give 3 << 24 = 3 * 2^24
+ *
+ *   due to the implementation intlog10(1000) might be not exactly 3 * 2^24
+ *
+ * look at intlog2 for similar examples
+ *
+ * return: log10(value) * 2^24
+ */
+extern unsigned int intlog10(u32 value);
+#endif
diff --git a/include/media/dvb_net.h b/include/media/dvb_net.h
new file mode 100644
index 000000000000..5e31d37f25fa
--- /dev/null
+++ b/include/media/dvb_net.h
@@ -0,0 +1,93 @@
+/*
+ * dvb_net.h
+ *
+ * Copyright (C) 2001 Ralph Metzler for convergence integrated media GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * 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.
+ *
+ */
+#ifndef _DVB_NET_H_
+#define _DVB_NET_H_
+#include <linux/module.h>
+#include <linux/netdevice.h>
+#include <linux/inetdevice.h>
+#include <linux/etherdevice.h>
+#include <linux/skbuff.h>
+#include <media/dvbdev.h>
+#define DVB_NET_DEVICES_MAX 10
+#ifdef CONFIG_DVB_NET
+/**
+ * struct dvb_net - describes a DVB network interface
+ *
+ * @dvbdev:             pointer to &struct dvb_device.
+ * @device:             array of pointers to &struct net_device.
+ * @state:              array of integers to each net device. A value
+ *                      different than zero means that the interface is
+ *                      in usage.
+ * @exit:               flag to indicate when the device is being removed.
+ * @demux:              pointer to &struct dmx_demux.
+ * @ioctl_mutex:        protect access to this struct.
+ *
+ * Currently, the core supports up to %DVB_NET_DEVICES_MAX (10) network
+ * devices.
+ */
+struct dvb_net {
+        struct dvb_device *dvbdev;
+        struct net_device *device[DVB_NET_DEVICES_MAX];
+        int state[DVB_NET_DEVICES_MAX];
+        unsigned int exit:1;
+        struct dmx_demux *demux;
+        struct mutex ioctl_mutex;
+};
+/**
+ * dvb_net_init - nitializes a digital TV network device and registers it.
+ *
+ * @adap:       pointer to &struct dvb_adapter.
+ * @dvbnet:     pointer to &struct dvb_net.
+ * @dmxdemux:   pointer to &struct dmx_demux.
+ */
+int dvb_net_init(struct dvb_adapter *adap, struct dvb_net *dvbnet,
+                  struct dmx_demux *dmxdemux);
+/**
+ * dvb_net_release - releases a digital TV network device and unregisters it.
+ *
+ * @dvbnet:     pointer to &struct dvb_net.
+ */
+void dvb_net_release(struct dvb_net *dvbnet);
+#else
+struct dvb_net {
+        struct dvb_device *dvbdev;
+};
+static inline void dvb_net_release(struct dvb_net *dvbnet)
+{
+}
+static inline int dvb_net_init(struct dvb_adapter *adap,
+                               struct dvb_net *dvbnet, struct dmx_demux *dmx)
+{
+        return 0;
+}
+#endif /* ifdef CONFIG_DVB_NET */
+#endif
diff --git a/include/media/dvb_ringbuffer.h b/include/media/dvb_ringbuffer.h
new file mode 100644
index 000000000000..8ed6bcc3a56e
--- /dev/null
+++ b/include/media/dvb_ringbuffer.h
@@ -0,0 +1,280 @@
+/*
+ *
+ * dvb_ringbuffer.h: ring buffer implementation for the dvb driver
+ *
+ * Copyright (C) 2003 Oliver Endriss
+ * Copyright (C) 2004 Andrew de Quincey
+ *
+ * based on code originally found in av7110.c & dvb_ci.c:
+ * Copyright (C) 1999-2003 Ralph Metzler & Marcus Metzler
+ *                         for convergence integrated media GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * 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 Lesser General Public License for more details.
+ */
+#ifndef _DVB_RINGBUFFER_H_
+#define _DVB_RINGBUFFER_H_
+#include <linux/spinlock.h>
+#include <linux/wait.h>
+/**
+ * struct dvb_ringbuffer - Describes a ring buffer used at DVB framework
+ *
+ * @data: Area were the ringbuffer data is written
+ * @size: size of the ringbuffer
+ * @pread: next position to read
+ * @pwrite: next position to write
+ * @error: used by ringbuffer clients to indicate that an error happened.
+ * @queue: Wait queue used by ringbuffer clients to indicate when buffer
+ *         was filled
+ * @lock: Spinlock used to protect the ringbuffer
+ */
+struct dvb_ringbuffer {
+        u8               *data;
+        ssize_t           size;
+        ssize_t           pread;
+        ssize_t           pwrite;
+        int               error;
+        wait_queue_head_t queue;
+        spinlock_t        lock;
+};
+#define DVB_RINGBUFFER_PKTHDRSIZE 3
+/**
+ * dvb_ringbuffer_init - initialize ring buffer, lock and queue
+ *
+ * @rbuf: pointer to struct dvb_ringbuffer
+ * @data: pointer to the buffer where the data will be stored
+ * @len: bytes from ring buffer into @buf
+ */
+extern void dvb_ringbuffer_init(struct dvb_ringbuffer *rbuf, void *data,
+                                size_t len);
+/**
+ * dvb_ringbuffer_empty - test whether buffer is empty
+ *
+ * @rbuf: pointer to struct dvb_ringbuffer
+ */
+extern int dvb_ringbuffer_empty(struct dvb_ringbuffer *rbuf);
+/**
+ * dvb_ringbuffer_free - returns the number of free bytes in the buffer
+ *
+ * @rbuf: pointer to struct dvb_ringbuffer
+ *
+ * Return: number of free bytes in the buffer
+ */
+extern ssize_t dvb_ringbuffer_free(struct dvb_ringbuffer *rbuf);
+/**
+ * dvb_ringbuffer_avail - returns the number of bytes waiting in the buffer
+ *
+ * @rbuf: pointer to struct dvb_ringbuffer
+ *
+ * Return: number of bytes waiting in the buffer
+ */
+extern ssize_t dvb_ringbuffer_avail(struct dvb_ringbuffer *rbuf);
+/**
+ * dvb_ringbuffer_reset - resets the ringbuffer to initial state
+ *
+ * @rbuf: pointer to struct dvb_ringbuffer
+ *
+ * Resets the read and write pointers to zero and flush the buffer.
+ *
+ * This counts as a read and write operation
+ */
+extern void dvb_ringbuffer_reset(struct dvb_ringbuffer *rbuf);
+/*
+ * read routines & macros
+ */
+/**
+ * dvb_ringbuffer_flush - flush buffer
+ *
+ * @rbuf: pointer to struct dvb_ringbuffer
+ */
+extern void dvb_ringbuffer_flush(struct dvb_ringbuffer *rbuf);
+/**
+ * dvb_ringbuffer_flush_spinlock_wakeup- flush buffer protected by spinlock
+ *      and wake-up waiting task(s)
+ *
+ * @rbuf: pointer to struct dvb_ringbuffer
+ */
+extern void dvb_ringbuffer_flush_spinlock_wakeup(struct dvb_ringbuffer *rbuf);
+/**
+ * DVB_RINGBUFFER_PEEK - peek at byte @offs in the buffer
+ *
+ * @rbuf: pointer to struct dvb_ringbuffer
+ * @offs: offset inside the ringbuffer
+ */
+#define DVB_RINGBUFFER_PEEK(rbuf, offs) \
+                        ((rbuf)->data[((rbuf)->pread + (offs)) % (rbuf)->size])
+/**
+ * DVB_RINGBUFFER_SKIP - advance read ptr by @num bytes
+ *
+ * @rbuf: pointer to struct dvb_ringbuffer
+ * @num: number of bytes to advance
+ */
+#define DVB_RINGBUFFER_SKIP(rbuf, num)  {\
+                        (rbuf)->pread = ((rbuf)->pread + (num)) % (rbuf)->size;\
+}
+/**
+ * dvb_ringbuffer_read_user - Reads a buffer into a user pointer
+ *
+ * @rbuf: pointer to struct dvb_ringbuffer
+ * @buf: pointer to the buffer where the data will be stored
+ * @len: bytes from ring buffer into @buf
+ *
+ * This variant assumes that the buffer is a memory at the userspace. So,
+ * it will internally call copy_to_user().
+ *
+ * Return: number of bytes transferred or -EFAULT
+ */
+extern ssize_t dvb_ringbuffer_read_user(struct dvb_ringbuffer *rbuf,
+                                   u8 __user *buf, size_t len);
+/**
+ * dvb_ringbuffer_read - Reads a buffer into a pointer
+ *
+ * @rbuf: pointer to struct dvb_ringbuffer
+ * @buf: pointer to the buffer where the data will be stored
+ * @len: bytes from ring buffer into @buf
+ *
+ * This variant assumes that the buffer is a memory at the Kernel space
+ *
+ * Return: number of bytes transferred or -EFAULT
+ */
+extern void dvb_ringbuffer_read(struct dvb_ringbuffer *rbuf,
+                                   u8 *buf, size_t len);
+/*
+ * write routines & macros
+ */
+/**
+ * DVB_RINGBUFFER_WRITE_BYTE - write single byte to ring buffer
+ *
+ * @rbuf: pointer to struct dvb_ringbuffer
+ * @byte: byte to write
+ */
+#define DVB_RINGBUFFER_WRITE_BYTE(rbuf, byte)   \
+                        { (rbuf)->data[(rbuf)->pwrite] = (byte); \
+                        (rbuf)->pwrite = ((rbuf)->pwrite + 1) % (rbuf)->size; }
+/**
+ * dvb_ringbuffer_write - Writes a buffer into the ringbuffer
+ *
+ * @rbuf: pointer to struct dvb_ringbuffer
+ * @buf: pointer to the buffer where the data will be read
+ * @len: bytes from ring buffer into @buf
+ *
+ * This variant assumes that the buffer is a memory at the Kernel space
+ *
+ * return: number of bytes transferred or -EFAULT
+ */
+extern ssize_t dvb_ringbuffer_write(struct dvb_ringbuffer *rbuf, const u8 *buf,
+                                    size_t len);
+/**
+ * dvb_ringbuffer_write_user - Writes a buffer received via a user pointer
+ *
+ * @rbuf: pointer to struct dvb_ringbuffer
+ * @buf: pointer to the buffer where the data will be read
+ * @len: bytes from ring buffer into @buf
+ *
+ * This variant assumes that the buffer is a memory at the userspace. So,
+ * it will internally call copy_from_user().
+ *
+ * Return: number of bytes transferred or -EFAULT
+ */
+extern ssize_t dvb_ringbuffer_write_user(struct dvb_ringbuffer *rbuf,
+                                         const u8 __user *buf, size_t len);
+/**
+ * dvb_ringbuffer_pkt_write - Write a packet into the ringbuffer.
+ *
+ * @rbuf: Ringbuffer to write to.
+ * @buf: Buffer to write.
+ * @len: Length of buffer (currently limited to 65535 bytes max).
+ *
+ * Return: Number of bytes written, or -EFAULT, -ENOMEM, -EVINAL.
+ */
+extern ssize_t dvb_ringbuffer_pkt_write(struct dvb_ringbuffer *rbuf, u8 *buf,
+                                        size_t len);
+/**
+ * dvb_ringbuffer_pkt_read_user - Read from a packet in the ringbuffer.
+ *
+ * @rbuf: Ringbuffer concerned.
+ * @idx: Packet index as returned by dvb_ringbuffer_pkt_next().
+ * @offset: Offset into packet to read from.
+ * @buf: Destination buffer for data.
+ * @len: Size of destination buffer.
+ *
+ * Return: Number of bytes read, or -EFAULT.
+ *
+ * .. note::
+ *
+ *    unlike dvb_ringbuffer_read(), this does **NOT** update the read pointer
+ *    in the ringbuffer. You must use dvb_ringbuffer_pkt_dispose() to mark a
+ *    packet as no longer required.
+ */
+extern ssize_t dvb_ringbuffer_pkt_read_user(struct dvb_ringbuffer *rbuf,
+                                            size_t idx,
+                                            int offset, u8 __user *buf,
+                                            size_t len);
+/**
+ * dvb_ringbuffer_pkt_read - Read from a packet in the ringbuffer.
+ * Note: unlike dvb_ringbuffer_read_user(), this DOES update the read pointer
+ * in the ringbuffer.
+ *
+ * @rbuf: Ringbuffer concerned.
+ * @idx: Packet index as returned by dvb_ringbuffer_pkt_next().
+ * @offset: Offset into packet to read from.
+ * @buf: Destination buffer for data.
+ * @len: Size of destination buffer.
+ *
+ * Return: Number of bytes read, or -EFAULT.
+ */
+extern ssize_t dvb_ringbuffer_pkt_read(struct dvb_ringbuffer *rbuf, size_t idx,
+                                       int offset, u8 *buf, size_t len);
+/**
+ * dvb_ringbuffer_pkt_dispose - Dispose of a packet in the ring buffer.
+ *
+ * @rbuf: Ring buffer concerned.
+ * @idx: Packet index as returned by dvb_ringbuffer_pkt_next().
+ */
+extern void dvb_ringbuffer_pkt_dispose(struct dvb_ringbuffer *rbuf, size_t idx);
+/**
+ * dvb_ringbuffer_pkt_next - Get the index of the next packet in a ringbuffer.
+ *
+ * @rbuf: Ringbuffer concerned.
+ * @idx: Previous packet index, or -1 to return the first packet index.
+ * @pktlen: On success, will be updated to contain the length of the packet
+ *          in bytes.
+ * returns Packet index (if >=0), or -1 if no packets available.
+ */
+extern ssize_t dvb_ringbuffer_pkt_next(struct dvb_ringbuffer *rbuf,
+                                       size_t idx, size_t *pktlen);
+#endif /* _DVB_RINGBUFFER_H_ */
diff --git a/include/media/dvb_vb2.h b/include/media/dvb_vb2.h
new file mode 100644
index 000000000000..01d1202d1a55
--- /dev/null
+++ b/include/media/dvb_vb2.h
@@ -0,0 +1,266 @@
+/*
+ * SPDX-License-Identifier: GPL-2.0
+ *
+ * dvb-vb2.h - DVB driver helper framework for streaming I/O
+ *
+ * Copyright (C) 2015 Samsung Electronics
+ *
+ * Author: jh1009.sung@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.
+ */
+#ifndef _DVB_VB2_H
+#define _DVB_VB2_H
+#include <linux/mutex.h>
+#include <linux/poll.h>
+#include <linux/dvb/dmx.h>
+#include <media/videobuf2-core.h>
+#include <media/videobuf2-dma-contig.h>
+#include <media/videobuf2-vmalloc.h>
+/**
+ * enum dvb_buf_type - types of Digital TV memory-mapped buffers
+ *
+ * @DVB_BUF_TYPE_CAPTURE: buffer is filled by the Kernel,
+ *                        with a received Digital TV stream
+ */
+enum dvb_buf_type {
+        DVB_BUF_TYPE_CAPTURE        = 1,
+};
+/**
+ * enum dvb_vb2_states - states to control VB2 state machine
+ * @DVB_VB2_STATE_NONE:
+ *      VB2 engine not initialized yet, init failed or VB2 was released.
+ * @DVB_VB2_STATE_INIT:
+ *      VB2 engine initialized.
+ * @DVB_VB2_STATE_REQBUFS:
+ *      Buffers were requested
+ * @DVB_VB2_STATE_STREAMON:
+ *      VB2 is streaming. Callers should not check it directly. Instead,
+ *      they should use dvb_vb2_is_streaming().
+ *
+ * Note:
+ *
+ * Callers should not touch at the state machine directly. This
+ * is handled inside dvb_vb2.c.
+ */
+enum dvb_vb2_states {
+        DVB_VB2_STATE_NONE      = 0x0,
+        DVB_VB2_STATE_INIT      = 0x1,
+        DVB_VB2_STATE_REQBUFS   = 0x2,
+        DVB_VB2_STATE_STREAMON  = 0x4,
+};
+#define DVB_VB2_NAME_MAX (20)
+/**
+ * struct dvb_buffer - video buffer information for v4l2.
+ *
+ * @vb:         embedded struct &vb2_buffer.
+ * @list:       list of &struct dvb_buffer.
+ */
+struct dvb_buffer {
+        struct vb2_buffer       vb;
+        struct list_head        list;
+};
+/**
+ * struct dvb_vb2_ctx - control struct for VB2 handler
+ * @vb_q:       pointer to &struct vb2_queue with videobuf2 queue.
+ * @mutex:      mutex to serialize vb2 operations. Used by
+ *              vb2 core %wait_prepare and %wait_finish operations.
+ * @slock:      spin lock used to protect buffer filling at dvb_vb2.c.
+ * @dvb_q:      List of buffers that are not filled yet.
+ * @buf:        Pointer to the buffer that are currently being filled.
+ * @offset:     index to the next position at the @buf to be filled.
+ * @remain:     How many bytes are left to be filled at @buf.
+ * @state:      bitmask of buffer states as defined by &enum dvb_vb2_states.
+ * @buf_siz:    size of each VB2 buffer.
+ * @buf_cnt:    number of VB2 buffers.
+ * @nonblocking:
+ *              If different than zero, device is operating on non-blocking
+ *              mode.
+ * @name:       name of the device type. Currently, it can either be
+ *              "dvr" or "demux_filter".
+ */
+struct dvb_vb2_ctx {
+        struct vb2_queue        vb_q;
+        struct mutex            mutex;
+        spinlock_t              slock;
+        struct list_head        dvb_q;
+        struct dvb_buffer       *buf;
+        int     offset;
+        int     remain;
+        int     state;
+        int     buf_siz;
+        int     buf_cnt;
+        int     nonblocking;
+        char    name[DVB_VB2_NAME_MAX + 1];
+};
+#ifndef DVB_MMAP
+static inline int dvb_vb2_init(struct dvb_vb2_ctx *ctx,
+                               const char *name, int non_blocking)
+{
+        return 0;
+};
+static inline int dvb_vb2_release(struct dvb_vb2_ctx *ctx)
+{
+        return 0;
+};
+#define dvb_vb2_is_streaming(ctx) (0)
+#define dvb_vb2_fill_buffer(ctx, file, wait) (0)
+static inline __poll_t dvb_vb2_poll(struct dvb_vb2_ctx *ctx,
+                                    struct file *file,
+                                    poll_table *wait)
+{
+        return 0;
+}
+#else
+/**
+ * dvb_vb2_init - initializes VB2 handler
+ *
+ * @ctx:        control struct for VB2 handler
+ * @name:       name for the VB2 handler
+ * @non_blocking:
+ *              if not zero, it means that the device is at non-blocking mode
+ */
+int dvb_vb2_init(struct dvb_vb2_ctx *ctx, const char *name, int non_blocking);
+/**
+ * dvb_vb2_release - Releases the VB2 handler allocated resources and
+ *      put @ctx at DVB_VB2_STATE_NONE state.
+ * @ctx:        control struct for VB2 handler
+ */
+int dvb_vb2_release(struct dvb_vb2_ctx *ctx);
+/**
+ * dvb_vb2_is_streaming - checks if the VB2 handler is streaming
+ * @ctx:        control struct for VB2 handler
+ *
+ * Return: 0 if not streaming, 1 otherwise.
+ */
+int dvb_vb2_is_streaming(struct dvb_vb2_ctx *ctx);
+/**
+ * dvb_vb2_fill_buffer - fills a VB2 buffer
+ * @ctx:        control struct for VB2 handler
+ * @src:        place where the data is stored
+ * @len:        number of bytes to be copied from @src
+ */
+int dvb_vb2_fill_buffer(struct dvb_vb2_ctx *ctx,
+                        const unsigned char *src, int len);
+/**
+ * dvb_vb2_poll - Wrapper to vb2_core_streamon() for Digital TV
+ *      buffer handling.
+ *
+ * @ctx:        control struct for VB2 handler
+ * @file:       &struct file argument passed to the poll
+ *              file operation handler.
+ * @wait:       &poll_table wait argument passed to the poll
+ *              file operation handler.
+ *
+ * Implements poll syscall() logic.
+ */
+__poll_t dvb_vb2_poll(struct dvb_vb2_ctx *ctx, struct file *file,
+                      poll_table *wait);
+#endif
+/**
+ * dvb_vb2_stream_on() - Wrapper to vb2_core_streamon() for Digital TV
+ *      buffer handling.
+ *
+ * @ctx:        control struct for VB2 handler
+ *
+ * Starts dvb streaming
+ */
+int dvb_vb2_stream_on(struct dvb_vb2_ctx *ctx);
+/**
+ * dvb_vb2_stream_off() - Wrapper to vb2_core_streamoff() for Digital TV
+ *      buffer handling.
+ *
+ * @ctx:        control struct for VB2 handler
+ *
+ * Stops dvb streaming
+ */
+int dvb_vb2_stream_off(struct dvb_vb2_ctx *ctx);
+/**
+ * dvb_vb2_reqbufs() - Wrapper to vb2_core_reqbufs() for Digital TV
+ *      buffer handling.
+ *
+ * @ctx:        control struct for VB2 handler
+ * @req:        &struct dmx_requestbuffers passed from userspace in
+ *              order to handle &DMX_REQBUFS.
+ *
+ * Initiate streaming by requesting a number of buffers. Also used to
+ * free previously requested buffers, is ``req->count`` is zero.
+ */
+int dvb_vb2_reqbufs(struct dvb_vb2_ctx *ctx, struct dmx_requestbuffers *req);
+/**
+ * dvb_vb2_querybuf() - Wrapper to vb2_core_querybuf() for Digital TV
+ *      buffer handling.
+ *
+ * @ctx:        control struct for VB2 handler
+ * @b:          &struct dmx_buffer passed from userspace in
+ *              order to handle &DMX_QUERYBUF.
+ *
+ *
+ */
+int dvb_vb2_querybuf(struct dvb_vb2_ctx *ctx, struct dmx_buffer *b);
+/**
+ * dvb_vb2_expbuf() - Wrapper to vb2_core_expbuf() for Digital TV
+ *      buffer handling.
+ *
+ * @ctx:        control struct for VB2 handler
+ * @exp:        &struct dmx_exportbuffer passed from userspace in
+ *              order to handle &DMX_EXPBUF.
+ *
+ * Export a buffer as a file descriptor.
+ */
+int dvb_vb2_expbuf(struct dvb_vb2_ctx *ctx, struct dmx_exportbuffer *exp);
+/**
+ * dvb_vb2_qbuf() - Wrapper to vb2_core_qbuf() for Digital TV buffer handling.
+ *
+ * @ctx:        control struct for VB2 handler
+ * @b:          &struct dmx_buffer passed from userspace in
+ *              order to handle &DMX_QBUF.
+ *
+ * Queue a Digital TV buffer as requested by userspace
+ */
+int dvb_vb2_qbuf(struct dvb_vb2_ctx *ctx, struct dmx_buffer *b);
+/**
+ * dvb_vb2_dqbuf() - Wrapper to vb2_core_dqbuf() for Digital TV
+ *      buffer handling.
+ *
+ * @ctx:        control struct for VB2 handler
+ * @b:          &struct dmx_buffer passed from userspace in
+ *              order to handle &DMX_DQBUF.
+ *
+ * Dequeue a Digital TV buffer to the userspace
+ */
+int dvb_vb2_dqbuf(struct dvb_vb2_ctx *ctx, struct dmx_buffer *b);
+/**
+ * dvb_vb2_mmap() - Wrapper to vb2_mmap() for Digital TV buffer handling.
+ *
+ * @ctx:        control struct for VB2 handler
+ * @vma:        pointer to &struct vm_area_struct with the vma passed
+ *              to the mmap file operation handler in the driver.
+ *
+ * map Digital TV video buffers into application address space.
+ */
+int dvb_vb2_mmap(struct dvb_vb2_ctx *ctx, struct vm_area_struct *vma);
+#endif /* _DVB_VB2_H */
diff --git a/include/media/dvbdev.h b/include/media/dvbdev.h
new file mode 100644
index 000000000000..554db879527f
--- /dev/null
+++ b/include/media/dvbdev.h
@@ -0,0 +1,407 @@
+/*
+ * dvbdev.h
+ *
+ * Copyright (C) 2000 Ralph Metzler & Marcus Metzler
+ *                    for convergence integrated media GmbH
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Lesser Public License
+ * as published by the Free Software Foundation; either version 2.1
+ * 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.
+ *
+ */
+#ifndef _DVBDEV_H_
+#define _DVBDEV_H_
+#include <linux/types.h>
+#include <linux/poll.h>
+#include <linux/fs.h>
+#include <linux/list.h>
+#include <media/media-device.h>
+#define DVB_MAJOR 212
+#if defined(CONFIG_DVB_MAX_ADAPTERS) && CONFIG_DVB_MAX_ADAPTERS > 0
+  #define DVB_MAX_ADAPTERS CONFIG_DVB_MAX_ADAPTERS
+#else
+  #define DVB_MAX_ADAPTERS 16
+#endif
+#define DVB_UNSET (-1)
+/* List of DVB device types */
+/**
+ * enum dvb_device_type - type of the Digital TV device
+ *
+ * @DVB_DEVICE_SEC:             Digital TV standalone Common Interface (CI)
+ * @DVB_DEVICE_FRONTEND:        Digital TV frontend.
+ * @DVB_DEVICE_DEMUX:           Digital TV demux.
+ * @DVB_DEVICE_DVR:             Digital TV digital video record (DVR).
+ * @DVB_DEVICE_CA:              Digital TV Conditional Access (CA).
+ * @DVB_DEVICE_NET:             Digital TV network.
+ *
+ * @DVB_DEVICE_VIDEO:           Digital TV video decoder.
+ *                              Deprecated. Used only on av7110-av.
+ * @DVB_DEVICE_AUDIO:           Digital TV audio decoder.
+ *                              Deprecated. Used only on av7110-av.
+ * @DVB_DEVICE_OSD:             Digital TV On Screen Display (OSD).
+ *                              Deprecated. Used only on av7110.
+ */
+enum dvb_device_type {
+        DVB_DEVICE_SEC,
+        DVB_DEVICE_FRONTEND,
+        DVB_DEVICE_DEMUX,
+        DVB_DEVICE_DVR,
+        DVB_DEVICE_CA,
+        DVB_DEVICE_NET,
+        DVB_DEVICE_VIDEO,
+        DVB_DEVICE_AUDIO,
+        DVB_DEVICE_OSD,
+};
+#define DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr) \
+        static short adapter_nr[] = \
+                {[0 ... (DVB_MAX_ADAPTERS - 1)] = DVB_UNSET }; \
+        module_param_array(adapter_nr, short, NULL, 0444); \
+        MODULE_PARM_DESC(adapter_nr, "DVB adapter numbers")
+struct dvb_frontend;
+/**
+ * struct dvb_adapter - represents a Digital TV adapter using Linux DVB API
+ *
+ * @num:                Number of the adapter
+ * @list_head:          List with the DVB adapters
+ * @device_list:        List with the DVB devices
+ * @name:               Name of the adapter
+ * @proposed_mac:       proposed MAC address for the adapter
+ * @priv:               private data
+ * @device:             pointer to struct device
+ * @module:             pointer to struct module
+ * @mfe_shared:         mfe shared: indicates mutually exclusive frontends
+ *                      Thie usage of this flag is currently deprecated
+ * @mfe_dvbdev:         Frontend device in use, in the case of MFE
+ * @mfe_lock:           Lock to prevent using the other frontends when MFE is
+ *                      used.
+ * @mdev:               pointer to struct media_device, used when the media
+ *                      controller is used.
+ * @conn:               RF connector. Used only if the device has no separate
+ *                      tuner.
+ * @conn_pads:          pointer to struct media_pad associated with @conn;
+ */
+struct dvb_adapter {
+        int num;
+        struct list_head list_head;
+        struct list_head device_list;
+        const char *name;
+        u8 proposed_mac [6];
+        void* priv;
+        struct device *device;
+        struct module *module;
+        int mfe_shared;                 /* indicates mutually exclusive frontends */
+        struct dvb_device *mfe_dvbdev;  /* frontend device in use */
+        struct mutex mfe_lock;          /* access lock for thread creation */
+#if defined(CONFIG_MEDIA_CONTROLLER_DVB)
+        struct media_device *mdev;
+        struct media_entity *conn;
+        struct media_pad *conn_pads;
+#endif
+};
+/**
+ * struct dvb_device - represents a DVB device node
+ *
+ * @list_head:  List head with all DVB devices
+ * @fops:       pointer to struct file_operations
+ * @adapter:    pointer to the adapter that holds this device node
+ * @type:       type of the device, as defined by &enum dvb_device_type.
+ * @minor:      devnode minor number. Major number is always DVB_MAJOR.
+ * @id:         device ID number, inside the adapter
+ * @readers:    Initialized by the caller. Each call to open() in Read Only mode
+ *              decreases this counter by one.
+ * @writers:    Initialized by the caller. Each call to open() in Read/Write
+ *              mode decreases this counter by one.
+ * @users:      Initialized by the caller. Each call to open() in any mode
+ *              decreases this counter by one.
+ * @wait_queue: wait queue, used to wait for certain events inside one of
+ *              the DVB API callers
+ * @kernel_ioctl: callback function used to handle ioctl calls from userspace.
+ * @name:       Name to be used for the device at the Media Controller
+ * @entity:     pointer to struct media_entity associated with the device node
+ * @pads:       pointer to struct media_pad associated with @entity;
+ * @priv:       private data
+ * @intf_devnode: Pointer to media_intf_devnode. Used by the dvbdev core to
+ *              store the MC device node interface
+ * @tsout_num_entities: Number of Transport Stream output entities
+ * @tsout_entity: array with MC entities associated to each TS output node
+ * @tsout_pads: array with the source pads for each @tsout_entity
+ *
+ * This structure is used by the DVB core (frontend, CA, net, demux) in
+ * order to create the device nodes. Usually, driver should not initialize
+ * this struct diretly.
+ */
+struct dvb_device {
+        struct list_head list_head;
+        const struct file_operations *fops;
+        struct dvb_adapter *adapter;
+        enum dvb_device_type type;
+        int minor;
+        u32 id;
+        /* in theory, 'users' can vanish now,
+           but I don't want to change too much now... */
+        int readers;
+        int writers;
+        int users;
+        wait_queue_head_t         wait_queue;
+        /* don't really need those !? -- FIXME: use video_usercopy  */
+        int (*kernel_ioctl)(struct file *file, unsigned int cmd, void *arg);
+        /* Needed for media controller register/unregister */
+#if defined(CONFIG_MEDIA_CONTROLLER_DVB)
+        const char *name;
+        /* Allocated and filled inside dvbdev.c */
+        struct media_intf_devnode *intf_devnode;
+        unsigned tsout_num_entities;
+        struct media_entity *entity, *tsout_entity;
+        struct media_pad *pads, *tsout_pads;
+#endif
+        void *priv;
+};
+/**
+ * dvb_register_adapter - Registers a new DVB adapter
+ *
+ * @adap:       pointer to struct dvb_adapter
+ * @name:       Adapter's name
+ * @module:     initialized with THIS_MODULE at the caller
+ * @device:     pointer to struct device that corresponds to the device driver
+ * @adapter_nums: Array with a list of the numbers for @dvb_register_adapter;
+ *              to select among them. Typically, initialized with:
+ *              DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nums)
+ */
+int dvb_register_adapter(struct dvb_adapter *adap, const char *name,
+                         struct module *module, struct device *device,
+                         short *adapter_nums);
+/**
+ * dvb_unregister_adapter - Unregisters a DVB adapter
+ *
+ * @adap:       pointer to struct dvb_adapter
+ */
+int dvb_unregister_adapter(struct dvb_adapter *adap);
+/**
+ * dvb_register_device - Registers a new DVB device
+ *
+ * @adap:       pointer to struct dvb_adapter
+ * @pdvbdev:    pointer to the place where the new struct dvb_device will be
+ *              stored
+ * @template:   Template used to create &pdvbdev;
+ * @priv:       private data
+ * @type:       type of the device, as defined by &enum dvb_device_type.
+ * @demux_sink_pads: Number of demux outputs, to be used to create the TS
+ *              outputs via the Media Controller.
+ */
+int dvb_register_device(struct dvb_adapter *adap,
+                        struct dvb_device **pdvbdev,
+                        const struct dvb_device *template,
+                        void *priv,
+                        enum dvb_device_type type,
+                        int demux_sink_pads);
+/**
+ * dvb_remove_device - Remove a registered DVB device
+ *
+ * This does not free memory.  To do that, call dvb_free_device().
+ *
+ * @dvbdev:     pointer to struct dvb_device
+ */
+void dvb_remove_device(struct dvb_device *dvbdev);
+/**
+ * dvb_free_device - Free memory occupied by a DVB device.
+ *
+ * Call dvb_unregister_device() before calling this function.
+ *
+ * @dvbdev:     pointer to struct dvb_device
+ */
+void dvb_free_device(struct dvb_device *dvbdev);
+/**
+ * dvb_unregister_device - Unregisters a DVB device
+ *
+ * This is a combination of dvb_remove_device() and dvb_free_device().
+ * Using this function is usually a mistake, and is often an indicator
+ * for a use-after-free bug (when a userspace process keeps a file
+ * handle to a detached device).
+ *
+ * @dvbdev:     pointer to struct dvb_device
+ */
+void dvb_unregister_device(struct dvb_device *dvbdev);
+#ifdef CONFIG_MEDIA_CONTROLLER_DVB
+/**
+ * dvb_create_media_graph - Creates media graph for the Digital TV part of the
+ *                              device.
+ *
+ * @adap:                       pointer to &struct dvb_adapter
+ * @create_rf_connector:        if true, it creates the RF connector too
+ *
+ * This function checks all DVB-related functions at the media controller
+ * entities and creates the needed links for the media graph. It is
+ * capable of working with multiple tuners or multiple frontends, but it
+ * won't create links if the device has multiple tuners and multiple frontends
+ * or if the device has multiple muxes. In such case, the caller driver should
+ * manually create the remaining links.
+ */
+__must_check int dvb_create_media_graph(struct dvb_adapter *adap,
+                                        bool create_rf_connector);
+/**
+ * dvb_register_media_controller - registers a media controller at DVB adapter
+ *
+ * @adap:                       pointer to &struct dvb_adapter
+ * @mdev:                       pointer to &struct media_device
+ */
+static inline void dvb_register_media_controller(struct dvb_adapter *adap,
+                                                 struct media_device *mdev)
+{
+        adap->mdev = mdev;
+}
+/**
+ * dvb_get_media_controller - gets the associated media controller
+ *
+ * @adap:                       pointer to &struct dvb_adapter
+ */
+static inline struct media_device
+*dvb_get_media_controller(struct dvb_adapter *adap)
+{
+        return adap->mdev;
+}
+#else
+static inline
+int dvb_create_media_graph(struct dvb_adapter *adap,
+                           bool create_rf_connector)
+{
+        return 0;
+};
+#define dvb_register_media_controller(a, b) {}
+#define dvb_get_media_controller(a) NULL
+#endif
+/**
+ * dvb_generic_open - Digital TV open function, used by DVB devices
+ *
+ * @inode: pointer to &struct inode.
+ * @file: pointer to &struct file.
+ *
+ * Checks if a DVB devnode is still valid, and if the permissions are
+ * OK and increment negative use count.
+ */
+int dvb_generic_open(struct inode *inode, struct file *file);
+/**
+ * dvb_generic_close - Digital TV close function, used by DVB devices
+ *
+ * @inode: pointer to &struct inode.
+ * @file: pointer to &struct file.
+ *
+ * Checks if a DVB devnode is still valid, and if the permissions are
+ * OK and decrement negative use count.
+ */
+int dvb_generic_release(struct inode *inode, struct file *file);
+/**
+ * dvb_generic_ioctl - Digital TV close function, used by DVB devices
+ *
+ * @file: pointer to &struct file.
+ * @cmd: Ioctl name.
+ * @arg: Ioctl argument.
+ *
+ * Checks if a DVB devnode and struct dvbdev.kernel_ioctl is still valid.
+ * If so, calls dvb_usercopy().
+ */
+long dvb_generic_ioctl(struct file *file,
+                       unsigned int cmd, unsigned long arg);
+/**
+ * dvb_usercopy - copies data from/to userspace memory when an ioctl is
+ *      issued.
+ *
+ * @file: Pointer to struct &file.
+ * @cmd: Ioctl name.
+ * @arg: Ioctl argument.
+ * @func: function that will actually handle the ioctl
+ *
+ * Ancillary function that uses ioctl direction and size to copy from
+ * userspace. Then, it calls @func, and, if needed, data is copied back
+ * to userspace.
+ */
+int dvb_usercopy(struct file *file, unsigned int cmd, unsigned long arg,
+                 int (*func)(struct file *file, unsigned int cmd, void *arg));
+/** generic DVB attach function. */
+#ifdef CONFIG_MEDIA_ATTACH
+/**
+ * dvb_attach - attaches a DVB frontend into the DVB core.
+ *
+ * @FUNCTION:   function on a frontend module to be called.
+ * @ARGS...:    @FUNCTION arguments.
+ *
+ * This ancillary function loads a frontend module in runtime and runs
+ * the @FUNCTION function there, with @ARGS.
+ * As it increments symbol usage cont, at unregister, dvb_detach()
+ * should be called.
+ */
+#define dvb_attach(FUNCTION, ARGS...) ({ \
+        void *__r = NULL; \
+        typeof(&FUNCTION) __a = symbol_request(FUNCTION); \
+        if (__a) { \
+                __r = (void *) __a(ARGS); \
+                if (__r == NULL) \
+                        symbol_put(FUNCTION); \
+        } else { \
+                printk(KERN_ERR "DVB: Unable to find symbol "#FUNCTION"()\n"); \
+        } \
+        __r; \
+})
+/**
+ * dvb_detach - detaches a DVB frontend loaded via dvb_attach()
+ *
+ * @FUNC:       attach function
+ *
+ * Decrements usage count for a function previously called via dvb_attach().
+ */
+#define dvb_detach(FUNC)        symbol_put_addr(FUNC)
+#else
+#define dvb_attach(FUNCTION, ARGS...) ({ \
+        FUNCTION(ARGS); \
+})
+#define dvb_detach(FUNC)        {}
+#endif
+#endif /* #ifndef _DVBDEV_H_ */
diff --git a/include/media/i2c-addr.h b/include/media/i2c-addr.h
deleted file mode 100644
index 1b6872f5e970..000000000000
--- a/include/media/i2c-addr.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- *      V4L I2C address list
- *
- *
- *      Copyright (C) 2006 Mauro Carvalho Chehab <mchehab@infradead.org>
- *      Based on a previous mapping by
- *      Ralph Metzler (rjkm@thp.uni-koeln.de)
- *      Gerd Knorr <kraxel@goldbach.in-berlin.de>
- *
- */
-/* bttv address list */
-#define I2C_ADDR_TSA5522        0xc2
-#define I2C_ADDR_TDA7432        0x8a
-#define I2C_ADDR_TDA8425        0x82
-#define I2C_ADDR_TDA9840        0x84
-#define I2C_ADDR_TDA9850        0xb6 /* also used by 9855,9873 */
-#define I2C_ADDR_TDA9874        0xb0 /* also used by 9875 */
-#define I2C_ADDR_TDA9875        0xb0
-#define I2C_ADDR_HAUPEE         0xa0
-#define I2C_ADDR_STBEE          0xae
-#define I2C_ADDR_VHX            0xc0
-#define I2C_ADDR_MSP3400        0x80
-#define I2C_ADDR_MSP3400_ALT    0x88
-#define I2C_ADDR_TEA6300        0x80 /* also used by 6320 */
-#define I2C_ADDR_DPL3518        0x84
-#define I2C_ADDR_TDA9887        0x86
-/*
- * i2c bus addresses for the chips supported by tvaudio.c
- */
-#define I2C_ADDR_TDA8425        0x82
-#define I2C_ADDR_TDA9840        0x84 /* also used by TA8874Z */
-#define I2C_ADDR_TDA985x_L      0xb4 /* also used by 9873 */
-#define I2C_ADDR_TDA985x_H      0xb6
-#define I2C_ADDR_TDA9874        0xb0 /* also used by 9875 */
-#define I2C_ADDR_TEA6300        0x80 /* also used by 6320 */
-#define I2C_ADDR_TEA6420        0x98
-#define I2C_ADDR_PIC16C54       0x96 /* PV951 */
diff --git a/include/media/i2c/as3645a.h b/include/media/i2c/as3645a.h
deleted file mode 100644
index fffd4b563f5a..000000000000
--- a/include/media/i2c/as3645a.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * include/media/i2c/as3645a.h
- *
- * Copyright (C) 2008-2011 Nokia Corporation
- *
- * Contact: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- *
- * 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.
- *
- */
-#ifndef __AS3645A_H__
-#define __AS3645A_H__
-#include <media/v4l2-subdev.h>
-#define AS3645A_NAME                            "as3645a"
-#define AS3645A_I2C_ADDR                        (0x60 >> 1) /* W:0x60, R:0x61 */
-#define AS3645A_FLASH_TIMEOUT_MIN               100000  /* us */
-#define AS3645A_FLASH_TIMEOUT_MAX               850000
-#define AS3645A_FLASH_TIMEOUT_STEP              50000
-#define AS3645A_FLASH_INTENSITY_MIN             200     /* mA */
-#define AS3645A_FLASH_INTENSITY_MAX_1LED        500
-#define AS3645A_FLASH_INTENSITY_MAX_2LEDS       400
-#define AS3645A_FLASH_INTENSITY_STEP            20
-#define AS3645A_TORCH_INTENSITY_MIN             20      /* mA */
-#define AS3645A_TORCH_INTENSITY_MAX             160
-#define AS3645A_TORCH_INTENSITY_STEP            20
-#define AS3645A_INDICATOR_INTENSITY_MIN         0       /* uA */
-#define AS3645A_INDICATOR_INTENSITY_MAX         10000
-#define AS3645A_INDICATOR_INTENSITY_STEP        2500
-/*
- * as3645a_platform_data - Flash controller platform data
- * @set_power:  Set power callback
- * @vref:       VREF offset (0=0V, 1=+0.3V, 2=-0.3V, 3=+0.6V)
- * @peak:       Inductor peak current limit (0=1.25A, 1=1.5A, 2=1.75A, 3=2.0A)
- * @ext_strobe: True if external flash strobe can be used
- * @flash_max_current:  Max flash current (mA, <= AS3645A_FLASH_INTENSITY_MAX)
- * @torch_max_current:  Max torch current (mA, >= AS3645A_TORCH_INTENSITY_MAX)
- * @timeout_max:        Max flash timeout (us, <= AS3645A_FLASH_TIMEOUT_MAX)
- */
-struct as3645a_platform_data {
-        int (*set_power)(struct v4l2_subdev *subdev, int on);
-        unsigned int vref;
-        unsigned int peak;
-        bool ext_strobe;
-        /* Flash and torch currents and timeout limits */
-        unsigned int flash_max_current;
-        unsigned int torch_max_current;
-        unsigned int timeout_max;
-};
-#endif /* __AS3645A_H__ */
diff --git a/include/media/i2c/bt819.h b/include/media/i2c/bt819.h
index 8025f4bc2bb6..1bcf0dbeb516 100644
--- a/include/media/i2c/bt819.h
+++ b/include/media/i2c/bt819.h
@@ -30,7 +30,7 @@
   Note: these ioctls that internal to the kernel and are never called
   from userspace. */
-#define BT819_FIFO_RESET_LOW    _IO('b', 0)
+#define BT819_FIFO_RESET_LOW    _IO('b', 0)
-#define BT819_FIFO_RESET_HIGH   _IO('b', 1)
+#define BT819_FIFO_RESET_HIGH   _IO('b', 1)
 #endif
diff --git a/include/media/i2c/ir-kbd-i2c.h b/include/media/i2c/ir-kbd-i2c.h
index 76491c62c254..9f47d6a48cff 100644
--- a/include/media/i2c/ir-kbd-i2c.h
+++ b/include/media/i2c/ir-kbd-i2c.h
@@ -19,11 +19,15 @@ struct IR_i2c {
        u32                    polling_interval; /* in ms */
        struct delayed_work    work;
-        char                   name[32];
        char                   phys[32];
        int                    (*get_key)(struct IR_i2c *ir,
                                          enum rc_proto *protocol,
                                          u32 *scancode, u8 *toggle);
+        /* tx */
+        struct i2c_client      *tx_c;
+        struct mutex           lock;    /* do not poll Rx during Tx */
+        unsigned int           carrier;
+        unsigned int           duty_cycle;
 };
 enum ir_kbd_get_key_fn {
diff --git a/include/media/i2c/m52790.h b/include/media/i2c/m52790.h
index 7ddffae31a67..8d9db3cf6fab 100644
--- a/include/media/i2c/m52790.h
+++ b/include/media/i2c/m52790.h
@@ -23,57 +23,57 @@
 /* Input routing switch 1 */
-#define M52790_SW1_IN_MASK      0x0003
+#define M52790_SW1_IN_MASK      0x0003
-#define M52790_SW1_IN_TUNER     0x0000
+#define M52790_SW1_IN_TUNER     0x0000
-#define M52790_SW1_IN_V2        0x0001
+#define M52790_SW1_IN_V2        0x0001
-#define M52790_SW1_IN_V3        0x0002
+#define M52790_SW1_IN_V3        0x0002
-#define M52790_SW1_IN_V4        0x0003
+#define M52790_SW1_IN_V4        0x0003
 /* Selects component input instead of composite */
-#define M52790_SW1_YCMIX        0x0004
+#define M52790_SW1_YCMIX        0x0004
 /* Input routing switch 2 */
-#define M52790_SW2_IN_MASK      0x0300
+#define M52790_SW2_IN_MASK      0x0300
-#define M52790_SW2_IN_TUNER     0x0000
+#define M52790_SW2_IN_TUNER     0x0000
-#define M52790_SW2_IN_V2        0x0100
+#define M52790_SW2_IN_V2        0x0100
-#define M52790_SW2_IN_V3        0x0200
+#define M52790_SW2_IN_V3        0x0200
-#define M52790_SW2_IN_V4        0x0300
+#define M52790_SW2_IN_V4        0x0300
 /* Selects component input instead of composite */
-#define M52790_SW2_YCMIX        0x0400
+#define M52790_SW2_YCMIX        0x0400
 /* Output routing switch 1 */
 /* Enable 6dB amplifier for composite out */
-#define M52790_SW1_V_AMP        0x0008
+#define M52790_SW1_V_AMP        0x0008
 /* Enable 6dB amplifier for component out */
-#define M52790_SW1_YC_AMP       0x0010
+#define M52790_SW1_YC_AMP       0x0010
 /* Audio output mode */
-#define M52790_SW1_AUDIO_MASK   0x00c0
+#define M52790_SW1_AUDIO_MASK   0x00c0
-#define M52790_SW1_AUDIO_MUTE   0x0000
+#define M52790_SW1_AUDIO_MUTE   0x0000
-#define M52790_SW1_AUDIO_R      0x0040
+#define M52790_SW1_AUDIO_R      0x0040
-#define M52790_SW1_AUDIO_L      0x0080
+#define M52790_SW1_AUDIO_L      0x0080
 #define M52790_SW1_AUDIO_STEREO 0x00c0
 /* Output routing switch 2 */
 /* Enable 6dB amplifier for composite out */
-#define M52790_SW2_V_AMP        0x0800
+#define M52790_SW2_V_AMP        0x0800
 /* Enable 6dB amplifier for component out */
-#define M52790_SW2_YC_AMP       0x1000
+#define M52790_SW2_YC_AMP       0x1000
 /* Audio output mode */
-#define M52790_SW2_AUDIO_MASK   0xc000
+#define M52790_SW2_AUDIO_MASK   0xc000
-#define M52790_SW2_AUDIO_MUTE   0x0000
+#define M52790_SW2_AUDIO_MUTE   0x0000
-#define M52790_SW2_AUDIO_R      0x4000
+#define M52790_SW2_AUDIO_R      0x4000
-#define M52790_SW2_AUDIO_L      0x8000
+#define M52790_SW2_AUDIO_L      0x8000
 #define M52790_SW2_AUDIO_STEREO 0xc000
@@ -83,9 +83,9 @@
 #define M52790_IN_V3    (M52790_SW1_IN_V3 | M52790_SW2_IN_V3)
 #define M52790_IN_V4    (M52790_SW1_IN_V4 | M52790_SW2_IN_V4)
-#define M52790_OUT_STEREO       (M52790_SW1_AUDIO_STEREO | \
+#define M52790_OUT_STEREO       (M52790_SW1_AUDIO_STEREO | \
                                 M52790_SW2_AUDIO_STEREO)
-#define M52790_OUT_AMP_STEREO   (M52790_SW1_AUDIO_STEREO | \
+#define M52790_OUT_AMP_STEREO   (M52790_SW1_AUDIO_STEREO | \
                                 M52790_SW1_V_AMP | \
                                 M52790_SW2_AUDIO_STEREO | \
                                 M52790_SW2_V_AMP)
diff --git a/include/media/i2c/saa7115.h b/include/media/i2c/saa7115.h
index 53954c90e7f6..a0cda423509d 100644
--- a/include/media/i2c/saa7115.h
+++ b/include/media/i2c/saa7115.h
@@ -36,15 +36,15 @@
 #define SAA7115_SVIDEO3    9
 /* outputs */
-#define SAA7115_IPORT_ON        1
+#define SAA7115_IPORT_ON        1
-#define SAA7115_IPORT_OFF       0
+#define SAA7115_IPORT_OFF       0
 /* SAA7111 specific outputs. */
-#define SAA7111_VBI_BYPASS      2
+#define SAA7111_VBI_BYPASS      2
 #define SAA7111_FMT_YUV422      0x00
-#define SAA7111_FMT_RGB         0x40
+#define SAA7111_FMT_RGB         0x40
-#define SAA7111_FMT_CCIR        0x80
+#define SAA7111_FMT_CCIR        0x80
-#define SAA7111_FMT_YUV411      0xc0
+#define SAA7111_FMT_YUV411      0xc0
 /* config flags */
 /*
diff --git a/include/media/i2c/tvaudio.h b/include/media/i2c/tvaudio.h
index 1ac8184693f8..f13e1a386364 100644
--- a/include/media/i2c/tvaudio.h
+++ b/include/media/i2c/tvaudio.h
@@ -21,7 +21,22 @@
 #ifndef _TVAUDIO_H
 #define _TVAUDIO_H
-#include <media/i2c-addr.h>
+/*
+ * i2c bus addresses for the chips supported by tvaudio.c
+ */
+#define I2C_ADDR_TDA8425        0x82
+#define I2C_ADDR_TDA9840        0x84
+#define I2C_ADDR_TDA9874        0xb0 /* also used by 9875 */
+#define I2C_ADDR_TDA9875        0xb0
+#define I2C_ADDR_TDA8425        0x82
+#define I2C_ADDR_TDA9840        0x84 /* also used by TA8874Z */
+#define I2C_ADDR_TDA985x_L      0xb4 /* also used by 9873 */
+#define I2C_ADDR_TDA985x_H      0xb6
+#define I2C_ADDR_TDA9874        0xb0 /* also used by 9875 */
+#define I2C_ADDR_TEA6300        0x80 /* also used by 6320 */
+#define I2C_ADDR_TEA6420        0x98
+#define I2C_ADDR_PIC16C54       0x96 /* PV951 */
 /* The tvaudio module accepts the following inputs: */
 #define TVAUDIO_INPUT_TUNER  0
diff --git a/include/media/i2c/upd64031a.h b/include/media/i2c/upd64031a.h
index 48ec03c4ef23..1eba24dfee48 100644
--- a/include/media/i2c/upd64031a.h
+++ b/include/media/i2c/upd64031a.h
@@ -18,9 +18,9 @@
 #define _UPD64031A_H_
 /* Ghost reduction modes */
-#define UPD64031A_GR_ON         0
+#define UPD64031A_GR_ON         0
-#define UPD64031A_GR_OFF        1
+#define UPD64031A_GR_OFF        1
-#define UPD64031A_GR_THROUGH    3
+#define UPD64031A_GR_THROUGH    3
 /* Direct 3D/YCS Connection */
 #define UPD64031A_3DYCS_DISABLE   (0 << 2)
diff --git a/include/media/lirc.h b/include/media/lirc.h
deleted file mode 100644
index 554988c860c1..000000000000
--- a/include/media/lirc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <uapi/linux/lirc.h>
diff --git a/include/media/lirc_dev.h b/include/media/lirc_dev.h
deleted file mode 100644
index d9c143d17f70..000000000000
--- a/include/media/lirc_dev.h
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * LIRC base driver
- *
- * by Artur Lipowski <alipowski@interia.pl>
- *        This code is licensed under GNU GPL
- *
- */
-#ifndef _LINUX_LIRC_DEV_H
-#define _LINUX_LIRC_DEV_H
-#define BUFLEN            16
-#include <linux/slab.h>
-#include <linux/fs.h>
-#include <linux/ioctl.h>
-#include <linux/poll.h>
-#include <linux/kfifo.h>
-#include <media/lirc.h>
-#include <linux/device.h>
-#include <linux/cdev.h>
-struct lirc_buffer {
-        wait_queue_head_t wait_poll;
-        spinlock_t fifo_lock;
-        unsigned int chunk_size;
-        unsigned int size; /* in chunks */
-        /* Using chunks instead of bytes pretends to simplify boundary checking
-         * And should allow for some performance fine tunning later */
-        struct kfifo fifo;
-};
-static inline void lirc_buffer_clear(struct lirc_buffer *buf)
-{
-        unsigned long flags;
-        if (kfifo_initialized(&buf->fifo)) {
-                spin_lock_irqsave(&buf->fifo_lock, flags);
-                kfifo_reset(&buf->fifo);
-                spin_unlock_irqrestore(&buf->fifo_lock, flags);
-        } else
-                WARN(1, "calling %s on an uninitialized lirc_buffer\n",
-                     __func__);
-}
-static inline int lirc_buffer_init(struct lirc_buffer *buf,
-                                    unsigned int chunk_size,
-                                    unsigned int size)
-{
-        int ret;
-        init_waitqueue_head(&buf->wait_poll);
-        spin_lock_init(&buf->fifo_lock);
-        buf->chunk_size = chunk_size;
-        buf->size = size;
-        ret = kfifo_alloc(&buf->fifo, size * chunk_size, GFP_KERNEL);
-        return ret;
-}
-static inline void lirc_buffer_free(struct lirc_buffer *buf)
-{
-        if (kfifo_initialized(&buf->fifo)) {
-                kfifo_free(&buf->fifo);
-        } else
-                WARN(1, "calling %s on an uninitialized lirc_buffer\n",
-                     __func__);
-}
-static inline int lirc_buffer_len(struct lirc_buffer *buf)
-{
-        int len;
-        unsigned long flags;
-        spin_lock_irqsave(&buf->fifo_lock, flags);
-        len = kfifo_len(&buf->fifo);
-        spin_unlock_irqrestore(&buf->fifo_lock, flags);
-        return len;
-}
-static inline int lirc_buffer_full(struct lirc_buffer *buf)
-{
-        return lirc_buffer_len(buf) == buf->size * buf->chunk_size;
-}
-static inline int lirc_buffer_empty(struct lirc_buffer *buf)
-{
-        return !lirc_buffer_len(buf);
-}
-static inline unsigned int lirc_buffer_read(struct lirc_buffer *buf,
-                                            unsigned char *dest)
-{
-        unsigned int ret = 0;
-        if (lirc_buffer_len(buf) >= buf->chunk_size)
-                ret = kfifo_out_locked(&buf->fifo, dest, buf->chunk_size,
-                                       &buf->fifo_lock);
-        return ret;
-}
-static inline unsigned int lirc_buffer_write(struct lirc_buffer *buf,
-                                             unsigned char *orig)
-{
-        unsigned int ret;
-        ret = kfifo_in_locked(&buf->fifo, orig, buf->chunk_size,
-                              &buf->fifo_lock);
-        return ret;
-}
-/**
- * struct lirc_dev - represents a LIRC device
- *
- * @name:               used for logging
- * @minor:              the minor device (/dev/lircX) number for the device
- * @code_length:        length of a remote control key code expressed in bits
- * @features:           lirc compatible hardware features, like LIRC_MODE_RAW,
- *                      LIRC_CAN\_\*, as defined at include/media/lirc.h.
- * @buffer_size:        Number of FIFO buffers with @chunk_size size.
- *                      Only used if @rbuf is NULL.
- * @chunk_size:         Size of each FIFO buffer.
- *                      Only used if @rbuf is NULL.
- * @data:               private per-driver data
- * @buf:                if %NULL, lirc_dev will allocate and manage the buffer,
- *                      otherwise allocated by the caller which will
- *                      have to write to the buffer by other means, like irq's
- *                      (see also lirc_serial.c).
- * @buf_internal:       whether lirc_dev has allocated the read buffer or not
- * @rdev:               &struct rc_dev associated with the device
- * @fops:               &struct file_operations for the device
- * @owner:              the module owning this struct
- * @attached:           if the device is still live
- * @open:               open count for the device's chardev
- * @mutex:              serialises file_operations calls
- * @dev:                &struct device assigned to the device
- * @cdev:               &struct cdev assigned to the device
- */
-struct lirc_dev {
-        char name[40];
-        unsigned int minor;
-        __u32 code_length;
-        __u32 features;
-        unsigned int buffer_size; /* in chunks holding one code each */
-        unsigned int chunk_size;
-        struct lirc_buffer *buf;
-        bool buf_internal;
-        void *data;
-        struct rc_dev *rdev;
-        const struct file_operations *fops;
-        struct module *owner;
-        bool attached;
-        int open;
-        struct mutex mutex; /* protect from simultaneous accesses */
-        struct device dev;
-        struct cdev cdev;
-};
-struct lirc_dev *lirc_allocate_device(void);
-void lirc_free_device(struct lirc_dev *d);
-int lirc_register_device(struct lirc_dev *d);
-void lirc_unregister_device(struct lirc_dev *d);
-/* Must be called in the open fop before lirc_get_pdata() can be used */
-void lirc_init_pdata(struct inode *inode, struct file *file);
-/* Returns the private data stored in the lirc_dev
- * associated with the given device file pointer.
- */
-void *lirc_get_pdata(struct file *file);
-/* default file operations
- * used by drivers if they override only some operations
- */
-int lirc_dev_fop_open(struct inode *inode, struct file *file);
-int lirc_dev_fop_close(struct inode *inode, struct file *file);
-__poll_t lirc_dev_fop_poll(struct file *file, poll_table *wait);
-long lirc_dev_fop_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
-ssize_t lirc_dev_fop_read(struct file *file, char __user *buffer, size_t length,
-                          loff_t *ppos);
-#endif
diff --git a/include/media/media-entity.h b/include/media/media-entity.h
index 222d379960b7..a732af1dbba0 100644
--- a/include/media/media-entity.h
+++ b/include/media/media-entity.h
@@ -88,6 +88,8 @@ struct media_entity_enum {
 * @stack:              Graph traversal stack; the stack contains information
 *                      on the path the media entities to be walked and the
 *                      links through which they were reached.
+ * @stack.entity:       pointer to &struct media_entity at the graph.
+ * @stack.link:         pointer to &struct list_head.
 * @ent_enum:           Visited entities
 * @top:                The top of the stack
 */
@@ -247,6 +249,9 @@ enum media_entity_type {
 * @pipe:       Pipeline this entity belongs to.
 * @info:       Union with devnode information.  Kept just for backward
 *              compatibility.
+ * @info.dev:   Contains device major and minor info.
+ * @info.dev.major: device node major, if the device is a devnode.
+ * @info.dev.minor: device node minor, if the device is a devnode.
 * @major:      Devnode major number (zero if not applicable). Kept just
 *              for backward compatibility.
 * @minor:      Devnode minor number (zero if not applicable). Kept just
@@ -629,7 +634,11 @@ int media_entity_pads_init(struct media_entity *entity, u16 num_pads,
 * This function must be called during the cleanup phase after unregistering
 * the entity (currently, it does nothing).
 */
-static inline void media_entity_cleanup(struct media_entity *entity) {};
+#if IS_ENABLED(CONFIG_MEDIA_CONTROLLER)
+static inline void media_entity_cleanup(struct media_entity *entity) {}
+#else
+#define media_entity_cleanup(entity) do { } while (false)
+#endif
 /**
 * media_create_pad_link() - creates a link between two entities.
diff --git a/include/media/rc-core.h b/include/media/rc-core.h
index 314a1edb6189..aed4272d47f5 100644
--- a/include/media/rc-core.h
+++ b/include/media/rc-core.h
@@ -17,6 +17,7 @@
 #define _RC_CORE
 #include <linux/spinlock.h>
+#include <linux/cdev.h>
 #include <linux/kfifo.h>
 #include <linux/time.h>
 #include <linux/timer.h>
@@ -30,9 +31,9 @@ do {								\
 } while (0)
 /**
- * enum rc_driver_type - type of the RC output
+ * enum rc_driver_type - type of the RC driver.
 *
- * @RC_DRIVER_SCANCODE:  Driver or hardware generates a scancode
+ * @RC_DRIVER_SCANCODE:  Driver or hardware generates a scancode.
 * @RC_DRIVER_IR_RAW:    Driver or hardware generates pulse/space sequences.
 *                       It needs a Infra-Red pulse/space decoder
 * @RC_DRIVER_IR_RAW_TX: Device transmitter only,
@@ -68,6 +69,33 @@ enum rc_filter_type {
 };
 /**
+ * struct lirc_fh - represents an open lirc file
+ * @list: list of open file handles
+ * @rc: rcdev for this lirc chardev
+ * @carrier_low: when setting the carrier range, first the low end must be
+ *      set with an ioctl and then the high end with another ioctl
+ * @send_timeout_reports: report timeouts in lirc raw IR.
+ * @rawir: queue for incoming raw IR
+ * @scancodes: queue for incoming decoded scancodes
+ * @wait_poll: poll struct for lirc device
+ * @send_mode: lirc mode for sending, either LIRC_MODE_SCANCODE or
+ *      LIRC_MODE_PULSE
+ * @rec_mode: lirc mode for receiving, either LIRC_MODE_SCANCODE or
+ *      LIRC_MODE_MODE2
+ */
+struct lirc_fh {
+        struct list_head list;
+        struct rc_dev *rc;
+        int                             carrier_low;
+        bool                            send_timeout_reports;
+        DECLARE_KFIFO_PTR(rawir, unsigned int);
+        DECLARE_KFIFO_PTR(scancodes, struct lirc_scancode);
+        wait_queue_head_t               wait_poll;
+        u8                              send_mode;
+        u8                              rec_mode;
+};
+/**
 * struct rc_dev - represents a remote control device
 * @dev: driver model's view of this device
 * @managed_alloc: devm_rc_allocate_device was used to create rc_dev
@@ -106,6 +134,8 @@ enum rc_filter_type {
 * @keypressed: whether a key is currently pressed
 * @keyup_jiffies: time (in jiffies) when the current keypress should be released
 * @timer_keyup: timer for releasing a keypress
+ * @timer_repeat: timer for autorepeat events. This is needed for CEC, which
+ *      has non-standard repeats.
 * @last_keycode: keycode of last keypress
 * @last_protocol: protocol of last keypress
 * @last_scancode: scancode of last keypress
@@ -115,6 +145,15 @@ enum rc_filter_type {
 * @max_timeout: maximum timeout supported by device
 * @rx_resolution : resolution (in ns) of input sampler
 * @tx_resolution: resolution (in ns) of output sampler
+ * @lirc_dev: lirc device
+ * @lirc_cdev: lirc char cdev
+ * @gap_start: time when gap starts
+ * @gap_duration: duration of initial gap
+ * @gap: true if we're in a gap
+ * @lirc_fh_lock: protects lirc_fh list
+ * @lirc_fh: list of open files
+ * @registered: set to true by rc_register_device(), false by
+ *      rc_unregister_device
 * @change_protocol: allow changing the protocol used on hardware decoders
 * @open: callback to allow drivers to enable polling/irq when IR input device
 *      is opened.
@@ -165,6 +204,7 @@ struct rc_dev {
        bool                            keypressed;
        unsigned long                   keyup_jiffies;
        struct timer_list               timer_keyup;
+        struct timer_list               timer_repeat;
        u32                             last_keycode;
        enum rc_proto                   last_protocol;
        u32                             last_scancode;
@@ -174,6 +214,16 @@ struct rc_dev {
        u32                             max_timeout;
        u32                             rx_resolution;
        u32                             tx_resolution;
+#ifdef CONFIG_LIRC
+        struct device                   lirc_dev;
+        struct cdev                     lirc_cdev;
+        ktime_t                         gap_start;
+        u64                             gap_duration;
+        bool                            gap;
+        spinlock_t                      lirc_fh_lock;
+        struct list_head                lirc_fh;
+#endif
+        bool                            registered;
        int                             (*change_protocol)(struct rc_dev *dev, u64 *rc_proto);
        int                             (*open)(struct rc_dev *dev);
        void                            (*close)(struct rc_dev *dev);
@@ -248,20 +298,6 @@ int devm_rc_register_device(struct device *parent, struct rc_dev *dev);
 */
 void rc_unregister_device(struct rc_dev *dev);
-/**
- * rc_open - Opens a RC device
- *
- * @rdev: pointer to struct rc_dev.
- */
-int rc_open(struct rc_dev *rdev);
-/**
- * rc_close - Closes a RC device
- *
- * @rdev: pointer to struct rc_dev.
- */
-void rc_close(struct rc_dev *rdev);
 void rc_repeat(struct rc_dev *dev);
 void rc_keydown(struct rc_dev *dev, enum rc_proto protocol, u32 scancode,
                u8 toggle);
@@ -309,6 +345,7 @@ int ir_raw_event_store_with_filter(struct rc_dev *dev,
 void ir_raw_event_set_idle(struct rc_dev *dev, bool idle);
 int ir_raw_encode_scancode(enum rc_proto protocol, u32 scancode,
                           struct ir_raw_event *events, unsigned int max);
+int ir_raw_encode_carrier(enum rc_proto protocol);
 static inline void ir_raw_event_reset(struct rc_dev *dev)
 {
diff --git a/include/media/rc-map.h b/include/media/rc-map.h
index 72197cb43781..7046734b3895 100644
--- a/include/media/rc-map.h
+++ b/include/media/rc-map.h
@@ -10,59 +10,7 @@
 */
 #include <linux/input.h>
+#include <uapi/linux/lirc.h>
-/**
- * enum rc_proto - the Remote Controller protocol
- *
- * @RC_PROTO_UNKNOWN: Protocol not known
- * @RC_PROTO_OTHER: Protocol known but proprietary
- * @RC_PROTO_RC5: Philips RC5 protocol
- * @RC_PROTO_RC5X_20: Philips RC5x 20 bit protocol
- * @RC_PROTO_RC5_SZ: StreamZap variant of RC5
- * @RC_PROTO_JVC: JVC protocol
- * @RC_PROTO_SONY12: Sony 12 bit protocol
- * @RC_PROTO_SONY15: Sony 15 bit protocol
- * @RC_PROTO_SONY20: Sony 20 bit protocol
- * @RC_PROTO_NEC: NEC protocol
- * @RC_PROTO_NECX: Extended NEC protocol
- * @RC_PROTO_NEC32: NEC 32 bit protocol
- * @RC_PROTO_SANYO: Sanyo protocol
- * @RC_PROTO_MCIR2_KBD: RC6-ish MCE keyboard
- * @RC_PROTO_MCIR2_MSE: RC6-ish MCE mouse
- * @RC_PROTO_RC6_0: Philips RC6-0-16 protocol
- * @RC_PROTO_RC6_6A_20: Philips RC6-6A-20 protocol
- * @RC_PROTO_RC6_6A_24: Philips RC6-6A-24 protocol
- * @RC_PROTO_RC6_6A_32: Philips RC6-6A-32 protocol
- * @RC_PROTO_RC6_MCE: MCE (Philips RC6-6A-32 subtype) protocol
- * @RC_PROTO_SHARP: Sharp protocol
- * @RC_PROTO_XMP: XMP protocol
- * @RC_PROTO_CEC: CEC protocol
- */
-enum rc_proto {
-        RC_PROTO_UNKNOWN        = 0,
-        RC_PROTO_OTHER          = 1,
-        RC_PROTO_RC5            = 2,
-        RC_PROTO_RC5X_20        = 3,
-        RC_PROTO_RC5_SZ         = 4,
-        RC_PROTO_JVC            = 5,
-        RC_PROTO_SONY12         = 6,
-        RC_PROTO_SONY15         = 7,
-        RC_PROTO_SONY20         = 8,
-        RC_PROTO_NEC            = 9,
-        RC_PROTO_NECX           = 10,
-        RC_PROTO_NEC32          = 11,
-        RC_PROTO_SANYO          = 12,
-        RC_PROTO_MCIR2_KBD      = 13,
-        RC_PROTO_MCIR2_MSE      = 14,
-        RC_PROTO_RC6_0          = 15,
-        RC_PROTO_RC6_6A_20      = 16,
-        RC_PROTO_RC6_6A_24      = 17,
-        RC_PROTO_RC6_6A_32      = 18,
-        RC_PROTO_RC6_MCE        = 19,
-        RC_PROTO_SHARP          = 20,
-        RC_PROTO_XMP            = 21,
-        RC_PROTO_CEC            = 22,
-};
 #define RC_PROTO_BIT_NONE               0ULL
 #define RC_PROTO_BIT_UNKNOWN            BIT_ULL(RC_PROTO_UNKNOWN)
diff --git a/include/media/v4l2-tpg.h b/include/media/tpg/v4l2-tpg.h
index 13e49d85cae3..823fadede7bf 100644
--- a/include/media/v4l2-tpg.h
+++ b/include/media/tpg/v4l2-tpg.h
@@ -26,8 +26,51 @@
 #include <linux/slab.h>
 #include <linux/vmalloc.h>
 #include <linux/videodev2.h>
-#include <media/v4l2-tpg-colors.h>
+struct tpg_rbg_color8 {
+        unsigned char r, g, b;
+};
+struct tpg_rbg_color16 {
+        __u16 r, g, b;
+};
+enum tpg_color {
+        TPG_COLOR_CSC_WHITE,
+        TPG_COLOR_CSC_YELLOW,
+        TPG_COLOR_CSC_CYAN,
+        TPG_COLOR_CSC_GREEN,
+        TPG_COLOR_CSC_MAGENTA,
+        TPG_COLOR_CSC_RED,
+        TPG_COLOR_CSC_BLUE,
+        TPG_COLOR_CSC_BLACK,
+        TPG_COLOR_75_YELLOW,
+        TPG_COLOR_75_CYAN,
+        TPG_COLOR_75_GREEN,
+        TPG_COLOR_75_MAGENTA,
+        TPG_COLOR_75_RED,
+        TPG_COLOR_75_BLUE,
+        TPG_COLOR_100_WHITE,
+        TPG_COLOR_100_YELLOW,
+        TPG_COLOR_100_CYAN,
+        TPG_COLOR_100_GREEN,
+        TPG_COLOR_100_MAGENTA,
+        TPG_COLOR_100_RED,
+        TPG_COLOR_100_BLUE,
+        TPG_COLOR_100_BLACK,
+        TPG_COLOR_TEXTFG,
+        TPG_COLOR_TEXTBG,
+        TPG_COLOR_RANDOM,
+        TPG_COLOR_RAMP,
+        TPG_COLOR_MAX = TPG_COLOR_RAMP + 256
+};
+extern const struct tpg_rbg_color8 tpg_colors[TPG_COLOR_MAX];
+extern const unsigned short tpg_rec709_to_linear[255 * 16 + 1];
+extern const unsigned short tpg_linear_to_rec709[255 * 16 + 1];
+extern const struct tpg_rbg_color16 tpg_csc_colors[V4L2_COLORSPACE_DCI_P3 + 1]
+                                          [V4L2_XFER_FUNC_SMPTE2084 + 1]
+                                          [TPG_COLOR_CSC_BLACK + 1];
 enum tpg_pattern {
        TPG_PAT_75_COLORBAR,
        TPG_PAT_100_COLORBAR,
diff --git a/include/media/tuner-types.h b/include/media/tuner-types.h
index 78f0654d9c3d..df76ac8e658c 100644
--- a/include/media/tuner-types.h
+++ b/include/media/tuner-types.h
@@ -171,6 +171,21 @@ struct tuner_params {
        struct tuner_range *ranges;
 };
+/**
+ * struct tunertype - describes the known tuners.
+ *
+ * @name:       string with the tuner's name.
+ * @count:      size of &struct tuner_params array.
+ * @params:     pointer to &struct tuner_params array.
+ *
+ * @min:        minimal tuner frequency, in 62.5 kHz step.
+ *              should be multiplied to 16 to convert to MHz.
+ * @max:        minimal tuner frequency, in 62.5 kHz step.
+ *              Should be multiplied to 16 to convert to MHz.
+ * @stepsize:   frequency step, in Hz.
+ * @initdata:   optional byte sequence to initialize the tuner.
+ * @sleepdata:  optional byte sequence to power down the tuner.
+ */
 struct tunertype {
        char *name;
        unsigned int count;
diff --git a/include/media/v4l2-async.h b/include/media/v4l2-async.h
index 6152434cbe82..1592d323c577 100644
--- a/include/media/v4l2-async.h
+++ b/include/media/v4l2-async.h
@@ -28,7 +28,7 @@ struct v4l2_async_notifier;
 *      in order to identify a match
 *
 * @V4L2_ASYNC_MATCH_CUSTOM: Match will use the logic provided by &struct
- *      v4l2_async_subdev.match ops
+ *      v4l2_async_subdev.match ops
 * @V4L2_ASYNC_MATCH_DEVNAME: Match will use the device name
 * @V4L2_ASYNC_MATCH_I2C: Match will check for I2C adapter ID and address
 * @V4L2_ASYNC_MATCH_FWNODE: Match will use firmware node
@@ -48,6 +48,31 @@ enum v4l2_async_match_type {
 *
 * @match_type: type of match that will be used
 * @match:      union of per-bus type matching data sets
+ * @match.fwnode:
+ *              pointer to &struct fwnode_handle to be matched.
+ *              Used if @match_type is %V4L2_ASYNC_MATCH_FWNODE.
+ * @match.device_name:
+ *              string containing the device name to be matched.
+ *              Used if @match_type is %V4L2_ASYNC_MATCH_DEVNAME.
+ * @match.i2c:  embedded struct with I2C parameters to be matched.
+ *              Both @match.i2c.adapter_id and @match.i2c.address
+ *              should be matched.
+ *              Used if @match_type is %V4L2_ASYNC_MATCH_I2C.
+ * @match.i2c.adapter_id:
+ *              I2C adapter ID to be matched.
+ *              Used if @match_type is %V4L2_ASYNC_MATCH_I2C.
+ * @match.i2c.address:
+ *              I2C address to be matched.
+ *              Used if @match_type is %V4L2_ASYNC_MATCH_I2C.
+ * @match.custom:
+ *              Driver-specific match criteria.
+ *              Used if @match_type is %V4L2_ASYNC_MATCH_CUSTOM.
+ * @match.custom.match:
+ *              Driver-specific match function to be used if
+ *              %V4L2_ASYNC_MATCH_CUSTOM.
+ * @match.custom.priv:
+ *              Driver-specific private struct with match parameters
+ *              to be used if %V4L2_ASYNC_MATCH_CUSTOM.
 * @list:       used to link struct v4l2_async_subdev objects, waiting to be
 *              probed, to a notifier->waiting list
 *
@@ -58,12 +83,8 @@ enum v4l2_async_match_type {
 struct v4l2_async_subdev {
        enum v4l2_async_match_type match_type;
        union {
-                struct {
+                struct fwnode_handle *fwnode;
-                        struct fwnode_handle *fwnode;
+                const char *device_name;
-                } fwnode;
-                struct {
-                        const char *name;
-                } device_name;
                struct {
                        int adapter_id;
                        unsigned short address;
@@ -167,7 +188,7 @@ void v4l2_async_notifier_cleanup(struct v4l2_async_notifier *notifier);
 /**
 * v4l2_async_register_subdev - registers a sub-device to the asynchronous
- *      subdevice framework
+ *      subdevice framework
 *
 * @sd: pointer to &struct v4l2_subdev
 */
@@ -197,7 +218,7 @@ int __must_check v4l2_async_register_subdev_sensor_common(
 /**
 * v4l2_async_unregister_subdev - unregisters a sub-device to the asynchronous
- *      subdevice framework
+ *      subdevice framework
 *
 * @sd: pointer to &struct v4l2_subdev
 */
diff --git a/include/media/v4l2-common.h b/include/media/v4l2-common.h
index aac8b7b6e691..e0d95a7c5d48 100644
--- a/include/media/v4l2-common.h
+++ b/include/media/v4l2-common.h
@@ -28,7 +28,7 @@
 #include <media/v4l2-dev.h>
-/* Common printk constucts for v4l-i2c drivers. These macros create a unique
+/* Common printk constructs for v4l-i2c drivers. These macros create a unique
   prefix consisting of the driver name, the adapter number and the i2c
   address. */
 #define v4l_printk(level, name, adapter, addr, fmt, arg...) \
@@ -50,7 +50,7 @@
 /* These three macros assume that the debug level is set with a module
   parameter called 'debug'. */
 #define v4l_dbg(level, debug, client, fmt, arg...)                           \
-        do {                                                                 \
+        do {                                                                 \
                if (debug >= (level))                                        \
                        v4l_client_printk(KERN_DEBUG, client, fmt , ## arg); \
        } while (0)
@@ -80,9 +80,9 @@
 /* These three macros assume that the debug level is set with a module
   parameter called 'debug'. */
 #define v4l2_dbg(level, debug, dev, fmt, arg...)                        \
-        do {                                                            \
+        do {                                                            \
                if (debug >= (level))                                   \
-                        v4l2_printk(KERN_DEBUG, dev, fmt , ## arg);     \
+                        v4l2_printk(KERN_DEBUG, dev, fmt , ## arg);     \
        } while (0)
 /**
@@ -127,7 +127,7 @@ struct v4l2_subdev_ops;
 * @client_type:  name of the chip that's on the adapter.
 * @addr: I2C address. If zero, it will use @probe_addrs
 * @probe_addrs: array with a list of address. The last entry at such
- *      array should be %I2C_CLIENT_END.
+ *      array should be %I2C_CLIENT_END.
 *
 * returns a &struct v4l2_subdev pointer.
 */
@@ -146,7 +146,7 @@ struct i2c_board_info;
 * @info: pointer to struct i2c_board_info used to replace the irq,
 *       platform_data and addr arguments.
 * @probe_addrs: array with a list of address. The last entry at such
- *      array should be %I2C_CLIENT_END.
+ *      array should be %I2C_CLIENT_END.
 *
 * returns a &struct v4l2_subdev pointer.
 */
@@ -174,17 +174,43 @@ void v4l2_i2c_subdev_init(struct v4l2_subdev *sd, struct i2c_client *client,
 */
 unsigned short v4l2_i2c_subdev_addr(struct v4l2_subdev *sd);
+/**
+ * enum v4l2_i2c_tuner_type - specifies the range of tuner address that
+ *      should be used when seeking for I2C devices.
+ *
+ * @ADDRS_RADIO:                Radio tuner addresses.
+ *                              Represent the following I2C addresses:
+ *                              0x10 (if compiled with tea5761 support)
+ *                              and 0x60.
+ * @ADDRS_DEMOD:                Demod tuner addresses.
+ *                              Represent the following I2C addresses:
+ *                              0x42, 0x43, 0x4a and 0x4b.
+ * @ADDRS_TV:                   TV tuner addresses.
+ *                              Represent the following I2C addresses:
+ *                              0x42, 0x43, 0x4a, 0x4b, 0x60, 0x61, 0x62,
+ *                              0x63 and 0x64.
+ * @ADDRS_TV_WITH_DEMOD:        TV tuner addresses if demod is present, this
+ *                              excludes addresses used by the demodulator
+ *                              from the list of candidates.
+ *                              Represent the following I2C addresses:
+ *                              0x60, 0x61, 0x62, 0x63 and 0x64.
+ *
+ * NOTE: All I2C addresses above use the 7-bit notation.
+ */
 enum v4l2_i2c_tuner_type {
-        ADDRS_RADIO,    /* Radio tuner addresses */
+        ADDRS_RADIO,
-        ADDRS_DEMOD,    /* Demod tuner addresses */
+        ADDRS_DEMOD,
-        ADDRS_TV,       /* TV tuner addresses */
+        ADDRS_TV,
-        /* TV tuner addresses if demod is present, this excludes
-           addresses used by the demodulator from the list of
-           candidates. */
        ADDRS_TV_WITH_DEMOD,
 };
-/* Return a list of I2C tuner addresses to probe. Use only if the tuner
+/**
-   addresses are unknown. */
+ * v4l2_i2c_tuner_addrs - Return a list of I2C tuner addresses to probe.
+ *
+ * @type: type of the tuner to seek, as defined by
+ *        &enum v4l2_i2c_tuner_type.
+ *
+ * NOTE: Use only if the tuner addresses are unknown.
+ */
 const unsigned short *v4l2_i2c_tuner_addrs(enum v4l2_i2c_tuner_type type);
 /* ------------------------------------------------------------------------- */
@@ -224,10 +250,14 @@ void v4l2_spi_subdev_init(struct v4l2_subdev *sd, struct spi_device *spi,
 /* ------------------------------------------------------------------------- */
-/* Note: these remaining ioctls/structs should be removed as well, but they are
+/*
-   still used in tuner-simple.c (TUNER_SET_CONFIG), cx18/ivtv (RESET) and
+ * FIXME: these remaining ioctls/structs should be removed as well, but they
-   v4l2-int-device.h (v4l2_routing). To remove these ioctls some more cleanup
+ * are still used in tuner-simple.c (TUNER_SET_CONFIG) and cx18/ivtv (RESET).
-   is needed in those modules. */
+ * To remove these ioctls some more cleanup is needed in those modules.
+ *
+ * It doesn't make much sense on documenting them, as what we really want is
+ * to get rid of them.
+ */
 /* s_config */
 struct v4l2_priv_tun_config {
@@ -236,32 +266,79 @@ struct v4l2_priv_tun_config {
 };
 #define TUNER_SET_CONFIG           _IOW('d', 92, struct v4l2_priv_tun_config)
-#define VIDIOC_INT_RESET                _IOW ('d', 102, u32)
+#define VIDIOC_INT_RESET                _IOW ('d', 102, u32)
-struct v4l2_routing {
-        u32 input;
-        u32 output;
-};
 /* ------------------------------------------------------------------------- */
 /* Miscellaneous helper functions */
-void v4l_bound_align_image(unsigned int *w, unsigned int wmin,
+/**
+ * v4l_bound_align_image - adjust video dimensions according to
+ *      a given constraints.
+ *
+ * @width:      pointer to width that will be adjusted if needed.
+ * @wmin:       minimum width.
+ * @wmax:       maximum width.
+ * @walign:     least significant bit on width.
+ * @height:     pointer to height that will be adjusted if needed.
+ * @hmin:       minimum height.
+ * @hmax:       maximum height.
+ * @halign:     least significant bit on width.
+ * @salign:     least significant bit for the image size (e. g.
+ *              :math:`width * height`).
+ *
+ * Clip an image to have @width between @wmin and @wmax, and @height between
+ * @hmin and @hmax, inclusive.
+ *
+ * Additionally, the @width will be a multiple of :math:`2^{walign}`,
+ * the @height will be a multiple of :math:`2^{halign}`, and the overall
+ * size :math:`width * height` will be a multiple of :math:`2^{salign}`.
+ *
+ * .. note::
+ *
+ *    #. The clipping rectangle may be shrunk or enlarged to fit the alignment
+ *       constraints.
+ *    #. @wmax must not be smaller than @wmin.
+ *    #. @hmax must not be smaller than @hmin.
+ *    #. The alignments must not be so high there are no possible image
+ *       sizes within the allowed bounds.
+ *    #. @wmin and @hmin must be at least 1 (don't use 0).
+ *    #. For @walign, @halign and @salign, if you don't care about a certain
+ *       alignment, specify ``0``, as :math:`2^0 = 1` and one byte alignment
+ *       is equivalent to no alignment.
+ *    #. If you only want to adjust downward, specify a maximum that's the
+ *       same as the initial value.
+ */
+void v4l_bound_align_image(unsigned int *width, unsigned int wmin,
                           unsigned int wmax, unsigned int walign,
-                           unsigned int *h, unsigned int hmin,
+                           unsigned int *height, unsigned int hmin,
                           unsigned int hmax, unsigned int halign,
                           unsigned int salign);
-struct v4l2_discrete_probe {
+/**
-        const struct v4l2_frmsize_discrete      *sizes;
+ * v4l2_find_nearest_format - find the nearest format size among a discrete
-        int                                     num_sizes;
+ *      set of resolutions.
-};
+ *
+ * @sizes: array of &struct v4l2_frmsize_discrete image sizes.
-const struct v4l2_frmsize_discrete *v4l2_find_nearest_format(
+ * @num_sizes: length of @sizes array.
-                const struct v4l2_discrete_probe *probe,
+ * @width: desired width.
-                s32 width, s32 height);
+ * @height: desired height.
+ *
+ * Finds the closest resolution to minimize the width and height differences
+ * between what requested and the supported resolutions.
+ */
+const struct v4l2_frmsize_discrete *
+v4l2_find_nearest_format(const struct v4l2_frmsize_discrete *sizes,
+                          const size_t num_sizes,
+                          s32 width, s32 height);
+/**
+ * v4l2_get_timestamp - helper routine to get a timestamp to be used when
+ *      filling streaming metadata. Internally, it uses ktime_get_ts(),
+ *      which is the recommended way to get it.
+ *
+ * @tv: pointer to &struct timeval to be filled.
+ */
 void v4l2_get_timestamp(struct timeval *tv);
 #endif /* V4L2_COMMON_H_ */
diff --git a/include/media/v4l2-ctrls.h b/include/media/v4l2-ctrls.h
index a9ced6bbee55..05ebb9ef9e73 100644
--- a/include/media/v4l2-ctrls.h
+++ b/include/media/v4l2-ctrls.h
@@ -166,8 +166,15 @@ typedef void (*v4l2_ctrl_notify_fnc)(struct v4l2_ctrl *ctrl, void *priv);
 *              empty strings ("") correspond to non-existing menu items (this
 *              is in addition to the menu_skip_mask above). The last entry
 *              must be NULL.
+ *              Used only if the @type is %V4L2_CTRL_TYPE_MENU.
+ * @qmenu_int:  A 64-bit integer array for with integer menu items.
+ *              The size of array must be equal to the menu size, e. g.:
+ *              :math:`ceil(\frac{maximum - minimum}{step}) + 1`.
+ *              Used only if the @type is %V4L2_CTRL_TYPE_INTEGER_MENU.
 * @flags:      The control's flags.
- * @cur:        The control's current value.
+ * @cur:        Structure to store the current value.
+ * @cur.val:    The control's current value, if the @type is represented via
+ *              a u32 integer (see &enum v4l2_ctrl_type).
 * @val:        The control's new s32 value.
 * @priv:       The control's private pointer. For use by the driver. It is
 *              untouched by the control framework. Note that this pointer is
@@ -1139,7 +1146,7 @@ int v4l2_s_ext_ctrls(struct v4l2_fh *fh, struct v4l2_ctrl_handler *hdl,
 /**
 * v4l2_ctrl_subdev_subscribe_event - Helper function to implement
- *      as a &struct v4l2_subdev_core_ops subscribe_event function
+ *      as a &struct v4l2_subdev_core_ops subscribe_event function
 *      that just subscribes control events.
 *
 * @sd: pointer to &struct v4l2_subdev
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index fa99f6f66712..53f32022fabe 100644
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -21,31 +21,63 @@
 #define VIDEO_MAJOR     81
-#define VFL_TYPE_GRABBER        0
+/**
-#define VFL_TYPE_VBI            1
+ * enum vfl_devnode_type - type of V4L2 device node
-#define VFL_TYPE_RADIO          2
+ *
-#define VFL_TYPE_SUBDEV         3
+ * @VFL_TYPE_GRABBER:   for video input/output devices
-#define VFL_TYPE_SDR            4
+ * @VFL_TYPE_VBI:       for vertical blank data (i.e. closed captions, teletext)
-#define VFL_TYPE_TOUCH          5
+ * @VFL_TYPE_RADIO:     for radio tuners
-#define VFL_TYPE_MAX            6
+ * @VFL_TYPE_SUBDEV:    for V4L2 subdevices
+ * @VFL_TYPE_SDR:       for Software Defined Radio tuners
-/* Is this a receiver, transmitter or mem-to-mem? */
+ * @VFL_TYPE_TOUCH:     for touch sensors
-/* Ignored for VFL_TYPE_SUBDEV. */
+ */
-#define VFL_DIR_RX              0
+enum vfl_devnode_type {
-#define VFL_DIR_TX              1
+        VFL_TYPE_GRABBER        = 0,
-#define VFL_DIR_M2M             2
+        VFL_TYPE_VBI            = 1,
+        VFL_TYPE_RADIO          = 2,
+        VFL_TYPE_SUBDEV         = 3,
+        VFL_TYPE_SDR            = 4,
+        VFL_TYPE_TOUCH          = 5,
+};
+#define VFL_TYPE_MAX VFL_TYPE_TOUCH
+/**
+ * enum  vfl_direction - Identifies if a &struct video_device corresponds
+ *      to a receiver, a transmitter or a mem-to-mem device.
+ *
+ * @VFL_DIR_RX:         device is a receiver.
+ * @VFL_DIR_TX:         device is a transmitter.
+ * @VFL_DIR_M2M:        device is a memory to memory device.
+ *
+ * Note: Ignored if &enum vfl_devnode_type is %VFL_TYPE_SUBDEV.
+ */
+enum vfl_devnode_direction {
+        VFL_DIR_RX,
+        VFL_DIR_TX,
+        VFL_DIR_M2M,
+};
 struct v4l2_ioctl_callbacks;
 struct video_device;
 struct v4l2_device;
 struct v4l2_ctrl_handler;
-/* Flag to mark the video_device struct as registered.
+/**
-   Drivers can clear this flag if they want to block all future
+ * enum v4l2_video_device_flags - Flags used by &struct video_device
-   device access. It is cleared by video_unregister_device. */
+ *
-#define V4L2_FL_REGISTERED      (0)
+ * @V4L2_FL_REGISTERED:
-/* file->private_data points to struct v4l2_fh */
+ *      indicates that a &struct video_device is registered.
-#define V4L2_FL_USES_V4L2_FH    (1)
+ *      Drivers can clear this flag if they want to block all future
+ *      device access. It is cleared by video_unregister_device.
+ * @V4L2_FL_USES_V4L2_FH:
+ *      indicates that file->private_data points to &struct v4l2_fh.
+ *      This flag is set by the core when v4l2_fh_init() is called.
+ *      All new drivers should use it.
+ */
+enum v4l2_video_device_flags {
+        V4L2_FL_REGISTERED      = 0,
+        V4L2_FL_USES_V4L2_FH    = 1,
+};
 /* Priority helper functions */
@@ -166,7 +198,7 @@ struct v4l2_file_operations {
 /*
 * Newer version of video_device, handled by videodev2.c
- *      This version moves redundant code from video device code to
+ *      This version moves redundant code from video device code to
 *      the common handler
 */
@@ -189,11 +221,12 @@ struct v4l2_file_operations {
 * @prio: pointer to &struct v4l2_prio_state with device's Priority state.
 *       If NULL, then v4l2_dev->prio will be used.
 * @name: video device name
- * @vfl_type: V4L device type
+ * @vfl_type: V4L device type, as defined by &enum vfl_devnode_type
 * @vfl_dir: V4L receiver, transmitter or m2m
 * @minor: device node 'minor'. It is set to -1 if the registration failed
 * @num: number of the video device node
- * @flags: video device flags. Use bitops to set/clear/test flags
+ * @flags: video device flags. Use bitops to set/clear/test flags.
+ *         Contains a set of &enum v4l2_video_device_flags.
 * @index: attribute to differentiate multiple indices on one physical device
 * @fh_lock: Lock for all v4l2_fhs
 * @fh_list: List of &struct v4l2_fh
@@ -237,8 +270,8 @@ struct video_device
        /* device info */
        char name[32];
-        int vfl_type;
+        enum vfl_devnode_type vfl_type;
-        int vfl_dir;
+        enum vfl_devnode_direction vfl_dir;
        int minor;
        u16 num;
        unsigned long flags;
@@ -261,18 +294,30 @@ struct video_device
        struct mutex *lock;
 };
-#define media_entity_to_video_device(__e) \
+/**
-        container_of(__e, struct video_device, entity)
+ * media_entity_to_video_device - Returns a &struct video_device from
-/* dev to video-device */
+ *      the &struct media_entity embedded on it.
+ *
+ * @entity: pointer to &struct media_entity
+ */
+#define media_entity_to_video_device(entity) \
+        container_of(entity, struct video_device, entity)
+/**
+ * to_video_device - Returns a &struct video_device from the
+ *      &struct device embedded on it.
+ *
+ * @cd: pointer to &struct device
+ */
 #define to_video_device(cd) container_of(cd, struct video_device, dev)
 /**
 * __video_register_device - register video4linux devices
 *
 * @vdev: struct video_device to register
- * @type: type of device to register
+ * @type: type of device to register, as defined by &enum vfl_devnode_type
 * @nr:   which device node number is desired:
- *      (0 == /dev/video0, 1 == /dev/video1, ..., -1 == first free)
+ *      (0 == /dev/video0, 1 == /dev/video1, ..., -1 == first free)
 * @warn_if_nr_in_use: warn if the desired device node number
 *        was already in use and another number was chosen instead.
 * @owner: module that owns the video device node
@@ -289,43 +334,37 @@ struct video_device
 *
 * Returns 0 on success.
 *
- * Valid values for @type are:
- *
- *      - %VFL_TYPE_GRABBER - A frame grabber
- *      - %VFL_TYPE_VBI - Vertical blank data (undecoded)
- *      - %VFL_TYPE_RADIO - A radio card
- *      - %VFL_TYPE_SUBDEV - A subdevice
- *      - %VFL_TYPE_SDR - Software Defined Radio
- *      - %VFL_TYPE_TOUCH - A touch sensor
- *
 * .. note::
 *
 *      This function is meant to be used only inside the V4L2 core.
 *      Drivers should use video_register_device() or
 *      video_register_device_no_warn().
 */
-int __must_check __video_register_device(struct video_device *vdev, int type,
+int __must_check __video_register_device(struct video_device *vdev,
-                int nr, int warn_if_nr_in_use, struct module *owner);
+                                         enum vfl_devnode_type type,
+                                         int nr, int warn_if_nr_in_use,
+                                         struct module *owner);
 /**
 *  video_register_device - register video4linux devices
 *
 * @vdev: struct video_device to register
- * @type: type of device to register
+ * @type: type of device to register, as defined by &enum vfl_devnode_type
 * @nr:   which device node number is desired:
- *      (0 == /dev/video0, 1 == /dev/video1, ..., -1 == first free)
+ *      (0 == /dev/video0, 1 == /dev/video1, ..., -1 == first free)
 *
 * Internally, it calls __video_register_device(). Please see its
 * documentation for more details.
 *
 * .. note::
- *      if video_register_device fails, the release() callback of
+ *      if video_register_device fails, the release() callback of
 *      &struct video_device structure is *not* called, so the caller
 *      is responsible for freeing any data. Usually that means that
 *      you video_device_release() should be called on failure.
 */
 static inline int __must_check video_register_device(struct video_device *vdev,
-                int type, int nr)
+                                                     enum vfl_devnode_type type,
+                                                     int nr)
 {
        return __video_register_device(vdev, type, nr, 1, vdev->fops->owner);
 }
@@ -334,9 +373,9 @@ static inline int __must_check video_register_device(struct video_device *vdev,
 *  video_register_device_no_warn - register video4linux devices
 *
 * @vdev: struct video_device to register
- * @type: type of device to register
+ * @type: type of device to register, as defined by &enum vfl_devnode_type
 * @nr:   which device node number is desired:
- *      (0 == /dev/video0, 1 == /dev/video1, ..., -1 == first free)
+ *      (0 == /dev/video0, 1 == /dev/video1, ..., -1 == first free)
 *
 * This function is identical to video_register_device() except that no
 * warning is issued if the desired device node number was already in use.
@@ -345,13 +384,14 @@ static inline int __must_check video_register_device(struct video_device *vdev,
 * documentation for more details.
 *
 * .. note::
- *      if video_register_device fails, the release() callback of
+ *      if video_register_device fails, the release() callback of
 *      &struct video_device structure is *not* called, so the caller
 *      is responsible for freeing any data. Usually that means that
 *      you video_device_release() should be called on failure.
 */
-static inline int __must_check video_register_device_no_warn(
+static inline int __must_check
-                struct video_device *vdev, int type, int nr)
+video_register_device_no_warn(struct video_device *vdev,
+                              enum vfl_devnode_type type, int nr)
 {
        return __video_register_device(vdev, type, nr, 0, vdev->fops->owner);
 }
@@ -383,7 +423,7 @@ void video_device_release(struct video_device *vdev);
 /**
 * video_device_release_empty - helper function to implement the
- *      video_device->release\(\) callback.
+ *      video_device->release\(\) callback.
 *
 * @vdev: pointer to &struct video_device
 *
diff --git a/include/media/v4l2-device.h b/include/media/v4l2-device.h
index 8ffa94009d1a..0c9e4da55499 100644
--- a/include/media/v4l2-device.h
+++ b/include/media/v4l2-device.h
@@ -38,7 +38,7 @@ struct v4l2_ctrl_handler;
 * @lock: lock this struct; can be used by the driver as well
 *      if this struct is embedded into a larger struct.
 * @name: unique device name, by default the driver name + bus ID
- * @notify: notify callback called by some sub-devices.
+ * @notify: notify operation called by some sub-devices.
 * @ctrl_handler: The control handler. May be %NULL.
 * @prio: Device's priority state
 * @ref: Keep track of the references to this struct.
@@ -56,7 +56,6 @@ struct v4l2_ctrl_handler;
 *    #) @dev->driver_data points to this struct.
 *    #) @dev might be %NULL if there is no parent device
 */
 struct v4l2_device {
        struct device *dev;
 #if defined(CONFIG_MEDIA_CONTROLLER)
@@ -166,7 +165,7 @@ void v4l2_device_unregister(struct v4l2_device *v4l2_dev);
 * v4l2_device_register_subdev - Registers a subdev with a v4l2 device.
 *
 * @v4l2_dev: pointer to struct &v4l2_device
- * @sd: pointer to struct &v4l2_subdev
+ * @sd: pointer to &struct v4l2_subdev
 *
 * While registered, the subdev module is marked as in-use.
 *
@@ -179,7 +178,7 @@ int __must_check v4l2_device_register_subdev(struct v4l2_device *v4l2_dev,
 /**
 * v4l2_device_unregister_subdev - Unregisters a subdev with a v4l2 device.
 *
- * @sd: pointer to struct &v4l2_subdev
+ * @sd: pointer to &struct v4l2_subdev
 *
 * .. note ::
 *
@@ -201,7 +200,7 @@ v4l2_device_register_subdev_nodes(struct v4l2_device *v4l2_dev);
 /**
 * v4l2_subdev_notify - Sends a notification to v4l2_device.
 *
- * @sd: pointer to struct &v4l2_subdev
+ * @sd: pointer to &struct v4l2_subdev
 * @notification: type of notification. Please notice that the notification
 *      type is driver-specific.
 * @arg: arguments for the notification. Those are specific to each
@@ -214,13 +213,43 @@ static inline void v4l2_subdev_notify(struct v4l2_subdev *sd,
                sd->v4l2_dev->notify(sd, notification, arg);
 }
-/* Iterate over all subdevs. */
+/* Helper macros to iterate over all subdevs. */
+/**
+ * v4l2_device_for_each_subdev - Helper macro that interates over all
+ *      sub-devices of a given &v4l2_device.
+ *
+ * @sd: pointer that will be filled by the macro with all
+ *      &struct v4l2_subdev pointer used as an iterator by the loop.
+ * @v4l2_dev: &struct v4l2_device owning the sub-devices to iterate over.
+ *
+ * This macro iterates over all sub-devices owned by the @v4l2_dev device.
+ * It acts as a for loop iterator and executes the next statement with
+ * the @sd variable pointing to each sub-device in turn.
+ */
 #define v4l2_device_for_each_subdev(sd, v4l2_dev)                       \
        list_for_each_entry(sd, &(v4l2_dev)->subdevs, list)
-/* Call the specified callback for all subdevs matching the condition.
+/**
-   Ignore any errors. Note that you cannot add or delete a subdev
+ * __v4l2_device_call_subdevs_p - Calls the specified operation for
-   while walking the subdevs list. */
+ *      all subdevs matching the condition.
+ *
+ * @v4l2_dev: &struct v4l2_device owning the sub-devices to iterate over.
+ * @sd: pointer that will be filled by the macro with all
+ *      &struct v4l2_subdev pointer used as an iterator by the loop.
+ * @cond: condition to be match
+ * @o: name of the element at &struct v4l2_subdev_ops that contains @f.
+ *     Each element there groups a set of operations functions.
+ * @f: operation function that will be called if @cond matches.
+ *      The operation functions are defined in groups, according to
+ *      each element at &struct v4l2_subdev_ops.
+ * @args...: arguments for @f.
+ *
+ * Ignore any errors.
+ *
+ * Note: subdevs cannot be added or deleted while walking
+ * the subdevs list.
+ */
 #define __v4l2_device_call_subdevs_p(v4l2_dev, sd, cond, o, f, args...) \
        do {                                                            \
                list_for_each_entry((sd), &(v4l2_dev)->subdevs, list)   \
@@ -228,6 +257,24 @@ static inline void v4l2_subdev_notify(struct v4l2_subdev *sd,
                                (sd)->ops->o->f((sd) , ##args);         \
        } while (0)
+/**
+ * __v4l2_device_call_subdevs - Calls the specified operation for
+ *      all subdevs matching the condition.
+ *
+ * @v4l2_dev: &struct v4l2_device owning the sub-devices to iterate over.
+ * @cond: condition to be match
+ * @o: name of the element at &struct v4l2_subdev_ops that contains @f.
+ *     Each element there groups a set of operations functions.
+ * @f: operation function that will be called if @cond matches.
+ *      The operation functions are defined in groups, according to
+ *      each element at &struct v4l2_subdev_ops.
+ * @args...: arguments for @f.
+ *
+ * Ignore any errors.
+ *
+ * Note: subdevs cannot be added or deleted while walking
+ * the subdevs list.
+ */
 #define __v4l2_device_call_subdevs(v4l2_dev, cond, o, f, args...)       \
        do {                                                            \
                struct v4l2_subdev *__sd;                               \
@@ -236,10 +283,30 @@ static inline void v4l2_subdev_notify(struct v4l2_subdev *sd,
                                                f , ##args);            \
        } while (0)
-/* Call the specified callback for all subdevs matching the condition.
+/**
-   If the callback returns an error other than 0 or -ENOIOCTLCMD, then
+ * __v4l2_device_call_subdevs_until_err_p - Calls the specified operation for
-   return with that error code. Note that you cannot add or delete a
+ *      all subdevs matching the condition.
-   subdev while walking the subdevs list. */
+ *
+ * @v4l2_dev: &struct v4l2_device owning the sub-devices to iterate over.
+ * @sd: pointer that will be filled by the macro with all
+ *      &struct v4l2_subdev sub-devices associated with @v4l2_dev.
+ * @cond: condition to be match
+ * @o: name of the element at &struct v4l2_subdev_ops that contains @f.
+ *     Each element there groups a set of operations functions.
+ * @f: operation function that will be called if @cond matches.
+ *      The operation functions are defined in groups, according to
+ *      each element at &struct v4l2_subdev_ops.
+ * @args...: arguments for @f.
+ *
+ * Return:
+ *
+ * If the operation returns an error other than 0 or ``-ENOIOCTLCMD``
+ * for any subdevice, then abort and return with that error code, zero
+ * otherwise.
+ *
+ * Note: subdevs cannot be added or deleted while walking
+ * the subdevs list.
+ */
 #define __v4l2_device_call_subdevs_until_err_p(v4l2_dev, sd, cond, o, f, args...) \
 ({                                                                      \
        long __err = 0;                                                 \
@@ -253,6 +320,28 @@ static inline void v4l2_subdev_notify(struct v4l2_subdev *sd,
        (__err == -ENOIOCTLCMD) ? 0 : __err;                            \
 })
+/**
+ * __v4l2_device_call_subdevs_until_err - Calls the specified operation for
+ *      all subdevs matching the condition.
+ *
+ * @v4l2_dev: &struct v4l2_device owning the sub-devices to iterate over.
+ * @cond: condition to be match
+ * @o: name of the element at &struct v4l2_subdev_ops that contains @f.
+ *     Each element there groups a set of operations functions.
+ * @f: operation function that will be called if @cond matches.
+ *      The operation functions are defined in groups, according to
+ *      each element at &struct v4l2_subdev_ops.
+ * @args...: arguments for @f.
+ *
+ * Return:
+ *
+ * If the operation returns an error other than 0 or ``-ENOIOCTLCMD``
+ * for any subdevice, then abort and return with that error code,
+ * zero otherwise.
+ *
+ * Note: subdevs cannot be added or deleted while walking
+ * the subdevs list.
+ */
 #define __v4l2_device_call_subdevs_until_err(v4l2_dev, cond, o, f, args...) \
 ({                                                                      \
        struct v4l2_subdev *__sd;                                       \
@@ -260,9 +349,26 @@ static inline void v4l2_subdev_notify(struct v4l2_subdev *sd,
                                                f , ##args);            \
 })
-/* Call the specified callback for all subdevs matching grp_id (if 0, then
+/**
-   match them all). Ignore any errors. Note that you cannot add or delete
+ * v4l2_device_call_all - Calls the specified operation for
-   a subdev while walking the subdevs list. */
+ *      all subdevs matching the &v4l2_subdev.grp_id, as assigned
+ *      by the bridge driver.
+ *
+ * @v4l2_dev: &struct v4l2_device owning the sub-devices to iterate over.
+ * @grpid: &struct v4l2_subdev->grp_id group ID to match.
+ *          Use 0 to match them all.
+ * @o: name of the element at &struct v4l2_subdev_ops that contains @f.
+ *     Each element there groups a set of operations functions.
+ * @f: operation function that will be called if @cond matches.
+ *      The operation functions are defined in groups, according to
+ *      each element at &struct v4l2_subdev_ops.
+ * @args...: arguments for @f.
+ *
+ * Ignore any errors.
+ *
+ * Note: subdevs cannot be added or deleted while walking
+ * the subdevs list.
+ */
 #define v4l2_device_call_all(v4l2_dev, grpid, o, f, args...)            \
        do {                                                            \
                struct v4l2_subdev *__sd;                               \
@@ -272,10 +378,30 @@ static inline void v4l2_subdev_notify(struct v4l2_subdev *sd,
                        ##args);                                        \
        } while (0)
-/* Call the specified callback for all subdevs matching grp_id (if 0, then
+/**
-   match them all). If the callback returns an error other than 0 or
+ * v4l2_device_call_until_err - Calls the specified operation for
-   -ENOIOCTLCMD, then return with that error code. Note that you cannot
+ *      all subdevs matching the &v4l2_subdev.grp_id, as assigned
-   add or delete a subdev while walking the subdevs list. */
+ *      by the bridge driver, until an error occurs.
+ *
+ * @v4l2_dev: &struct v4l2_device owning the sub-devices to iterate over.
+ * @grpid: &struct v4l2_subdev->grp_id group ID to match.
+ *         Use 0 to match them all.
+ * @o: name of the element at &struct v4l2_subdev_ops that contains @f.
+ *     Each element there groups a set of operations functions.
+ * @f: operation function that will be called if @cond matches.
+ *      The operation functions are defined in groups, according to
+ *      each element at &struct v4l2_subdev_ops.
+ * @args...: arguments for @f.
+ *
+ * Return:
+ *
+ * If the operation returns an error other than 0 or ``-ENOIOCTLCMD``
+ * for any subdevice, then abort and return with that error code,
+ * zero otherwise.
+ *
+ * Note: subdevs cannot be added or deleted while walking
+ * the subdevs list.
+ */
 #define v4l2_device_call_until_err(v4l2_dev, grpid, o, f, args...)      \
 ({                                                                      \
        struct v4l2_subdev *__sd;                                       \
@@ -284,10 +410,24 @@ static inline void v4l2_subdev_notify(struct v4l2_subdev *sd,
                        ##args);                                        \
 })
-/*
+/**
- * Call the specified callback for all subdevs where grp_id & grpmsk != 0
+ * v4l2_device_mask_call_all - Calls the specified operation for
- * (if grpmsk == `0, then match them all). Ignore any errors. Note that you
+ *      all subdevices where a group ID matches a specified bitmask.
- * cannot add or delete a subdev while walking the subdevs list.
+ *
+ * @v4l2_dev: &struct v4l2_device owning the sub-devices to iterate over.
+ * @grpmsk: bitmask to be checked against &struct v4l2_subdev->grp_id
+ *          group ID to be matched. Use 0 to match them all.
+ * @o: name of the element at &struct v4l2_subdev_ops that contains @f.
+ *     Each element there groups a set of operations functions.
+ * @f: operation function that will be called if @cond matches.
+ *      The operation functions are defined in groups, according to
+ *      each element at &struct v4l2_subdev_ops.
+ * @args...: arguments for @f.
+ *
+ * Ignore any errors.
+ *
+ * Note: subdevs cannot be added or deleted while walking
+ * the subdevs list.
 */
 #define v4l2_device_mask_call_all(v4l2_dev, grpmsk, o, f, args...)      \
        do {                                                            \
@@ -298,11 +438,28 @@ static inline void v4l2_subdev_notify(struct v4l2_subdev *sd,
                        ##args);                                        \
        } while (0)
-/*
+/**
- * Call the specified callback for all subdevs where grp_id & grpmsk != 0
+ * v4l2_device_mask_call_until_err - Calls the specified operation for
- * (if grpmsk == 0, then match them all). If the callback returns an error
+ *      all subdevices where a group ID matches a specified bitmask.
- * other than 0 or %-ENOIOCTLCMD, then return with that error code. Note that
+ *
- * you cannot add or delete a subdev while walking the subdevs list.
+ * @v4l2_dev: &struct v4l2_device owning the sub-devices to iterate over.
+ * @grpmsk: bitmask to be checked against &struct v4l2_subdev->grp_id
+ *          group ID to be matched. Use 0 to match them all.
+ * @o: name of the element at &struct v4l2_subdev_ops that contains @f.
+ *     Each element there groups a set of operations functions.
+ * @f: operation function that will be called if @cond matches.
+ *      The operation functions are defined in groups, according to
+ *      each element at &struct v4l2_subdev_ops.
+ * @args...: arguments for @f.
+ *
+ * Return:
+ *
+ * If the operation returns an error other than 0 or ``-ENOIOCTLCMD``
+ * for any subdevice, then abort and return with that error code,
+ * zero otherwise.
+ *
+ * Note: subdevs cannot be added or deleted while walking
+ * the subdevs list.
 */
 #define v4l2_device_mask_call_until_err(v4l2_dev, grpmsk, o, f, args...) \
 ({                                                                      \
@@ -312,9 +469,19 @@ static inline void v4l2_subdev_notify(struct v4l2_subdev *sd,
                        ##args);                                        \
 })
-/*
- * Does any subdev with matching grpid (or all if grpid == 0) has the given
+/**
- * op?
+ * v4l2_device_has_op - checks if any subdev with matching grpid has a
+ *      given ops.
+ *
+ * @v4l2_dev: &struct v4l2_device owning the sub-devices to iterate over.
+ * @grpid: &struct v4l2_subdev->grp_id group ID to match.
+ *         Use 0 to match them all.
+ * @o: name of the element at &struct v4l2_subdev_ops that contains @f.
+ *     Each element there groups a set of operations functions.
+ * @f: operation function that will be called if @cond matches.
+ *      The operation functions are defined in groups, according to
+ *      each element at &struct v4l2_subdev_ops.
 */
 #define v4l2_device_has_op(v4l2_dev, grpid, o, f)                       \
 ({                                                                      \
@@ -331,9 +498,18 @@ static inline void v4l2_subdev_notify(struct v4l2_subdev *sd,
        __result;                                                       \
 })
-/*
+/**
- * Does any subdev with matching grpmsk (or all if grpmsk == 0) has the given
+ * v4l2_device_mask_has_op - checks if any subdev with matching group
- * op?
+ *      mask has a given ops.
+ *
+ * @v4l2_dev: &struct v4l2_device owning the sub-devices to iterate over.
+ * @grpmsk: bitmask to be checked against &struct v4l2_subdev->grp_id
+ *          group ID to be matched. Use 0 to match them all.
+ * @o: name of the element at &struct v4l2_subdev_ops that contains @f.
+ *     Each element there groups a set of operations functions.
+ * @f: operation function that will be called if @cond matches.
+ *      The operation functions are defined in groups, according to
+ *      each element at &struct v4l2_subdev_ops.
 */
 #define v4l2_device_mask_has_op(v4l2_dev, grpmsk, o, f)                 \
 ({                                                                      \
diff --git a/include/media/v4l2-dv-timings.h b/include/media/v4l2-dv-timings.h
index 61a18893e004..ebf00e07a515 100644
--- a/include/media/v4l2-dv-timings.h
+++ b/include/media/v4l2-dv-timings.h
@@ -203,13 +203,15 @@ struct v4l2_fract v4l2_calc_aspect_ratio(u8 hor_landscape, u8 vert_portrait);
 */
 struct v4l2_fract v4l2_dv_timings_aspect_ratio(const struct v4l2_dv_timings *t);
-/*
+/**
- * reduce_fps - check if conditions for reduced fps are true.
+ * can_reduce_fps - check if conditions for reduced fps are true.
- * bt - v4l2 timing structure
+ * @bt: v4l2 timing structure
- * For different timings reduced fps is allowed if following conditions
+ *
- * are met -
+ * For different timings reduced fps is allowed if the following conditions
- * For CVT timings: if reduced blanking v2 (vsync == 8) is true.
+ * are met:
- * For CEA861 timings: if V4L2_DV_FL_CAN_REDUCE_FPS flag is true.
+ *
+ *   - For CVT timings: if reduced blanking v2 (vsync == 8) is true.
+ *   - For CEA861 timings: if %V4L2_DV_FL_CAN_REDUCE_FPS flag is true.
 */
 static inline  bool can_reduce_fps(struct v4l2_bt_timings *bt)
 {
diff --git a/include/media/v4l2-event.h b/include/media/v4l2-event.h
index 6741910c3a18..17833e886e11 100644
--- a/include/media/v4l2-event.h
+++ b/include/media/v4l2-event.h
@@ -24,40 +24,6 @@
 #include <linux/videodev2.h>
 #include <linux/wait.h>
-/*
- * Overview:
- *
- * Events are subscribed per-filehandle. An event specification consists of a
- * type and is optionally associated with an object identified through the
- * 'id' field. So an event is uniquely identified by the (type, id) tuple.
- *
- * The v4l2-fh struct has a list of subscribed events. The v4l2_subscribed_event
- * struct is added to that list, one for every subscribed event.
- *
- * Each v4l2_subscribed_event struct ends with an array of v4l2_kevent structs.
- * This array (ringbuffer, really) is used to store any events raised by the
- * driver. The v4l2_kevent struct links into the 'available' list of the
- * v4l2_fh struct so VIDIOC_DQEVENT will know which event to dequeue first.
- *
- * Finally, if the event subscription is associated with a particular object
- * such as a V4L2 control, then that object needs to know about that as well
- * so that an event can be raised by that object. So the 'node' field can
- * be used to link the v4l2_subscribed_event struct into a list of that
- * object.
- *
- * So to summarize:
- *
- * struct v4l2_fh has two lists: one of the subscribed events, and one of the
- * pending events.
- *
- * struct v4l2_subscribed_event has a ringbuffer of raised (pending) events of
- * that particular type.
- *
- * If struct v4l2_subscribed_event is associated with a specific object, then
- * that object will have an internal list of struct v4l2_subscribed_event so
- * it knows who subscribed an event to that object.
- */
 struct v4l2_fh;
 struct v4l2_subdev;
 struct v4l2_subscribed_event;
@@ -218,7 +184,7 @@ int v4l2_event_subdev_unsubscribe(struct v4l2_subdev *sd,
                                  struct v4l2_event_subscription *sub);
 /**
 * v4l2_src_change_event_subscribe - helper function that calls
- *      v4l2_event_subscribe() if the event is %V4L2_EVENT_SOURCE_CHANGE.
+ *      v4l2_event_subscribe() if the event is %V4L2_EVENT_SOURCE_CHANGE.
 *
 * @fh: pointer to struct v4l2_fh
 * @sub: pointer to &struct v4l2_event_subscription
diff --git a/include/media/v4l2-flash-led-class.h b/include/media/v4l2-flash-led-class.h
index 5c1d50f78e12..0a5e4518ca11 100644
--- a/include/media/v4l2-flash-led-class.h
+++ b/include/media/v4l2-flash-led-class.h
@@ -91,12 +91,24 @@ struct v4l2_flash {
        struct v4l2_ctrl **ctrls;
 };
+/**
+ * v4l2_subdev_to_v4l2_flash - Returns a &struct v4l2_flash from the
+ * &struct v4l2_subdev embedded on it.
+ *
+ * @sd: pointer to &struct v4l2_subdev
+ */
 static inline struct v4l2_flash *v4l2_subdev_to_v4l2_flash(
                                                        struct v4l2_subdev *sd)
 {
        return container_of(sd, struct v4l2_flash, sd);
 }
+/**
+ * v4l2_ctrl_to_v4l2_flash - Returns a &struct v4l2_flash from the
+ * &struct v4l2_ctrl embedded on it.
+ *
+ * @c: pointer to &struct v4l2_ctrl
+ */
 static inline struct v4l2_flash *v4l2_ctrl_to_v4l2_flash(struct v4l2_ctrl *c)
 {
        return container_of(c->handler, struct v4l2_flash, hdl);
diff --git a/include/media/v4l2-fwnode.h b/include/media/v4l2-fwnode.h
index b5b465677d28..c228ec1c77cf 100644
--- a/include/media/v4l2-fwnode.h
+++ b/include/media/v4l2-fwnode.h
@@ -81,7 +81,17 @@ struct v4l2_fwnode_bus_mipi_csi1 {
 * struct v4l2_fwnode_endpoint - the endpoint data structure
 * @base: fwnode endpoint of the v4l2_fwnode
 * @bus_type: bus type
- * @bus: bus configuration data structure
+ * @bus: union with bus configuration data structure
+ * @bus.parallel: embedded &struct v4l2_fwnode_bus_parallel.
+ *                Used if the bus is parallel.
+ * @bus.mipi_csi1: embedded &struct v4l2_fwnode_bus_mipi_csi1.
+ *                 Used if the bus is MIPI Alliance's Camera Serial
+ *                 Interface version 1 (MIPI CSI1) or Standard
+ *                 Mobile Imaging Architecture's Compact Camera Port 2
+ *                 (SMIA CCP2).
+ * @bus.mipi_csi2: embedded &struct v4l2_fwnode_bus_mipi_csi2.
+ *                 Used if the bus is MIPI Alliance's Camera Serial
+ *                 Interface version 2 (MIPI CSI2).
 * @link_frequencies: array of supported link frequencies
 * @nr_of_link_frequencies: number of elements in link_frequenccies array
 */
diff --git a/include/media/v4l2-mediabus.h b/include/media/v4l2-mediabus.h
index 93f8afcb7a22..4d8626c468bc 100644
--- a/include/media/v4l2-mediabus.h
+++ b/include/media/v4l2-mediabus.h
@@ -12,6 +12,8 @@
 #define V4L2_MEDIABUS_H
 #include <linux/v4l2-mediabus.h>
+#include <linux/bitops.h>
 /* Parallel flags */
 /*
@@ -20,44 +22,44 @@
 * horizontal and vertical synchronisation. In "Slave mode" the host is
 * providing these signals to the slave.
 */
-#define V4L2_MBUS_MASTER                        (1 << 0)
+#define V4L2_MBUS_MASTER                        BIT(0)
-#define V4L2_MBUS_SLAVE                         (1 << 1)
+#define V4L2_MBUS_SLAVE                         BIT(1)
 /*
 * Signal polarity flags
 * Note: in BT.656 mode HSYNC, FIELD, and VSYNC are unused
 * V4L2_MBUS_[HV]SYNC* flags should be also used for specifying
 * configuration of hardware that uses [HV]REF signals
 */
-#define V4L2_MBUS_HSYNC_ACTIVE_HIGH             (1 << 2)
+#define V4L2_MBUS_HSYNC_ACTIVE_HIGH             BIT(2)
-#define V4L2_MBUS_HSYNC_ACTIVE_LOW              (1 << 3)
+#define V4L2_MBUS_HSYNC_ACTIVE_LOW              BIT(3)
-#define V4L2_MBUS_VSYNC_ACTIVE_HIGH             (1 << 4)
+#define V4L2_MBUS_VSYNC_ACTIVE_HIGH             BIT(4)
-#define V4L2_MBUS_VSYNC_ACTIVE_LOW              (1 << 5)
+#define V4L2_MBUS_VSYNC_ACTIVE_LOW              BIT(5)
-#define V4L2_MBUS_PCLK_SAMPLE_RISING            (1 << 6)
+#define V4L2_MBUS_PCLK_SAMPLE_RISING            BIT(6)
-#define V4L2_MBUS_PCLK_SAMPLE_FALLING           (1 << 7)
+#define V4L2_MBUS_PCLK_SAMPLE_FALLING           BIT(7)
-#define V4L2_MBUS_DATA_ACTIVE_HIGH              (1 << 8)
+#define V4L2_MBUS_DATA_ACTIVE_HIGH              BIT(8)
-#define V4L2_MBUS_DATA_ACTIVE_LOW               (1 << 9)
+#define V4L2_MBUS_DATA_ACTIVE_LOW               BIT(9)
 /* FIELD = 0/1 - Field1 (odd)/Field2 (even) */
-#define V4L2_MBUS_FIELD_EVEN_HIGH               (1 << 10)
+#define V4L2_MBUS_FIELD_EVEN_HIGH               BIT(10)
 /* FIELD = 1/0 - Field1 (odd)/Field2 (even) */
-#define V4L2_MBUS_FIELD_EVEN_LOW                (1 << 11)
+#define V4L2_MBUS_FIELD_EVEN_LOW                BIT(11)
 /* Active state of Sync-on-green (SoG) signal, 0/1 for LOW/HIGH respectively. */
-#define V4L2_MBUS_VIDEO_SOG_ACTIVE_HIGH (1 << 12)
+#define V4L2_MBUS_VIDEO_SOG_ACTIVE_HIGH         BIT(12)
-#define V4L2_MBUS_VIDEO_SOG_ACTIVE_LOW          (1 << 13)
+#define V4L2_MBUS_VIDEO_SOG_ACTIVE_LOW          BIT(13)
 /* Serial flags */
 /* How many lanes the client can use */
-#define V4L2_MBUS_CSI2_1_LANE                   (1 << 0)
+#define V4L2_MBUS_CSI2_1_LANE                   BIT(0)
-#define V4L2_MBUS_CSI2_2_LANE                   (1 << 1)
+#define V4L2_MBUS_CSI2_2_LANE                   BIT(1)
-#define V4L2_MBUS_CSI2_3_LANE                   (1 << 2)
+#define V4L2_MBUS_CSI2_3_LANE                   BIT(2)
-#define V4L2_MBUS_CSI2_4_LANE                   (1 << 3)
+#define V4L2_MBUS_CSI2_4_LANE                   BIT(3)
 /* On which channels it can send video data */
-#define V4L2_MBUS_CSI2_CHANNEL_0                (1 << 4)
+#define V4L2_MBUS_CSI2_CHANNEL_0                BIT(4)
-#define V4L2_MBUS_CSI2_CHANNEL_1                (1 << 5)
+#define V4L2_MBUS_CSI2_CHANNEL_1                BIT(5)
-#define V4L2_MBUS_CSI2_CHANNEL_2                (1 << 6)
+#define V4L2_MBUS_CSI2_CHANNEL_2                BIT(6)
-#define V4L2_MBUS_CSI2_CHANNEL_3                (1 << 7)
+#define V4L2_MBUS_CSI2_CHANNEL_3                BIT(7)
 /* Does it support only continuous or also non-continuous clock mode */
-#define V4L2_MBUS_CSI2_CONTINUOUS_CLOCK         (1 << 8)
+#define V4L2_MBUS_CSI2_CONTINUOUS_CLOCK         BIT(8)
-#define V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK      (1 << 9)
+#define V4L2_MBUS_CSI2_NONCONTINUOUS_CLOCK      BIT(9)
 #define V4L2_MBUS_CSI2_LANES            (V4L2_MBUS_CSI2_1_LANE | V4L2_MBUS_CSI2_2_LANE | \
                                         V4L2_MBUS_CSI2_3_LANE | V4L2_MBUS_CSI2_4_LANE)
@@ -91,6 +93,13 @@ struct v4l2_mbus_config {
        unsigned int flags;
 };
+/**
+ * v4l2_fill_pix_format - Ancillary routine that fills a &struct
+ *      v4l2_pix_format fields from a &struct v4l2_mbus_framefmt.
+ *
+ * @pix_fmt:    pointer to &struct v4l2_pix_format to be filled
+ * @mbus_fmt:   pointer to &struct v4l2_mbus_framefmt to be used as model
+ */
 static inline void v4l2_fill_pix_format(struct v4l2_pix_format *pix_fmt,
                                const struct v4l2_mbus_framefmt *mbus_fmt)
 {
@@ -103,6 +112,15 @@ static inline void v4l2_fill_pix_format(struct v4l2_pix_format *pix_fmt,
        pix_fmt->xfer_func = mbus_fmt->xfer_func;
 }
+/**
+ * v4l2_fill_pix_format - Ancillary routine that fills a &struct
+ *      v4l2_mbus_framefmt from a &struct v4l2_pix_format and a
+ *      data format code.
+ *
+ * @mbus_fmt:   pointer to &struct v4l2_mbus_framefmt to be filled
+ * @pix_fmt:    pointer to &struct v4l2_pix_format to be used as model
+ * @code:       data format code (from &enum v4l2_mbus_pixelcode)
+ */
 static inline void v4l2_fill_mbus_format(struct v4l2_mbus_framefmt *mbus_fmt,
                           const struct v4l2_pix_format *pix_fmt,
                           u32 code)
@@ -117,6 +135,13 @@ static inline void v4l2_fill_mbus_format(struct v4l2_mbus_framefmt *mbus_fmt,
        mbus_fmt->code = code;
 }
+/**
+ * v4l2_fill_pix_format - Ancillary routine that fills a &struct
+ *      v4l2_pix_format_mplane fields from a media bus structure.
+ *
+ * @pix_mp_fmt: pointer to &struct v4l2_pix_format_mplane to be filled
+ * @mbus_fmt:   pointer to &struct v4l2_mbus_framefmt to be used as model
+ */
 static inline void v4l2_fill_pix_format_mplane(
                                struct v4l2_pix_format_mplane *pix_mp_fmt,
                                const struct v4l2_mbus_framefmt *mbus_fmt)
@@ -130,6 +155,13 @@ static inline void v4l2_fill_pix_format_mplane(
        pix_mp_fmt->xfer_func = mbus_fmt->xfer_func;
 }
+/**
+ * v4l2_fill_pix_format - Ancillary routine that fills a &struct
+ *      v4l2_mbus_framefmt from a &struct v4l2_pix_format_mplane.
+ *
+ * @mbus_fmt:   pointer to &struct v4l2_mbus_framefmt to be filled
+ * @pix_mp_fmt: pointer to &struct v4l2_pix_format_mplane to be used as model
+ */
 static inline void v4l2_fill_mbus_format_mplane(
                                struct v4l2_mbus_framefmt *mbus_fmt,
                                const struct v4l2_pix_format_mplane *pix_mp_fmt)
diff --git a/include/media/v4l2-subdev.h b/include/media/v4l2-subdev.h
index ec399c770301..980a86c08fce 100644
--- a/include/media/v4l2-subdev.h
+++ b/include/media/v4l2-subdev.h
@@ -108,22 +108,31 @@ struct v4l2_decode_vbi_line {
 * not yet implemented) since ops provide proper type-checking.
 */
-/* Subdevice external IO pin configuration */
+/**
-#define V4L2_SUBDEV_IO_PIN_DISABLE      (1 << 0) /* ENABLE assumed */
+ * enum v4l2_subdev_io_pin_bits - Subdevice external IO pin configuration
-#define V4L2_SUBDEV_IO_PIN_OUTPUT       (1 << 1)
+ *      bits
-#define V4L2_SUBDEV_IO_PIN_INPUT        (1 << 2)
+ *
-#define V4L2_SUBDEV_IO_PIN_SET_VALUE    (1 << 3) /* Set output value */
+ * @V4L2_SUBDEV_IO_PIN_DISABLE: disables a pin config. ENABLE assumed.
-#define V4L2_SUBDEV_IO_PIN_ACTIVE_LOW   (1 << 4) /* ACTIVE HIGH assumed */
+ * @V4L2_SUBDEV_IO_PIN_OUTPUT: set it if pin is an output.
+ * @V4L2_SUBDEV_IO_PIN_INPUT: set it if pin is an input.
+ * @V4L2_SUBDEV_IO_PIN_SET_VALUE: to set the output value via
+ *                                &struct v4l2_subdev_io_pin_config->value.
+ * @V4L2_SUBDEV_IO_PIN_ACTIVE_LOW: pin active is bit 0.
+ *                                 Otherwise, ACTIVE HIGH is assumed.
+ */
+enum v4l2_subdev_io_pin_bits {
+        V4L2_SUBDEV_IO_PIN_DISABLE      = 0,
+        V4L2_SUBDEV_IO_PIN_OUTPUT       = 1,
+        V4L2_SUBDEV_IO_PIN_INPUT        = 2,
+        V4L2_SUBDEV_IO_PIN_SET_VALUE    = 3,
+        V4L2_SUBDEV_IO_PIN_ACTIVE_LOW   = 4,
+};
 /**
 * struct v4l2_subdev_io_pin_config - Subdevice external IO pin configuration
 *
- * @flags: bitmask with flags for this pin's config:
+ * @flags: bitmask with flags for this pin's config, whose bits are defined by
- *         %V4L2_SUBDEV_IO_PIN_DISABLE - disables a pin config,
+ *         &enum v4l2_subdev_io_pin_bits.
- *         %V4L2_SUBDEV_IO_PIN_OUTPUT - if pin is an output,
- *         %V4L2_SUBDEV_IO_PIN_INPUT - if pin is an input,
- *         %V4L2_SUBDEV_IO_PIN_SET_VALUE - to set the output value via @value
- *         and %V4L2_SUBDEV_IO_PIN_ACTIVE_LOW - if active is 0.
 * @pin: Chip external IO pin to configure
 * @function: Internal signal pad/function to route to IO pin
 * @value: Initial value for pin - e.g. GPIO output value
@@ -140,7 +149,7 @@ struct v4l2_subdev_io_pin_config {
 /**
 * struct v4l2_subdev_core_ops - Define core ops callbacks for subdevs
 *
- * @log_status: callback for %VIDIOC_LOG_STATUS ioctl handler code.
+ * @log_status: callback for VIDIOC_LOG_STATUS() ioctl handler code.
 *
 * @s_io_pin_config: configure one or more chip I/O pins for chips that
 *      multiplex different internal signal pads out to IO pins.  This function
@@ -168,9 +177,9 @@ struct v4l2_subdev_io_pin_config {
 * @compat_ioctl32: called when a 32 bits application uses a 64 bits Kernel,
 *                  in order to fix data passed from/to userspace.
 *
- * @g_register: callback for %VIDIOC_G_REGISTER ioctl handler code.
+ * @g_register: callback for VIDIOC_DBG_G_REGISTER() ioctl handler code.
 *
- * @s_register: callback for %VIDIOC_G_REGISTER ioctl handler code.
+ * @s_register: callback for VIDIOC_DBG_S_REGISTER() ioctl handler code.
 *
 * @s_power: puts subdevice in power saving mode (on == 0) or normal operation
 *      mode (on == 1).
@@ -215,29 +224,48 @@ struct v4l2_subdev_core_ops {
 * struct v4l2_subdev_tuner_ops - Callbacks used when v4l device was opened
 *      in radio mode.
 *
- * @s_radio: callback for %VIDIOC_S_RADIO ioctl handler code.
+ * @s_radio: callback that switches the tuner to radio mode.
+ *           drivers should explicitly call it when a tuner ops should
+ *           operate on radio mode, before being able to handle it.
+ *           Used on devices that have both AM/FM radio receiver and TV.
 *
- * @s_frequency: callback for %VIDIOC_S_FREQUENCY ioctl handler code.
+ * @s_frequency: callback for VIDIOC_S_FREQUENCY() ioctl handler code.
 *
- * @g_frequency: callback for %VIDIOC_G_FREQUENCY ioctl handler code.
+ * @g_frequency: callback for VIDIOC_G_FREQUENCY() ioctl handler code.
 *               freq->type must be filled in. Normally done by video_ioctl2()
 *               or the bridge driver.
 *
- * @enum_freq_bands: callback for %VIDIOC_ENUM_FREQ_BANDS ioctl handler code.
+ * @enum_freq_bands: callback for VIDIOC_ENUM_FREQ_BANDS() ioctl handler code.
 *
- * @g_tuner: callback for %VIDIOC_G_TUNER ioctl handler code.
+ * @g_tuner: callback for VIDIOC_G_TUNER() ioctl handler code.
 *
- * @s_tuner: callback for %VIDIOC_S_TUNER ioctl handler code. @vt->type must be
+ * @s_tuner: callback for VIDIOC_S_TUNER() ioctl handler code. @vt->type must be
 *           filled in. Normally done by video_ioctl2 or the
 *           bridge driver.
 *
- * @g_modulator: callback for %VIDIOC_G_MODULATOR ioctl handler code.
+ * @g_modulator: callback for VIDIOC_G_MODULATOR() ioctl handler code.
 *
- * @s_modulator: callback for %VIDIOC_S_MODULATOR ioctl handler code.
+ * @s_modulator: callback for VIDIOC_S_MODULATOR() ioctl handler code.
 *
 * @s_type_addr: sets tuner type and its I2C addr.
 *
 * @s_config: sets tda9887 specific stuff, like port1, port2 and qss
+ *
+ * .. note::
+ *
+ *      On devices that have both AM/FM and TV, it is up to the driver
+ *      to explicitly call s_radio when the tuner should be switched to
+ *      radio mode, before handling other &struct v4l2_subdev_tuner_ops
+ *      that would require it. An example of such usage is::
+ *
+ *        static void s_frequency(void *priv, const struct v4l2_frequency *f)
+ *        {
+ *              ...
+ *              if (f.type == V4L2_TUNER_RADIO)
+ *                      v4l2_device_call_all(v4l2_dev, 0, tuner, s_radio);
+ *              ...
+ *              v4l2_device_call_all(v4l2_dev, 0, tuner, s_frequency);
+ *        }
 */
 struct v4l2_subdev_tuner_ops {
        int (*s_radio)(struct v4l2_subdev *sd);
@@ -285,25 +313,32 @@ struct v4l2_subdev_audio_ops {
        int (*s_stream)(struct v4l2_subdev *sd, int enable);
 };
-/* Indicates the @length field specifies maximum data length. */
+/**
-#define V4L2_MBUS_FRAME_DESC_FL_LEN_MAX         (1U << 0)
+ * enum v4l2_mbus_frame_desc_entry - media bus frame description flags
-/*
+ *
- * Indicates that the format does not have line offsets, i.e. the
+ * @V4L2_MBUS_FRAME_DESC_FL_LEN_MAX:
- * receiver should use 1D DMA.
+ *      Indicates that &struct v4l2_mbus_frame_desc_entry->length field
+ *      specifies maximum data length.
+ * @V4L2_MBUS_FRAME_DESC_FL_BLOB:
+ *      Indicates that the format does not have line offsets, i.e.
+ *      the receiver should use 1D DMA.
 */
-#define V4L2_MBUS_FRAME_DESC_FL_BLOB            (1U << 1)
+enum v4l2_mbus_frame_desc_flags {
+        V4L2_MBUS_FRAME_DESC_FL_LEN_MAX = BIT(0),
+        V4L2_MBUS_FRAME_DESC_FL_BLOB    = BIT(1),
+};
 /**
 * struct v4l2_mbus_frame_desc_entry - media bus frame description structure
 *
- * @flags: bitmask flags: %V4L2_MBUS_FRAME_DESC_FL_LEN_MAX and
+ * @flags:      bitmask flags, as defined by &enum v4l2_mbus_frame_desc_flags.
- *                        %V4L2_MBUS_FRAME_DESC_FL_BLOB.
+ * @pixelcode:  media bus pixel code, valid if @flags
- * @pixelcode: media bus pixel code, valid if FRAME_DESC_FL_BLOB is not set
+ *              %FRAME_DESC_FL_BLOB is not set.
- * @length: number of octets per frame, valid if V4L2_MBUS_FRAME_DESC_FL_BLOB
+ * @length:     number of octets per frame, valid if @flags
- *          is set
+ *              %V4L2_MBUS_FRAME_DESC_FL_LEN_MAX is set.
 */
 struct v4l2_mbus_frame_desc_entry {
-        u16 flags;
+        enum v4l2_mbus_frame_desc_flags flags;
        u32 pixelcode;
        u32 length;
 };
@@ -332,9 +367,9 @@ struct v4l2_mbus_frame_desc {
 *      regarding clock frequency dividers, etc. If not used, then set flags
 *      to 0. If the frequency is not supported, then -EINVAL is returned.
 *
- * @g_std: callback for %VIDIOC_G_STD ioctl handler code.
+ * @g_std: callback for VIDIOC_G_STD() ioctl handler code.
 *
- * @s_std: callback for %VIDIOC_S_STD ioctl handler code.
+ * @s_std: callback for VIDIOC_S_STD() ioctl handler code.
 *
 * @s_std_output: set v4l2_std_id for video OUTPUT devices. This is ignored by
 *      video input devices.
@@ -342,7 +377,7 @@ struct v4l2_mbus_frame_desc {
 * @g_std_output: get current standard for video OUTPUT devices. This is ignored
 *      by video input devices.
 *
- * @querystd: callback for %VIDIOC_QUERYSTD ioctl handler code.
+ * @querystd: callback for VIDIOC_QUERYSTD() ioctl handler code.
 *
 * @g_tvnorms: get &v4l2_std_id with all standards supported by the video
 *      CAPTURE device. This is ignored by video output devices.
@@ -358,13 +393,15 @@ struct v4l2_mbus_frame_desc {
 *
 * @g_pixelaspect: callback to return the pixelaspect ratio.
 *
- * @g_parm: callback for %VIDIOC_G_PARM ioctl handler code.
+ * @g_parm: callback for VIDIOC_G_PARM() ioctl handler code.
 *
- * @s_parm: callback for %VIDIOC_S_PARM ioctl handler code.
+ * @s_parm: callback for VIDIOC_S_PARM() ioctl handler code.
 *
- * @g_frame_interval: callback for %VIDIOC_G_FRAMEINTERVAL ioctl handler code.
+ * @g_frame_interval: callback for VIDIOC_SUBDEV_G_FRAME_INTERVAL()
+ *                    ioctl handler code.
 *
- * @s_frame_interval: callback for %VIDIOC_S_FRAMEINTERVAL ioctl handler code.
+ * @s_frame_interval: callback for VIDIOC_SUBDEV_S_FRAME_INTERVAL()
+ *                    ioctl handler code.
 *
 * @s_dv_timings: Set custom dv timings in the sub device. This is used
 *      when sub device is capable of setting detailed timing information
@@ -372,7 +409,7 @@ struct v4l2_mbus_frame_desc {
 *
 * @g_dv_timings: Get custom dv timings in the sub device.
 *
- * @query_dv_timings: callback for %VIDIOC_QUERY_DV_TIMINGS ioctl handler code.
+ * @query_dv_timings: callback for VIDIOC_QUERY_DV_TIMINGS() ioctl handler code.
 *
 * @g_mbus_config: get supported mediabus configurations
 *
@@ -443,7 +480,8 @@ struct v4l2_subdev_video_ops {
 *      member (to determine whether CC data from the first or second field
 *      should be obtained).
 *
- * @g_sliced_vbi_cap: callback for %VIDIOC_SLICED_VBI_CAP ioctl handler code.
+ * @g_sliced_vbi_cap: callback for VIDIOC_G_SLICED_VBI_CAP() ioctl handler
+ *                    code.
 *
 * @s_raw_fmt: setup the video encoder/decoder for raw VBI.
 *
@@ -610,30 +648,30 @@ struct v4l2_subdev_pad_config {
 * struct v4l2_subdev_pad_ops - v4l2-subdev pad level operations
 *
 * @init_cfg: initialize the pad config to default values
- * @enum_mbus_code: callback for %VIDIOC_SUBDEV_ENUM_MBUS_CODE ioctl handler
+ * @enum_mbus_code: callback for VIDIOC_SUBDEV_ENUM_MBUS_CODE() ioctl handler
 *                  code.
- * @enum_frame_size: callback for %VIDIOC_SUBDEV_ENUM_FRAME_SIZE ioctl handler
+ * @enum_frame_size: callback for VIDIOC_SUBDEV_ENUM_FRAME_SIZE() ioctl handler
 *                   code.
 *
- * @enum_frame_interval: callback for %VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL ioctl
+ * @enum_frame_interval: callback for VIDIOC_SUBDEV_ENUM_FRAME_INTERVAL() ioctl
 *                       handler code.
 *
- * @get_fmt: callback for %VIDIOC_SUBDEV_G_FMT ioctl handler code.
+ * @get_fmt: callback for VIDIOC_SUBDEV_G_FMT() ioctl handler code.
 *
- * @set_fmt: callback for %VIDIOC_SUBDEV_S_FMT ioctl handler code.
+ * @set_fmt: callback for VIDIOC_SUBDEV_S_FMT() ioctl handler code.
 *
- * @get_selection: callback for %VIDIOC_SUBDEV_G_SELECTION ioctl handler code.
+ * @get_selection: callback for VIDIOC_SUBDEV_G_SELECTION() ioctl handler code.
 *
- * @set_selection: callback for %VIDIOC_SUBDEV_S_SELECTION ioctl handler code.
+ * @set_selection: callback for VIDIOC_SUBDEV_S_SELECTION() ioctl handler code.
 *
- * @get_edid: callback for %VIDIOC_SUBDEV_G_EDID ioctl handler code.
+ * @get_edid: callback for VIDIOC_SUBDEV_G_EDID() ioctl handler code.
 *
- * @set_edid: callback for %VIDIOC_SUBDEV_S_EDID ioctl handler code.
+ * @set_edid: callback for VIDIOC_SUBDEV_S_EDID() ioctl handler code.
 *
- * @dv_timings_cap: callback for %VIDIOC_SUBDEV_DV_TIMINGS_CAP ioctl handler
+ * @dv_timings_cap: callback for VIDIOC_SUBDEV_DV_TIMINGS_CAP() ioctl handler
 *                  code.
 *
- * @enum_dv_timings: callback for %VIDIOC_SUBDEV_ENUM_DV_TIMINGS ioctl handler
+ * @enum_dv_timings: callback for VIDIOC_SUBDEV_ENUM_DV_TIMINGS() ioctl handler
 *                   code.
 *
 * @link_validate: used by the media controller code to check if the links
@@ -766,7 +804,7 @@ struct v4l2_subdev_platform_data {
 * @list: List of sub-devices
 * @owner: The owner is the same as the driver's &struct device owner.
 * @owner_v4l2_dev: true if the &sd->owner matches the owner of @v4l2_dev->dev
- *      ownner. Initialized by v4l2_device_register_subdev().
+ *      owner. Initialized by v4l2_device_register_subdev().
 * @flags: subdev flags. Can be:
 *   %V4L2_SUBDEV_FL_IS_I2C - Set this flag if this subdev is a i2c device;
 *   %V4L2_SUBDEV_FL_IS_SPI - Set this flag if this subdev is a spi device;
diff --git a/include/media/v4l2-tpg-colors.h b/include/media/v4l2-tpg-colors.h
deleted file mode 100644
index 2a88d1fae0cd..000000000000
--- a/include/media/v4l2-tpg-colors.h
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * v4l2-tpg-colors.h - Color definitions for the test pattern generator
- *
- * Copyright 2014 Cisco Systems, Inc. and/or its affiliates. All rights reserved.
- *
- * This program is free software; you may redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-#ifndef _V4L2_TPG_COLORS_H_
-#define _V4L2_TPG_COLORS_H_
-struct color {
-        unsigned char r, g, b;
-};
-struct color16 {
-        int r, g, b;
-};
-enum tpg_color {
-        TPG_COLOR_CSC_WHITE,
-        TPG_COLOR_CSC_YELLOW,
-        TPG_COLOR_CSC_CYAN,
-        TPG_COLOR_CSC_GREEN,
-        TPG_COLOR_CSC_MAGENTA,
-        TPG_COLOR_CSC_RED,
-        TPG_COLOR_CSC_BLUE,
-        TPG_COLOR_CSC_BLACK,
-        TPG_COLOR_75_YELLOW,
-        TPG_COLOR_75_CYAN,
-        TPG_COLOR_75_GREEN,
-        TPG_COLOR_75_MAGENTA,
-        TPG_COLOR_75_RED,
-        TPG_COLOR_75_BLUE,
-        TPG_COLOR_100_WHITE,
-        TPG_COLOR_100_YELLOW,
-        TPG_COLOR_100_CYAN,
-        TPG_COLOR_100_GREEN,
-        TPG_COLOR_100_MAGENTA,
-        TPG_COLOR_100_RED,
-        TPG_COLOR_100_BLUE,
-        TPG_COLOR_100_BLACK,
-        TPG_COLOR_TEXTFG,
-        TPG_COLOR_TEXTBG,
-        TPG_COLOR_RANDOM,
-        TPG_COLOR_RAMP,
-        TPG_COLOR_MAX = TPG_COLOR_RAMP + 256
-};
-extern const struct color tpg_colors[TPG_COLOR_MAX];
-extern const unsigned short tpg_rec709_to_linear[255 * 16 + 1];
-extern const unsigned short tpg_linear_to_rec709[255 * 16 + 1];
-extern const struct color16 tpg_csc_colors[V4L2_COLORSPACE_DCI_P3 + 1]
-                                          [V4L2_XFER_FUNC_SMPTE2084 + 1]
-                                          [TPG_COLOR_CSC_BLACK + 1];
-#endif
diff --git a/include/media/videobuf-dvb.h b/include/media/videobuf-dvb.h
index a14ac7711c92..c9c81990a56c 100644
--- a/include/media/videobuf-dvb.h
+++ b/include/media/videobuf-dvb.h
@@ -1,9 +1,9 @@
 /* SPDX-License-Identifier: GPL-2.0 */
-#include <dvbdev.h>
+#include <media/dvbdev.h>
-#include <dmxdev.h>
+#include <media/dmxdev.h>
-#include <dvb_demux.h>
+#include <media/dvb_demux.h>
-#include <dvb_net.h>
+#include <media/dvb_net.h>
-#include <dvb_frontend.h>
+#include <media/dvb_frontend.h>
 #ifndef _VIDEOBUF_DVB_H_
 #define _VIDEOBUF_DVB_H_
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h
index e55efc62a950..aa16c064294f 100644
--- a/include/media/videobuf2-core.h
+++ b/include/media/videobuf2-core.h
@@ -16,6 +16,7 @@
 #include <linux/mutex.h>
 #include <linux/poll.h>
 #include <linux/dma-buf.h>
+#include <linux/bitops.h>
 #define VB2_MAX_FRAME   (32)
 #define VB2_MAX_PLANES  (8)
@@ -45,7 +46,7 @@ struct vb2_fileio_data;
 struct vb2_threadio_data;
 /**
- * struct vb2_mem_ops - memory handling/memory allocator operations
+ * struct vb2_mem_ops - memory handling/memory allocator operations.
 * @alloc:      allocate video memory and, optionally, allocator private data,
 *              return ERR_PTR() on failure or a pointer to allocator private,
 *              per-buffer data on success; the returned private structure
@@ -69,7 +70,7 @@ struct vb2_threadio_data;
 *               argument to other ops in this structure.
 * @put_userptr: inform the allocator that a USERPTR buffer will no longer
 *               be used.
- * @attach_dmabuf: attach a shared struct dma_buf for a hardware operation;
+ * @attach_dmabuf: attach a shared &struct dma_buf for a hardware operation;
 *                 used for DMABUF memory types; dev is the alloc device
 *                 dbuf is the shared dma_buf; returns ERR_PTR() on failure;
 *                 allocator private per-buffer structure on success;
@@ -145,28 +146,28 @@ struct vb2_mem_ops {
 };
 /**
- * struct vb2_plane - plane information
+ * struct vb2_plane - plane information.
- * @mem_priv:   private data with this plane
+ * @mem_priv:   private data with this plane.
- * @dbuf:       dma_buf - shared buffer object
+ * @dbuf:       dma_buf - shared buffer object.
 * @dbuf_mapped:        flag to show whether dbuf is mapped or not
- * @bytesused:  number of bytes occupied by data in the plane (payload)
+ * @bytesused:  number of bytes occupied by data in the plane (payload).
- * @length:     size of this plane (NOT the payload) in bytes
+ * @length:     size of this plane (NOT the payload) in bytes.
 * @min_length: minimum required size of this plane (NOT the payload) in bytes.
 *              @length is always greater or equal to @min_length.
- * @offset:     when memory in the associated struct vb2_buffer is
+ * @m:          Union with memtype-specific data.
- *              VB2_MEMORY_MMAP, equals the offset from the start of
+ * @m.offset:   when memory in the associated struct vb2_buffer is
+ *              %VB2_MEMORY_MMAP, equals the offset from the start of
 *              the device memory for this plane (or is a "cookie" that
- *              should be passed to mmap() called on the video node)
+ *              should be passed to mmap() called on the video node).
- * @userptr:    when memory is VB2_MEMORY_USERPTR, a userspace pointer
+ * @m.userptr:  when memory is %VB2_MEMORY_USERPTR, a userspace pointer
- *              pointing to this plane
+ *              pointing to this plane.
- * @fd:         when memory is VB2_MEMORY_DMABUF, a userspace file
+ * @m.fd:       when memory is %VB2_MEMORY_DMABUF, a userspace file
- *              descriptor associated with this plane
+ *              descriptor associated with this plane.
- * @m:          Union with memtype-specific data (@offset, @userptr or
- *              @fd).
 * @data_offset:        offset in the plane to the start of data; usually 0,
- *              unless there is a header in front of the data
+ *              unless there is a header in front of the data.
+ *
 * Should contain enough information to be able to cover all the fields
- * of struct v4l2_plane at videodev2.h
+ * of &struct v4l2_plane at videodev2.h.
 */
 struct vb2_plane {
        void                    *mem_priv;
@@ -184,35 +185,35 @@ struct vb2_plane {
 };
 /**
- * enum vb2_io_modes - queue access methods
+ * enum vb2_io_modes - queue access methods.
- * @VB2_MMAP:           driver supports MMAP with streaming API
+ * @VB2_MMAP:           driver supports MMAP with streaming API.
- * @VB2_USERPTR:        driver supports USERPTR with streaming API
+ * @VB2_USERPTR:        driver supports USERPTR with streaming API.
- * @VB2_READ:           driver supports read() style access
+ * @VB2_READ:           driver supports read() style access.
- * @VB2_WRITE:          driver supports write() style access
+ * @VB2_WRITE:          driver supports write() style access.
- * @VB2_DMABUF:         driver supports DMABUF with streaming API
+ * @VB2_DMABUF:         driver supports DMABUF with streaming API.
 */
 enum vb2_io_modes {
-        VB2_MMAP        = (1 << 0),
+        VB2_MMAP        = BIT(0),
-        VB2_USERPTR     = (1 << 1),
+        VB2_USERPTR     = BIT(1),
-        VB2_READ        = (1 << 2),
+        VB2_READ        = BIT(2),
-        VB2_WRITE       = (1 << 3),
+        VB2_WRITE       = BIT(3),
-        VB2_DMABUF      = (1 << 4),
+        VB2_DMABUF      = BIT(4),
 };
 /**
- * enum vb2_buffer_state - current video buffer state
+ * enum vb2_buffer_state - current video buffer state.
- * @VB2_BUF_STATE_DEQUEUED:     buffer under userspace control
+ * @VB2_BUF_STATE_DEQUEUED:     buffer under userspace control.
- * @VB2_BUF_STATE_PREPARING:    buffer is being prepared in videobuf
+ * @VB2_BUF_STATE_PREPARING:    buffer is being prepared in videobuf.
- * @VB2_BUF_STATE_PREPARED:     buffer prepared in videobuf and by the driver
+ * @VB2_BUF_STATE_PREPARED:     buffer prepared in videobuf and by the driver.
- * @VB2_BUF_STATE_QUEUED:       buffer queued in videobuf, but not in driver
+ * @VB2_BUF_STATE_QUEUED:       buffer queued in videobuf, but not in driver.
- * @VB2_BUF_STATE_REQUEUEING:   re-queue a buffer to the driver
+ * @VB2_BUF_STATE_REQUEUEING:   re-queue a buffer to the driver.
 * @VB2_BUF_STATE_ACTIVE:       buffer queued in driver and possibly used
- *                              in a hardware operation
+ *                              in a hardware operation.
 * @VB2_BUF_STATE_DONE:         buffer returned from driver to videobuf, but
- *                              not yet dequeued to userspace
+ *                              not yet dequeued to userspace.
 * @VB2_BUF_STATE_ERROR:        same as above, but the operation on the buffer
 *                              has ended with an error, which will be reported
- *                              to the userspace when it is dequeued
+ *                              to the userspace when it is dequeued.
 */
 enum vb2_buffer_state {
        VB2_BUF_STATE_DEQUEUED,
@@ -228,15 +229,15 @@ enum vb2_buffer_state {
 struct vb2_queue;
 /**
- * struct vb2_buffer - represents a video buffer
+ * struct vb2_buffer - represents a video buffer.
- * @vb2_queue:          the queue to which this driver belongs
+ * @vb2_queue:          pointer to &struct vb2_queue with the queue to
- * @index:              id number of the buffer
+ *                      which this driver belongs.
- * @type:               buffer type
+ * @index:              id number of the buffer.
- * @memory:             the method, in which the actual data is passed
+ * @type:               buffer type.
+ * @memory:             the method, in which the actual data is passed.
 * @num_planes:         number of planes in the buffer
- *                      on an internal driver queue
+ *                      on an internal driver queue.
- * @planes:             private per-plane information; do not change
+ * @timestamp:          frame timestamp in ns.
- * @timestamp:          frame timestamp in ns
 */
 struct vb2_buffer {
        struct vb2_queue        *vb2_queue;
@@ -244,7 +245,6 @@ struct vb2_buffer {
        unsigned int            type;
        unsigned int            memory;
        unsigned int            num_planes;
-        struct vb2_plane        planes[VB2_MAX_PLANES];
        u64                     timestamp;
        /* private: internal use only
@@ -254,9 +254,11 @@ struct vb2_buffer {
         *                      all buffers queued from userspace
         * done_entry:          entry on the list that stores all buffers ready
         *                      to be dequeued to userspace
+         * vb2_plane:           per-plane information; do not change
         */
        enum vb2_buffer_state   state;
+        struct vb2_plane        planes[VB2_MAX_PLANES];
        struct list_head        queued_entry;
        struct list_head        done_entry;
 #ifdef CONFIG_VIDEO_ADV_DEBUG
@@ -292,7 +294,7 @@ struct vb2_buffer {
 };
 /**
- * struct vb2_ops - driver-specific callbacks
+ * struct vb2_ops - driver-specific callbacks.
 *
 * @queue_setup:        called from VIDIOC_REQBUFS() and VIDIOC_CREATE_BUFS()
 *                      handlers before memory allocation. It can be called
@@ -358,8 +360,8 @@ struct vb2_buffer {
 *                      the @buf_queue callback are to be returned by the driver
 *                      by calling vb2_buffer_done() with %VB2_BUF_STATE_QUEUED.
 *                      If you need a minimum number of buffers before you can
- *                      start streaming, then set @min_buffers_needed in the
+ *                      start streaming, then set
- *                      vb2_queue structure. If that is non-zero then
+ *                      &vb2_queue->min_buffers_needed. If that is non-zero then
 *                      @start_streaming won't be called until at least that
 *                      many buffers have been queued up by userspace.
 * @stop_streaming:     called when 'streaming' state must be disabled; driver
@@ -396,18 +398,18 @@ struct vb2_ops {
 };
 /**
- * struct vb2_buf_ops - driver-specific callbacks
+ * struct vb2_buf_ops - driver-specific callbacks.
 *
 * @verify_planes_array: Verify that a given user space structure contains
 *                      enough planes for the buffer. This is called
 *                      for each dequeued buffer.
- * @fill_user_buffer:   given a vb2_buffer fill in the userspace structure.
+ * @fill_user_buffer:   given a &vb2_buffer fill in the userspace structure.
- *                      For V4L2 this is a struct v4l2_buffer.
+ *                      For V4L2 this is a &struct v4l2_buffer.
- * @fill_vb2_buffer:    given a userspace structure, fill in the vb2_buffer.
+ * @fill_vb2_buffer:    given a userspace structure, fill in the &vb2_buffer.
 *                      If the userspace structure is invalid, then this op
 *                      will return an error.
 * @copy_timestamp:     copy the timestamp from a userspace structure to
- *                      the vb2_buffer struct.
+ *                      the &struct vb2_buffer.
 */
 struct vb2_buf_ops {
        int (*verify_planes_array)(struct vb2_buffer *vb, const void *pb);
@@ -418,20 +420,21 @@ struct vb2_buf_ops {
 };
 /**
- * struct vb2_queue - a videobuf queue
+ * struct vb2_queue - a videobuf queue.
 *
 * @type:       private buffer type whose content is defined by the vb2-core
 *              caller. For example, for V4L2, it should match
- *              the types defined on enum &v4l2_buf_type
+ *              the types defined on &enum v4l2_buf_type.
- * @io_modes:   supported io methods (see vb2_io_modes enum)
+ * @io_modes:   supported io methods (see &enum vb2_io_modes).
+ * @alloc_devs: &struct device memory type/allocator-specific per-plane device
 * @dev:        device to use for the default allocation context if the driver
 *              doesn't fill in the @alloc_devs array.
 * @dma_attrs:  DMA attributes to use for the DMA.
 * @bidirectional: when this flag is set the DMA direction for the buffers of
- *              this queue will be overridden with DMA_BIDIRECTIONAL direction.
+ *              this queue will be overridden with %DMA_BIDIRECTIONAL direction.
 *              This is useful in cases where the hardware (firmware) writes to
- *              a buffer which is mapped as read (DMA_TO_DEVICE), or reads from
+ *              a buffer which is mapped as read (%DMA_TO_DEVICE), or reads from
- *              buffer which is mapped for write (DMA_FROM_DEVICE) in order
+ *              buffer which is mapped for write (%DMA_FROM_DEVICE) in order
 *              to satisfy some internal hardware restrictions or adds a padding
 *              needed by the processing algorithm. In case the DMA mapping is
 *              not bidirectional but the hardware (firmware) trying to access
@@ -440,10 +443,10 @@ struct vb2_buf_ops {
 * @fileio_read_once:           report EOF after reading the first buffer
 * @fileio_write_immediately:   queue buffer after each write() call
 * @allow_zero_bytesused:       allow bytesused == 0 to be passed to the driver
- * @quirk_poll_must_check_waiting_for_buffers: Return POLLERR at poll when QBUF
+ * @quirk_poll_must_check_waiting_for_buffers: Return %POLLERR at poll when QBUF
 *              has not been called. This is a vb1 idiom that has been adopted
 *              also by vb2.
- * @lock:       pointer to a mutex that protects the vb2_queue struct. The
+ * @lock:       pointer to a mutex that protects the &struct vb2_queue. The
 *              driver can set this to a mutex to let the v4l2 core serialize
 *              the queuing ioctls. If the driver wants to handle locking
 *              itself, then this should be set to NULL. This lock is not used
@@ -454,17 +457,17 @@ struct vb2_buf_ops {
 *              drivers to easily associate an owner filehandle with the queue.
 * @ops:        driver-specific callbacks
 * @mem_ops:    memory allocator specific callbacks
- * @buf_ops:    callbacks to deliver buffer information
+ * @buf_ops:    callbacks to deliver buffer information.
- *              between user-space and kernel-space
+ *              between user-space and kernel-space.
- * @drv_priv:   driver private data
+ * @drv_priv:   driver private data.
 * @buf_struct_size: size of the driver-specific buffer structure;
 *              "0" indicates the driver doesn't want to use a custom buffer
- *              structure type. for example, sizeof(struct vb2_v4l2_buffer)
+ *              structure type. for example, ``sizeof(struct vb2_v4l2_buffer)``
 *              will be used for v4l2.
- * @timestamp_flags: Timestamp flags; V4L2_BUF_FLAG_TIMESTAMP_* and
+ * @timestamp_flags: Timestamp flags; ``V4L2_BUF_FLAG_TIMESTAMP_*`` and
- *              V4L2_BUF_FLAG_TSTAMP_SRC_*
+ *              ``V4L2_BUF_FLAG_TSTAMP_SRC_*``
 * @gfp_flags:  additional gfp flags used when allocating the buffers.
- *              Typically this is 0, but it may be e.g. GFP_DMA or __GFP_DMA32
+ *              Typically this is 0, but it may be e.g. %GFP_DMA or %__GFP_DMA32
 *              to force the buffer allocation to a specific memory zone.
 * @min_buffers_needed: the minimum number of buffers needed before
 *              @start_streaming can be called. Used when a DMA engine
@@ -484,20 +487,19 @@ struct vb2_buf_ops {
 * @done_list:  list of buffers ready to be dequeued to userspace
 * @done_lock:  lock to protect done_list list
 * @done_wq:    waitqueue for processes waiting for buffers ready to be dequeued
- * @alloc_devs: memory type/allocator-specific per-plane device
 * @streaming:  current streaming state
 * @start_streaming_called: @start_streaming was called successfully and we
 *              started streaming.
 * @error:      a fatal error occurred on the queue
 * @waiting_for_buffers: used in poll() to check if vb2 is still waiting for
 *              buffers. Only set for capture queues if qbuf has not yet been
- *              called since poll() needs to return POLLERR in that situation.
+ *              called since poll() needs to return %POLLERR in that situation.
 * @is_multiplanar: set if buffer type is multiplanar
 * @is_output:  set if buffer type is output
 * @copy_timestamp: set if vb2-core should set timestamps
 * @last_buffer_dequeued: used in poll() and DQBUF to immediately return if the
 *              last decoded buffer was already dequeued. Set for capture queues
- *              when a buffer with the V4L2_BUF_FLAG_LAST is dequeued.
+ *              when a buffer with the %V4L2_BUF_FLAG_LAST is dequeued.
 * @fileio:     file io emulator internal data, used only if emulator is active
 * @threadio:   thread io internal data, used only if thread is active
 */
@@ -525,6 +527,8 @@ struct vb2_queue {
        gfp_t                           gfp_flags;
        u32                             min_buffers_needed;
+        struct device                   *alloc_devs[VB2_MAX_PLANES];
        /* private: internal use only */
        struct mutex                    mmap_lock;
        unsigned int                    memory;
@@ -540,8 +544,6 @@ struct vb2_queue {
        spinlock_t                      done_lock;
        wait_queue_head_t               done_wq;
-        struct device                   *alloc_devs[VB2_MAX_PLANES];
        unsigned int                    streaming:1;
        unsigned int                    start_streaming_called:1;
        unsigned int                    error:1;
@@ -568,9 +570,10 @@ struct vb2_queue {
 };
 /**
- * vb2_plane_vaddr() - Return a kernel virtual address of a given plane
+ * vb2_plane_vaddr() - Return a kernel virtual address of a given plane.
- * @vb:         vb2_buffer to which the plane in question belongs to
+ * @vb:         pointer to &struct vb2_buffer to which the plane in
- * @plane_no:   plane number for which the address is to be returned
+ *              question belongs to.
+ * @plane_no:   plane number for which the address is to be returned.
 *
 * This function returns a kernel virtual address of a given plane if
 * such a mapping exist, NULL otherwise.
@@ -578,9 +581,10 @@ struct vb2_queue {
 void *vb2_plane_vaddr(struct vb2_buffer *vb, unsigned int plane_no);
 /**
- * vb2_plane_cookie() - Return allocator specific cookie for the given plane
+ * vb2_plane_cookie() - Return allocator specific cookie for the given plane.
- * @vb:         vb2_buffer to which the plane in question belongs to
+ * @vb:         pointer to &struct vb2_buffer to which the plane in
- * @plane_no:   plane number for which the cookie is to be returned
+ *              question belongs to.
+ * @plane_no:   plane number for which the cookie is to be returned.
 *
 * This function returns an allocator specific cookie for a given plane if
 * available, NULL otherwise. The allocator should provide some simple static
@@ -591,9 +595,11 @@ void *vb2_plane_vaddr(struct vb2_buffer *vb, unsigned int plane_no);
 void *vb2_plane_cookie(struct vb2_buffer *vb, unsigned int plane_no);
 /**
- * vb2_buffer_done() - inform videobuf that an operation on a buffer is finished
+ * vb2_buffer_done() - inform videobuf that an operation on a buffer
- * @vb:         vb2_buffer returned from the driver
+ *      is finished.
- * @state:      either %VB2_BUF_STATE_DONE if the operation finished
+ * @vb:         pointer to &struct vb2_buffer to be used.
+ * @state:      state of the buffer, as defined by &enum vb2_buffer_state.
+ *              Either %VB2_BUF_STATE_DONE if the operation finished
 *              successfully, %VB2_BUF_STATE_ERROR if the operation finished
 *              with an error or %VB2_BUF_STATE_QUEUED if the driver wants to
 *              requeue buffers. If start_streaming fails then it should return
@@ -614,8 +620,8 @@ void *vb2_plane_cookie(struct vb2_buffer *vb, unsigned int plane_no);
 void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state);
 /**
- * vb2_discard_done() - discard all buffers marked as DONE
+ * vb2_discard_done() - discard all buffers marked as DONE.
- * @q:          videobuf2 queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
 *
 * This function is intended to be used with suspend/resume operations. It
 * discards all 'done' buffers as they would be too old to be requested after
@@ -628,74 +634,83 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state);
 void vb2_discard_done(struct vb2_queue *q);
 /**
- * vb2_wait_for_all_buffers() - wait until all buffers are given back to vb2
+ * vb2_wait_for_all_buffers() - wait until all buffers are given back to vb2.
- * @q:          videobuf2 queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
 *
 * This function will wait until all buffers that have been given to the driver
 * by &vb2_ops->buf_queue are given back to vb2 with vb2_buffer_done(). It
- * doesn't call wait_prepare()/wait_finish() pair. It is intended to be called
+ * doesn't call &vb2_ops->wait_prepare/&vb2_ops->wait_finish pair.
- * with all locks taken, for example from &vb2_ops->stop_streaming callback.
+ * It is intended to be called with all locks taken, for example from
+ * &vb2_ops->stop_streaming callback.
 */
 int vb2_wait_for_all_buffers(struct vb2_queue *q);
 /**
- * vb2_core_querybuf() - query video buffer information
+ * vb2_core_querybuf() - query video buffer information.
- * @q:          videobuf queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
- * @index:      id number of the buffer
+ * @index:      id number of the buffer.
- * @pb:         buffer struct passed from userspace
+ * @pb:         buffer struct passed from userspace.
+ *
+ * Videobuf2 core helper to implement VIDIOC_QUERYBUF() operation. It is called
+ * internally by VB2 by an API-specific handler, like ``videobuf2-v4l2.h``.
 *
- * Should be called from vidioc_querybuf ioctl handler in driver.
 * The passed buffer should have been verified.
+ *
 * This function fills the relevant information for the userspace.
+ *
+ * Return: returns zero on success; an error code otherwise.
 */
 void vb2_core_querybuf(struct vb2_queue *q, unsigned int index, void *pb);
 /**
- * vb2_core_reqbufs() - Initiate streaming
+ * vb2_core_reqbufs() - Initiate streaming.
- * @q:          videobuf2 queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
- * @memory: memory type
+ * @memory:     memory type, as defined by &enum vb2_memory.
- * @count: requested buffer count
+ * @count:      requested buffer count.
 *
- * Should be called from vidioc_reqbufs ioctl handler of a driver.
+ * Videobuf2 core helper to implement VIDIOC_REQBUF() operation. It is called
+ * internally by VB2 by an API-specific handler, like ``videobuf2-v4l2.h``.
 *
 * This function:
 *
- * #) verifies streaming parameters passed from the userspace,
+ * #) verifies streaming parameters passed from the userspace;
- * #) sets up the queue,
+ * #) sets up the queue;
 * #) negotiates number of buffers and planes per buffer with the driver
- *    to be used during streaming,
+ *    to be used during streaming;
- * #) allocates internal buffer structures (struct vb2_buffer), according to
+ * #) allocates internal buffer structures (&struct vb2_buffer), according to
- *    the agreed parameters,
+ *    the agreed parameters;
 * #) for MMAP memory type, allocates actual video memory, using the
- *    memory handling/allocation routines provided during queue initialization
+ *    memory handling/allocation routines provided during queue initialization.
 *
 * If req->count is 0, all the memory will be freed instead.
- * If the queue has been allocated previously (by a previous vb2_reqbufs) call
- * and the queue is not busy, memory will be reallocated.
 *
- * The return values from this function are intended to be directly returned
+ * If the queue has been allocated previously by a previous vb2_core_reqbufs()
- * from vidioc_reqbufs handler in driver.
+ * call and the queue is not busy, memory will be reallocated.
+ *
+ * Return: returns zero on success; an error code otherwise.
 */
 int vb2_core_reqbufs(struct vb2_queue *q, enum vb2_memory memory,
                unsigned int *count);
 /**
 * vb2_core_create_bufs() - Allocate buffers and any required auxiliary structs
- * @q:          videobuf2 queue
+ * @q: pointer to &struct vb2_queue with videobuf2 queue.
- * @memory: memory type
+ * @memory: memory type, as defined by &enum vb2_memory.
- * @count: requested buffer count
+ * @count: requested buffer count.
- * @requested_planes: number of planes requested
+ * @requested_planes: number of planes requested.
- * @requested_sizes: array with the size of the planes
+ * @requested_sizes: array with the size of the planes.
+ *
+ * Videobuf2 core helper to implement VIDIOC_CREATE_BUFS() operation. It is
+ * called internally by VB2 by an API-specific handler, like
+ * ``videobuf2-v4l2.h``.
 *
- * Should be called from VIDIOC_CREATE_BUFS() ioctl handler of a driver.
 * This function:
 *
- * #) verifies parameter sanity
+ * #) verifies parameter sanity;
- * #) calls the .queue_setup() queue operation
+ * #) calls the &vb2_ops->queue_setup queue operation;
- * #) performs any necessary memory allocations
+ * #) performs any necessary memory allocations.
 *
- * Return: the return values from this function are intended to be directly
+ * Return: returns zero on success; an error code otherwise.
- * returned from VIDIOC_CREATE_BUFS() handler in driver.
 */
 int vb2_core_create_bufs(struct vb2_queue *q, enum vb2_memory memory,
                         unsigned int *count, unsigned int requested_planes,
@@ -703,57 +718,61 @@ int vb2_core_create_bufs(struct vb2_queue *q, enum vb2_memory memory,
 /**
 * vb2_core_prepare_buf() - Pass ownership of a buffer from userspace
- *                      to the kernel
+ *                      to the kernel.
- * @q:          videobuf2 queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
- * @index:      id number of the buffer
+ * @index:      id number of the buffer.
- * @pb:         buffer structure passed from userspace to vidioc_prepare_buf
+ * @pb:         buffer structure passed from userspace to
- *              handler in driver
+ *              &v4l2_ioctl_ops->vidioc_prepare_buf handler in driver.
+ *
+ * Videobuf2 core helper to implement VIDIOC_PREPARE_BUF() operation. It is
+ * called internally by VB2 by an API-specific handler, like
+ * ``videobuf2-v4l2.h``.
 *
- * Should be called from vidioc_prepare_buf ioctl handler of a driver.
 * The passed buffer should have been verified.
- * This function calls buf_prepare callback in the driver (if provided),
- * in which driver-specific buffer initialization can be performed,
 *
- * The return values from this function are intended to be directly returned
+ * This function calls vb2_ops->buf_prepare callback in the driver
- * from vidioc_prepare_buf handler in driver.
+ * (if provided), in which driver-specific buffer initialization can
+ * be performed.
+ *
+ * Return: returns zero on success; an error code otherwise.
 */
 int vb2_core_prepare_buf(struct vb2_queue *q, unsigned int index, void *pb);
 /**
 * vb2_core_qbuf() - Queue a buffer from userspace
 *
- * @q:          videobuf2 queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
 * @index:      id number of the buffer
- * @pb:         buffer structure passed from userspace to vidioc_qbuf handler
+ * @pb:         buffer structure passed from userspace to
- *              in driver
+ *              v4l2_ioctl_ops->vidioc_qbuf handler in driver
 *
- * Should be called from vidioc_qbuf ioctl handler of a driver.
+ * Videobuf2 core helper to implement VIDIOC_QBUF() operation. It is called
- * The passed buffer should have been verified.
+ * internally by VB2 by an API-specific handler, like ``videobuf2-v4l2.h``.
 *
 * This function:
 *
- * #) if necessary, calls buf_prepare callback in the driver (if provided), in
+ * #) if necessary, calls &vb2_ops->buf_prepare callback in the driver
- *    which driver-specific buffer initialization can be performed,
+ *    (if provided), in which driver-specific buffer initialization can
+ *    be performed;
 * #) if streaming is on, queues the buffer in driver by the means of
 *    &vb2_ops->buf_queue callback for processing.
 *
- * The return values from this function are intended to be directly returned
+ * Return: returns zero on success; an error code otherwise.
- * from vidioc_qbuf handler in driver.
 */
 int vb2_core_qbuf(struct vb2_queue *q, unsigned int index, void *pb);
 /**
 * vb2_core_dqbuf() - Dequeue a buffer to the userspace
- * @q:          videobuf2 queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue
 * @pindex:     pointer to the buffer index. May be NULL
- * @pb:         buffer structure passed from userspace to vidioc_dqbuf handler
+ * @pb:         buffer structure passed from userspace to
- *              in driver
+ *              v4l2_ioctl_ops->vidioc_dqbuf handler in driver.
 * @nonblocking: if true, this call will not sleep waiting for a buffer if no
 *               buffers ready for dequeuing are present. Normally the driver
- *               would be passing (file->f_flags & O_NONBLOCK) here
+ *               would be passing (file->f_flags & O_NONBLOCK) here.
 *
- * Should be called from vidioc_dqbuf ioctl handler of a driver.
+ * Videobuf2 core helper to implement VIDIOC_DQBUF() operation. It is called
- * The passed buffer should have been verified.
+ * internally by VB2 by an API-specific handler, like ``videobuf2-v4l2.h``.
 *
 * This function:
 *
@@ -763,73 +782,108 @@ int vb2_core_qbuf(struct vb2_queue *q, unsigned int index, void *pb);
 * #) the buffer struct members are filled with relevant information for
 *    the userspace.
 *
- * The return values from this function are intended to be directly returned
+ * Return: returns zero on success; an error code otherwise.
- * from vidioc_dqbuf handler in driver.
 */
 int vb2_core_dqbuf(struct vb2_queue *q, unsigned int *pindex, void *pb,
                   bool nonblocking);
+/**
+ * vb2_core_streamon() - Implements VB2 stream ON logic
+ *
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue
+ * @type:       type of the queue to be started.
+ *              For V4L2, this is defined by &enum v4l2_buf_type type.
+ *
+ * Videobuf2 core helper to implement VIDIOC_STREAMON() operation. It is called
+ * internally by VB2 by an API-specific handler, like ``videobuf2-v4l2.h``.
+ *
+ * Return: returns zero on success; an error code otherwise.
+ */
 int vb2_core_streamon(struct vb2_queue *q, unsigned int type);
+/**
+ * vb2_core_streamoff() - Implements VB2 stream OFF logic
+ *
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue
+ * @type:       type of the queue to be started.
+ *              For V4L2, this is defined by &enum v4l2_buf_type type.
+ *
+ * Videobuf2 core helper to implement VIDIOC_STREAMOFF() operation. It is
+ * called internally by VB2 by an API-specific handler, like
+ * ``videobuf2-v4l2.h``.
+ *
+ * Return: returns zero on success; an error code otherwise.
+ */
 int vb2_core_streamoff(struct vb2_queue *q, unsigned int type);
 /**
- * vb2_core_expbuf() - Export a buffer as a file descriptor
+ * vb2_core_expbuf() - Export a buffer as a file descriptor.
- * @q:          videobuf2 queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
- * @fd:         file descriptor associated with DMABUF (set by driver) *
+ * @fd:         pointer to the file descriptor associated with DMABUF
- * @type:       buffer type
+ *              (set by driver).
- * @index:      id number of the buffer
+ * @type:       buffer type.
+ * @index:      id number of the buffer.
 * @plane:      index of the plane to be exported, 0 for single plane queues
- * @flags:      flags for newly created file, currently only O_CLOEXEC is
+ * @flags:      file flags for newly created file, as defined at
- *              supported, refer to manual of open syscall for more details
+ *              include/uapi/asm-generic/fcntl.h.
+ *              Currently, the only used flag is %O_CLOEXEC.
+ *              is supported, refer to manual of open syscall for more details.
 *
- * The return values from this function are intended to be directly returned
+ *
- * from vidioc_expbuf handler in driver.
+ * Videobuf2 core helper to implement VIDIOC_EXPBUF() operation. It is called
+ * internally by VB2 by an API-specific handler, like ``videobuf2-v4l2.h``.
+ *
+ * Return: returns zero on success; an error code otherwise.
 */
 int vb2_core_expbuf(struct vb2_queue *q, int *fd, unsigned int type,
                unsigned int index, unsigned int plane, unsigned int flags);
 /**
 * vb2_core_queue_init() - initialize a videobuf2 queue
- * @q:          videobuf2 queue; this structure should be allocated in driver
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
+ *              This structure should be allocated in driver
 *
- * The vb2_queue structure should be allocated by the driver. The driver is
+ * The &vb2_queue structure should be allocated by the driver. The driver is
 * responsible of clearing it's content and setting initial values for some
 * required entries before calling this function.
- * q->ops, q->mem_ops, q->type and q->io_modes are mandatory. Please refer
+ *
- * to the struct vb2_queue description in include/media/videobuf2-core.h
+ * .. note::
- * for more information.
+ *
+ *    The following fields at @q should be set before calling this function:
+ *    &vb2_queue->ops, &vb2_queue->mem_ops, &vb2_queue->type.
 */
 int vb2_core_queue_init(struct vb2_queue *q);
 /**
 * vb2_core_queue_release() - stop streaming, release the queue and free memory
- * @q:          videobuf2 queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
 *
 * This function stops streaming and performs necessary clean ups, including
 * freeing video buffer memory. The driver is responsible for freeing
- * the vb2_queue structure itself.
+ * the &struct vb2_queue itself.
 */
 void vb2_core_queue_release(struct vb2_queue *q);
 /**
 * vb2_queue_error() - signal a fatal error on the queue
- * @q:          videobuf2 queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
 *
 * Flag that a fatal unrecoverable error has occurred and wake up all processes
- * waiting on the queue. Polling will now set POLLERR and queuing and dequeuing
+ * waiting on the queue. Polling will now set %POLLERR and queuing and dequeuing
- * buffers will return -EIO.
+ * buffers will return %-EIO.
 *
- * The error flag will be cleared when cancelling the queue, either from
+ * The error flag will be cleared when canceling the queue, either from
- * vb2_streamoff or vb2_queue_release. Drivers should thus not call this
+ * vb2_streamoff() or vb2_queue_release(). Drivers should thus not call this
 * function before starting the stream, otherwise the error flag will remain set
 * until the queue is released when closing the device node.
 */
 void vb2_queue_error(struct vb2_queue *q);
 /**
- * vb2_mmap() - map video buffers into application address space
+ * vb2_mmap() - map video buffers into application address space.
- * @q:          videobuf2 queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
- * @vma:        vma passed to the mmap file operation handler in the driver
+ * @vma:        pointer to &struct vm_area_struct with the vma passed
+ *              to the mmap file operation handler in the driver.
 *
 * Should be called from mmap file operation handler of a driver.
 * This function maps one plane of one of the available video buffers to
@@ -837,8 +891,10 @@ void vb2_queue_error(struct vb2_queue *q);
 * has to be called once per each plane per each buffer previously allocated.
 *
 * When the userspace application calls mmap, it passes to it an offset returned
- * to it earlier by the means of vidioc_querybuf handler. That offset acts as
+ * to it earlier by the means of &v4l2_ioctl_ops->vidioc_querybuf handler.
- * a "cookie", which is then used to identify the plane to be mapped.
+ * That offset acts as a "cookie", which is then used to identify the plane
+ * to be mapped.
+ *
 * This function finds a plane with a matching offset and a mapping is performed
 * by the means of a provided memory operation.
 *
@@ -848,6 +904,21 @@ void vb2_queue_error(struct vb2_queue *q);
 int vb2_mmap(struct vb2_queue *q, struct vm_area_struct *vma);
 #ifndef CONFIG_MMU
+/**
+ * vb2_get_unmapped_area - map video buffers into application address space.
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
+ * @addr:       memory address.
+ * @len:        buffer size.
+ * @pgoff:      page offset.
+ * @flags:      memory flags.
+ *
+ * This function is used in noMMU platforms to propose address mapping
+ * for a given buffer. It's intended to be used as a handler for the
+ * &file_operations->get_unmapped_area operation.
+ *
+ * This is called by the mmap() syscall routines will call this
+ * to get a proposed address for the mapping, when ``!CONFIG_MMU``.
+ */
 unsigned long vb2_get_unmapped_area(struct vb2_queue *q,
                                    unsigned long addr,
                                    unsigned long len,
@@ -856,10 +927,12 @@ unsigned long vb2_get_unmapped_area(struct vb2_queue *q,
 #endif
 /**
- * vb2_core_poll() - implements poll userspace operation
+ * vb2_core_poll() - implements poll syscall() logic.
- * @q:          videobuf2 queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
- * @file:       file argument passed to the poll file operation handler
+ * @file:       &struct file argument passed to the poll
- * @wait:       wait argument passed to the poll file operation handler
+ *              file operation handler.
+ * @wait:       &poll_table wait argument passed to the poll
+ *              file operation handler.
 *
 * This function implements poll file operation handler for a driver.
 * For CAPTURE queues, if a buffer is ready to be dequeued, the userspace will
@@ -874,16 +947,32 @@ unsigned long vb2_get_unmapped_area(struct vb2_queue *q,
 __poll_t vb2_core_poll(struct vb2_queue *q, struct file *file,
                           poll_table *wait);
+/**
+ * vb2_read() - implements read() syscall logic.
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
+ * @data:       pointed to target userspace buffer
+ * @count:      number of bytes to read
+ * @ppos:       file handle position tracking pointer
+ * @nonblock:   mode selector (1 means blocking calls, 0 means nonblocking)
+ */
 size_t vb2_read(struct vb2_queue *q, char __user *data, size_t count,
                loff_t *ppos, int nonblock);
+/**
+ * vb2_read() - implements write() syscall logic.
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
+ * @data:       pointed to target userspace buffer
+ * @count:      number of bytes to write
+ * @ppos:       file handle position tracking pointer
+ * @nonblock:   mode selector (1 means blocking calls, 0 means nonblocking)
+ */
 size_t vb2_write(struct vb2_queue *q, const char __user *data, size_t count,
                loff_t *ppos, int nonblock);
 /**
- * typedef vb2_thread_fnc - callback function for use with vb2_thread
+ * typedef vb2_thread_fnc - callback function for use with vb2_thread.
 *
- * @vb: pointer to struct &vb2_buffer
+ * @vb: pointer to struct &vb2_buffer.
- * @priv: pointer to a private pointer
+ * @priv: pointer to a private data.
 *
 * This is called whenever a buffer is dequeued in the thread.
 */
@@ -891,13 +980,13 @@ typedef int (*vb2_thread_fnc)(struct vb2_buffer *vb, void *priv);
 /**
 * vb2_thread_start() - start a thread for the given queue.
- * @q:          videobuf queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
- * @fnc:        callback function
+ * @fnc:        &vb2_thread_fnc callback function.
- * @priv:       priv pointer passed to the callback function
+ * @priv:       priv pointer passed to the callback function.
 * @thread_name:the name of the thread. This will be prefixed with "vb2-".
 *
 * This starts a thread that will queue and dequeue until an error occurs
- * or @vb2_thread_stop is called.
+ * or vb2_thread_stop() is called.
 *
 * .. attention::
 *
@@ -910,13 +999,13 @@ int vb2_thread_start(struct vb2_queue *q, vb2_thread_fnc fnc, void *priv,
 /**
 * vb2_thread_stop() - stop the thread for the given queue.
- * @q:          videobuf queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
 */
 int vb2_thread_stop(struct vb2_queue *q);
 /**
- * vb2_is_streaming() - return streaming status of the queue
+ * vb2_is_streaming() - return streaming status of the queue.
- * @q:          videobuf queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
 */
 static inline bool vb2_is_streaming(struct vb2_queue *q)
 {
@@ -925,15 +1014,16 @@ static inline bool vb2_is_streaming(struct vb2_queue *q)
 /**
 * vb2_fileio_is_active() - return true if fileio is active.
- * @q:          videobuf queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
 *
 * This returns true if read() or write() is used to stream the data
 * as opposed to stream I/O. This is almost never an important distinction,
 * except in rare cases. One such case is that using read() or write() to
- * stream a format using V4L2_FIELD_ALTERNATE is not allowed since there
+ * stream a format using %V4L2_FIELD_ALTERNATE is not allowed since there
 * is no way you can pass the field information of each buffer to/from
 * userspace. A driver that supports this field format should check for
- * this in the queue_setup op and reject it if this function returns true.
+ * this in the &vb2_ops->queue_setup op and reject it if this function returns
+ * true.
 */
 static inline bool vb2_fileio_is_active(struct vb2_queue *q)
 {
@@ -941,8 +1031,8 @@ static inline bool vb2_fileio_is_active(struct vb2_queue *q)
 }
 /**
- * vb2_is_busy() - return busy status of the queue
+ * vb2_is_busy() - return busy status of the queue.
- * @q:          videobuf queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
 *
 * This function checks if queue has any buffers allocated.
 */
@@ -952,8 +1042,8 @@ static inline bool vb2_is_busy(struct vb2_queue *q)
 }
 /**
- * vb2_get_drv_priv() - return driver private data associated with the queue
+ * vb2_get_drv_priv() - return driver private data associated with the queue.
- * @q:          videobuf queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
 */
 static inline void *vb2_get_drv_priv(struct vb2_queue *q)
 {
@@ -961,10 +1051,11 @@ static inline void *vb2_get_drv_priv(struct vb2_queue *q)
 }
 /**
- * vb2_set_plane_payload() - set bytesused for the plane plane_no
+ * vb2_set_plane_payload() - set bytesused for the plane @plane_no.
- * @vb:         buffer for which plane payload should be set
+ * @vb:         pointer to &struct vb2_buffer to which the plane in
- * @plane_no:   plane number for which payload should be set
+ *              question belongs to.
- * @size:       payload in bytes
+ * @plane_no:   plane number for which payload should be set.
+ * @size:       payload in bytes.
 */
 static inline void vb2_set_plane_payload(struct vb2_buffer *vb,
                                 unsigned int plane_no, unsigned long size)
@@ -975,8 +1066,9 @@ static inline void vb2_set_plane_payload(struct vb2_buffer *vb,
 /**
 * vb2_get_plane_payload() - get bytesused for the plane plane_no
- * @vb:         buffer for which plane payload should be set
+ * @vb:         pointer to &struct vb2_buffer to which the plane in
- * @plane_no:   plane number for which payload should be set
+ *              question belongs to.
+ * @plane_no:   plane number for which payload should be set.
 */
 static inline unsigned long vb2_get_plane_payload(struct vb2_buffer *vb,
                                 unsigned int plane_no)
@@ -987,9 +1079,10 @@ static inline unsigned long vb2_get_plane_payload(struct vb2_buffer *vb,
 }
 /**
- * vb2_plane_size() - return plane size in bytes
+ * vb2_plane_size() - return plane size in bytes.
- * @vb:         buffer for which plane size should be returned
+ * @vb:         pointer to &struct vb2_buffer to which the plane in
- * @plane_no:   plane number for which size should be returned
+ *              question belongs to.
+ * @plane_no:   plane number for which size should be returned.
 */
 static inline unsigned long
 vb2_plane_size(struct vb2_buffer *vb, unsigned int plane_no)
@@ -1000,8 +1093,8 @@ vb2_plane_size(struct vb2_buffer *vb, unsigned int plane_no)
 }
 /**
- * vb2_start_streaming_called() - return streaming status of driver
+ * vb2_start_streaming_called() - return streaming status of driver.
- * @q:          videobuf queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
 */
 static inline bool vb2_start_streaming_called(struct vb2_queue *q)
 {
@@ -1009,8 +1102,8 @@ static inline bool vb2_start_streaming_called(struct vb2_queue *q)
 }
 /**
- * vb2_clear_last_buffer_dequeued() - clear last buffer dequeued flag of queue
+ * vb2_clear_last_buffer_dequeued() - clear last buffer dequeued flag of queue.
- * @q:          videobuf queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
 */
 static inline void vb2_clear_last_buffer_dequeued(struct vb2_queue *q)
 {
@@ -1024,10 +1117,10 @@ static inline void vb2_clear_last_buffer_dequeued(struct vb2_queue *q)
 /**
 * vb2_buffer_in_use() - return true if the buffer is in use and
- * the queue cannot be freed (by the means of REQBUFS(0)) call
+ * the queue cannot be freed (by the means of VIDIOC_REQBUFS(0)) call.
 *
- * @vb:         buffer for which plane size should be returned
+ * @vb:         buffer for which plane size should be returned.
- * @q:          videobuf queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
 */
 bool vb2_buffer_in_use(struct vb2_queue *q, struct vb2_buffer *vb);
@@ -1035,11 +1128,11 @@ bool vb2_buffer_in_use(struct vb2_queue *q, struct vb2_buffer *vb);
 * vb2_verify_memory_type() - Check whether the memory type and buffer type
 * passed to a buffer operation are compatible with the queue.
 *
- * @q:          videobuf queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
 * @memory:     memory model, as defined by enum &vb2_memory.
 * @type:       private buffer type whose content is defined by the vb2-core
 *              caller. For example, for V4L2, it should match
- *              the types defined on enum &v4l2_buf_type
+ *              the types defined on enum &v4l2_buf_type.
 */
 int vb2_verify_memory_type(struct vb2_queue *q,
                enum vb2_memory memory, unsigned int type);
diff --git a/include/media/videobuf2-dvb.h b/include/media/videobuf2-dvb.h
index 5a31faa24f1a..8605366ec87c 100644
--- a/include/media/videobuf2-dvb.h
+++ b/include/media/videobuf2-dvb.h
@@ -2,12 +2,11 @@
 #ifndef _VIDEOBUF2_DVB_H_
 #define _VIDEOBUF2_DVB_H_
-#include <dvbdev.h>
+#include <media/dvbdev.h>
-#include <dmxdev.h>
+#include <media/dmxdev.h>
-#include <dvb_demux.h>
+#include <media/dvb_demux.h>
-#include <dvb_net.h>
+#include <media/dvb_net.h>
-#include <dvb_frontend.h>
+#include <media/dvb_frontend.h>
 #include <media/videobuf2-v4l2.h>
 /* We don't actually need to include media-device.h here */
diff --git a/include/media/videobuf2-memops.h b/include/media/videobuf2-memops.h
index a6ed091b79ce..4b5b84f93538 100644
--- a/include/media/videobuf2-memops.h
+++ b/include/media/videobuf2-memops.h
@@ -19,11 +19,11 @@
 #include <linux/refcount.h>
 /**
- * struct vb2_vmarea_handler - common vma refcount tracking handler
+ * struct vb2_vmarea_handler - common vma refcount tracking handler.
 *
- * @refcount:   pointer to refcount entry in the buffer
+ * @refcount:   pointer to &refcount_t entry in the buffer.
- * @put:        callback to function that decreases buffer refcount
+ * @put:        callback to function that decreases buffer refcount.
- * @arg:        argument for @put callback
+ * @arg:        argument for @put callback.
 */
 struct vb2_vmarea_handler {
        refcount_t              *refcount;
diff --git a/include/media/videobuf2-v4l2.h b/include/media/videobuf2-v4l2.h
index c2fa55657440..3d5e2d739f05 100644
--- a/include/media/videobuf2-v4l2.h
+++ b/include/media/videobuf2-v4l2.h
@@ -24,16 +24,17 @@
 #endif
 /**
- * struct vb2_v4l2_buffer - video buffer information for v4l2
+ * struct vb2_v4l2_buffer - video buffer information for v4l2.
 *
- * @vb2_buf:    video buffer 2
+ * @vb2_buf:    embedded struct &vb2_buffer.
- * @flags:      buffer informational flags
+ * @flags:      buffer informational flags.
- * @field:      enum v4l2_field; field order of the image in the buffer
+ * @field:      field order of the image in the buffer, as defined by
- * @timecode:   frame timecode
+ *              &enum v4l2_field.
- * @sequence:   sequence count of this frame
+ * @timecode:   frame timecode.
+ * @sequence:   sequence count of this frame.
 *
 * Should contain enough information to be able to cover all the fields
- * of struct v4l2_buffer at videodev2.h
+ * of &struct v4l2_buffer at ``videodev2.h``.
 */
 struct vb2_v4l2_buffer {
        struct vb2_buffer       vb2_buf;
@@ -56,9 +57,9 @@ int vb2_querybuf(struct vb2_queue *q, struct v4l2_buffer *b);
 * vb2_reqbufs() - Wrapper for vb2_core_reqbufs() that also verifies
 * the memory and type values.
 *
- * @q:          videobuf2 queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
- * @req:        struct passed from userspace to vidioc_reqbufs handler
+ * @req:        &struct v4l2_requestbuffers passed from userspace to
- *              in driver
+ *              &v4l2_ioctl_ops->vidioc_reqbufs handler in driver.
 */
 int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req);
@@ -66,94 +67,99 @@ int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req);
 * vb2_create_bufs() - Wrapper for vb2_core_create_bufs() that also verifies
 * the memory and type values.
 *
- * @q:          videobuf2 queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
- * @create:     creation parameters, passed from userspace to vidioc_create_bufs
+ * @create:     creation parameters, passed from userspace to
- *              handler in driver
+ *              &v4l2_ioctl_ops->vidioc_create_bufs handler in driver
 */
 int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create);
 /**
 * vb2_prepare_buf() - Pass ownership of a buffer from userspace to the kernel
 *
- * @q:          videobuf2 queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
- * @b:          buffer structure passed from userspace to vidioc_prepare_buf
+ * @b:          buffer structure passed from userspace to
- *              handler in driver
+ *              &v4l2_ioctl_ops->vidioc_prepare_buf handler in driver
+ *
+ * Should be called from &v4l2_ioctl_ops->vidioc_prepare_buf ioctl handler
+ * of a driver.
 *
- * Should be called from vidioc_prepare_buf ioctl handler of a driver.
 * This function:
 *
 * #) verifies the passed buffer,
- * #) calls buf_prepare callback in the driver (if provided), in which
+ * #) calls &vb2_ops->buf_prepare callback in the driver (if provided),
- *    driver-specific buffer initialization can be performed.
+ *    in which driver-specific buffer initialization can be performed.
 *
 * The return values from this function are intended to be directly returned
- * from vidioc_prepare_buf handler in driver.
+ * from &v4l2_ioctl_ops->vidioc_prepare_buf handler in driver.
 */
 int vb2_prepare_buf(struct vb2_queue *q, struct v4l2_buffer *b);
 /**
 * vb2_qbuf() - Queue a buffer from userspace
- * @q:          videobuf2 queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
- * @b:          buffer structure passed from userspace to VIDIOC_QBUF() handler
+ * @b:          buffer structure passed from userspace to
- *              in driver
+ *              &v4l2_ioctl_ops->vidioc_qbuf handler in driver
 *
- * Should be called from VIDIOC_QBUF() ioctl handler of a driver.
+ * Should be called from &v4l2_ioctl_ops->vidioc_qbuf handler of a driver.
 *
 * This function:
 *
- * #) verifies the passed buffer,
+ * #) verifies the passed buffer;
- * #) if necessary, calls buf_prepare callback in the driver (if provided), in
+ * #) if necessary, calls &vb2_ops->buf_prepare callback in the driver
- *    which driver-specific buffer initialization can be performed,
+ *    (if provided), in which driver-specific buffer initialization can
- * #) if streaming is on, queues the buffer in driver by the means of buf_queue
+ *    be performed;
- *    callback for processing.
+ * #) if streaming is on, queues the buffer in driver by the means of
+ *    &vb2_ops->buf_queue callback for processing.
 *
 * The return values from this function are intended to be directly returned
- * from VIDIOC_QBUF() handler in driver.
+ * from &v4l2_ioctl_ops->vidioc_qbuf handler in driver.
 */
 int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b);
 /**
 * vb2_expbuf() - Export a buffer as a file descriptor
- * @q:          videobuf2 queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
- * @eb:         export buffer structure passed from userspace to VIDIOC_EXPBUF()
+ * @eb:         export buffer structure passed from userspace to
- *              handler in driver
+ *              &v4l2_ioctl_ops->vidioc_expbuf handler in driver
 *
 * The return values from this function are intended to be directly returned
- * from VIDIOC_EXPBUF() handler in driver.
+ * from &v4l2_ioctl_ops->vidioc_expbuf handler in driver.
 */
 int vb2_expbuf(struct vb2_queue *q, struct v4l2_exportbuffer *eb);
 /**
 * vb2_dqbuf() - Dequeue a buffer to the userspace
- * @q:          videobuf2 queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
- * @b:          buffer structure passed from userspace to VIDIOC_DQBUF() handler
+ * @b:          buffer structure passed from userspace to
- *              in driver
+ *              &v4l2_ioctl_ops->vidioc_dqbuf handler in driver
 * @nonblocking: if true, this call will not sleep waiting for a buffer if no
 *               buffers ready for dequeuing are present. Normally the driver
- *               would be passing (file->f_flags & O_NONBLOCK) here
+ *               would be passing (&file->f_flags & %O_NONBLOCK) here
 *
- * Should be called from VIDIOC_DQBUF() ioctl handler of a driver.
+ * Should be called from &v4l2_ioctl_ops->vidioc_dqbuf ioctl handler
+ * of a driver.
 *
 * This function:
 *
- * #) verifies the passed buffer,
+ * #) verifies the passed buffer;
- * #) calls buf_finish callback in the driver (if provided), in which
+ * #) calls &vb2_ops->buf_finish callback in the driver (if provided), in which
 *    driver can perform any additional operations that may be required before
- *    returning the buffer to userspace, such as cache sync,
+ *    returning the buffer to userspace, such as cache sync;
 * #) the buffer struct members are filled with relevant information for
 *    the userspace.
 *
 * The return values from this function are intended to be directly returned
- * from VIDIOC_DQBUF() handler in driver.
+ * from &v4l2_ioctl_ops->vidioc_dqbuf handler in driver.
 */
 int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking);
 /**
 * vb2_streamon - start streaming
- * @q:          videobuf2 queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
- * @type:       type argument passed from userspace to vidioc_streamon handler
+ * @type:       type argument passed from userspace to vidioc_streamon handler,
+ *              as defined by &enum v4l2_buf_type.
 *
- * Should be called from vidioc_streamon handler of a driver.
+ * Should be called from &v4l2_ioctl_ops->vidioc_streamon handler of a driver.
 *
 * This function:
 *
@@ -161,13 +167,13 @@ int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking);
 * 2) passes any previously queued buffers to the driver and starts streaming
 *
 * The return values from this function are intended to be directly returned
- * from vidioc_streamon handler in the driver.
+ * from &v4l2_ioctl_ops->vidioc_streamon handler in the driver.
 */
 int vb2_streamon(struct vb2_queue *q, enum v4l2_buf_type type);
 /**
 * vb2_streamoff - stop streaming
- * @q:          videobuf2 queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
 * @type:       type argument passed from userspace to vidioc_streamoff handler
 *
 * Should be called from vidioc_streamoff handler of a driver.
@@ -186,7 +192,7 @@ int vb2_streamoff(struct vb2_queue *q, enum v4l2_buf_type type);
 /**
 * vb2_queue_init() - initialize a videobuf2 queue
- * @q:          videobuf2 queue; this structure should be allocated in driver
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
 *
 * The vb2_queue structure should be allocated by the driver. The driver is
 * responsible of clearing it's content and setting initial values for some
@@ -199,7 +205,7 @@ int __must_check vb2_queue_init(struct vb2_queue *q);
 /**
 * vb2_queue_release() - stop streaming, release the queue and free memory
- * @q:          videobuf2 queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
 *
 * This function stops streaming and performs necessary clean ups, including
 * freeing video buffer memory. The driver is responsible for freeing
@@ -209,7 +215,7 @@ void vb2_queue_release(struct vb2_queue *q);
 /**
 * vb2_poll() - implements poll userspace operation
- * @q:          videobuf2 queue
+ * @q:          pointer to &struct vb2_queue with videobuf2 queue.
 * @file:       file argument passed to the poll file operation handler
 * @wait:       wait argument passed to the poll file operation handler
 *
@@ -270,7 +276,7 @@ unsigned long vb2_fop_get_unmapped_area(struct file *file, unsigned long addr,
 /**
 * vb2_ops_wait_prepare - helper function to lock a struct &vb2_queue
 *
- * @vq: pointer to struct vb2_queue
+ * @vq: pointer to &struct vb2_queue
 *
 * ..note:: only use if vq->lock is non-NULL.
 */
@@ -279,7 +285,7 @@ void vb2_ops_wait_prepare(struct vb2_queue *vq);
 /**
 * vb2_ops_wait_finish - helper function to unlock a struct &vb2_queue
 *
- * @vq: pointer to struct vb2_queue
+ * @vq: pointer to &struct vb2_queue
 *
 * ..note:: only use if vq->lock is non-NULL.
 */
diff --git a/include/rdma/ib_hdrs.h b/include/rdma/ib_hdrs.h
index c124d515f7d5..6e35416170a3 100644
--- a/include/rdma/ib_hdrs.h
+++ b/include/rdma/ib_hdrs.h
@@ -313,16 +313,14 @@ static inline u32 ib_bth_get_qpn(struct ib_other_headers *ohdr)
        return (u32)((be32_to_cpu(ohdr->bth[1])) & IB_QPN_MASK);
 }
-static inline u8 ib_bth_get_becn(struct ib_other_headers *ohdr)
+static inline bool ib_bth_get_becn(struct ib_other_headers *ohdr)
 {
-        return (u8)((be32_to_cpu(ohdr->bth[1]) >> IB_BECN_SHIFT) &
+        return (ohdr->bth[1]) & cpu_to_be32(IB_BECN_SMASK);
-                     IB_BECN_MASK);
 }
-static inline u8 ib_bth_get_fecn(struct ib_other_headers *ohdr)
+static inline bool ib_bth_get_fecn(struct ib_other_headers *ohdr)
 {
-        return (u8)((be32_to_cpu(ohdr->bth[1]) >> IB_FECN_SHIFT) &
+        return (ohdr->bth[1]) & cpu_to_be32(IB_FECN_SMASK);
-                    IB_FECN_MASK);
 }
 static inline u8 ib_bth_get_tver(struct ib_other_headers *ohdr)
@@ -331,4 +329,13 @@ static inline u8 ib_bth_get_tver(struct ib_other_headers *ohdr)
                    IB_BTH_TVER_MASK);
 }
+static inline bool ib_bth_is_solicited(struct ib_other_headers *ohdr)
+{
+        return ohdr->bth[0] & cpu_to_be32(IB_BTH_SOLICITED);
+}
+static inline bool ib_bth_is_migration(struct ib_other_headers *ohdr)
+{
+        return ohdr->bth[0] & cpu_to_be32(IB_BTH_MIG_REQ);
+}
 #endif                          /* IB_HDRS_H */
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h
index 5263c86fd103..73b2387e3f74 100644
--- a/include/rdma/ib_verbs.h
+++ b/include/rdma/ib_verbs.h
@@ -874,6 +874,7 @@ struct ib_mr_status {
 __attribute_const__ enum ib_rate mult_to_ib_rate(int mult);
 enum rdma_ah_attr_type {
+        RDMA_AH_ATTR_TYPE_UNDEFINED,
        RDMA_AH_ATTR_TYPE_IB,
        RDMA_AH_ATTR_TYPE_ROCE,
        RDMA_AH_ATTR_TYPE_OPA,
@@ -3810,17 +3811,24 @@ static inline void rdma_ah_set_grh(struct rdma_ah_attr *attr,
        grh->traffic_class = traffic_class;
 }
-/*Get AH type */
+/**
+ * rdma_ah_find_type - Return address handle type.
+ *
+ * @dev: Device to be checked
+ * @port_num: Port number
+ */
 static inline enum rdma_ah_attr_type rdma_ah_find_type(struct ib_device *dev,
-                                                       u32 port_num)
+                                                       u8 port_num)
 {
        if (rdma_protocol_roce(dev, port_num))
                return RDMA_AH_ATTR_TYPE_ROCE;
-        else if ((rdma_protocol_ib(dev, port_num)) &&
+        if (rdma_protocol_ib(dev, port_num)) {
-                 (rdma_cap_opa_ah(dev, port_num)))
+                if (rdma_cap_opa_ah(dev, port_num))
-                return RDMA_AH_ATTR_TYPE_OPA;
+                        return RDMA_AH_ATTR_TYPE_OPA;
-        else
                return RDMA_AH_ATTR_TYPE_IB;
+        }
+        return RDMA_AH_ATTR_TYPE_UNDEFINED;
 }
 /**
diff --git a/include/uapi/linux/dvb/dmx.h b/include/uapi/linux/dvb/dmx.h
index c10f1324b4ca..5f3c5a918f00 100644
--- a/include/uapi/linux/dvb/dmx.h
+++ b/include/uapi/linux/dvb/dmx.h
@@ -211,6 +211,61 @@ struct dmx_stc {
        __u64 stc;
 };
+/**
+ * struct dmx_buffer - dmx buffer info
+ *
+ * @index:      id number of the buffer
+ * @bytesused:  number of bytes occupied by data in the buffer (payload);
+ * @offset:     for buffers with memory == DMX_MEMORY_MMAP;
+ *              offset from the start of the device memory for this plane,
+ *              (or a "cookie" that should be passed to mmap() as offset)
+ * @length:     size in bytes of the buffer
+ *
+ * Contains data exchanged by application and driver using one of the streaming
+ * I/O methods.
+ */
+struct dmx_buffer {
+        __u32                   index;
+        __u32                   bytesused;
+        __u32                   offset;
+        __u32                   length;
+};
+/**
+ * struct dmx_requestbuffers - request dmx buffer information
+ *
+ * @count:      number of requested buffers,
+ * @size:       size in bytes of the requested buffer
+ *
+ * Contains data used for requesting a dmx buffer.
+ * All reserved fields must be set to zero.
+ */
+struct dmx_requestbuffers {
+        __u32                   count;
+        __u32                   size;
+};
+/**
+ * struct dmx_exportbuffer - export of dmx buffer as DMABUF file descriptor
+ *
+ * @index:      id number of the buffer
+ * @flags:      flags for newly created file, currently only O_CLOEXEC is
+ *              supported, refer to manual of open syscall for more details
+ * @fd:         file descriptor associated with DMABUF (set by driver)
+ *
+ * Contains data used for exporting a dmx buffer as DMABUF file descriptor.
+ * The buffer is identified by a 'cookie' returned by DMX_QUERYBUF
+ * (identical to the cookie used to mmap() the buffer to userspace). All
+ * reserved fields must be set to zero. The field reserved0 is expected to
+ * become a structure 'type' allowing an alternative layout of the structure
+ * content. Therefore this field should not be used for any other extensions.
+ */
+struct dmx_exportbuffer {
+        __u32           index;
+        __u32           flags;
+        __s32           fd;
+};
 #define DMX_START                _IO('o', 41)
 #define DMX_STOP                 _IO('o', 42)
 #define DMX_SET_FILTER           _IOW('o', 43, struct dmx_sct_filter_params)
@@ -231,4 +286,10 @@ typedef struct dmx_filter dmx_filter_t;
 #endif
-#endif /* _UAPI_DVBDMX_H_ */
+#define DMX_REQBUFS              _IOWR('o', 60, struct dmx_requestbuffers)
+#define DMX_QUERYBUF             _IOWR('o', 61, struct dmx_buffer)
+#define DMX_EXPBUF               _IOWR('o', 62, struct dmx_exportbuffer)
+#define DMX_QBUF                 _IOWR('o', 63, struct dmx_buffer)
+#define DMX_DQBUF                _IOWR('o', 64, struct dmx_buffer)
+#endif /* _DVBDMX_H_ */
diff --git a/include/uapi/linux/dvb/frontend.h b/include/uapi/linux/dvb/frontend.h
index b297b65845d6..4f9b4551c534 100644
--- a/include/uapi/linux/dvb/frontend.h
+++ b/include/uapi/linux/dvb/frontend.h
@@ -547,7 +547,10 @@ enum fe_interleaving {
 #define DTV_STAT_ERROR_BLOCK_COUNT      68
 #define DTV_STAT_TOTAL_BLOCK_COUNT      69
-#define DTV_MAX_COMMAND         DTV_STAT_TOTAL_BLOCK_COUNT
+/* Physical layer scrambling */
+#define DTV_SCRAMBLING_SEQUENCE_INDEX   70
+#define DTV_MAX_COMMAND         DTV_SCRAMBLING_SEQUENCE_INDEX
 /**
 * enum fe_pilot - Type of pilot tone
@@ -756,16 +759,15 @@ enum fecap_scale_params {
 /**
 * struct dtv_stats - Used for reading a DTV status property
 *
- * @scale:      Filled with enum fecap_scale_params - the scale
+ * @scale:
- *              in usage for that parameter
+ *      Filled with enum fecap_scale_params - the scale in usage
- *
+ *      for that parameter
- * The ``{unnamed_union}`` may have either one of the values below:
 *
- * %svalue
+ * @svalue:
 *      integer value of the measure, for %FE_SCALE_DECIBEL,
 *      used for dB measures. The unit is 0.001 dB.
 *
- * %uvalue
+ * @uvalue:
 *      unsigned integer value of the measure, used when @scale is
 *      either %FE_SCALE_RELATIVE or %FE_SCALE_COUNTER.
 *
@@ -828,19 +830,19 @@ struct dtv_fe_stats {
 /**
 * struct dtv_property - store one of frontend command and its value
 *
- * @cmd:        Digital TV command.
+ * @cmd:                Digital TV command.
- * @reserved:   Not used.
+ * @reserved:           Not used.
- * @u:          Union with the values for the command.
+ * @u:                  Union with the values for the command.
- * @result:     Unused
+ * @u.data:             A unsigned 32 bits integer with command value.
- *
+ * @u.buffer:           Struct to store bigger properties.
- * The @u union may have either one of the values below:
+ *                      Currently unused.
+ * @u.buffer.data:      an unsigned 32-bits array.
+ * @u.buffer.len:       number of elements of the buffer.
+ * @u.buffer.reserved1: Reserved.
+ * @u.buffer.reserved2: Reserved.
+ * @u.st:               a &struct dtv_fe_stats array of statistics.
+ * @result:             Currently unused.
 *
- * %data
- *      an unsigned 32-bits number.
- * %st
- *      a &struct dtv_fe_stats array of statistics.
- * %buffer
- *      a buffer of up to 32 characters (currently unused).
 */
 struct dtv_property {
        __u32 cmd;
diff --git a/include/uapi/linux/dvb/version.h b/include/uapi/linux/dvb/version.h
index 02e32ea83984..2c5cffe6d2a0 100644
--- a/include/uapi/linux/dvb/version.h
+++ b/include/uapi/linux/dvb/version.h
@@ -25,6 +25,6 @@
 #define _DVBVERSION_H_
 #define DVB_API_VERSION 5
-#define DVB_API_VERSION_MINOR 10
+#define DVB_API_VERSION_MINOR 11
 #endif /*_DVBVERSION_H_*/
diff --git a/include/uapi/linux/dvb/video.h b/include/uapi/linux/dvb/video.h
index 4d51f98182bb..df3d7028c807 100644
--- a/include/uapi/linux/dvb/video.h
+++ b/include/uapi/linux/dvb/video.h
@@ -83,11 +83,11 @@ typedef enum {
 #define VIDEO_CMD_CONTINUE    (3)
 /* Flags for VIDEO_CMD_FREEZE */
-#define VIDEO_CMD_FREEZE_TO_BLACK       (1 << 0)
+#define VIDEO_CMD_FREEZE_TO_BLACK       (1 << 0)
 /* Flags for VIDEO_CMD_STOP */
-#define VIDEO_CMD_STOP_TO_BLACK         (1 << 0)
+#define VIDEO_CMD_STOP_TO_BLACK         (1 << 0)
-#define VIDEO_CMD_STOP_IMMEDIATELY      (1 << 1)
+#define VIDEO_CMD_STOP_IMMEDIATELY      (1 << 1)
 /* Play input formats: */
 /* The decoder has no special format requirements */
@@ -124,8 +124,8 @@ struct video_command {
 /* FIELD_UNKNOWN can be used if the hardware does not know whether
   the Vsync is for an odd, even or progressive (i.e. non-interlaced)
   field. */
-#define VIDEO_VSYNC_FIELD_UNKNOWN       (0)
+#define VIDEO_VSYNC_FIELD_UNKNOWN       (0)
-#define VIDEO_VSYNC_FIELD_ODD           (1)
+#define VIDEO_VSYNC_FIELD_ODD           (1)
 #define VIDEO_VSYNC_FIELD_EVEN          (2)
 #define VIDEO_VSYNC_FIELD_PROGRESSIVE   (3)
@@ -133,8 +133,8 @@ struct video_event {
        __s32 type;
 #define VIDEO_EVENT_SIZE_CHANGED        1
 #define VIDEO_EVENT_FRAME_RATE_CHANGED  2
-#define VIDEO_EVENT_DECODER_STOPPED     3
+#define VIDEO_EVENT_DECODER_STOPPED     3
-#define VIDEO_EVENT_VSYNC               4
+#define VIDEO_EVENT_VSYNC               4
        /* unused, make sure to use atomic time for y2038 if it ever gets used */
        long timestamp;
        union {
@@ -268,9 +268,9 @@ typedef __u16 video_attributes_t;
 #define VIDEO_GET_PTS              _IOR('o', 57, __u64)
 /* Read the number of displayed frames since the decoder was started */
-#define VIDEO_GET_FRAME_COUNT      _IOR('o', 58, __u64)
+#define VIDEO_GET_FRAME_COUNT      _IOR('o', 58, __u64)
-#define VIDEO_COMMAND              _IOWR('o', 59, struct video_command)
+#define VIDEO_COMMAND              _IOWR('o', 59, struct video_command)
-#define VIDEO_TRY_COMMAND          _IOWR('o', 60, struct video_command)
+#define VIDEO_TRY_COMMAND          _IOWR('o', 60, struct video_command)
 #endif /* _UAPI_DVBVIDEO_H_ */
diff --git a/include/uapi/linux/input-event-codes.h b/include/uapi/linux/input-event-codes.h
index 061fa62958a2..53fbae27b280 100644
--- a/include/uapi/linux/input-event-codes.h
+++ b/include/uapi/linux/input-event-codes.h
@@ -594,6 +594,7 @@
 #define BTN_DPAD_RIGHT          0x223
 #define KEY_ALS_TOGGLE          0x230   /* Ambient light sensor */
+#define KEY_ROTATE_LOCK_TOGGLE  0x231   /* Display rotation lock */
 #define KEY_BUTTONCONFIG                0x240   /* AL Button Configuration */
 #define KEY_TASKMANAGER         0x241   /* AL Task/Project Manager */
diff --git a/include/uapi/linux/lirc.h b/include/uapi/linux/lirc.h
index c3aef4316fbf..4fe580d36e41 100644
--- a/include/uapi/linux/lirc.h
+++ b/include/uapi/linux/lirc.h
@@ -47,12 +47,14 @@
 #define LIRC_MODE_RAW                  0x00000001
 #define LIRC_MODE_PULSE                0x00000002
 #define LIRC_MODE_MODE2                0x00000004
+#define LIRC_MODE_SCANCODE             0x00000008
 #define LIRC_MODE_LIRCCODE             0x00000010
 #define LIRC_CAN_SEND_RAW              LIRC_MODE2SEND(LIRC_MODE_RAW)
 #define LIRC_CAN_SEND_PULSE            LIRC_MODE2SEND(LIRC_MODE_PULSE)
 #define LIRC_CAN_SEND_MODE2            LIRC_MODE2SEND(LIRC_MODE_MODE2)
+#define LIRC_CAN_SEND_SCANCODE         LIRC_MODE2SEND(LIRC_MODE_SCANCODE)
 #define LIRC_CAN_SEND_LIRCCODE         LIRC_MODE2SEND(LIRC_MODE_LIRCCODE)
 #define LIRC_CAN_SEND_MASK             0x0000003f
@@ -64,6 +66,7 @@
 #define LIRC_CAN_REC_RAW               LIRC_MODE2REC(LIRC_MODE_RAW)
 #define LIRC_CAN_REC_PULSE             LIRC_MODE2REC(LIRC_MODE_PULSE)
 #define LIRC_CAN_REC_MODE2             LIRC_MODE2REC(LIRC_MODE_MODE2)
+#define LIRC_CAN_REC_SCANCODE          LIRC_MODE2REC(LIRC_MODE_SCANCODE)
 #define LIRC_CAN_REC_LIRCCODE          LIRC_MODE2REC(LIRC_MODE_LIRCCODE)
 #define LIRC_CAN_REC_MASK              LIRC_MODE2REC(LIRC_CAN_SEND_MASK)
@@ -131,4 +134,83 @@
 #define LIRC_SET_WIDEBAND_RECEIVER     _IOW('i', 0x00000023, __u32)
+/*
+ * struct lirc_scancode - decoded scancode with protocol for use with
+ *      LIRC_MODE_SCANCODE
+ *
+ * @timestamp: Timestamp in nanoseconds using CLOCK_MONOTONIC when IR
+ *      was decoded.
+ * @flags: should be 0 for transmit. When receiving scancodes,
+ *      LIRC_SCANCODE_FLAG_TOGGLE or LIRC_SCANCODE_FLAG_REPEAT can be set
+ *      depending on the protocol
+ * @rc_proto: see enum rc_proto
+ * @keycode: the translated keycode. Set to 0 for transmit.
+ * @scancode: the scancode received or to be sent
+ */
+struct lirc_scancode {
+        __u64   timestamp;
+        __u16   flags;
+        __u16   rc_proto;
+        __u32   keycode;
+        __u64   scancode;
+};
+/* Set if the toggle bit of rc-5 or rc-6 is enabled */
+#define LIRC_SCANCODE_FLAG_TOGGLE       1
+/* Set if this is a nec or sanyo repeat */
+#define LIRC_SCANCODE_FLAG_REPEAT       2
+/**
+ * enum rc_proto - the Remote Controller protocol
+ *
+ * @RC_PROTO_UNKNOWN: Protocol not known
+ * @RC_PROTO_OTHER: Protocol known but proprietary
+ * @RC_PROTO_RC5: Philips RC5 protocol
+ * @RC_PROTO_RC5X_20: Philips RC5x 20 bit protocol
+ * @RC_PROTO_RC5_SZ: StreamZap variant of RC5
+ * @RC_PROTO_JVC: JVC protocol
+ * @RC_PROTO_SONY12: Sony 12 bit protocol
+ * @RC_PROTO_SONY15: Sony 15 bit protocol
+ * @RC_PROTO_SONY20: Sony 20 bit protocol
+ * @RC_PROTO_NEC: NEC protocol
+ * @RC_PROTO_NECX: Extended NEC protocol
+ * @RC_PROTO_NEC32: NEC 32 bit protocol
+ * @RC_PROTO_SANYO: Sanyo protocol
+ * @RC_PROTO_MCIR2_KBD: RC6-ish MCE keyboard
+ * @RC_PROTO_MCIR2_MSE: RC6-ish MCE mouse
+ * @RC_PROTO_RC6_0: Philips RC6-0-16 protocol
+ * @RC_PROTO_RC6_6A_20: Philips RC6-6A-20 protocol
+ * @RC_PROTO_RC6_6A_24: Philips RC6-6A-24 protocol
+ * @RC_PROTO_RC6_6A_32: Philips RC6-6A-32 protocol
+ * @RC_PROTO_RC6_MCE: MCE (Philips RC6-6A-32 subtype) protocol
+ * @RC_PROTO_SHARP: Sharp protocol
+ * @RC_PROTO_XMP: XMP protocol
+ * @RC_PROTO_CEC: CEC protocol
+ */
+enum rc_proto {
+        RC_PROTO_UNKNOWN        = 0,
+        RC_PROTO_OTHER          = 1,
+        RC_PROTO_RC5            = 2,
+        RC_PROTO_RC5X_20        = 3,
+        RC_PROTO_RC5_SZ         = 4,
+        RC_PROTO_JVC            = 5,
+        RC_PROTO_SONY12         = 6,
+        RC_PROTO_SONY15         = 7,
+        RC_PROTO_SONY20         = 8,
+        RC_PROTO_NEC            = 9,
+        RC_PROTO_NECX           = 10,
+        RC_PROTO_NEC32          = 11,
+        RC_PROTO_SANYO          = 12,
+        RC_PROTO_MCIR2_KBD      = 13,
+        RC_PROTO_MCIR2_MSE      = 14,
+        RC_PROTO_RC6_0          = 15,
+        RC_PROTO_RC6_6A_20      = 16,
+        RC_PROTO_RC6_6A_24      = 17,
+        RC_PROTO_RC6_6A_32      = 18,
+        RC_PROTO_RC6_MCE        = 19,
+        RC_PROTO_SHARP          = 20,
+        RC_PROTO_XMP            = 21,
+        RC_PROTO_CEC            = 22,
+};
 #endif
diff --git a/include/uapi/linux/ndctl.h b/include/uapi/linux/ndctl.h
index 3f03567631cb..7e27070b9440 100644
--- a/include/uapi/linux/ndctl.h
+++ b/include/uapi/linux/ndctl.h
@@ -15,54 +15,6 @@
 #include <linux/types.h>
-struct nd_cmd_smart {
-        __u32 status;
-        __u8 data[128];
-} __packed;
-#define ND_SMART_HEALTH_VALID   (1 << 0)
-#define ND_SMART_SPARES_VALID   (1 << 1)
-#define ND_SMART_USED_VALID     (1 << 2)
-#define ND_SMART_TEMP_VALID     (1 << 3)
-#define ND_SMART_CTEMP_VALID    (1 << 4)
-#define ND_SMART_ALARM_VALID    (1 << 9)
-#define ND_SMART_SHUTDOWN_VALID (1 << 10)
-#define ND_SMART_VENDOR_VALID   (1 << 11)
-#define ND_SMART_SPARE_TRIP     (1 << 0)
-#define ND_SMART_TEMP_TRIP      (1 << 1)
-#define ND_SMART_CTEMP_TRIP     (1 << 2)
-#define ND_SMART_NON_CRITICAL_HEALTH    (1 << 0)
-#define ND_SMART_CRITICAL_HEALTH        (1 << 1)
-#define ND_SMART_FATAL_HEALTH           (1 << 2)
-struct nd_smart_payload {
-        __u32 flags;
-        __u8 reserved0[4];
-        __u8 health;
-        __u8 spares;
-        __u8 life_used;
-        __u8 alarm_flags;
-        __u16 temperature;
-        __u16 ctrl_temperature;
-        __u8 reserved1[15];
-        __u8 shutdown_state;
-        __u32 vendor_size;
-        __u8 vendor_data[92];
-} __packed;
-struct nd_cmd_smart_threshold {
-        __u32 status;
-        __u8 data[8];
-} __packed;
-struct nd_smart_threshold_payload {
-        __u8 alarm_control;
-        __u8 reserved0;
-        __u16 temperature;
-        __u8 spares;
-        __u8 reserved[3];
-} __packed;
 struct nd_cmd_dimm_flags {
        __u32 status;
        __u32 flags;
@@ -211,12 +163,6 @@ static inline const char *nvdimm_cmd_name(unsigned cmd)
 #define ND_IOCTL 'N'
-#define ND_IOCTL_SMART                  _IOWR(ND_IOCTL, ND_CMD_SMART,\
-                                        struct nd_cmd_smart)
-#define ND_IOCTL_SMART_THRESHOLD        _IOWR(ND_IOCTL, ND_CMD_SMART_THRESHOLD,\
-                                        struct nd_cmd_smart_threshold)
 #define ND_IOCTL_DIMM_FLAGS             _IOWR(ND_IOCTL, ND_CMD_DIMM_FLAGS,\
                                        struct nd_cmd_dimm_flags)
@@ -263,7 +209,7 @@ enum nd_driver_flags {
 };
 enum {
-        ND_MIN_NAMESPACE_SIZE = 0x00400000,
+        ND_MIN_NAMESPACE_SIZE = PAGE_SIZE,
 };
 enum ars_masks {
diff --git a/include/uapi/linux/pci_regs.h b/include/uapi/linux/pci_regs.h
index 70c2b2ade048..0c79eac5e9b8 100644
--- a/include/uapi/linux/pci_regs.h
+++ b/include/uapi/linux/pci_regs.h
@@ -622,15 +622,19 @@
 * safely.
 */
 #define PCI_EXP_DEVCAP2         36      /* Device Capabilities 2 */
+#define  PCI_EXP_DEVCAP2_COMP_TMOUT_DIS 0x00000010 /* Completion Timeout Disable supported */
 #define  PCI_EXP_DEVCAP2_ARI            0x00000020 /* Alternative Routing-ID */
 #define  PCI_EXP_DEVCAP2_ATOMIC_ROUTE   0x00000040 /* Atomic Op routing */
-#define PCI_EXP_DEVCAP2_ATOMIC_COMP64   0x00000100 /* Atomic 64-bit compare */
+#define  PCI_EXP_DEVCAP2_ATOMIC_COMP32  0x00000080 /* 32b AtomicOp completion */
+#define  PCI_EXP_DEVCAP2_ATOMIC_COMP64  0x00000100 /* 64b AtomicOp completion */
+#define  PCI_EXP_DEVCAP2_ATOMIC_COMP128 0x00000200 /* 128b AtomicOp completion */
 #define  PCI_EXP_DEVCAP2_LTR            0x00000800 /* Latency tolerance reporting */
 #define  PCI_EXP_DEVCAP2_OBFF_MASK      0x000c0000 /* OBFF support mechanism */
 #define  PCI_EXP_DEVCAP2_OBFF_MSG       0x00040000 /* New message signaling */
 #define  PCI_EXP_DEVCAP2_OBFF_WAKE      0x00080000 /* Re-use WAKE# for OBFF */
 #define PCI_EXP_DEVCTL2         40      /* Device Control 2 */
 #define  PCI_EXP_DEVCTL2_COMP_TIMEOUT   0x000f  /* Completion Timeout Value */
+#define  PCI_EXP_DEVCTL2_COMP_TMOUT_DIS 0x0010  /* Completion Timeout Disable */
 #define  PCI_EXP_DEVCTL2_ARI            0x0020  /* Alternative Routing-ID */
 #define PCI_EXP_DEVCTL2_ATOMIC_REQ      0x0040  /* Set Atomic requests */
 #define PCI_EXP_DEVCTL2_ATOMIC_EGRESS_BLOCK 0x0080 /* Block atomic egress */
@@ -966,26 +970,28 @@
 /* Downstream Port Containment */
 #define PCI_EXP_DPC_CAP                 4       /* DPC Capability */
-#define PCI_EXP_DPC_IRQ                 0x1f    /* DPC Interrupt Message Number */
+#define PCI_EXP_DPC_IRQ                 0x001F  /* Interrupt Message Number */
-#define  PCI_EXP_DPC_CAP_RP_EXT         0x20    /* Root Port Extensions for DPC */
+#define  PCI_EXP_DPC_CAP_RP_EXT         0x0020  /* Root Port Extensions */
-#define  PCI_EXP_DPC_CAP_POISONED_TLP   0x40    /* Poisoned TLP Egress Blocking Supported */
+#define  PCI_EXP_DPC_CAP_POISONED_TLP   0x0040  /* Poisoned TLP Egress Blocking Supported */
-#define  PCI_EXP_DPC_CAP_SW_TRIGGER     0x80    /* Software Triggering Supported */
+#define  PCI_EXP_DPC_CAP_SW_TRIGGER     0x0080  /* Software Triggering Supported */
-#define  PCI_EXP_DPC_RP_PIO_LOG_SIZE    0xF00   /* RP PIO log size */
+#define  PCI_EXP_DPC_RP_PIO_LOG_SIZE    0x0F00  /* RP PIO Log Size */
 #define  PCI_EXP_DPC_CAP_DL_ACTIVE      0x1000  /* ERR_COR signal on DL_Active supported */
 #define PCI_EXP_DPC_CTL                 6       /* DPC control */
-#define  PCI_EXP_DPC_CTL_EN_NONFATAL    0x02    /* Enable trigger on ERR_NONFATAL message */
+#define  PCI_EXP_DPC_CTL_EN_NONFATAL    0x0002  /* Enable trigger on ERR_NONFATAL message */
-#define  PCI_EXP_DPC_CTL_INT_EN         0x08    /* DPC Interrupt Enable */
+#define  PCI_EXP_DPC_CTL_INT_EN         0x0008  /* DPC Interrupt Enable */
 #define PCI_EXP_DPC_STATUS              8       /* DPC Status */
-#define  PCI_EXP_DPC_STATUS_TRIGGER     0x01    /* Trigger Status */
+#define  PCI_EXP_DPC_STATUS_TRIGGER         0x0001 /* Trigger Status */
-#define  PCI_EXP_DPC_STATUS_INTERRUPT   0x08    /* Interrupt Status */
+#define  PCI_EXP_DPC_STATUS_TRIGGER_RSN     0x0006 /* Trigger Reason */
-#define  PCI_EXP_DPC_RP_BUSY            0x10    /* Root Port Busy */
+#define  PCI_EXP_DPC_STATUS_INTERRUPT       0x0008 /* Interrupt Status */
+#define  PCI_EXP_DPC_RP_BUSY                0x0010 /* Root Port Busy */
+#define  PCI_EXP_DPC_STATUS_TRIGGER_RSN_EXT 0x0060 /* Trig Reason Extension */
 #define PCI_EXP_DPC_SOURCE_ID           10      /* DPC Source Identifier */
 #define PCI_EXP_DPC_RP_PIO_STATUS        0x0C   /* RP PIO Status */
-#define PCI_EXP_DPC_RP_PIO_MASK          0x10   /* RP PIO MASK */
+#define PCI_EXP_DPC_RP_PIO_MASK          0x10   /* RP PIO Mask */
 #define PCI_EXP_DPC_RP_PIO_SEVERITY      0x14   /* RP PIO Severity */
 #define PCI_EXP_DPC_RP_PIO_SYSERROR      0x18   /* RP PIO SysError */
 #define PCI_EXP_DPC_RP_PIO_EXCEPTION     0x1C   /* RP PIO Exception */
diff --git a/include/uapi/linux/switchtec_ioctl.h b/include/uapi/linux/switchtec_ioctl.h
index 75df44373034..4f4daf8db954 100644
--- a/include/uapi/linux/switchtec_ioctl.h
+++ b/include/uapi/linux/switchtec_ioctl.h
@@ -88,7 +88,8 @@ struct switchtec_ioctl_event_summary {
 #define SWITCHTEC_IOCTL_EVENT_FORCE_SPEED               26
 #define SWITCHTEC_IOCTL_EVENT_CREDIT_TIMEOUT            27
 #define SWITCHTEC_IOCTL_EVENT_LINK_STATE                28
-#define SWITCHTEC_IOCTL_MAX_EVENTS                      29
+#define SWITCHTEC_IOCTL_EVENT_GFMS                      29
+#define SWITCHTEC_IOCTL_MAX_EVENTS                      30
 #define SWITCHTEC_IOCTL_EVENT_LOCAL_PART_IDX -1
 #define SWITCHTEC_IOCTL_EVENT_IDX_ALL -2
diff --git a/include/uapi/linux/uvcvideo.h b/include/uapi/linux/uvcvideo.h
index e80b4655d8cd..020714d2c5bd 100644
--- a/include/uapi/linux/uvcvideo.h
+++ b/include/uapi/linux/uvcvideo.h
@@ -68,4 +68,30 @@ struct uvc_xu_control_query {
 #define UVCIOC_CTRL_MAP         _IOWR('u', 0x20, struct uvc_xu_control_mapping)
 #define UVCIOC_CTRL_QUERY       _IOWR('u', 0x21, struct uvc_xu_control_query)
+/*
+ * Metadata node
+ */
+/**
+ * struct uvc_meta_buf - metadata buffer building block
+ * @ns          - system timestamp of the payload in nanoseconds
+ * @sof         - USB Frame Number
+ * @length      - length of the payload header
+ * @flags       - payload header flags
+ * @buf         - optional device-specific header data
+ *
+ * UVC metadata nodes fill buffers with possibly multiple instances of this
+ * struct. The first two fields are added by the driver, they can be used for
+ * clock synchronisation. The rest is an exact copy of a UVC payload header.
+ * Only complete objects with complete buffers are included. Therefore it's
+ * always sizeof(meta->ts) + sizeof(meta->sof) + meta->length bytes large.
+ */
+struct uvc_meta_buf {
+        __u64 ns;
+        __u16 sof;
+        __u8 length;
+        __u8 flags;
+        __u8 buf[];
+} __packed;
 #endif
diff --git a/include/uapi/linux/v4l2-controls.h b/include/uapi/linux/v4l2-controls.h
index a692623e0236..cbbb750d87d1 100644
--- a/include/uapi/linux/v4l2-controls.h
+++ b/include/uapi/linux/v4l2-controls.h
@@ -67,8 +67,8 @@
 /* User-class control IDs */
 #define V4L2_CID_BASE                   (V4L2_CTRL_CLASS_USER | 0x900)
-#define V4L2_CID_USER_BASE              V4L2_CID_BASE
+#define V4L2_CID_USER_BASE              V4L2_CID_BASE
-#define V4L2_CID_USER_CLASS             (V4L2_CTRL_CLASS_USER | 1)
+#define V4L2_CID_USER_CLASS             (V4L2_CTRL_CLASS_USER | 1)
 #define V4L2_CID_BRIGHTNESS             (V4L2_CID_BASE+0)
 #define V4L2_CID_CONTRAST               (V4L2_CID_BASE+1)
 #define V4L2_CID_SATURATION             (V4L2_CID_BASE+2)
@@ -102,7 +102,7 @@ enum v4l2_power_line_frequency {
 #define V4L2_CID_HUE_AUTO                       (V4L2_CID_BASE+25)
 #define V4L2_CID_WHITE_BALANCE_TEMPERATURE      (V4L2_CID_BASE+26)
 #define V4L2_CID_SHARPNESS                      (V4L2_CID_BASE+27)
-#define V4L2_CID_BACKLIGHT_COMPENSATION         (V4L2_CID_BASE+28)
+#define V4L2_CID_BACKLIGHT_COMPENSATION         (V4L2_CID_BASE+28)
 #define V4L2_CID_CHROMA_AGC                     (V4L2_CID_BASE+29)
 #define V4L2_CID_COLOR_KILLER                   (V4L2_CID_BASE+30)
 #define V4L2_CID_COLORFX                        (V4L2_CID_BASE+31)
@@ -194,11 +194,11 @@ enum v4l2_colorfx {
 /* The MPEG controls are applicable to all codec controls
 * and the 'MPEG' part of the define is historical */
-#define V4L2_CID_MPEG_BASE                      (V4L2_CTRL_CLASS_MPEG | 0x900)
+#define V4L2_CID_MPEG_BASE                      (V4L2_CTRL_CLASS_MPEG | 0x900)
-#define V4L2_CID_MPEG_CLASS                     (V4L2_CTRL_CLASS_MPEG | 1)
+#define V4L2_CID_MPEG_CLASS                     (V4L2_CTRL_CLASS_MPEG | 1)
 /*  MPEG streams, specific to multiplexed streams */
-#define V4L2_CID_MPEG_STREAM_TYPE               (V4L2_CID_MPEG_BASE+0)
+#define V4L2_CID_MPEG_STREAM_TYPE               (V4L2_CID_MPEG_BASE+0)
 enum v4l2_mpeg_stream_type {
        V4L2_MPEG_STREAM_TYPE_MPEG2_PS   = 0, /* MPEG-2 program stream */
        V4L2_MPEG_STREAM_TYPE_MPEG2_TS   = 1, /* MPEG-2 transport stream */
@@ -207,26 +207,26 @@ enum v4l2_mpeg_stream_type {
        V4L2_MPEG_STREAM_TYPE_MPEG1_VCD  = 4, /* MPEG-1 VCD-compatible stream */
        V4L2_MPEG_STREAM_TYPE_MPEG2_SVCD = 5, /* MPEG-2 SVCD-compatible stream */
 };
-#define V4L2_CID_MPEG_STREAM_PID_PMT            (V4L2_CID_MPEG_BASE+1)
+#define V4L2_CID_MPEG_STREAM_PID_PMT            (V4L2_CID_MPEG_BASE+1)
-#define V4L2_CID_MPEG_STREAM_PID_AUDIO          (V4L2_CID_MPEG_BASE+2)
+#define V4L2_CID_MPEG_STREAM_PID_AUDIO          (V4L2_CID_MPEG_BASE+2)
-#define V4L2_CID_MPEG_STREAM_PID_VIDEO          (V4L2_CID_MPEG_BASE+3)
+#define V4L2_CID_MPEG_STREAM_PID_VIDEO          (V4L2_CID_MPEG_BASE+3)
-#define V4L2_CID_MPEG_STREAM_PID_PCR            (V4L2_CID_MPEG_BASE+4)
+#define V4L2_CID_MPEG_STREAM_PID_PCR            (V4L2_CID_MPEG_BASE+4)
-#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO       (V4L2_CID_MPEG_BASE+5)
+#define V4L2_CID_MPEG_STREAM_PES_ID_AUDIO       (V4L2_CID_MPEG_BASE+5)
-#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO       (V4L2_CID_MPEG_BASE+6)
+#define V4L2_CID_MPEG_STREAM_PES_ID_VIDEO       (V4L2_CID_MPEG_BASE+6)
-#define V4L2_CID_MPEG_STREAM_VBI_FMT            (V4L2_CID_MPEG_BASE+7)
+#define V4L2_CID_MPEG_STREAM_VBI_FMT            (V4L2_CID_MPEG_BASE+7)
 enum v4l2_mpeg_stream_vbi_fmt {
        V4L2_MPEG_STREAM_VBI_FMT_NONE = 0,  /* No VBI in the MPEG stream */
        V4L2_MPEG_STREAM_VBI_FMT_IVTV = 1,  /* VBI in private packets, IVTV format */
 };
 /*  MPEG audio controls specific to multiplexed streams  */
-#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ       (V4L2_CID_MPEG_BASE+100)
+#define V4L2_CID_MPEG_AUDIO_SAMPLING_FREQ       (V4L2_CID_MPEG_BASE+100)
 enum v4l2_mpeg_audio_sampling_freq {
        V4L2_MPEG_AUDIO_SAMPLING_FREQ_44100 = 0,
        V4L2_MPEG_AUDIO_SAMPLING_FREQ_48000 = 1,
        V4L2_MPEG_AUDIO_SAMPLING_FREQ_32000 = 2,
 };
-#define V4L2_CID_MPEG_AUDIO_ENCODING            (V4L2_CID_MPEG_BASE+101)
+#define V4L2_CID_MPEG_AUDIO_ENCODING            (V4L2_CID_MPEG_BASE+101)
 enum v4l2_mpeg_audio_encoding {
        V4L2_MPEG_AUDIO_ENCODING_LAYER_1 = 0,
        V4L2_MPEG_AUDIO_ENCODING_LAYER_2 = 1,
@@ -234,7 +234,7 @@ enum v4l2_mpeg_audio_encoding {
        V4L2_MPEG_AUDIO_ENCODING_AAC     = 3,
        V4L2_MPEG_AUDIO_ENCODING_AC3     = 4,
 };
-#define V4L2_CID_MPEG_AUDIO_L1_BITRATE          (V4L2_CID_MPEG_BASE+102)
+#define V4L2_CID_MPEG_AUDIO_L1_BITRATE          (V4L2_CID_MPEG_BASE+102)
 enum v4l2_mpeg_audio_l1_bitrate {
        V4L2_MPEG_AUDIO_L1_BITRATE_32K  = 0,
        V4L2_MPEG_AUDIO_L1_BITRATE_64K  = 1,
@@ -251,7 +251,7 @@ enum v4l2_mpeg_audio_l1_bitrate {
        V4L2_MPEG_AUDIO_L1_BITRATE_416K = 12,
        V4L2_MPEG_AUDIO_L1_BITRATE_448K = 13,
 };
-#define V4L2_CID_MPEG_AUDIO_L2_BITRATE          (V4L2_CID_MPEG_BASE+103)
+#define V4L2_CID_MPEG_AUDIO_L2_BITRATE          (V4L2_CID_MPEG_BASE+103)
 enum v4l2_mpeg_audio_l2_bitrate {
        V4L2_MPEG_AUDIO_L2_BITRATE_32K  = 0,
        V4L2_MPEG_AUDIO_L2_BITRATE_48K  = 1,
@@ -268,7 +268,7 @@ enum v4l2_mpeg_audio_l2_bitrate {
        V4L2_MPEG_AUDIO_L2_BITRATE_320K = 12,
        V4L2_MPEG_AUDIO_L2_BITRATE_384K = 13,
 };
-#define V4L2_CID_MPEG_AUDIO_L3_BITRATE          (V4L2_CID_MPEG_BASE+104)
+#define V4L2_CID_MPEG_AUDIO_L3_BITRATE          (V4L2_CID_MPEG_BASE+104)
 enum v4l2_mpeg_audio_l3_bitrate {
        V4L2_MPEG_AUDIO_L3_BITRATE_32K  = 0,
        V4L2_MPEG_AUDIO_L3_BITRATE_40K  = 1,
@@ -285,32 +285,32 @@ enum v4l2_mpeg_audio_l3_bitrate {
        V4L2_MPEG_AUDIO_L3_BITRATE_256K = 12,
        V4L2_MPEG_AUDIO_L3_BITRATE_320K = 13,
 };
-#define V4L2_CID_MPEG_AUDIO_MODE                (V4L2_CID_MPEG_BASE+105)
+#define V4L2_CID_MPEG_AUDIO_MODE                (V4L2_CID_MPEG_BASE+105)
 enum v4l2_mpeg_audio_mode {
        V4L2_MPEG_AUDIO_MODE_STEREO       = 0,
        V4L2_MPEG_AUDIO_MODE_JOINT_STEREO = 1,
        V4L2_MPEG_AUDIO_MODE_DUAL         = 2,
        V4L2_MPEG_AUDIO_MODE_MONO         = 3,
 };
-#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION      (V4L2_CID_MPEG_BASE+106)
+#define V4L2_CID_MPEG_AUDIO_MODE_EXTENSION      (V4L2_CID_MPEG_BASE+106)
 enum v4l2_mpeg_audio_mode_extension {
        V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_4  = 0,
        V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_8  = 1,
        V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_12 = 2,
        V4L2_MPEG_AUDIO_MODE_EXTENSION_BOUND_16 = 3,
 };
-#define V4L2_CID_MPEG_AUDIO_EMPHASIS            (V4L2_CID_MPEG_BASE+107)
+#define V4L2_CID_MPEG_AUDIO_EMPHASIS            (V4L2_CID_MPEG_BASE+107)
 enum v4l2_mpeg_audio_emphasis {
        V4L2_MPEG_AUDIO_EMPHASIS_NONE         = 0,
        V4L2_MPEG_AUDIO_EMPHASIS_50_DIV_15_uS = 1,
        V4L2_MPEG_AUDIO_EMPHASIS_CCITT_J17    = 2,
 };
-#define V4L2_CID_MPEG_AUDIO_CRC                 (V4L2_CID_MPEG_BASE+108)
+#define V4L2_CID_MPEG_AUDIO_CRC                 (V4L2_CID_MPEG_BASE+108)
 enum v4l2_mpeg_audio_crc {
        V4L2_MPEG_AUDIO_CRC_NONE  = 0,
        V4L2_MPEG_AUDIO_CRC_CRC16 = 1,
 };
-#define V4L2_CID_MPEG_AUDIO_MUTE                (V4L2_CID_MPEG_BASE+109)
+#define V4L2_CID_MPEG_AUDIO_MUTE                (V4L2_CID_MPEG_BASE+109)
 #define V4L2_CID_MPEG_AUDIO_AAC_BITRATE         (V4L2_CID_MPEG_BASE+110)
 #define V4L2_CID_MPEG_AUDIO_AC3_BITRATE         (V4L2_CID_MPEG_BASE+111)
 enum v4l2_mpeg_audio_ac3_bitrate {
@@ -346,33 +346,33 @@ enum v4l2_mpeg_audio_dec_playback {
 #define V4L2_CID_MPEG_AUDIO_DEC_MULTILINGUAL_PLAYBACK (V4L2_CID_MPEG_BASE+113)
 /*  MPEG video controls specific to multiplexed streams */
-#define V4L2_CID_MPEG_VIDEO_ENCODING            (V4L2_CID_MPEG_BASE+200)
+#define V4L2_CID_MPEG_VIDEO_ENCODING            (V4L2_CID_MPEG_BASE+200)
 enum v4l2_mpeg_video_encoding {
        V4L2_MPEG_VIDEO_ENCODING_MPEG_1     = 0,
        V4L2_MPEG_VIDEO_ENCODING_MPEG_2     = 1,
        V4L2_MPEG_VIDEO_ENCODING_MPEG_4_AVC = 2,
 };
-#define V4L2_CID_MPEG_VIDEO_ASPECT              (V4L2_CID_MPEG_BASE+201)
+#define V4L2_CID_MPEG_VIDEO_ASPECT              (V4L2_CID_MPEG_BASE+201)
 enum v4l2_mpeg_video_aspect {
        V4L2_MPEG_VIDEO_ASPECT_1x1     = 0,
        V4L2_MPEG_VIDEO_ASPECT_4x3     = 1,
        V4L2_MPEG_VIDEO_ASPECT_16x9    = 2,
        V4L2_MPEG_VIDEO_ASPECT_221x100 = 3,
 };
-#define V4L2_CID_MPEG_VIDEO_B_FRAMES            (V4L2_CID_MPEG_BASE+202)
+#define V4L2_CID_MPEG_VIDEO_B_FRAMES            (V4L2_CID_MPEG_BASE+202)
-#define V4L2_CID_MPEG_VIDEO_GOP_SIZE            (V4L2_CID_MPEG_BASE+203)
+#define V4L2_CID_MPEG_VIDEO_GOP_SIZE            (V4L2_CID_MPEG_BASE+203)
-#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE         (V4L2_CID_MPEG_BASE+204)
+#define V4L2_CID_MPEG_VIDEO_GOP_CLOSURE         (V4L2_CID_MPEG_BASE+204)
-#define V4L2_CID_MPEG_VIDEO_PULLDOWN            (V4L2_CID_MPEG_BASE+205)
+#define V4L2_CID_MPEG_VIDEO_PULLDOWN            (V4L2_CID_MPEG_BASE+205)
-#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE        (V4L2_CID_MPEG_BASE+206)
+#define V4L2_CID_MPEG_VIDEO_BITRATE_MODE        (V4L2_CID_MPEG_BASE+206)
 enum v4l2_mpeg_video_bitrate_mode {
        V4L2_MPEG_VIDEO_BITRATE_MODE_VBR = 0,
        V4L2_MPEG_VIDEO_BITRATE_MODE_CBR = 1,
 };
-#define V4L2_CID_MPEG_VIDEO_BITRATE             (V4L2_CID_MPEG_BASE+207)
+#define V4L2_CID_MPEG_VIDEO_BITRATE             (V4L2_CID_MPEG_BASE+207)
-#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK        (V4L2_CID_MPEG_BASE+208)
+#define V4L2_CID_MPEG_VIDEO_BITRATE_PEAK        (V4L2_CID_MPEG_BASE+208)
 #define V4L2_CID_MPEG_VIDEO_TEMPORAL_DECIMATION (V4L2_CID_MPEG_BASE+209)
-#define V4L2_CID_MPEG_VIDEO_MUTE                (V4L2_CID_MPEG_BASE+210)
+#define V4L2_CID_MPEG_VIDEO_MUTE                (V4L2_CID_MPEG_BASE+210)
-#define V4L2_CID_MPEG_VIDEO_MUTE_YUV            (V4L2_CID_MPEG_BASE+211)
+#define V4L2_CID_MPEG_VIDEO_MUTE_YUV            (V4L2_CID_MPEG_BASE+211)
 #define V4L2_CID_MPEG_VIDEO_DECODER_SLICE_INTERFACE             (V4L2_CID_MPEG_BASE+212)
 #define V4L2_CID_MPEG_VIDEO_DECODER_MPEG4_DEBLOCK_FILTER        (V4L2_CID_MPEG_BASE+213)
 #define V4L2_CID_MPEG_VIDEO_CYCLIC_INTRA_REFRESH_MB             (V4L2_CID_MPEG_BASE+214)
@@ -590,14 +590,14 @@ enum v4l2_vp8_golden_frame_sel {
 #define V4L2_CID_MPEG_VIDEO_VPX_PROFILE                 (V4L2_CID_MPEG_BASE+511)
 /*  MPEG-class control IDs specific to the CX2341x driver as defined by V4L2 */
-#define V4L2_CID_MPEG_CX2341X_BASE                              (V4L2_CTRL_CLASS_MPEG | 0x1000)
+#define V4L2_CID_MPEG_CX2341X_BASE                              (V4L2_CTRL_CLASS_MPEG | 0x1000)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE         (V4L2_CID_MPEG_CX2341X_BASE+0)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE         (V4L2_CID_MPEG_CX2341X_BASE+0)
 enum v4l2_mpeg_cx2341x_video_spatial_filter_mode {
        V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_MANUAL = 0,
        V4L2_MPEG_CX2341X_VIDEO_SPATIAL_FILTER_MODE_AUTO   = 1,
 };
-#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER              (V4L2_CID_MPEG_CX2341X_BASE+1)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_SPATIAL_FILTER              (V4L2_CID_MPEG_CX2341X_BASE+1)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE    (V4L2_CID_MPEG_CX2341X_BASE+2)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE    (V4L2_CID_MPEG_CX2341X_BASE+2)
 enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type {
        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_OFF                  = 0,
        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_1D_HOR               = 1,
@@ -605,18 +605,18 @@ enum v4l2_mpeg_cx2341x_video_luma_spatial_filter_type {
        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_HV_SEPARABLE      = 3,
        V4L2_MPEG_CX2341X_VIDEO_LUMA_SPATIAL_FILTER_TYPE_2D_SYM_NON_SEPARABLE = 4,
 };
-#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE  (V4L2_CID_MPEG_CX2341X_BASE+3)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE  (V4L2_CID_MPEG_CX2341X_BASE+3)
 enum v4l2_mpeg_cx2341x_video_chroma_spatial_filter_type {
        V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_OFF    = 0,
        V4L2_MPEG_CX2341X_VIDEO_CHROMA_SPATIAL_FILTER_TYPE_1D_HOR = 1,
 };
-#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE        (V4L2_CID_MPEG_CX2341X_BASE+4)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE        (V4L2_CID_MPEG_CX2341X_BASE+4)
 enum v4l2_mpeg_cx2341x_video_temporal_filter_mode {
        V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_MANUAL = 0,
        V4L2_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER_MODE_AUTO   = 1,
 };
-#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER             (V4L2_CID_MPEG_CX2341X_BASE+5)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_TEMPORAL_FILTER             (V4L2_CID_MPEG_CX2341X_BASE+5)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE          (V4L2_CID_MPEG_CX2341X_BASE+6)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE          (V4L2_CID_MPEG_CX2341X_BASE+6)
 enum v4l2_mpeg_cx2341x_video_median_filter_type {
        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_OFF      = 0,
        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR      = 1,
@@ -624,11 +624,11 @@ enum v4l2_mpeg_cx2341x_video_median_filter_type {
        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_HOR_VERT = 3,
        V4L2_MPEG_CX2341X_VIDEO_MEDIAN_FILTER_TYPE_DIAG     = 4,
 };
-#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM   (V4L2_CID_MPEG_CX2341X_BASE+7)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_BOTTOM   (V4L2_CID_MPEG_CX2341X_BASE+7)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP      (V4L2_CID_MPEG_CX2341X_BASE+8)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_LUMA_MEDIAN_FILTER_TOP      (V4L2_CID_MPEG_CX2341X_BASE+8)
 #define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_BOTTOM (V4L2_CID_MPEG_CX2341X_BASE+9)
-#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP    (V4L2_CID_MPEG_CX2341X_BASE+10)
+#define V4L2_CID_MPEG_CX2341X_VIDEO_CHROMA_MEDIAN_FILTER_TOP    (V4L2_CID_MPEG_CX2341X_BASE+10)
-#define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS         (V4L2_CID_MPEG_CX2341X_BASE+11)
+#define V4L2_CID_MPEG_CX2341X_STREAM_INSERT_NAV_PACKETS         (V4L2_CID_MPEG_CX2341X_BASE+11)
 /*  MPEG-class control IDs specific to the Samsung MFC 5.1 driver as defined by V4L2 */
 #define V4L2_CID_MPEG_MFC51_BASE                                (V4L2_CTRL_CLASS_MPEG | 0x1100)
@@ -660,8 +660,8 @@ enum v4l2_mpeg_mfc51_video_force_frame_type {
 /*  Camera class control IDs */
-#define V4L2_CID_CAMERA_CLASS_BASE      (V4L2_CTRL_CLASS_CAMERA | 0x900)
+#define V4L2_CID_CAMERA_CLASS_BASE      (V4L2_CTRL_CLASS_CAMERA | 0x900)
-#define V4L2_CID_CAMERA_CLASS           (V4L2_CTRL_CLASS_CAMERA | 1)
+#define V4L2_CID_CAMERA_CLASS           (V4L2_CTRL_CLASS_CAMERA | 1)
 #define V4L2_CID_EXPOSURE_AUTO                  (V4L2_CID_CAMERA_CLASS_BASE+1)
 enum  v4l2_exposure_auto_type {
diff --git a/include/uapi/linux/videodev2.h b/include/uapi/linux/videodev2.h
index 1c095b5a99c5..982718965180 100644
--- a/include/uapi/linux/videodev2.h
+++ b/include/uapi/linux/videodev2.h
@@ -107,14 +107,14 @@ enum v4l2_field {
                                         transmitted first */
 };
 #define V4L2_FIELD_HAS_TOP(field)       \
-        ((field) == V4L2_FIELD_TOP      ||\
+        ((field) == V4L2_FIELD_TOP      ||\
         (field) == V4L2_FIELD_INTERLACED ||\
         (field) == V4L2_FIELD_INTERLACED_TB ||\
         (field) == V4L2_FIELD_INTERLACED_BT ||\
         (field) == V4L2_FIELD_SEQ_TB   ||\
         (field) == V4L2_FIELD_SEQ_BT)
 #define V4L2_FIELD_HAS_BOTTOM(field)    \
-        ((field) == V4L2_FIELD_BOTTOM   ||\
+        ((field) == V4L2_FIELD_BOTTOM   ||\
         (field) == V4L2_FIELD_INTERLACED ||\
         (field) == V4L2_FIELD_INTERLACED_TB ||\
         (field) == V4L2_FIELD_INTERLACED_BT ||\
@@ -467,12 +467,12 @@ struct v4l2_capability {
 *      V I D E O   I M A G E   F O R M A T
 */
 struct v4l2_pix_format {
-        __u32                   width;
+        __u32                   width;
        __u32                   height;
        __u32                   pixelformat;
        __u32                   field;          /* enum v4l2_field */
-        __u32                   bytesperline;   /* for padding, zero if unused */
+        __u32                   bytesperline;   /* for padding, zero if unused */
-        __u32                   sizeimage;
+        __u32                   sizeimage;
        __u32                   colorspace;     /* enum v4l2_colorspace */
        __u32                   priv;           /* private data, depends on pixelformat */
        __u32                   flags;          /* format flags (V4L2_PIX_FMT_FLAG_*) */
@@ -669,6 +669,12 @@ struct v4l2_pix_format {
 #define V4L2_PIX_FMT_MT21C    v4l2_fourcc('M', 'T', '2', '1') /* Mediatek compressed block mode  */
 #define V4L2_PIX_FMT_INZI     v4l2_fourcc('I', 'N', 'Z', 'I') /* Intel Planar Greyscale 10-bit and Depth 16-bit */
+/* 10bit raw bayer packed, 32 bytes for every 25 pixels, last LSB 6 bits unused */
+#define V4L2_PIX_FMT_IPU3_SBGGR10       v4l2_fourcc('i', 'p', '3', 'b') /* IPU3 packed 10-bit BGGR bayer */
+#define V4L2_PIX_FMT_IPU3_SGBRG10       v4l2_fourcc('i', 'p', '3', 'g') /* IPU3 packed 10-bit GBRG bayer */
+#define V4L2_PIX_FMT_IPU3_SGRBG10       v4l2_fourcc('i', 'p', '3', 'G') /* IPU3 packed 10-bit GRBG bayer */
+#define V4L2_PIX_FMT_IPU3_SRGGB10       v4l2_fourcc('i', 'p', '3', 'r') /* IPU3 packed 10-bit RGGB bayer */
 /* SDR formats - used only for Software Defined Radio devices */
 #define V4L2_SDR_FMT_CU8          v4l2_fourcc('C', 'U', '0', '8') /* IQ u8 */
 #define V4L2_SDR_FMT_CU16LE       v4l2_fourcc('C', 'U', '1', '6') /* IQ u16le */
@@ -688,6 +694,7 @@ struct v4l2_pix_format {
 /* Meta-data formats */
 #define V4L2_META_FMT_VSP1_HGO    v4l2_fourcc('V', 'S', 'P', 'H') /* R-Car VSP1 1-D Histogram */
 #define V4L2_META_FMT_VSP1_HGT    v4l2_fourcc('V', 'S', 'P', 'T') /* R-Car VSP1 2-D Histogram */
+#define V4L2_META_FMT_UVC         v4l2_fourcc('U', 'V', 'C', 'H') /* UVC Payload Header metadata */
 /* priv field value to indicates that subsequent fields are valid. */
 #define V4L2_PIX_FMT_PRIV_MAGIC         0xfeedcafe
@@ -1166,7 +1173,7 @@ typedef __u64 v4l2_std_id;
                                 V4L2_STD_NTSC_M_JP     |\
                                 V4L2_STD_NTSC_M_KR)
 /* Secam macros */
-#define V4L2_STD_SECAM_DK       (V4L2_STD_SECAM_D       |\
+#define V4L2_STD_SECAM_DK       (V4L2_STD_SECAM_D       |\
                                 V4L2_STD_SECAM_K       |\
                                 V4L2_STD_SECAM_K1)
 /* All Secam Standards */
@@ -1247,7 +1254,7 @@ struct v4l2_standard {
 };
 /*
- *      D V     B T     T I M I N G S
+ *      D V     B T     T I M I N G S
 */
 /** struct v4l2_bt_timings - BT.656/BT.1120 timing data
@@ -1588,7 +1595,7 @@ struct v4l2_ext_controls {
        struct v4l2_ext_control *controls;
 };
-#define V4L2_CTRL_ID_MASK         (0x0fffffff)
+#define V4L2_CTRL_ID_MASK         (0x0fffffff)
 #ifndef __KERNEL__
 #define V4L2_CTRL_ID2CLASS(id)    ((id) & 0x0fff0000UL)
 #endif
@@ -1660,11 +1667,11 @@ struct v4l2_querymenu {
 /*  Control flags  */
 #define V4L2_CTRL_FLAG_DISABLED         0x0001
 #define V4L2_CTRL_FLAG_GRABBED          0x0002
-#define V4L2_CTRL_FLAG_READ_ONLY        0x0004
+#define V4L2_CTRL_FLAG_READ_ONLY        0x0004
-#define V4L2_CTRL_FLAG_UPDATE           0x0008
+#define V4L2_CTRL_FLAG_UPDATE           0x0008
-#define V4L2_CTRL_FLAG_INACTIVE         0x0010
+#define V4L2_CTRL_FLAG_INACTIVE         0x0010
-#define V4L2_CTRL_FLAG_SLIDER           0x0020
+#define V4L2_CTRL_FLAG_SLIDER           0x0020
-#define V4L2_CTRL_FLAG_WRITE_ONLY       0x0040
+#define V4L2_CTRL_FLAG_WRITE_ONLY       0x0040
 #define V4L2_CTRL_FLAG_VOLATILE         0x0080
 #define V4L2_CTRL_FLAG_HAS_PAYLOAD      0x0100
 #define V4L2_CTRL_FLAG_EXECUTE_ON_WRITE 0x0200
@@ -1778,21 +1785,21 @@ struct v4l2_hw_freq_seek {
 */
 struct v4l2_rds_data {
-        __u8    lsb;
+        __u8    lsb;
-        __u8    msb;
+        __u8    msb;
-        __u8    block;
+        __u8    block;
 } __attribute__ ((packed));
-#define V4L2_RDS_BLOCK_MSK       0x7
+#define V4L2_RDS_BLOCK_MSK       0x7
-#define V4L2_RDS_BLOCK_A         0
+#define V4L2_RDS_BLOCK_A         0
-#define V4L2_RDS_BLOCK_B         1
+#define V4L2_RDS_BLOCK_B         1
-#define V4L2_RDS_BLOCK_C         2
+#define V4L2_RDS_BLOCK_C         2
-#define V4L2_RDS_BLOCK_D         3
+#define V4L2_RDS_BLOCK_D         3
-#define V4L2_RDS_BLOCK_C_ALT     4
+#define V4L2_RDS_BLOCK_C_ALT     4
-#define V4L2_RDS_BLOCK_INVALID   7
+#define V4L2_RDS_BLOCK_INVALID   7
 #define V4L2_RDS_BLOCK_CORRECTED 0x40
-#define V4L2_RDS_BLOCK_ERROR     0x80
+#define V4L2_RDS_BLOCK_ERROR     0x80
 /*
 *      A U D I O
@@ -2348,8 +2355,8 @@ struct v4l2_create_buffers {
 #define VIDIOC_S_CROP            _IOW('V', 60, struct v4l2_crop)
 #define VIDIOC_G_JPEGCOMP        _IOR('V', 61, struct v4l2_jpegcompression)
 #define VIDIOC_S_JPEGCOMP        _IOW('V', 62, struct v4l2_jpegcompression)
-#define VIDIOC_QUERYSTD          _IOR('V', 63, v4l2_std_id)
+#define VIDIOC_QUERYSTD          _IOR('V', 63, v4l2_std_id)
-#define VIDIOC_TRY_FMT          _IOWR('V', 64, struct v4l2_format)
+#define VIDIOC_TRY_FMT          _IOWR('V', 64, struct v4l2_format)
 #define VIDIOC_ENUMAUDIO        _IOWR('V', 65, struct v4l2_audio)
 #define VIDIOC_ENUMAUDOUT       _IOWR('V', 66, struct v4l2_audioout)
 #define VIDIOC_G_PRIORITY        _IOR('V', 67, __u32) /* enum v4l2_priority */
@@ -2370,8 +2377,8 @@ struct v4l2_create_buffers {
 * Only implemented if CONFIG_VIDEO_ADV_DEBUG is defined.
 * You must be root to use these ioctls. Never use these in applications!
 */
-#define VIDIOC_DBG_S_REGISTER    _IOW('V', 79, struct v4l2_dbg_register)
+#define VIDIOC_DBG_S_REGISTER    _IOW('V', 79, struct v4l2_dbg_register)
-#define VIDIOC_DBG_G_REGISTER   _IOWR('V', 80, struct v4l2_dbg_register)
+#define VIDIOC_DBG_G_REGISTER   _IOWR('V', 80, struct v4l2_dbg_register)
 #define VIDIOC_S_HW_FREQ_SEEK    _IOW('V', 82, struct v4l2_hw_freq_seek)
 #define VIDIOC_S_DV_TIMINGS     _IOWR('V', 87, struct v4l2_dv_timings)
diff --git a/include/uapi/rdma/rdma_netlink.h b/include/uapi/rdma/rdma_netlink.h
index 17e59bec169e..4c77e2a7b07e 100644
--- a/include/uapi/rdma/rdma_netlink.h
+++ b/include/uapi/rdma/rdma_netlink.h
@@ -227,16 +227,14 @@ enum rdma_nldev_command {
        RDMA_NLDEV_CMD_UNSPEC,
        RDMA_NLDEV_CMD_GET, /* can dump */
-        RDMA_NLDEV_CMD_SET,
-        RDMA_NLDEV_CMD_NEW,
-        RDMA_NLDEV_CMD_DEL,
-        RDMA_NLDEV_CMD_PORT_GET, /* can dump */
+        /* 2 - 4 are free to use */
-        RDMA_NLDEV_CMD_PORT_SET,
-        RDMA_NLDEV_CMD_PORT_NEW,
-        RDMA_NLDEV_CMD_PORT_DEL,
-        RDMA_NLDEV_CMD_RES_GET, /* can dump */
+        RDMA_NLDEV_CMD_PORT_GET = 5, /* can dump */
+        /* 6 - 8 are free to use */
+        RDMA_NLDEV_CMD_RES_GET = 9, /* can dump */
        RDMA_NLDEV_CMD_RES_QP_GET, /* can dump */