commit ff65af4576644e7cb8ddd0074dbb5421b1912625
author Douglas Anderson <dianders@chromium.org> Tue Mar 26 13:28:32 2019 -0700
committer Fabien Parent <parent.f@gmail.com> Fri May 29 09:54:38 2020 +0000
tree 6b1a34ba41c33e4204298af35e53e7b800c01020
parent 7dc0d1694e42ffb8d814eae6be5767e7a16dba0b

CHROMIUM: MALI: Make us compatible with upstream bindings

Upstream has landed bindings for mali and they're _almost_ the
downstream ones.  See
"Documentation/devicetree/bindings/gpu/arm,mali-midgard.txt" in
mainline linux.

Let's make ourselves compatible.  Part of this just adds the relevant
"compatible" strings and part of this lets us handle lower case IRQ
names.

BUG=chromium:941638
TEST=Boot up and use GPU on veyron w/ upstream bindings

Change-Id: I71fbf5af0bd843d6c163ad68e7095f02a39d53c3
Signed-off-by: Douglas Anderson <dianders@chromium.org>
Reviewed-on: https://chromium-review.googlesource.com/1539806
Reviewed-by: Dominik Behr <dbehr@chromium.org>
Reviewed-by: Nicolas Boichat <drinkcat@chromium.org>

drivers/gpu/arm/midgard/mali_kbase_core_linux.c

diff --git a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
index 8e7aa3a..948a4a8 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
@@ -204,11 +204,11 @@
 		}
 
 #ifdef CONFIG_OF
-		if (!strncmp(irq_res->name, "JOB", 4)) {
+		if (!strncasecmp(irq_res->name, "job", 4)) {
 			irqtag = JOB_IRQ_TAG;
-		} else if (!strncmp(irq_res->name, "MMU", 4)) {
+		} else if (!strncasecmp(irq_res->name, "mmu", 4)) {
 			irqtag = MMU_IRQ_TAG;
-		} else if (!strncmp(irq_res->name, "GPU", 4)) {
+		} else if (!strncasecmp(irq_res->name, "gpu", 4)) {
 			irqtag = GPU_IRQ_TAG;
 		} else {
 			dev_err(&pdev->dev, "Invalid irq res name: '%s'\n",
@@ -4141,8 +4141,21 @@
 
 #ifdef CONFIG_OF
 static const struct of_device_id kbase_dt_ids[] = {
+	/* DOWNSTREAM ONLY--DO NOT USE */
 	{ .compatible = "arm,malit6xx" },
 	{ .compatible = "arm,mali-midgard" },
+
+	/* From upstream bindings */
+	{ .compatible = "arm,mali-t604" },
+	{ .compatible = "arm,mali-t624" },
+	{ .compatible = "arm,mali-t628" },
+	{ .compatible = "arm,mali-t720" },
+	{ .compatible = "arm,mali-t760" },
+	{ .compatible = "arm,mali-t820" },
+	{ .compatible = "arm,mali-t830" },
+	{ .compatible = "arm,mali-t860" },
+	{ .compatible = "arm,mali-t880" },
+
 	{ /* sentinel */ }
 };
 MODULE_DEVICE_TABLE(of, kbase_dt_ids);