From patchwork Sat Jan 24 19:39:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Walmsley X-Patchwork-Id: 5700191 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id B09499F305 for ; Sat, 24 Jan 2015 19:41:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id DB1EF2020E for ; Sat, 24 Jan 2015 19:41:51 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (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 10AED201BB for ; Sat, 24 Jan 2015 19:41:51 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1YF6Yc-0005nM-MM; Sat, 24 Jan 2015 19:39:46 +0000 Received: from utopia.booyaka.com ([74.50.51.50]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1YF6YZ-0005kO-Mu for linux-arm-kernel@lists.infradead.org; Sat, 24 Jan 2015 19:39:44 +0000 Received: (qmail 6254 invoked by uid 1019); 24 Jan 2015 19:39:20 -0000 Date: Sat, 24 Jan 2015 19:39:20 +0000 (UTC) From: Paul Walmsley To: Tero Kristo Subject: Re: [PATCH 13/23] ARM: OMAP2+: CM: determine CM base address from device tree In-Reply-To: <1417103514-17027-14-git-send-email-t-kristo@ti.com> Message-ID: References: <1417103514-17027-1-git-send-email-t-kristo@ti.com> <1417103514-17027-14-git-send-email-t-kristo@ti.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150124_113943_906856_DCC9CFE8 X-CRM114-Status: GOOD ( 12.32 ) X-Spam-Score: -0.0 (/) Cc: tony@atomide.com, nm@ti.com, linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_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 Hi Tero On Thu, 27 Nov 2014, Tero Kristo wrote: > There is no need to provide the CM base address through a low-level API > from the low-level IO init, as this information is available through DT. > Re-routed the parsing function to be called from the CM drivers also to > simplify the implementation under io.c. > > Signed-off-by: Tero Kristo This one breaks boot on OMAP2430 (and presumably all other OMAP2xxx). Adding something like this seems to get it working. - Paul --- arch/arm/mach-omap2/cm_common.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/arch/arm/mach-omap2/cm_common.c b/arch/arm/mach-omap2/cm_common.c index c2d7c7b3002c..1770364f0499 100644 --- a/arch/arm/mach-omap2/cm_common.c +++ b/arch/arm/mach-omap2/cm_common.c @@ -234,7 +234,12 @@ static struct omap_prcm_init_data omap3_cm_data = { .offset = -OMAP3430_IVA2_MOD, }; +static struct omap_prcm_init_data omap2_prcm_data = { + .index = CLK_MEMMAP_INDEX_CM1, +}; + static struct of_device_id omap_cm_dt_match_table[] = { + { .compatible = "ti,omap2-prcm", .data = &omap2_prcm_data }, { .compatible = "ti,omap3-cm", .data = &omap3_cm_data }, { .compatible = "ti,omap4-cm1", .data = &cm_data }, { .compatible = "ti,omap4-cm2", .data = &cm2_data },