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: 5700181 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 6733CC058D for ; Sat, 24 Jan 2015 19:39:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 75AB420212 for ; Sat, 24 Jan 2015 19:39:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6C41F201BB for ; Sat, 24 Jan 2015 19:39:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753839AbbAXTjV (ORCPT ); Sat, 24 Jan 2015 14:39:21 -0500 Received: from utopia.booyaka.com ([74.50.51.50]:44315 "EHLO utopia.booyaka.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753477AbbAXTjV (ORCPT ); Sat, 24 Jan 2015 14:39:21 -0500 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 cc: tony@atomide.com, linux-omap@vger.kernel.org, nm@ti.com, linux-arm-kernel@lists.infradead.org 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 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, 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 },