dts: gpu: g12b: enable ACE-lite
authorJiyu Yang <Jiyu.Yang@amlogic.com>
Tue, 19 Jun 2018 08:37:34 +0000 (16:37 +0800)
committerYixun Lan <yixun.lan@amlogic.com>
Tue, 24 Jul 2018 02:06:43 +0000 (19:06 -0700)
PD#168676: dts: gpu: g12b: enable ACE-lite

Change-Id: I19eaa04dd0ce35499b162fb1caafa7fa8a438404
Signed-off-by: Jiyu Yang <Jiyu.Yang@amlogic.com>
MAINTAINERS
arch/arm64/boot/dts/amlogic/mesong12a-bifrost.dtsi [new file with mode: 0644]
arch/arm64/boot/dts/amlogic/mesong12a-dvalin.dtsi [deleted file]
arch/arm64/boot/dts/amlogic/mesong12a.dtsi
arch/arm64/boot/dts/amlogic/mesong12b.dtsi

index 8c9ceb7d7a81bb4441319b8a7c7fb6d7494683fe..552809a78583a91e65064925864bf0314b2186e9 100644 (file)
@@ -13674,6 +13674,7 @@ F:      drivers/amlogic/mtd/boot.c
 AMLOGIC GPU DEVICETREE
 M:     Jiyu Yang <jiyu.yang@amlogic.com>
 F:     arch/arm64/boot/dts/amlogic/mesongxtvbb-gpu-t83x.dtsi
+F:     arch/arm64/boot/dts/amlogic/mesong12a-bifrost.dtsi
 
 AMLOGIC GPU SYSTRACE
 M:     Binqi Zhang <binqi.zhang@amlogic.com>
