ENGR00303542-2 Change pu dummy for i.mx6sx

-Change pu dummy for i.mx6sx to allow gpu power operation

Signed-off-by: Robin Gong <b38343@freescale.com>
Signed-off-by: Loren Huang <b02279@freescale.com>

3 files changed, 24 insertions, 3 deletions

diff --git a/arch/arm/boot/dts/imx6sx.dtsi b/arch/arm/boot/dts/imx6sx.dtsi
index 6a527c7a02b3..73285aa81334 100644
--- a/arch/arm/boot/dts/imx6sx.dtsi
+++ b/arch/arm/boot/dts/imx6sx.dtsi
@@ -72,6 +72,10 @@
                 };
         };
 
+                pu_dummy: pudummy_reg {
+                        compatible = "fsl,imx6-dummy-pureg"; /* only used in ldo-bypass */
+                };
+
         soc {
                 #address-cells = <1>;
                 #size-cells = <1>;
@@ -352,9 +356,12 @@
                         };
 
                         gpc: gpc@020dc000 {
-                                compatible = "fsl,imx6q-gpc", "syscon";
+                                compatible = "fsl,imx6q-gpc";
                                 reg = <0x020dc000 0x4000>;
                                 interrupts = <0 89 0x04>;
+                                clocks = <&clks IMX6SX_CLK_GPU>, <&clks IMX6SX_CLK_IPG>;
+                                clock-names = "gpu3d_core", "ipg";
+                                pu-supply = <&pu_dummy>;
                         };
 
                         gpio1: gpio@0209c000 {
diff --git a/arch/arm/mach-imx/anatop.c b/arch/arm/mach-imx/anatop.c
index 9bdea7ec68b2..a2795cc3c7bb 100644
--- a/arch/arm/mach-imx/anatop.c
+++ b/arch/arm/mach-imx/anatop.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013 Freescale Semiconductor, Inc.
+ * Copyright (C) 2013-2014 Freescale Semiconductor, Inc.
  *
  * The code contained herein is licensed under the GNU General Public
  * License. You may obtain a copy of the GNU General Public License
@@ -112,6 +112,9 @@ void imx_anatop_pu_enable(bool enable)
 {
         u32 val;
 
+        if (cpu_is_imx6sx())
+                return;
+
         regmap_read(anatop, ANADIG_REG_CORE, &val);
         val &= ANADIG_REG_TARG_MASK << ANADIG_REG2_TARG_SHIFT;
         /*
diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c
index 97343277d1e8..7b6035cf1a7b 100644
--- a/arch/arm/mach-imx/gpc.c
+++ b/arch/arm/mach-imx/gpc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2013 Freescale Semiconductor, Inc.
+ * Copyright 2011-2014 Freescale Semiconductor, Inc.
  * Copyright 2011 Linaro Ltd.
  *
  * The code contained herein is licensed under the GNU General Public
@@ -225,6 +225,8 @@ static void imx_pu_clk(bool enable)
                 if (cpu_is_imx6sl()) {
                         clk_prepare_enable(gpu2d_clk);
                         clk_prepare_enable(openvg_axi_clk);
+                } else if (cpu_is_imx6sx()) {
+                        clk_prepare_enable(gpu3d_clk);
                 } else {
                         clk_prepare_enable(gpu3d_clk);
                         clk_prepare_enable(gpu3d_shader_clk);
@@ -237,6 +239,8 @@ static void imx_pu_clk(bool enable)
                 if (cpu_is_imx6sl()) {
                         clk_disable_unprepare(gpu2d_clk);
                         clk_disable_unprepare(openvg_axi_clk);
+                } else if (cpu_is_imx6sx()) {
+                        clk_disable_unprepare(gpu3d_clk);
                 } else {
                         clk_disable_unprepare(gpu3d_clk);
                         clk_disable_unprepare(gpu3d_shader_clk);
@@ -492,6 +496,13 @@ static int imx_gpc_probe(struct platform_device *pdev)
                         dev_err(gpc_dev, "failed to get clk!\n");
                         return -ENOENT;
                 }
+        } else if (cpu_is_imx6sx()) {
+                gpu3d_clk = devm_clk_get(gpc_dev, "gpu3d_core");
+                ipg_clk = devm_clk_get(gpc_dev, "ipg");
+                if (IS_ERR(gpu3d_clk) || IS_ERR(ipg_clk)) {
+                        dev_err(gpc_dev, "failed to get clk!\n");
+                        return -ENOENT;
+                }
         } else {
                 gpu3d_clk = devm_clk_get(gpc_dev, "gpu3d_core");
                 gpu3d_shader_clk = devm_clk_get(gpc_dev, "gpu3d_shader");