From patchwork Mon Jan 31 16:27:46 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sumit Semwal X-Patchwork-Id: 520221 X-Patchwork-Delegate: tomi.valkeinen@nokia.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p0VGVCQu023447 for ; Mon, 31 Jan 2011 16:31:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755920Ab1AaQbL (ORCPT ); Mon, 31 Jan 2011 11:31:11 -0500 Received: from bear.ext.ti.com ([192.94.94.41]:52772 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754954Ab1AaQbL (ORCPT ); Mon, 31 Jan 2011 11:31:11 -0500 Received: from dlep33.itg.ti.com ([157.170.170.112]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id p0VGV7hV004660 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Mon, 31 Jan 2011 10:31:07 -0600 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep33.itg.ti.com (8.13.7/8.13.7) with ESMTP id p0VGV3nw005370; Mon, 31 Jan 2011 10:31:03 -0600 (CST) Received: from localhost (h83-4.vpn.ti.com [172.24.83.4]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id p0VGUxf06281; Mon, 31 Jan 2011 10:30:59 -0600 (CST) From: Sumit Semwal To: tomi.valkeinen@nokia.com, paul@pwsan.com, khilman@ti.com, hvaibhav@ti.com, linux-omap@vger.kernel.org, b-cousson@ti.com Cc: Sumit Semwal Subject: [PATCH v3 4/4] OMAP4: DSS2: clocks: Add ick as dummy clock Date: Mon, 31 Jan 2011 21:57:46 +0530 Message-Id: <1296491266-6949-5-git-send-email-sumit.semwal@ti.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1296491266-6949-1-git-send-email-sumit.semwal@ti.com> References: <1296491266-6949-1-git-send-email-sumit.semwal@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 (demeter1.kernel.org [140.211.167.41]); Mon, 31 Jan 2011 16:31:23 +0000 (UTC) diff --git a/arch/arm/mach-omap2/clock44xx_data.c b/arch/arm/mach-omap2/clock44xx_data.c index 9bd3ae5..615a361 100644 --- a/arch/arm/mach-omap2/clock44xx_data.c +++ b/arch/arm/mach-omap2/clock44xx_data.c @@ -3112,6 +3112,11 @@ static struct omap_clk omap44xx_clks[] = { CLK("omap_dss", "dss_clk", &dss_dss_clk, CK_443X), CLK("omap_dss", "video_clk", &dss_48mhz_clk, CK_443X), CLK("omap_dss", "fck", &dss_fck, CK_443X), + /* + * On OMAP4, DSS ick is a dummy clock; this is needed for compatibility + * with OMAP2/3. + */ + CLK("omap_dss", "ick", &dummy_ck, CK_443X), CLK(NULL, "efuse_ctrl_cust_fck", &efuse_ctrl_cust_fck, CK_443X), CLK(NULL, "emif1_fck", &emif1_fck, CK_443X), CLK(NULL, "emif2_fck", &emif2_fck, CK_443X),