From patchwork Tue May 13 09:26:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 30022 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ie0-f200.google.com (mail-ie0-f200.google.com [209.85.223.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E937F20446 for ; Tue, 13 May 2014 10:02:39 +0000 (UTC) Received: by mail-ie0-f200.google.com with SMTP id rd18sf491653iec.11 for ; Tue, 13 May 2014 03:02:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:in-reply-to:references :sender:precedence:list-id:x-original-sender :x-original-authentication-results:mailing-list:list-post:list-help :list-archive:list-unsubscribe; bh=aJGIs/7Q/9LC91ZejFFUQ1NqaBdOMAcjAvQvA/ru5jg=; b=hNSehFGNTRkvu4bxVy6KxVLapl7KJ1gsgCYdCkKwuZoA4P+GwoOo0hIkhkvQdXa1HF zS6g2kUIK3IYEMc7yRjKy648uu+uIciApaRVsracISRUww5pnyezAKJV3D5YlXWlwLPA T90N+U7mYbi5H0REEuX3J9mnhGDFoNCSShysZ4zTybJaYiyUQtqtDytBBINEarFCMX4j LGG6BT+nsg5r4p46j3XIh8rKlKIvxLSyGwtV9YR8Ki41764bEvaiSalTNGxLJCrUeAb6 q2ENJGTtHR3AGxjkU91IhtGOUsFVN8c5AnYct9E14e8NotanMzx2R1K9Ua4NQynaAhTg BFbA== X-Gm-Message-State: ALoCoQll7poU2oNvURvkPjv0yPzd6pSfEwrjzKKtFngx5C6ZBtRlgfRQTMTsI1ff5Poj00T7Ve+M X-Received: by 10.42.229.194 with SMTP id jj2mr15019722icb.18.1399975359470; Tue, 13 May 2014 03:02:39 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.106.201 with SMTP id e67ls1831306qgf.94.gmail; Tue, 13 May 2014 03:02:39 -0700 (PDT) X-Received: by 10.220.250.203 with SMTP id mp11mr28088987vcb.2.1399975359359; Tue, 13 May 2014 03:02:39 -0700 (PDT) Received: from mail-ve0-f172.google.com (mail-ve0-f172.google.com [209.85.128.172]) by mx.google.com with ESMTPS id uc9si1913704vdc.174.2014.05.13.03.02.39 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 13 May 2014 03:02:39 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.172 as permitted sender) client-ip=209.85.128.172; Received: by mail-ve0-f172.google.com with SMTP id oz11so123858veb.17 for ; Tue, 13 May 2014 03:02:39 -0700 (PDT) X-Received: by 10.220.162.6 with SMTP id t6mr28645574vcx.12.1399975359283; Tue, 13 May 2014 03:02:39 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.220.221.72 with SMTP id ib8csp138025vcb; Tue, 13 May 2014 03:02:38 -0700 (PDT) X-Received: by 10.68.171.4 with SMTP id aq4mr4029373pbc.150.1399975358351; Tue, 13 May 2014 03:02:38 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id ot5si7706476pbc.510.2014.05.13.03.02.37; Tue, 13 May 2014 03:02:37 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1760120AbaEMJ74 (ORCPT + 27 others); Tue, 13 May 2014 05:59:56 -0400 Received: from ip4-83-240-18-248.cust.nbox.cz ([83.240.18.248]:60831 "EHLO ip4-83-240-18-248.cust.nbox.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1760077AbaEMJ24 (ORCPT ); Tue, 13 May 2014 05:28:56 -0400 Received: from ku by ip4-83-240-18-248.cust.nbox.cz with local (Exim 4.80.1) (envelope-from ) id 1Wk914-0002nR-8D; Tue, 13 May 2014 11:28:54 +0200 From: Jiri Slaby To: stable@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Roger Quadros , Paul Walmsley , Keshava Munegowda , Partha Basak , Jiri Slaby Subject: [PATCH 3.12 013/182] ARM: OMAP3: hwmod data: Correct clock domains for USB modules Date: Tue, 13 May 2014 11:26:05 +0200 Message-Id: X-Mailer: git-send-email 1.9.3 In-Reply-To: <7aa1bde8f6143b2db33e6567a8c3a4debaa246f4.1399973152.git.jslaby@suse.cz> References: <7aa1bde8f6143b2db33e6567a8c3a4debaa246f4.1399973152.git.jslaby@suse.cz> In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: linux-kernel-owner@vger.kernel.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.172 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Roger Quadros 3.12-stable review patch. If anyone has any objections, please let me know. =============== commit c6c56697ae4bf1226263c19e8353343d7083f40e upstream. OMAP3 doesn't contain "l3_init_clkdm" clock domain. Use the proper clock domains for USB Host and USB TLL modules. Gets rid of the following warnings during boot omap_hwmod: usb_host_hs: could not associate to clkdm l3_init_clkdm omap_hwmod: usb_tll_hs: could not associate to clkdm l3_init_clkdm Reported-by: Nishanth Menon Cc: Paul Walmsley Signed-off-by: Roger Quadros Fixes: de231388cb80a8ef3e779bbfa0564ba0157b7377 ("ARM: OMAP: USB: EHCI and OHCI hwmod structures for OMAP3") Cc: Keshava Munegowda Cc: Partha Basak Signed-off-by: Paul Walmsley Signed-off-by: Jiri Slaby --- arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c index 60f23440082e..857e76c38a15 100644 --- a/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c +++ b/arch/arm/mach-omap2/omap_hwmod_3xxx_data.c @@ -1968,7 +1968,7 @@ static struct omap_hwmod_irq_info omap3xxx_usb_host_hs_irqs[] = { static struct omap_hwmod omap3xxx_usb_host_hs_hwmod = { .name = "usb_host_hs", .class = &omap3xxx_usb_host_hs_hwmod_class, - .clkdm_name = "l3_init_clkdm", + .clkdm_name = "usbhost_clkdm", .mpu_irqs = omap3xxx_usb_host_hs_irqs, .main_clk = "usbhost_48m_fck", .prcm = { @@ -2053,7 +2053,7 @@ static struct omap_hwmod_irq_info omap3xxx_usb_tll_hs_irqs[] = { static struct omap_hwmod omap3xxx_usb_tll_hs_hwmod = { .name = "usb_tll_hs", .class = &omap3xxx_usb_tll_hs_hwmod_class, - .clkdm_name = "l3_init_clkdm", + .clkdm_name = "core_l4_clkdm", .mpu_irqs = omap3xxx_usb_tll_hs_irqs, .main_clk = "usbtll_fck", .prcm = {