---

yaml --- r: 345362 b: refs/heads/master c: 219e815 h: refs/heads/master v: v3
git-mirror · Nov 28, 2012 · 22fb558 · 22fb558
1 parent b6ebd8a
commit 22fb558
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ac8f7c4894bea3ae1af31e78fea31b1ba3347834
+refs/heads/master: 219e81536c8776b30ccf3262c1ceaeaddf7a231a
diff --git a/trunk/drivers/gpu/drm/tegra/dc.c b/trunk/drivers/gpu/drm/tegra/dc.c
@@ -818,6 +818,7 @@ static int tegra_dc_remove(struct platform_device *pdev)
 }
 
 static struct of_device_id tegra_dc_of_match[] = {
+	{ .compatible = "nvidia,tegra30-dc", },
 	{ .compatible = "nvidia,tegra20-dc", },
 	{ },
 };

diff --git a/trunk/drivers/gpu/drm/tegra/hdmi.c b/trunk/drivers/gpu/drm/tegra/hdmi.c
@@ -1318,8 +1318,8 @@ static int tegra_hdmi_remove(struct platform_device *pdev)
 }
 
 static struct of_device_id tegra_hdmi_of_match[] = {
-	{ .compatible = "nvidia,tegra20-hdmi", },
 	{ .compatible = "nvidia,tegra30-hdmi", },
+	{ .compatible = "nvidia,tegra20-hdmi", },
 	{ },
 };
 

diff --git a/trunk/drivers/gpu/drm/tegra/host1x.c b/trunk/drivers/gpu/drm/tegra/host1x.c
@@ -68,6 +68,8 @@ static int host1x_parse_dt(struct host1x *host1x)
 	static const char * const compat[] = {
 		"nvidia,tegra20-dc",
 		"nvidia,tegra20-hdmi",
+		"nvidia,tegra30-dc",
+		"nvidia,tegra30-hdmi",
 	};
 	unsigned int i;
 	int err;
@@ -268,6 +270,7 @@ int host1x_unregister_client(struct host1x *host1x,
 }
 
 static struct of_device_id tegra_host1x_of_match[] = {
+	{ .compatible = "nvidia,tegra30-host1x", },
 	{ .compatible = "nvidia,tegra20-host1x", },
 	{ },
 };
-Original file line number
+Diff line change
@@ Expand Up / @@ -818,6 +818,7 @@ static int tegra_dc_remove(struct platform_device *pdev) @@
     }
     static struct of_device_id tegra_dc_of_match[] = {
+    	{ .compatible = "nvidia,tegra30-dc", },
     	{ .compatible = "nvidia,tegra20-dc", },
     	{ },
     };
@@ Expand Down @@