1 files changed, 24 insertions, 4 deletions

diff --git a/drivers/gpu/host1x/dev.c b/drivers/gpu/host1x/dev.c
index 80da003d63de..2529908d304b 100644
--- a/drivers/gpu/host1x/dev.c
+++ b/drivers/gpu/host1x/dev.c
@@ -34,6 +34,7 @@
 #include "debug.h"
 #include "hw/host1x01.h"
 #include "hw/host1x02.h"
+#include "hw/host1x04.h"
 
 void host1x_sync_writel(struct host1x *host1x, u32 v, u32 r)
 {
@@ -77,7 +78,17 @@ static const struct host1x_info host1x02_info = {
         .sync_offset = 0x3000,
 };
 
+static const struct host1x_info host1x04_info = {
+        .nb_channels = 12,
+        .nb_pts = 192,
+        .nb_mlocks = 16,
+        .nb_bases = 64,
+        .init = host1x04_init,
+        .sync_offset = 0x2100,
+};
+
 static struct of_device_id host1x_of_match[] = {
+        { .compatible = "nvidia,tegra124-host1x", .data = &host1x04_info, },
         { .compatible = "nvidia,tegra114-host1x", .data = &host1x02_info, },
         { .compatible = "nvidia,tegra30-host1x", .data = &host1x01_info, },
         { .compatible = "nvidia,tegra20-host1x", .data = &host1x01_info, },
@@ -210,17 +221,26 @@ static int __init tegra_host1x_init(void)
                 return err;
 
         err = platform_driver_register(&tegra_host1x_driver);
-        if (err < 0) {
-                host1x_bus_exit();
-                return err;
-        }
+        if (err < 0)
+                goto unregister_bus;
+
+        err = platform_driver_register(&tegra_mipi_driver);
+        if (err < 0)
+                goto unregister_host1x;
 
         return 0;
+
+unregister_host1x:
+        platform_driver_unregister(&tegra_host1x_driver);
+unregister_bus:
+        host1x_bus_exit();
+        return err;
 }
 module_init(tegra_host1x_init);
 
 static void __exit tegra_host1x_exit(void)
 {
+        platform_driver_unregister(&tegra_mipi_driver);
         platform_driver_unregister(&tegra_host1x_driver);
         host1x_bus_exit();
 }