commit 6023ac399fd253827b3ca52603b789cd5834eb77
author Douglas Anderson <dianders@chromium.org> Tue Mar 26 13:28:32 2019 -0700
committer Mattijs Korpershoek <mkorpershoek@baylibre.com> Fri May 29 14:23:27 2020 +0000
tree caffe41c708be4828857f586d8afed6ce57789d4
parent ec3e4d58598a7217ced992bb7525e8b1ba681c47

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=b:149806107
BUG=chromium:941638
TEST=Boot up and use GPU on veyron w/ upstream bindings

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>
(cherry-picked from b83b2abc963c2ea5bb0acaf06b7fb91c00d54cd6)
[drinkcat: Re-picked on top of r20p0 MALI]
Signed-off-by: Nicolas Boichat <drinkcat@chromium.org>

Change-Id: I9af0db787e9ad0aecd33bb3574d651053705246f
Signed-off-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 f2c5477..d69646d 100644
--- a/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
+++ b/drivers/gpu/arm/midgard/mali_kbase_core_linux.c
@@ -401,11 +401,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",
@@ -4520,8 +4520,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);