Skip to content

Commit

Permalink
media: rp1-cfe: Swap "raspberypi,rp1-cfe" compatible to downstream dr…
Browse files Browse the repository at this point in the history
…iver

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 <[email protected]>
  • Loading branch information
6by9 authored and pelwell committed Jan 10, 2025
1 parent f90431c commit 53ad9d6
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion drivers/media/platform/raspberrypi/rp1-cfe/cfe.c
Original file line number Diff line number Diff line change
Expand Up @@ -2485,7 +2485,7 @@ static const struct dev_pm_ops cfe_pm_ops = {
};

static const struct of_device_id cfe_of_match[] = {
{ .compatible = "raspberrypi,rp1-cfe" },
{ .compatible = "raspberrypi,rp1-cfe-upstream" },
{ /* sentinel */ },
};
MODULE_DEVICE_TABLE(of, cfe_of_match);
Expand Down
2 changes: 1 addition & 1 deletion drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
Original file line number Diff line number Diff line change
Expand Up @@ -2443,7 +2443,7 @@ static const struct dev_pm_ops cfe_pm_ops = {
};

static const struct of_device_id cfe_of_match[] = {
{ .compatible = "raspberrypi,rp1-cfe-downstream" },
{ .compatible = "raspberrypi,rp1-cfe" },
{ /* sentinel */ },
};
MODULE_DEVICE_TABLE(of, cfe_of_match);
Expand Down

0 comments on commit 53ad9d6

Please sign in to comment.