From ce56ea5260e1e0dc5b6b23c953280e786637e328 Mon Sep 17 00:00:00 2001
From: klokik <0xb000@gmail.com>
Date: Tue, 23 Jan 2018 23:20:28 +0200
Subject: [PATCH 1/3] Add GC320 DeviceTree node for Omap54xx

---
 arch/arm/boot/dts/omap5.dtsi | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/arch/arm/boot/dts/omap5.dtsi b/arch/arm/boot/dts/omap5.dtsi
index 9346dbd1075f..10ea8b83a9c7 100644
--- a/arch/arm/boot/dts/omap5.dtsi
+++ b/arch/arm/boot/dts/omap5.dtsi
@@ -119,6 +119,12 @@
        };
    };

+   gpu-subsystem {
+       compatible = "vivante,gc-gpu-subsystem";
+       cores = <&bb2d>;
+       status = "okay";
+   };
+
    /*
     * XXX: Use a flat representation of the OMAP3 interconnect.
     * The real OMAP interconnect network is quite complex.
@@ -448,6 +454,16 @@
            clock-names = "gpu_iclk", "gpu_fclk1", "gpu_fclk2";
        };

+       bb2d: bb2d@59000000 {
+           compatible = "ti,dra7-bb2d","vivante,gc";
+           reg = <0x59000000 0x0700>;
+           interrupts = <GIC_SPI 125 IRQ_TYPE_LEVEL_HIGH>;
+           ti,hwmods = "bb2d";
+           clocks = <&dpll_core_h24x2_ck>;
+           clock-names = "fclk";
+           status = "okay";
+       };
+
        i2c2: i2c@48072000 {
            compatible = "ti,omap4-i2c";
            reg = <0x48072000 0x100>;
--
2.15.1


From c038efd660bd53bb49f67bc29d318ed53fb18767 Mon Sep 17 00:00:00 2001
From: klokik <0xb000@gmail.com>
Date: Tue, 23 Jan 2018 23:21:09 +0200
Subject: [PATCH 2/3] Add bb2d hwmod for omap5

---
 arch/arm/mach-omap2/omap_hwmod_54xx_data.c | 33 ++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
index 2c72fcb48f4d..4bdfd7451dcd 100644
--- a/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
+++ b/arch/arm/mach-omap2/omap_hwmod_54xx_data.c
@@ -850,6 +850,30 @@ static struct omap_hwmod omap54xx_gpu_hwmod = {
    },
 };

+/*
+ * 'bb2d' class
+ *
+ */
+
+static struct omap_hwmod_class omap54xx_bb2d_hwmod_class = {
+   .name   = "bb2d",
+};
+
+/* bb2d */
+static struct omap_hwmod omap54xx_bb2d_hwmod = {
+   .name       = "bb2d",
+   .class      = &omap54xx_bb2d_hwmod_class,
+   .clkdm_name = "dss_clkdm",
+   .main_clk   = "dpll_core_h24x2_ck",
+   .prcm = {
+       .omap4 = {
+           .clkctrl_offs = OMAP54XX_CM_DSS_BB2D_CLKCTRL_OFFSET,
+           .context_offs = OMAP54XX_RM_DSS_BB2D_CONTEXT_OFFSET,
+           .modulemode   = MODULEMODE_SWCTRL,
+       },
+   },
+};
+
 /*
  * 'i2c' class
  * multimaster high-speed i2c controller
@@ -2431,6 +2455,14 @@ static struct omap_hwmod_ocp_if omap54xx_l3_main_1__gpu = {
    .user           = OCP_USER_MPU | OCP_USER_SDMA,
 };

+/* l3_main_2 -> bb2d */
+static struct omap_hwmod_ocp_if omap54xx_l3_main_2__bb2d = {
+   .master     = &omap54xx_l3_main_2_hwmod,
+   .slave      = &omap54xx_bb2d_hwmod,
+   .clk        = "l3_iclk_div",
+   .user       = OCP_USER_MPU | OCP_USER_SDMA,
+};
+
 /* l4_per -> i2c1 */
 static struct omap_hwmod_ocp_if omap54xx_l4_per__i2c1 = {
    .master     = &omap54xx_l4_per_hwmod,
@@ -2821,6 +2853,7 @@ static struct omap_hwmod_ocp_if *omap54xx_hwmod_ocp_ifs[] __initdata = {
    &omap54xx_l4_per__gpio7,
    &omap54xx_l4_per__gpio8,
    &omap54xx_l3_main_1__gpu,
+   &omap54xx_l3_main_2__bb2d,
    &omap54xx_l4_per__i2c1,
    &omap54xx_l4_per__i2c2,
    &omap54xx_l4_per__i2c3,
--
2.15.1


From 620d321c1361d592ebb5bc837397f92d8b6e01d2 Mon Sep 17 00:00:00 2001
From: klokik <0xb000@gmail.com>
Date: Tue, 23 Jan 2018 23:21:49 +0200
Subject: [PATCH 3/3] Add omap to compatible devices for etnaviv drm

---
 drivers/gpu/drm/etnaviv/Kconfig       | 2 +-
 drivers/gpu/drm/etnaviv/etnaviv_drv.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/etnaviv/Kconfig b/drivers/gpu/drm/etnaviv/Kconfig
index a29b8f59eb15..be5b44c6ac39 100644
--- a/drivers/gpu/drm/etnaviv/Kconfig
+++ b/drivers/gpu/drm/etnaviv/Kconfig
@@ -2,7 +2,7 @@
 config DRM_ETNAVIV
    tristate "ETNAVIV (DRM support for Vivante GPU IP cores)"
    depends on DRM
-   depends on ARCH_MXC || ARCH_DOVE || (ARM && COMPILE_TEST)
+   depends on ARCH_MXC || ARCH_DOVE || ARCH_OMAP2PLUS || (ARM && COMPILE_TEST)
    depends on MMU
    select SHMEM
    select SYNC_FILE
diff --git a/drivers/gpu/drm/etnaviv/etnaviv_drv.c b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
index 491eddf9b150..c3348cda6011 100644
--- a/drivers/gpu/drm/etnaviv/etnaviv_drv.c
+++ b/drivers/gpu/drm/etnaviv/etnaviv_drv.c
@@ -694,6 +694,7 @@ static int etnaviv_pdev_remove(struct platform_device *pdev)
 static const struct of_device_id dt_match[] = {
    { .compatible = "fsl,imx-gpu-subsystem" },
    { .compatible = "marvell,dove-gpu-subsystem" },
+   { .compatible = "vivante,gc-gpu-subsystem" },
    {}
 };
 MODULE_DEVICE_TABLE(of, dt_match);
--
2.15.1