From patchwork Mon Mar 23 10:49:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 6071471 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 20466BF90F for ; Mon, 23 Mar 2015 10:50:27 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 488E620253 for ; Mon, 23 Mar 2015 10:50:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 500B12020F for ; Mon, 23 Mar 2015 10:50:25 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752100AbbCWKuY (ORCPT ); Mon, 23 Mar 2015 06:50:24 -0400 Received: from bhuna.collabora.co.uk ([93.93.135.160]:33306 "EHLO bhuna.collabora.co.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752033AbbCWKuX (ORCPT ); Mon, 23 Mar 2015 06:50:23 -0400 Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: javier) with ESMTPSA id 190166003BB From: Javier Martinez Canillas To: Kukjin Kim Cc: Javier Martinez Canillas , Olof Johansson , =?UTF-8?q?Andreas=20F=C3=A4rber?= , Marek Szyprowski , Doug Anderson , Andrzej Hajda , linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/1] Revert "ARM: dts: add display power domain for exynos5250" Date: Mon, 23 Mar 2015 11:49:59 +0100 Message-Id: <1427107800-21668-1-git-send-email-javier.martinez@collabora.co.uk> X-Mailer: git-send-email 2.1.4 Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This reverts commit 2d2c9a8d0a4f90e298315d2f4a282d8bd5d45e5c ("ARM: dts: add display power domain for exynos5250"). The mentioned commit added a domain definition for the DISP1 power domain and references to it in the appropriate devices but this change breaks the display in at least the Exynos5250 based Snow and Spring Chromebooks. On these machines, the boot-loader enables the DISP1 domain and before the mentioned commit, the kernel didn't know about it so the power domain remained always enabled. But after that commit when the exynos-dp probe is deferred, the DISP1 domain is powered off and on again but the exynos-dp driver fails to configure the video showing the following error: exynos-dp 145b0000.dp-controller: Timeout of video streamclk ok exynos-dp 145b0000.dp-controller: unable to config video The same issue happens when the display is turned off and on again using DPMS. So, it seems the DISP1 power domain definition is not complete since the display works with the initialization made by the boot loader but it does not work when the power domain is enabled by the kernel. Having the definition in the DTS makes the power domain to be powered on when needed and powered off when not needed which is better in terms of power consumption but for now is safer to just revert the commit to avoid adding a regression in some machines. Signed-off-by: Javier Martinez Canillas Tested-by: Kevin Hilman --- arch/arm/boot/dts/exynos5250.dtsi | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/arch/arm/boot/dts/exynos5250.dtsi b/arch/arm/boot/dts/exynos5250.dtsi index 77f656eb8e6b..482fa97c6b3a 100644 --- a/arch/arm/boot/dts/exynos5250.dtsi +++ b/arch/arm/boot/dts/exynos5250.dtsi @@ -105,12 +105,6 @@ #power-domain-cells = <0>; }; - pd_disp1: disp1-power-domain@100440A0 { - compatible = "samsung,exynos4210-pd"; - reg = <0x100440A0 0x20>; - #power-domain-cells = <0>; - }; - clock: clock-controller@10010000 { compatible = "samsung,exynos5250-clock"; reg = <0x10010000 0x30000>; @@ -752,7 +746,6 @@ hdmi: hdmi { compatible = "samsung,exynos4212-hdmi"; reg = <0x14530000 0x70000>; - power-domains = <&pd_disp1>; interrupts = <0 95 0>; clocks = <&clock CLK_HDMI>, <&clock CLK_SCLK_HDMI>, <&clock CLK_SCLK_PIXEL>, <&clock CLK_SCLK_HDMIPHY>, @@ -765,7 +758,6 @@ mixer { compatible = "samsung,exynos5250-mixer"; reg = <0x14450000 0x10000>; - power-domains = <&pd_disp1>; interrupts = <0 94 0>; clocks = <&clock CLK_MIXER>, <&clock CLK_HDMI>, <&clock CLK_SCLK_HDMI>; @@ -779,7 +771,6 @@ }; dp: dp-controller@145B0000 { - power-domains = <&pd_disp1>; clocks = <&clock CLK_DP>; clock-names = "dp"; phys = <&dp_phy>; @@ -787,7 +778,6 @@ }; fimd: fimd@14400000 { - power-domains = <&pd_disp1>; clocks = <&clock CLK_SCLK_FIMD1>, <&clock CLK_FIMD1>; clock-names = "sclk_fimd", "fimd"; };