Skip to content

Commit 3178804

Browse files
mchehabHans Verkuil
mchehab
authored and
Hans Verkuil
committed
Merge tag 'br-v6.2i' of git://linuxtv.org/hverkuil/media_tree into media_stage
Tag branch Signed-off-by: Mauro Carvalho Chehab <[email protected]> * tag 'br-v6.2i' of git://linuxtv.org/hverkuil/media_tree: (31 commits) media: s5c73m3: Switch to GPIO descriptors media: i2c: s5k5baf: switch to using gpiod API media: i2c: s5k6a3: switch to using gpiod API media: imx: remove code for non-existing config IMX_GPT_ICAP media: si470x: Fix use-after-free in si470x_int_in_callback() media: staging: stkwebcam: Restore MEDIA_{USB,CAMERA}_SUPPORT dependencies media: coda: Add check for kmalloc media: coda: Add check for dcoda_iram_alloc dt-bindings: media: s5c73m3: Fix reset-gpio descriptor media: dt-bindings: allwinner: h6-vpu-g2: Add IOMMU reference property media: s5k4ecgx: Delete driver media: s5k4ecgx: Switch to GPIO descriptors media: Switch to use dev_err_probe() helper headers: Remove some left-over license text in include/uapi/linux/v4l2-* headers: Remove some left-over license text in include/uapi/linux/dvb/ media: usb: pwc-uncompress: Use flex array destination for memcpy() media: s5p-mfc: Fix to handle reference queue during finishing media: s5p-mfc: Clear workbit to handle error condition media: s5p-mfc: Fix in register read and write for H264 media: imx: Use get_mbus_config instead of parsing upstream DT endpoints ...
2 parents b2ea130 + a14e84d commit 3178804

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

59 files changed

+247
-1788
lines changed

‎Documentation/devicetree/bindings/media/allwinner,sun50i-h6-vpu-g2.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,17 @@ properties:
3636
resets:
3737
maxItems: 1
3838

39+
iommus:
40+
maxItems: 1
41+
3942
required:
4043
- compatible
4144
- reg
4245
- interrupts
4346
- clocks
4447
- clock-names
4548
- resets
49+
- iommus
4650

4751
additionalProperties: false
4852

@@ -59,6 +63,7 @@ examples:
5963
clocks = <&ccu CLK_BUS_VP9>, <&ccu CLK_VP9>;
6064
clock-names = "bus", "mod";
6165
resets = <&ccu RST_BUS_VP9>;
66+
iommus = <&iommu 5>;
6267
};
6368
6469
...

