From patchwork Wed Oct 10 14:30:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matt Porter X-Patchwork-Id: 1574001 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 9E35D40135 for ; Wed, 10 Oct 2012 14:30:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932171Ab2JJOaB (ORCPT ); Wed, 10 Oct 2012 10:30:01 -0400 Received: from mail-ie0-f174.google.com ([209.85.223.174]:50922 "EHLO mail-ie0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932084Ab2JJOaA (ORCPT ); Wed, 10 Oct 2012 10:30:00 -0400 Received: by mail-ie0-f174.google.com with SMTP id k13so947715iea.19 for ; Wed, 10 Oct 2012 07:30:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer; bh=7+9JeWsSC8w6atK4CSHTKXoaro85QpfN80UkPrbNf2M=; b=jQTLfsVrwNFUYYhST5BeO98qG8yQawZCngfsnoYvKnuBu0vdWW+GMAf+yaok7KM+E0 gmrSV9Vv50jZGvqFwguXwreAIp0P7uRNDC0dLMu/g8yAbVKzXNmWOU2gnsRXJ7Fd0Rhr Gs2yRbTZRh9E0QShUJ3t5xT0kFNvmxl9RQcR9JO9/kGnWv5GsDH5mH6aiGz5TuI7WjvB A+y/DKQhxscgZZ/s9nNmKsbtyjmy0t57YhyIc25iRbtd/kUOP3knXjyzCmgJHP8cozI3 Xtow5e/Ur75wRedlMCHwFMf9L0Bl5BJnxOKnCFMsi6OzFSl2ra4lxolWibJaw2fCSJ5k wnFQ== Received: by 10.50.155.193 with SMTP id vy1mr5447034igb.50.1349879399893; Wed, 10 Oct 2012 07:29:59 -0700 (PDT) Received: from beef.ohporter.com (cpe-24-166-64-7.neo.res.rr.com. [24.166.64.7]) by mx.google.com with ESMTPS id y9sm1232467igm.10.2012.10.10.07.29.58 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 10 Oct 2012 07:29:59 -0700 (PDT) From: Matt Porter To: Tony Lindgren , Vaibhav Hiremath , Linux OMAP List Cc: Linux ARM Kernel List , Linux Kernel Mailing List Subject: [PATCH] ARM: OMAP2+: AM33XX: clock data: fix mcasp entries Date: Wed, 10 Oct 2012 10:30:49 -0400 Message-Id: <1349879449-22657-1-git-send-email-mporter@ti.com> X-Mailer: git-send-email 1.7.9.5 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org 6ea74cb ARM: OMAP2+: hwmod: get rid of all omap_clk_get_by_name usage exposes a bug in the AM33XX clock data for mcasp. After moving to clk_get() usage, the _init() of all registered hwmods fails on mcasp0 due to incorrect clock data causing clk_get() to fail. This causes all successive hwmods to fail to _init() leaving them in a bad state. This patch updates the mcasp clock entries so clk_get() will succeed. It is tested on BeagleBone and is needed for 3.7-rc1 to fix AM33xx boot. Signed-off-by: Matt Porter --- arch/arm/mach-omap2/clock33xx_data.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/clock33xx_data.c b/arch/arm/mach-omap2/clock33xx_data.c index b87b88c..0a64139 100644 --- a/arch/arm/mach-omap2/clock33xx_data.c +++ b/arch/arm/mach-omap2/clock33xx_data.c @@ -1033,8 +1033,8 @@ static struct omap_clk am33xx_clks[] = { CLK("481d0000.d_can", NULL, &dcan1_fck, CK_AM33XX), CLK(NULL, "debugss_ick", &debugss_ick, CK_AM33XX), CLK(NULL, "pruss_ocp_gclk", &pruss_ocp_gclk, CK_AM33XX), - CLK("davinci-mcasp.0", NULL, &mcasp0_fck, CK_AM33XX), - CLK("davinci-mcasp.1", NULL, &mcasp1_fck, CK_AM33XX), + CLK(NULL, "mcasp0_fck", &mcasp0_fck, CK_AM33XX), + CLK(NULL, "mcasp1_fck", &mcasp1_fck, CK_AM33XX), CLK("NULL", "mmc2_fck", &mmc2_fck, CK_AM33XX), CLK(NULL, "mmu_fck", &mmu_fck, CK_AM33XX), CLK(NULL, "smartreflex0_fck", &smartreflex0_fck, CK_AM33XX),