diff options
| author | Robin Gong <b38343@freescale.com> | 2015-06-12 11:26:52 +0800 |
|---|---|---|
| committer | Robin Gong <b38343@freescale.com> | 2015-06-12 11:50:56 +0800 |
| commit | 8d3c66a38415b5cce6ea83c5f737cab8ab224111 (patch) | |
| tree | f0c063df04ab2a0bb3d18a23a1c7cde90f4e5f6f /arch/arm/mach-imx/gpc.c | |
| parent | aa8cdc894a3c8556da4326bb9002abe57ec61ebc (diff) | |
MLK-11097-2: ARM: gpc: skip power domain touch for i.mx6ul
Skip power domain touch since there are no PU and display misc power domain
on i.mx6ul.
Signed-off-by: Robin Gong <b38343@freescale.com>
(cherry picked from commit fe28d08ebb7922d429f5b24c13b4ea2eccf5b8f6)
Diffstat (limited to 'arch/arm/mach-imx/gpc.c')
| -rw-r--r-- | arch/arm/mach-imx/gpc.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/gpc.c b/arch/arm/mach-imx/gpc.c index 18f026bef9eb..bd5a7c8753a5 100644 --- a/arch/arm/mach-imx/gpc.c +++ b/arch/arm/mach-imx/gpc.c @@ -559,6 +559,10 @@ static int imx_gpc_genpd_init(struct device *dev, struct regulator *pu_reg) int pu_clks, disp_clks, ipg_clks = 1; int i = 0, k = 0; + /* No pu and display misc on i.mx6ul */ + if (cpu_is_imx6ul()) + return 0; + imx6q_pu_domain.base.of_node = dev->of_node; imx6q_pu_domain.reg = pu_reg; |