‎Documentation/devicetree/bindings/media/samsung-s5c73m3.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ i2c@138a000000 {
7676
clock-frequency = <24000000>;
7777
clocks = <&clk 0>;
7878
clock-names = "cis_extclk";
79-
reset-gpios = <&gpf1 3 1>;
79+
xshutdown-gpios = <&gpf1 3 1>;
8080
standby-gpios = <&gpm0 1 1>;
8181
port {
8282
s5c73m3_ep: endpoint {

‎Documentation/devicetree/bindings/media/video-interfaces.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,9 +145,10 @@ properties:
145145

146146
pclk-sample:
147147
$ref: /schemas/types.yaml#/definitions/uint32
148-
enum: [ 0, 1 ]
148+
enum: [ 0, 1, 2 ]
149149
description:
150-
Sample data on rising (1) or falling (0) edge of the pixel clock signal.
150+
Sample data on falling (0), rising (1) or both (2) edges of the pixel
151+
clock signal.
151152

152153
sync-on-green-active:
153154
$ref: /schemas/types.yaml#/definitions/uint32

‎drivers/media/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ config MEDIA_CONTROLLER
182182
#
183183

184184
config DVB_CORE
185-
tristate
185+
tristate "DVB Core"
186186
depends on MEDIA_DIGITAL_TV_SUPPORT
187187
depends on (I2C || I2C=n)
188188
default MEDIA_DIGITAL_TV_SUPPORT

‎drivers/media/cec/platform/stm32/stm32-cec.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -288,12 +288,9 @@ static int stm32_cec_probe(struct platform_device *pdev)
288288
return ret;
289289

290290
cec->clk_cec = devm_clk_get(&pdev->dev, "cec");
291-
if (IS_ERR(cec->clk_cec)) {
292-
if (PTR_ERR(cec->clk_cec) != -EPROBE_DEFER)
293-
dev_err(&pdev->dev, "Cannot get cec clock\n");
294-
295-
return PTR_ERR(cec->clk_cec);
296-
}
291+
if (IS_ERR(cec->clk_cec))
292+
return dev_err_probe(&pdev->dev, PTR_ERR(cec->clk_cec),
293+
"Cannot get cec clock\n");
297294

298295
ret = clk_prepare(cec->clk_cec);
299296
if (ret) {

‎drivers/media/i2c/Kconfig

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -751,16 +751,6 @@ config VIDEO_S5C73M3
751751
This is a V4L2 sensor driver for Samsung S5C73M3
752752
8 Mpixel camera.
753753

754-
config VIDEO_S5K4ECGX
755-
tristate "Samsung S5K4ECGX sensor support"
756-
depends on I2C && VIDEO_DEV
757-
select MEDIA_CONTROLLER
758-
select VIDEO_V4L2_SUBDEV_API
759-
select CRC32
760-
help
761-
This is a V4L2 sensor driver for Samsung S5K4ECGX 5M
762-
camera sensor with an embedded SoC image signal processor.
763-
764754
config VIDEO_S5K5BAF
765755
tristate "Samsung S5K5BAF sensor support"
766756
depends on I2C && VIDEO_DEV

‎drivers/media/i2c/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,6 @@ obj-$(CONFIG_VIDEO_RDACM20) += rdacm20.o
105105
obj-$(CONFIG_VIDEO_RDACM21) += rdacm21.o
106106
obj-$(CONFIG_VIDEO_RJ54N1) += rj54n1cb0c.o
107107
obj-$(CONFIG_VIDEO_S5C73M3) += s5c73m3/
108-
obj-$(CONFIG_VIDEO_S5K4ECGX) += s5k4ecgx.o
109108
obj-$(CONFIG_VIDEO_S5K5BAF) += s5k5baf.o
110109
obj-$(CONFIG_VIDEO_S5K6A3) += s5k6a3.o
111110
obj-$(CONFIG_VIDEO_S5K6AA) += s5k6aa.o

‎drivers/media/i2c/ad5820.c

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -300,21 +300,15 @@ static int ad5820_probe(struct i2c_client *client)
300300
return -ENOMEM;
301301

302302
coil->vana = devm_regulator_get(&client->dev, "VANA");
303-
if (IS_ERR(coil->vana)) {
304-
ret = PTR_ERR(coil->vana);
305-
if (ret != -EPROBE_DEFER)
306-
dev_err(&client->dev, "could not get regulator for vana\n");
307-
return ret;
308-
}
303+
if (IS_ERR(coil->vana))
304+
return dev_err_probe(&client->dev, PTR_ERR(coil->vana),
305+
"could not get regulator for vana\n");
309306

310307
coil->enable_gpio = devm_gpiod_get_optional(&client->dev, "enable",
311308
GPIOD_OUT_LOW);
312-
if (IS_ERR(coil->enable_gpio)) {
313-
ret = PTR_ERR(coil->enable_gpio);
314-
if (ret != -EPROBE_DEFER)
315-
dev_err(&client->dev, "could not get enable gpio\n");
316-
return ret;
317-
}
309+
if (IS_ERR(coil->enable_gpio))
310+
return dev_err_probe(&client->dev, PTR_ERR(coil->enable_gpio),
311+
"could not get enable gpio\n");
318312

319313
mutex_init(&coil->power_lock);
320314

‎drivers/media/i2c/imx274.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2060,9 +2060,8 @@ static int imx274_probe(struct i2c_client *client)
20602060
imx274->reset_gpio = devm_gpiod_get_optional(dev, "reset",
20612061
GPIOD_OUT_HIGH);
20622062
if (IS_ERR(imx274->reset_gpio)) {
2063-
if (PTR_ERR(imx274->reset_gpio) != -EPROBE_DEFER)
2064-
dev_err(dev, "Reset GPIO not setup in DT");
2065-
ret = PTR_ERR(imx274->reset_gpio);
2063+
ret = dev_err_probe(dev, PTR_ERR(imx274->reset_gpio),
2064+
"Reset GPIO not setup in DT\n");
20662065
goto err_me;
20672066
}
20682067

‎drivers/media/i2c/isl7998x.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -665,7 +665,7 @@ static int isl7998x_set_standard(struct isl7998x *isl7998x, v4l2_std_id norm)
665665
static int isl7998x_init(struct isl7998x *isl7998x)
666666
{
667667
const unsigned int lanes = isl7998x->nr_mipi_lanes;
668-
const u32 isl7998x_video_in_chan_map[] = { 0x00, 0x11, 0x02, 0x02 };
668+
static const u32 isl7998x_video_in_chan_map[] = { 0x00, 0x11, 0x02, 0x02 };
669669
const struct reg_sequence isl7998x_init_seq_custom[] = {
670670
{ ISL7998X_REG_P0_VIDEO_IN_CHAN_CTL,
671671
isl7998x_video_in_chan_map[isl7998x->nr_inputs - 1] },

0 commit comments

Comments
 (0)