diff --git a/arch/arm64/boot/dts/amlogic/mesong12a-bifrost.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a-bifrost.dtsi
new file mode 100644 (file)
index 0000000..4a7e51d
--- /dev/null
@@ -0,0 +1,128 @@
+/*
+ * arch/arm64/boot/dts/amlogic/mesong12a-bifrost.dtsi
+ *
+ * Copyright (C) 2017 Amlogic, Inc. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ */
+
+/ {
+
+       gpu:bifrost {
+               compatible = "arm,malit60x", "arm,malit6xx", "arm,mali-midgard";
+               #cooling-cells = <2>;           /* min followed by max */
+               reg = <0 0xFFE40000 0 0x04000>, /*mali APB bus base address*/
+                       <0 0xFFD01000 0 0x01000>, /*reset register*/
+                       <0 0xFF800000 0 0x01000>, /*aobus for gpu pmu domain*/
+                       <0 0xFF63c000 0 0x01000>, /*hiubus for gpu clk cntl*/
+                       <0 0xFFD01000 0 0x01000>; /*reset register*/
+               interrupt-parent = <&gic>;
+               interrupts = <0 160 4>, <0 161 4>, <0 162 4>;
+               interrupt-names = "GPU", "MMU", "JOB";
+               /* ACE-Lite = 0; ACE = 1; No-coherency = 31; */
+               /* system-coherency = <31>; */
+
+               num_of_pp = <2>;
+               sc_mpp = <1>; /* number of shader cores used most of time. */
+               clocks = <&clkc CLKID_GPU_MUX &clkc CLKID_GP0_PLL>;
+               clock-names = "gpu_mux","gp0_pll";
+
+
+               tbl =  <&dvfs285_cfg
+                       &dvfs400_cfg
+                       &dvfs500_cfg
+                       &dvfs666_cfg
+                       &dvfs850_cfg
+                       &dvfs850_cfg>;
+
+               dvfs125_cfg:clk125_cfg {
+                       clk_freq = <125000000>;
+                       clk_parent = "fclk_div4";
+                       clkp_freq = <500000000>;
+                       clk_reg = <0xA03>;
+                       voltage = <1150>;
+                       keep_count = <5>;
+                       threshold = <30 120>;
+               };
+
+               dvfs250_cfg:dvfs250_cfg {
+                       clk_freq = <250000000>;
+                       clk_parent = "fclk_div4";
+                       clkp_freq = <500000000>;
+                       clk_reg = <0xA01>;
+                       voltage = <1150>;
+                       keep_count = <5>;
+                       threshold = <80 170>;
+               };
+
+               dvfs285_cfg:dvfs285_cfg {
+                       clk_freq = <285714285>;
+                       clk_parent = "fclk_div7";
+                       clkp_freq = <285714285>;
+                       clk_reg = <0xE00>;
+                       voltage = <1150>;
+                       keep_count = <5>;
+                       threshold = <100 190>;
+               };
+
+               dvfs400_cfg:dvfs400_cfg {
+                       clk_freq = <400000000>;
+                       clk_parent = "fclk_div5";
+                       clkp_freq = <400000000>;
+                       clk_reg = <0xC00>;
+                       voltage = <1150>;
+                       keep_count = <5>;
+                       threshold = <152 207>;
+               };
+
+               dvfs500_cfg:dvfs500_cfg {
+                       clk_freq = <500000000>;
+                       clk_parent = "fclk_div4";
+                       clkp_freq = <500000000>;
+                       clk_reg = <0xA00>;
+                       voltage = <1150>;
+                       keep_count = <5>;
+                       threshold = <180 220>;
+               };
+
+               dvfs666_cfg:dvfs666_cfg {
+                       clk_freq = <666666666>;
+                       clk_parent = "fclk_div3";
+                       clkp_freq = <666666666>;
+                       clk_reg = <0x800>;
+                       voltage = <1150>;
+                       keep_count = <5>;
+                       threshold = <210 236>;
+               };
+
+               dvfs800_cfg:dvfs800_cfg {
+                       clk_freq = <800000000>;
+                       clk_parent = "fclk_div2p5";
+                       clkp_freq = <800000000>;
+                       clk_reg = <0x600>;
+                       voltage = <1150>;
+                       keep_count = <5>;
+                       threshold = <230 255>;
+               };
+
+               dvfs850_cfg:dvfs850_cfg {
+                       clk_freq = <846000000>;
+                       clk_parent = "gp0_pll";
+                       clkp_freq = <846000000>;
+                       clk_reg = <0x200>;
+                       voltage = <1150>;
+                       keep_count = <5>;
+                       threshold = <230 255>;
+               };
+       };
+
+};/* end of / */
diff --git a/arch/arm64/boot/dts/amlogic/mesong12a-dvalin.dtsi b/arch/arm64/boot/dts/amlogic/mesong12a-dvalin.dtsi
deleted file mode 100644 (file)
index d485843..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Amlogic G12a Platform gpu
- *
- * Copyright (c) 2017-2017 Amlogic Ltd
- *
- * This file is licensed under a dual GPLv2 or BSD license.
- *
- */
-
-/ {
-
-       gpu:dvalin@0xffe40000 {
-               compatible = "arm,malit60x", "arm,malit6xx", "arm,mali-midgard";
-               #cooling-cells = <2>;           /* min followed by max */
-               reg = <0 0xFFE40000 0 0x04000>, /*mali APB bus base address*/
-                       <0 0xFFD01000 0 0x01000>, /*reset register*/
-                       <0 0xFF800000 0 0x01000>, /*aobus for gpu pmu domain*/
-                       <0 0xFF63c000 0 0x01000>, /*hiubus for gpu clk cntl*/
-                       <0 0xFFD01000 0 0x01000>; /*reset register*/
-               interrupt-parent = <&gic>;
-               interrupts = <0 160 4>, <0 161 4>, <0 162 4>;
-               interrupt-names = "GPU", "MMU", "JOB";
-
-               num_of_pp = <2>;
-               sc_mpp = <1>; /* number of shader cores used most of time. */
-               clocks = <&clkc CLKID_GPU_MUX &clkc CLKID_GP0_PLL>;
-               clock-names = "gpu_mux","gp0_pll";
-
-
-               tbl =  <&dvfs285_cfg
-                       &dvfs400_cfg
-                       &dvfs500_cfg
-                       &dvfs666_cfg
-                       &dvfs850_cfg
-                       &dvfs850_cfg>;
-
-               dvfs125_cfg:clk125_cfg {
-                       clk_freq = <125000000>;
-                       clk_parent = "fclk_div4";
-                       clkp_freq = <500000000>;
-                       clk_reg = <0xA03>;
-                       voltage = <1150>;
-                       keep_count = <5>;
-                       threshold = <30 120>;
-               };
-
-               dvfs250_cfg:dvfs250_cfg {
-                       clk_freq = <250000000>;
-                       clk_parent = "fclk_div4";
-                       clkp_freq = <500000000>;
-                       clk_reg = <0xA01>;
-                       voltage = <1150>;
-                       keep_count = <5>;
-                       threshold = <80 170>;
-               };
-
-               dvfs285_cfg:dvfs285_cfg {
-                       clk_freq = <285714285>;
-                       clk_parent = "fclk_div7";
-                       clkp_freq = <285714285>;
-                       clk_reg = <0xE00>;
-                       voltage = <1150>;
-                       keep_count = <5>;
-                       threshold = <100 190>;
-               };
-
-               dvfs400_cfg:dvfs400_cfg {
-                       clk_freq = <400000000>;
-                       clk_parent = "fclk_div5";
-                       clkp_freq = <400000000>;
-                       clk_reg = <0xC00>;
-                       voltage = <1150>;
-                       keep_count = <5>;
-                       threshold = <152 207>;
-               };
-
-               dvfs500_cfg:dvfs500_cfg {
-                       clk_freq = <500000000>;
-                       clk_parent = "fclk_div4";
-                       clkp_freq = <500000000>;
-                       clk_reg = <0xA00>;
-                       voltage = <1150>;
-                       keep_count = <5>;
-                       threshold = <180 220>;
-               };
-
-               dvfs666_cfg:dvfs666_cfg {
-                       clk_freq = <666666666>;
-                       clk_parent = "fclk_div3";
-                       clkp_freq = <666666666>;
-                       clk_reg = <0x800>;
-                       voltage = <1150>;
-                       keep_count = <5>;
-                       threshold = <210 236>;
-               };
-
-               dvfs800_cfg:dvfs800_cfg {
-                       clk_freq = <800000000>;
-                       clk_parent = "fclk_div2p5";
-                       clkp_freq = <800000000>;
-                       clk_reg = <0x600>;
-                       voltage = <1150>;
-                       keep_count = <5>;
-                       threshold = <230 255>;
-               };
-
-               dvfs850_cfg:dvfs850_cfg {
-                       clk_freq = <846000000>;
-                       clk_parent = "gp0_pll";
-                       clkp_freq = <846000000>;
-                       clk_reg = <0x200>;
-                       voltage = <1150>;
-                       keep_count = <5>;
-                       threshold = <230 255>;
-               };
-       };
-
-};/* end of / */
index a19da76461be603514758348157747be987e3f63..cbd933657cffad1ba7595309e0a5c3739717c713 100644 (file)
@@ -26,7 +26,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/input/meson_rc.h>
 #include <dt-bindings/phy/phy-amlogic-pcie.h>
-#include "mesong12a-dvalin.dtsi"
+#include "mesong12a-bifrost.dtsi"
 
 / {
        cpus:cpus {
index 9206ffb85a26318888a068ba6e5cfdbbd5091c0d..48f7e18919b9005ac497e13c3f182cc6a2440918 100644 (file)
@@ -26,7 +26,7 @@
 #include <dt-bindings/input/input.h>
 #include <dt-bindings/input/meson_rc.h>
 #include <dt-bindings/phy/phy-amlogic-pcie.h>
-#include "mesong12a-dvalin.dtsi"
+#include "mesong12a-bifrost.dtsi"
 #include "g12b-sched-energy.dtsi"
 
 / {
        };
 };
 
+&gpu{
+       system-coherency = <0>;
+};
+
 &pinctrl_aobus {
        sd_to_ao_uart_clr_pins:sd_to_ao_uart_clr_pins {
                mux {