From patchwork Fri Apr 4 14:53:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Stanislawski X-Patchwork-Id: 3939751 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 68E00BFF02 for ; Fri, 4 Apr 2014 16:55:37 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 92F262038C for ; Fri, 4 Apr 2014 16:55:36 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 228882011D for ; Fri, 4 Apr 2014 16:55:35 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WW5We-0005Ij-4w; Fri, 04 Apr 2014 14:55:24 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1WW5Wb-00057B-NK; Fri, 04 Apr 2014 14:55:21 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1WW5WZ-00053w-7X for linux-arm-kernel@lists.infradead.org; Fri, 04 Apr 2014 14:55:19 +0000 Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N3I00IDHHFLXD60@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Fri, 04 Apr 2014 23:54:57 +0900 (KST) X-AuditID: cbfee61a-b7fb26d00000724f-38-533ec7c1c87d Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id 00.6F.29263.1C7CE335; Fri, 04 Apr 2014 23:54:57 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0N3I00MT5HD4NV30@mmp2.samsung.com>; Fri, 04 Apr 2014 23:54:57 +0900 (KST) From: Tomasz Stanislawski To: linux-kernel@vger.kernel.org, linux-samsung-soc@vger.kernel.org, linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: [PATCH 4/4] Revert "drm/exynos: add mout_hdmi clock in hdmi driver to change parent" Date: Fri, 04 Apr 2014 16:53:21 +0200 Message-id: <1396623201-26000-5-git-send-email-t.stanislaws@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1396623201-26000-1-git-send-email-t.stanislaws@samsung.com> References: <1396623201-26000-1-git-send-email-t.stanislaws@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrFLMWRmVeSWpSXmKPExsVy+t9jQd2Dx+2CDS4tEbe4te4cq0XvuZNM FvOPAFlXvr5ns5h0fwKLRe+Cq2wWF572sFmcbXrDbrHp8TVWi8u75rBZzDi/j8ni6YSLbBaH Vxxgspgx+SWbxbzPO5ks1s94zWIxr/0lq4Ogx4LPV9g9ds66y+5x59oeNo/t3x6wetzvPs7k sXlJvUffllWMHsdvbGfy+LxJLoAzissmJTUnsyy1SN8ugSujbRJPwRfBiqfvNjE2MK7k72Lk 5JAQMJGYd3kfO4QtJnHh3nq2LkYuDiGB6YwSXZu3M0E4XUwSU5sfgVWxAXUcW/KZESQhIrCK UWLi/6fsIA6zwCYmiZ2N3SwgVcIC8RK3P8xjA7FZBFQlDn6ayghi8wp4SGy6/5kRYp+iRPez CWA1nAKeEr1LvjOD2EJANd1rFrBMYORdwMiwilE0tSC5oDgpPddQrzgxt7g0L10vOT93EyM4 xJ9J7WBc2WBxiFGAg1GJh7djh12wEGtiWXFl7iFGCQ5mJRHeuglAId6UxMqq1KL8+KLSnNTi Q4zSHCxK4rwHWq0DhQTSE0tSs1NTC1KLYLJMHJxSDYw9a0yNH/xctf89W5/z7zfGM1al9lVd 231mm0br4ezL59fukpJj/Pwh4jrrgpk/Jjm5rTXQ6Gu4O4MrWfm+aWBC+hRhhqv2r2ebnvwf 9j1J758mz52bFx5t8dLVsnwu+ZWhfvvaNep8GhJN+/eI8zjLrS/cyj3rzD4pn8MO69a+OWU7 9UrAxfelSizFGYmGWsxFxYkAutPUL20CAAA= X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20140404_105519_490522_AADB02AD X-CRM114-Status: UNSURE ( 8.37 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -7.5 (-------) Cc: Tomasz Stanislawski , kgene.kim@samsung.com, mturquette@linaro.org, airlied@linux.ie, t.figa@samsung.com, sw0312.kim@samsung.com, rob.herring@calxeda.com, kishon@ti.com, inki.dae@samsung.com, a.hajda@samsung.com, kyungmin.park@samsung.com, sylvester.nawrocki@gmail.com X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 59956d35a8618235ea715280b49447bb36f2c975. Signed-off-by: Tomasz Stanislawski --- drivers/gpu/drm/exynos/exynos_hdmi.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_hdmi.c b/drivers/gpu/drm/exynos/exynos_hdmi.c index 9a6d652..8ebb4bf 100644 --- a/drivers/gpu/drm/exynos/exynos_hdmi.c +++ b/drivers/gpu/drm/exynos/exynos_hdmi.c @@ -75,7 +75,6 @@ struct hdmi_resources { struct clk *sclk_pixel; struct clk *sclk_hdmiphy; struct clk *hdmiphy; - struct clk *mout_hdmi; struct regulator_bulk_data *regul_bulk; int regul_count; }; @@ -1282,7 +1281,7 @@ static void hdmi_v13_mode_apply(struct hdmi_context *hdata) } clk_disable_unprepare(hdata->res.sclk_hdmi); - clk_set_parent(hdata->res.mout_hdmi, hdata->res.sclk_hdmiphy); + clk_set_parent(hdata->res.sclk_hdmi, hdata->res.sclk_hdmiphy); clk_prepare_enable(hdata->res.sclk_hdmi); /* enable HDMI and timing generator */ @@ -1449,7 +1448,7 @@ static void hdmi_v14_mode_apply(struct hdmi_context *hdata) } clk_disable_unprepare(hdata->res.sclk_hdmi); - clk_set_parent(hdata->res.mout_hdmi, hdata->res.sclk_hdmiphy); + clk_set_parent(hdata->res.sclk_hdmi, hdata->res.sclk_hdmiphy); clk_prepare_enable(hdata->res.sclk_hdmi); /* enable HDMI and timing generator */ @@ -1475,7 +1474,7 @@ static void hdmiphy_conf_reset(struct hdmi_context *hdata) u32 reg; clk_disable_unprepare(hdata->res.sclk_hdmi); - clk_set_parent(hdata->res.mout_hdmi, hdata->res.sclk_pixel); + clk_set_parent(hdata->res.sclk_hdmi, hdata->res.sclk_pixel); clk_prepare_enable(hdata->res.sclk_hdmi); /* operation mode */ @@ -1982,13 +1981,8 @@ static int hdmi_resources_init(struct hdmi_context *hdata) DRM_ERROR("failed to get clock 'hdmiphy'\n"); goto fail; } - res->mout_hdmi = devm_clk_get(dev, "mout_hdmi"); - if (IS_ERR(res->mout_hdmi)) { - DRM_ERROR("failed to get clock 'mout_hdmi'\n"); - goto fail; - } - clk_set_parent(res->mout_hdmi, res->sclk_pixel); + clk_set_parent(res->sclk_hdmi, res->sclk_pixel); res->regul_bulk = devm_kzalloc(dev, ARRAY_SIZE(supply) * sizeof(res->regul_bulk[0]), GFP_KERNEL);