From patchwork Sat Sep 21 13:45:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aaro Koskinen X-Patchwork-Id: 2922441 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 B9AE1BFF05 for ; Sat, 21 Sep 2013 13:51:07 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 081FB200ED for ; Sat, 21 Sep 2013 13:51:07 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1E5B0200E7 for ; Sat, 21 Sep 2013 13:51:06 +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 1VNNZX-0006qD-6e; Sat, 21 Sep 2013 13:50:07 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VNNZK-00004v-L8; Sat, 21 Sep 2013 13:49:54 +0000 Received: from filtteri5.pp.htv.fi ([213.243.153.188]) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VNNYq-0008Sw-UV for linux-arm-kernel@lists.infradead.org; Sat, 21 Sep 2013 13:49:26 +0000 Received: from localhost (localhost [127.0.0.1]) by filtteri5.pp.htv.fi (Postfix) with ESMTP id 581DD5A6F95; Sat, 21 Sep 2013 16:48:59 +0300 (EEST) X-Virus-Scanned: Debian amavisd-new at pp.htv.fi Received: from smtp4.welho.com ([213.243.153.38]) by localhost (filtteri5.pp.htv.fi [213.243.153.188]) (amavisd-new, port 10024) with ESMTP id 4qXNrWFqA+Pp; Sat, 21 Sep 2013 16:48:54 +0300 (EEST) Received: from blackmetal.pp.htv.fi (cs181064211.pp.htv.fi [82.181.64.211]) by smtp4.welho.com (Postfix) with ESMTP id 776485BC011; Sat, 21 Sep 2013 16:48:54 +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 Subject: [PATCH 1/3] ARM: OMAP2: HACK: hardcode hsmmc2 input clock source for N950/N9 Date: Sat, 21 Sep 2013 16:45:40 +0300 Message-Id: <1379771142-29087-2-git-send-email-aaro.koskinen@iki.fi> X-Mailer: git-send-email 1.8.4.rc3 In-Reply-To: <1379771142-29087-1-git-send-email-aaro.koskinen@iki.fi> References: <1379771142-29087-1-git-send-email-aaro.koskinen@iki.fi> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130921_094925_151529_214FFC87 X-CRM114-Status: UNSURE ( 9.92 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.9 (-) Cc: Sakari Ailus , Aaro Koskinen 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 Without this the eMMC (root file system) cannot be used on N950/N9. Any ideas for a proper solution? Signed-off-by: Aaro Koskinen --- arch/arm/mach-omap2/board-generic.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 39c7838..8be49b3 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c @@ -20,6 +20,7 @@ #include #include "common.h" +#include "control.h" #include "common-board-devices.h" #include "dss-common.h" @@ -51,12 +52,26 @@ static void __init legacy_init_ehci_clk(char *clkname) } } +static void __init hsmmc2_input_clk(void) +{ + u32 reg; + + reg = omap_ctrl_readl(OMAP343X_CONTROL_DEVCONF1); + reg |= OMAP2_MMCSDIO2ADPCLKISEL; + omap_ctrl_writel(reg, OMAP343X_CONTROL_DEVCONF1); +} + static void __init omap_generic_init(void) { omap_sdrc_init(NULL, NULL); of_platform_populate(NULL, omap_dt_match_table, NULL, NULL); + /* HACK: Configure the MMC input clock source on N950/N9. */ + if (of_machine_is_compatible("nokia,omap3-n950") || + of_machine_is_compatible("nokia,omap3-n9")) + hsmmc2_input_clk(); + /* * HACK: call display setup code for selected boards to enable omapdss. * This will be removed when omapdss supports DT.