From patchwork Mon Aug 22 08:26:10 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomi Valkeinen X-Patchwork-Id: 1084462 X-Patchwork-Delegate: tomi.valkeinen@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p7M8QUnm014247 for ; Mon, 22 Aug 2011 08:26:30 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754643Ab1HVI01 (ORCPT ); Mon, 22 Aug 2011 04:26:27 -0400 Received: from na3sys009aog102.obsmtp.com ([74.125.149.69]:34898 "EHLO na3sys009aog102.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754230Ab1HVI00 (ORCPT ); Mon, 22 Aug 2011 04:26:26 -0400 Received: from mail-bw0-f52.google.com ([209.85.214.52]) (using TLSv1) by na3sys009aob102.postini.com ([74.125.148.12]) with SMTP ID DSNKTlISsMBji8oylSMqfxfyUbIljvAbL2Pi@postini.com; Mon, 22 Aug 2011 01:26:25 PDT Received: by mail-bw0-f52.google.com with SMTP id zs2so3627548bkb.25 for ; Mon, 22 Aug 2011 01:26:24 -0700 (PDT) Received: by 10.204.153.27 with SMTP id i27mr801044bkw.323.1314001584388; Mon, 22 Aug 2011 01:26:24 -0700 (PDT) Received: from localhost.localdomain (a62-248-128-208.elisa-laajakaista.fi [62.248.128.208]) by mx.google.com with ESMTPS id zy5sm1834133bkb.64.2011.08.22.01.26.22 (version=SSLv3 cipher=OTHER); Mon, 22 Aug 2011 01:26:23 -0700 (PDT) From: Tomi Valkeinen To: linux-omap@vger.kernel.org, linux-fbdev@vger.kernel.org Cc: archit@ti.com, Tomi Valkeinen Subject: [PATCH 2/3] Revert "OMAP: DSS2: HDMI: fix hdmi clock name" Date: Mon, 22 Aug 2011 11:26:10 +0300 Message-Id: <1314001571-17877-3-git-send-email-tomi.valkeinen@ti.com> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1314001571-17877-1-git-send-email-tomi.valkeinen@ti.com> References: <1314001571-17877-1-git-send-email-tomi.valkeinen@ti.com> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Mon, 22 Aug 2011 08:26:31 +0000 (UTC) This reverts commit df5d3ed23cf73ee0763a8963003bda9b69d9620f. The HDMI clock name has been fixed in HWMOD data. Signed-off-by: Tomi Valkeinen --- drivers/video/omap2/dss/hdmi.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c index 3767323..9353dcf 100644 --- a/drivers/video/omap2/dss/hdmi.c +++ b/drivers/video/omap2/dss/hdmi.c @@ -1704,9 +1704,9 @@ static int hdmi_get_clocks(struct platform_device *pdev) hdmi.sys_clk = clk; - clk = clk_get(&pdev->dev, "dss_48mhz_clk"); + clk = clk_get(&pdev->dev, "fck"); if (IS_ERR(clk)) { - DSSERR("can't get hdmi_clk\n"); + DSSERR("can't get fck\n"); clk_put(hdmi.sys_clk); return PTR_ERR(clk); }