Skip to content

Commit 53ad9d6

Browse files
6by9pelwell
authored andcommitted
media: rp1-cfe: Swap "raspberypi,rp1-cfe" compatible to downstream driver
Whilst we are wanting to maintain the downstream driver at the same time as having the upstream merged, swap the "raspberypi,rp1-cfe" compatible string across. Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
1 parent f90431c commit 53ad9d6

File tree

2 files changed

+2
-2
lines changed
  • drivers/media/platform/raspberrypi

2 files changed

+2
-2
lines changed

drivers/media/platform/raspberrypi/rp1-cfe/cfe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2485,7 +2485,7 @@ static const struct dev_pm_ops cfe_pm_ops = {
24852485
};
24862486

24872487
static const struct of_device_id cfe_of_match[] = {
2488-
{ .compatible = "raspberrypi,rp1-cfe" },
2488+
{ .compatible = "raspberrypi,rp1-cfe-upstream" },
24892489
{ /* sentinel */ },
24902490
};
24912491
MODULE_DEVICE_TABLE(of, cfe_of_match);

drivers/media/platform/raspberrypi/rp1_cfe/cfe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2443,7 +2443,7 @@ static const struct dev_pm_ops cfe_pm_ops = {
24432443
};
24442444

24452445
static const struct of_device_id cfe_of_match[] = {
2446-
{ .compatible = "raspberrypi,rp1-cfe-downstream" },
2446+
{ .compatible = "raspberrypi,rp1-cfe" },
24472447
{ /* sentinel */ },
24482448
};
24492449
MODULE_DEVICE_TABLE(of, cfe_of_match);

0 commit comments

Comments
 (0)