History

Merge tag 'media/v5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media

Pull media updates from Mauro Carvalho Chehab: - Legacy soc_camera driver was removed from staging - New I2C sensor related drivers: dw9768, ch7322, max9271, rdacm20 - TI vpe driver code was re-organized and had new features added - Added Xilinx MIPI CSI-2 Rx Subsystem driver - Added support for Infrared Toy and IR Droid devices - Lots of random driver fixes, new features and cleanups * tag 'media/v5.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (318 commits) media: camss: fix memory leaks on error handling paths in probe media: davinci: vpif_capture: fix potential double free media: radio: remove redundant assignment to variable retval media: allegro: fix potential null dereference on header media: mtk-mdp: Fix a refcounting bug on error in init media: allegro: fix an error pointer vs NULL check media: meye: fix missing pm_mchip_mode field media: cafe-driver: use generic power management media: saa7164: use generic power management media: v4l2-dev/ioctl: Fix document for VIDIOC_QUERYCAP media: v4l2: Correct kernel-doc inconsistency media: v4l2: Correct kernel-doc inconsistency media: dvbdev.h: keep * together with the type media: v4l2-subdev.h: keep * together with the type media: videobuf2: Print videobuf2 buffer state by name media: colorspaces-details.rst: fix V4L2_COLORSPACE_JPEG description media: tw68: use generic power management media: meye: use generic power management media: cx88: use generic power management media: cx25821: use generic power management ...

Linus Torvalds committed 6 years ago

Commit fa73e212 parents 75dee3b f45882c268 files · +12785 −12116Browse files

Showing the changes to include/linux (2 of 268 files). Show all

Unified · Split

2 files
  1. include/linux/platform_data/media/omap1_camera.h +0 −32
  2. include/linux/property.h +5 −0
include/linux/platform_data/media/omap1_camera.h+0−32
@@ -1,32 +0,0 @@
1/* SPDX-License-Identifier: GPL-2.0-only */
2/*
3 * Header for V4L2 SoC Camera driver for OMAP1 Camera Interface
4 *
5 * Copyright (C) 2010, Janusz Krzysztofik <jkrzyszt@tis.icnet.pl>
6 */
7
8#ifndef __MEDIA_OMAP1_CAMERA_H_
9#define __MEDIA_OMAP1_CAMERA_H_
10
11#include <linux/bitops.h>
12
13#define OMAP1_CAMERA_IOSIZE 0x1c
14
15enum omap1_cam_vb_mode {
16 OMAP1_CAM_DMA_CONTIG = 0,
17 OMAP1_CAM_DMA_SG,
18};
19
20#define OMAP1_CAMERA_MIN_BUF_COUNT(x) ((x) == OMAP1_CAM_DMA_CONTIG ? 3 : 2)
21
22struct omap1_cam_platform_data {
23 unsigned long camexclk_khz;
24 unsigned long lclk_khz_max;
25 unsigned long flags;
26};
27
28#define OMAP1_CAMERA_LCLK_RISING BIT(0)
29#define OMAP1_CAMERA_RST_LOW BIT(1)
30#define OMAP1_CAMERA_RST_HIGH BIT(2)
31
32#endif /* __MEDIA_OMAP1_CAMERA_H_ */
include/linux/property.h+5−0
@@ -389,6 +389,11 @@ struct fwnode_handle * · 388 unmodified lines
389fwnode_graph_get_remote_node(const struct fwnode_handle *fwnode, u32 port,389fwnode_graph_get_remote_node(const struct fwnode_handle *fwnode, u32 port,
390 u32 endpoint);390 u32 endpoint);
391 391
392static inline bool fwnode_graph_is_endpoint(struct fwnode_handle *fwnode)
393{
394 return fwnode_property_present(fwnode, "remote-endpoint");
395}
396
392/*397/*
393 * Fwnode lookup flags398 * Fwnode lookup flags
394 *399 *