media: rp1-cfe: Swap "raspberypi,rp1-cfe" compatible to downstream dr…

…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]>
6by9 · Jan 9, 2025 · fa9e7aa · fa9e7aa
1 parent a49540e
commit fa9e7aa
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c b/drivers/media/platform/raspberrypi/rp1-cfe/cfe.c
@@ -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);

diff --git a/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c b/drivers/media/platform/raspberrypi/rp1_cfe/cfe.c
@@ -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);