From patchwork Tue Sep 24 19:28:15 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaro Koskinen X-Patchwork-Id: 2935461 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 2D1689F288 for ; Tue, 24 Sep 2013 19:29:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 1727020453 for ; Tue, 24 Sep 2013 19:29:10 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 72C6620426 for ; Tue, 24 Sep 2013 19:29:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754671Ab3IXT3H (ORCPT ); Tue, 24 Sep 2013 15:29:07 -0400 Received: from filtteri2.pp.htv.fi ([213.243.153.185]:42042 "EHLO filtteri2.pp.htv.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754652Ab3IXT3E (ORCPT ); Tue, 24 Sep 2013 15:29:04 -0400 Received: from localhost (localhost [127.0.0.1]) by filtteri2.pp.htv.fi (Postfix) with ESMTP id 7D4EF19BCFF; Tue, 24 Sep 2013 22:29:03 +0300 (EEST) X-Virus-Scanned: Debian amavisd-new at pp.htv.fi Received: from smtp6.welho.com ([213.243.153.40]) by localhost (filtteri2.pp.htv.fi [213.243.153.185]) (amavisd-new, port 10024) with ESMTP id D9HlbIkaaJlB; Tue, 24 Sep 2013 22:28:58 +0300 (EEST) Received: from blackmetal.pp.htv.fi (cs181064211.pp.htv.fi [82.181.64.211]) by smtp6.welho.com (Postfix) with ESMTP id 85DEA5BC005; Tue, 24 Sep 2013 22:28:58 +0300 (EEST) From: Aaro Koskinen To: Tony Lindgren , =?UTF-8?q?Beno=C3=AEt=20Cousson?= , devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org Cc: Aaro Koskinen Subject: [PATCH v2 1/3] ARM: OMAP2: pdata-quirks: set internal clock source for MMC2 on N950/N9 Date: Tue, 24 Sep 2013 22:28:15 +0300 Message-Id: <1380050897-6605-2-git-send-email-aaro.koskinen@iki.fi> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1380050897-6605-1-git-send-email-aaro.koskinen@iki.fi> References: <1380050897-6605-1-git-send-email-aaro.koskinen@iki.fi> Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-9.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham 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 Set internal clock source for MMC2 on N950/N9. Signed-off-by: Aaro Koskinen --- arch/arm/mach-omap2/pdata-quirks.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/arch/arm/mach-omap2/pdata-quirks.c b/arch/arm/mach-omap2/pdata-quirks.c index 52b4bc3..1a7f492 100644 --- a/arch/arm/mach-omap2/pdata-quirks.c +++ b/arch/arm/mach-omap2/pdata-quirks.c @@ -16,6 +16,7 @@ #include "common.h" #include "common-board-devices.h" #include "dss-common.h" +#include "control.h" struct pdata_init { const char *compatible; @@ -62,6 +63,17 @@ static inline void omap_init_wl12xx_of(void) } #endif +#ifdef CONFIG_ARCH_OMAP3 +static void __init hsmmc2_internal_input_clk(void) +{ + u32 reg; + + reg = omap_ctrl_readl(OMAP343X_CONTROL_DEVCONF1); + reg |= OMAP2_MMCSDIO2ADPCLKISEL; + omap_ctrl_writel(reg, OMAP343X_CONTROL_DEVCONF1); +} +#endif /* CONFIG_ARCH_OMAP3 */ + #ifdef CONFIG_ARCH_OMAP4 static void __init omap4_sdp_legacy_init(void) { @@ -86,6 +98,10 @@ static void __init omap5_uevm_legacy_init(void) #endif static struct pdata_init pdata_quirks[] __initdata = { +#ifdef CONFIG_ARCH_OMAP3 + { "nokia,omap3-n9", hsmmc2_internal_input_clk, }, + { "nokia,omap3-n950", hsmmc2_internal_input_clk, }, +#endif #ifdef CONFIG_ARCH_OMAP4 { "ti,omap4-sdp", omap4_sdp_legacy_init, }, { "ti,omap4-panda", omap4_panda_legacy_init, },